Commit Graph

2135 Commits

Author SHA1 Message Date
Jitendra Singh 1f5d8a8f28
Revert "Revert "Development"" 2019-06-15 16:50:37 +05:30
Jitendra Singh 3d8144a75a
Merge pull request #1041 from bagisto/revert-1037-revert-1033-development
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:37 +05:30
Jitendra Singh 545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page"" 2019-06-15 16:49:02 +05:30
Jitendra Singh f0f8d7c059
Merge pull request #1040 from bagisto/revert-1036-revert-1028-jitendra
Revert "Revert "Added Guest default customer group with id 0""
2019-06-15 16:48:47 +05:30
Jitendra Singh d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0"" 2019-06-15 16:48:29 +05:30
Jitendra Singh 1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra
Reset changes
2019-06-15 16:47:36 +05:30
jitendra e3946a79dd Reset changes 2019-06-15 16:46:55 +05:30
Jitendra Singh 65f899dcfe
Merge pull request #1038 from jitendra-webkul/jitendra
Guest removed from customer pages
2019-06-15 16:35:42 +05:30
jitendra ff64d23319 Guest removed from customer pages 2019-06-15 16:34:56 +05:30
Jitendra Singh c06bc39a7f
Merge pull request #1037 from bagisto/revert-1033-development
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:13:43 +05:30
Jitendra Singh 4427ec8205
Merge pull request #1036 from bagisto/revert-1028-jitendra
Revert "Added Guest default customer group with id 0"
2019-06-15 15:13:24 +05:30
Jitendra Singh ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
Jitendra Singh 1482628316
Merge pull request #1034 from bagisto/revert-1032-development
Revert "Development"
2019-06-15 15:13:08 +05:30
Jitendra Singh 426cbe0ae5
Revert "Added Guest default customer group with id 0" 2019-06-15 15:10:11 +05:30
Jitendra Singh fb5687c451
Revert "buy now issue" 2019-06-15 15:10:10 +05:30
Jitendra Singh 668f92185b
Revert "Development" 2019-06-15 15:10:04 +05:30
Jitendra Singh 7ac715e93d
Revert "Fixed issue with order summary rendering on cart page" 2019-06-15 15:09:59 +05:30
Prashant Singh 4bf4f2686f
Merge pull request #1033 from prashant-webkul/development
Fixed issue with order summary rendering on cart page
2019-06-15 14:57:03 +05:30
Prashant Singh 0927786cee Fixed issue with order summary rendering on cart page 2019-06-15 14:56:24 +05:30
Prashant Singh 49b8777e5a
Merge pull request #1032 from prashant-webkul/development
Development
2019-06-15 13:15:34 +05:30
Prashant Singh eaa755bbea Fixed discount on frontend 2019-06-15 13:13:07 +05:30
Prashant Singh 8d68be8e07 Rule condition discount calculation now working properly 2019-06-15 12:27:54 +05:30
Prashant Singh 078e3da984
Merge pull request #1031 from prashant-webkul/development
Development
2019-06-15 10:49:58 +05:30
Prashant Singh fc43b158dd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-15 10:49:04 +05:30
Prashant Singh 7e30b0bc48
Merge pull request #1029 from rahulshukla-webkul/development
buy now issue
2019-06-15 10:44:35 +05:30
Prashant Singh 3a8b923f5c Discount rule 2019-06-14 23:48:08 +05:30
rahul shukla 076f197de7 buy now issue 2019-06-14 21:04:22 +05:30
Prashant Singh c36950c609 applied translation string in apply coupon responses 2019-06-14 20:26:54 +05:30
Prashant Singh 0188644fce Prepared standard responses when applying couponable rules 2019-06-14 20:04:32 +05:30
Prashant Singh bb097be557 Added error message provision in the same when coupon application fails 2019-06-14 19:58:25 +05:30
Prashant Singh bec9ebe7fb coupon section fix in review-order component 2019-06-14 19:52:58 +05:30
Prashant Singh 1e865986c4 improved conditions check in applying cart rules 2019-06-14 19:24:15 +05:30
Prashant Singh da82f2935c removed some dead code 2019-06-14 17:55:03 +05:30
Jitendra Singh ad5890f88b
Merge pull request #1028 from jitendra-webkul/jitendra
Added Guest default customer group with id 0
2019-06-14 16:42:19 +05:30
jitendra e26c2b4d89 Added Guest default customer group with id 0 2019-06-14 16:41:18 +05:30
Jitendra Singh 2b9f40d7db
Merge pull request #1027 from jitendra-webkul/jitendra
Fixed checkout issue
2019-06-14 15:14:24 +05:30
jitendra 3f814d9253 Fixed checkout issue 2019-06-14 15:13:20 +05:30
Jitendra Singh 8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
Fixed checkout issue
2019-06-14 15:00:15 +05:30
jitendra 5b81968bae Fixed checkout issue 2019-06-14 14:59:29 +05:30
Jitendra Singh ee65ea82b6
Merge pull request #1025 from rahulshukla-webkul/development
Development
2019-06-14 14:24:41 +05:30
rahul shukla c8fb37698c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-14 14:22:50 +05:30
rahul shukla 0bdd03b331 ticket 201 error & admin css for back icon 2019-06-14 14:22:22 +05:30
Jitendra Singh cae99e8bbe
Merge pull request #1024 from prashant-webkul/development
Development
2019-06-14 13:24:29 +05:30
Prashant Singh 4bfefd3a07 base sync 2019-06-14 13:22:37 +05:30
Prashant Singh c52238e45e Cart rule frontend normalization 2019-06-14 13:21:17 +05:30
Prashant Singh 7f9409bd8e Checkout and cart page now coupled with cart rules 2019-06-14 12:10:03 +05:30
Prashant Singh e9a0588185 discount rule fixes 2019-06-13 22:19:44 +05:30
Jitendra Singh 6a093980bf
Merge pull request #1023 from rahulshukla-webkul/development
Development
2019-06-13 20:29:13 +05:30
rahul shukla 5afef79ac2 merge with master 2019-06-13 20:24:52 +05:30
rahul shukla 1a36cd32c7 change query for min price of variant 2019-06-13 20:22:16 +05:30