Commit Graph

2913 Commits

Author SHA1 Message Date
Prashant Singh ce5dc3c09d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-16 16:17:17 +05:30
Prashant Singh c5aec7445d Fixed a bug in sku finding which was using like instead of equals operator 2019-09-16 16:16:45 +05:30
Jitendra Singh 58306e3252
Merge pull request #1448 from prateek-webkul/master
Issue #1442 fixed
2019-09-16 10:19:58 +05:30
Jitendra Singh 9cc13c8ca6
Merge pull request #1462 from codeinnovers/master
fix of issue #1460
2019-09-16 10:18:42 +05:30
Jitendra Singh c7b231979b
Merge pull request #1458 from rahulshukla-webkul/development
change defualt payment method & oderder number in customer invoice
2019-09-16 10:18:24 +05:30
CodeInnovers 3d03bc099c fixed issue #1460 2019-09-15 23:33:35 +05:30
codeinnovers 743ebfede0
Merge pull request #2 from bagisto/master
merge from main branch
2019-09-15 22:53:56 +05:30
rahul shukla 53030b2a21 conditon added for checkout back button 2019-09-13 17:02:46 +05:30
rahul shukla 00b83b1398 change defualt payment method & oderder number in customer invoice 2019-09-13 15:54:05 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
Jitendra Singh bc862d9d99
Merge pull request #1457 from rahulshukla-webkul/development
Issue #1260 & mail logo
2019-09-13 15:07:12 +05:30
rahul shukla 48d86f05e8 Issue #1260 & mail logo 2019-09-13 15:04:29 +05:30
Jitendra Singh ff653c9e1d
Merge pull request #1456 from rahulshukla-webkul/development
Development
2019-09-13 14:39:18 +05:30
rahul shukla c39255e254 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-13 14:35:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
Jitendra Singh 1c8810e40d
Merge pull request #1454 from prashant-webkul/development
Cart rule Actions class method getEligibleItems had an boolean expression which wasn't working as intended.
2019-09-13 12:53:01 +05:30
prateek srivastava 98792912d8 translation added 2019-09-13 12:50:06 +05:30
prateek srivastava 9794fc659e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-13 12:45:07 +05:30
Prashant Singh 685aedf528 getEligble items in action fixed as its was not working as boolean expression 2019-09-13 12:22:50 +05:30
Prashant Singh d02c903470 Support request template 2019-09-13 11:37:00 +05:30
Prashant Singh a7b2925db4 Fixed issue #1452 2019-09-13 11:01:54 +05:30
Jitendra Singh cdbd654f4f
Merge pull request #1451 from prashant-webkul/development
Development
2019-09-13 10:18:24 +05:30
Prashant Singh fa1af6f8e0 Templates moved in ISSUE_TEMPLATE directory 2019-09-13 00:40:42 +05:30
Prashant Singh 6dfa36871e github template added for support, bugs/issues, feature and security vulnerabilities. 2019-09-13 00:37:58 +05:30
Jitendra Singh 928ac803a9
Merge pull request #1450 from rahulshukla-webkul/development
Issue #1447
2019-09-12 21:38:38 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 5fd72de3a9 Issue #1249 2019-09-12 18:31:40 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
rahul shukla 61da74ee2b Issue #1447 2019-09-12 16:25:51 +05:30
Prashant Singh b089149268 Fixed issue #1428 2019-09-12 16:21:03 +05:30
Jitendra Singh 9a443b6f3b
Merge pull request #1446 from prashant-webkul/development
Command line installer fix
2019-09-12 15:52:58 +05:30
Prashant Singh b55f6c5ed4 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-09-12 15:24:05 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
Prashant Singh 90a965a537 Command line installer fix 2019-09-12 11:51:11 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh d5bbc0230d Fixed issue #1288 2019-09-11 20:15:41 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30
Jitendra Singh 5c2cb7b90c
Merge pull request #1443 from rahulshukla-webkul/development
Development
2019-09-11 18:26:29 +05:30
rahul shukla d9a0c6078e order number 2019-09-11 17:47:52 +05:30
rahul shukla aab8bd1479 order number 2019-09-11 17:34:11 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
Jitendra Singh 8281ea0088
Merge pull request #1441 from rahulshukla-webkul/development
error in cancel mail
2019-09-11 13:57:41 +05:30
Jitendra Singh 3cd49daa5c
Merge pull request #1440 from prashant-webkul/development
Fixed a translation typo in create cart rule form
2019-09-11 13:57:35 +05:30
rahul shukla ce59e8b1d5 error in cancel mail 2019-09-11 13:55:07 +05:30
Prashant Singh e6104668e0 Fixed a translation typo in create cart rule form 2019-09-11 13:52:24 +05:30
Jitendra Singh 7c9d8a06ed
Merge pull request #1439 from prashant-webkul/development
Removed setInvoker method and allowed property to get set in Datagrid…
2019-09-11 13:47:01 +05:30
Jitendra Singh b3ca0200ac
Merge pull request #1387 from codeinnovers/master
fixed issue  #1371
2019-09-11 13:13:13 +05:30
Prashant Singh d48fe8d435 Removed setInvoker method and allowed property to get set in Datagrid's constructor. 2019-09-11 12:59:51 +05:30
Jitendra Singh fe335a0e70
Merge pull request #1437 from prashant-webkul/development
Datagrid add column, action and mass action dynamic event fire. Command line utility for installation.
2019-09-11 12:35:34 +05:30