merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,947 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

2947 Commits

Author SHA1 Message Date
CodeInnovers 01b6f86c3e fixed issue #1480 2019-09-18 23:08:27 +05:30
codeinnovers b8aaa4fee0
Merge pull request #3 from bagisto/master 
merging request
 2019-09-18 22:51:13 +05:30
Jitendra Singh cee52398a1
Merge pull request #1478 from jitendra-webkul/refund 
Refund
 2019-09-18 19:12:40 +05:30
jitendra 84969849d1 Added translations 2019-09-18 19:12:05 +05:30
jitendra 4e856d02e8 Redund status added 2019-09-18 19:06:25 +05:30
Jitendra Singh f99b88f41f
Merge pull request #1477 from jitendra-webkul/refund 
Translation added
 2019-09-18 19:03:27 +05:30
jitendra 382dee4da2 Translation added 2019-09-18 19:02:34 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund 
Refund system completed
 2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
Jitendra Singh 3a46a4e6ca
Merge pull request #1475 from rahulshukla-webkul/development 
Development
 2019-09-18 15:16:58 +05:30
rahul shukla bc38823d44 merge with master 2019-09-18 15:11:50 +05:30
rahul shukla cd05e92754 change log updated 2019-09-18 15:10:53 +05:30
Jitendra Singh 838a2ca93e
Merge pull request #1474 from prashant-webkul/development 
Changed version and updated changelog for version 0.1.7
 2019-09-18 14:49:16 +05:30
Prashant Singh 32e6153f41 Changed version and updated changelog for version 0.1.7 2019-09-18 14:45:58 +05:30
Jitendra Singh 157ac241e9
Merge pull request #1473 from prashant-webkul/development 
Feature: Command line installer
 2019-09-18 13:02:45 +05:30
Prashant Singh db6e3ae090 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-09-18 11:59:28 +05:30
Prashant Singh d7c8b55b40 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-18 11:59:13 +05:30
Jitendra Singh 57202f05fc
Merge pull request #1471 from rahulshukla-webkul/development 
dashboard dats issue
 2019-09-18 11:52:09 +05:30
Prashant Singh 38fc0c7bd0 Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-18 05:02:56 +05:30
Prashant Singh 8cf340f35d Merge branch 'master' of http://github.com/bagisto/bagisto into development 2019-09-18 05:02:19 +05:30
Prashant Singh ae52216b9c Bagisto command line installer fixes 2019-09-18 05:01:41 +05:30
rahul shukla 6e620d892e chnage log updated for new release 2019-09-17 18:30:25 +05:30
rahul shukla 8429a5fccf dashboard dats issue 2019-09-17 16:56:45 +05:30
Jitendra Singh 18d998560e
Merge pull request #1470 from rahulshukla-webkul/development 
Issue #1258, Invoice creation after paypal
 2019-09-17 16:35:43 +05:30
rahul shukla b13a82efaf Issue #1258, Invoice creation after paypal 2019-09-17 16:22:53 +05:30
Prashant Singh b6f24af7df Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-17 15:37:36 +05:30
Jitendra Singh 352c9685e8
Merge pull request #1468 from rahulshukla-webkul/development 
Development
 2019-09-17 12:49:31 +05:30
rahul shukla 5f8ea65835 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-17 12:36:59 +05:30
rahul shukla b3651a135a Issue #1461 2019-09-17 12:36:36 +05:30
Jitendra Singh 09b84d01f4
Merge pull request #1464 from rahulshukla-webkul/development 
Development
 2019-09-16 19:16:50 +05:30
Jitendra Singh 7a23c60ff0
Merge pull request #1465 from prashant-webkul/development 
Catalog Rule & Cart Rule: Fixed a bug in sku finding which was using like instead of equals ope…
 2019-09-16 17:56:06 +05:30
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
rahul shukla d3c68573d2 locale based error message 2019-09-16 13:53:56 +05:30
rahul shukla 4ddcaed81d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-16 13:52:04 +05:30
rahul shukla 62b2a3f9c3 locale based error message 2019-09-16 13:51:47 +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