Commit Graph

2118 Commits

Author SHA1 Message Date
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
Jitendra Singh b25a8656ff
Merge pull request #1022 from jitendra-webkul/jitendra
Jitendra
2019-06-13 19:49:49 +05:30
jitendra 6e8c0da054 Fixed conflicts 2019-06-13 19:48:30 +05:30
jitendra 806f8f71f6 Added discount amount to cart item 2019-06-13 19:34:13 +05:30
Jitendra Singh d370821f7f
Merge pull request #1021 from prashant-webkul/development
Development
2019-06-13 19:31:53 +05:30
Prashant Singh abf46c8a99 Added discount amount in cart item table 2019-06-13 19:30:00 +05:30
Prashant Singh a27bae1c2d All assets compiled for production 2019-06-13 19:08:42 +05:30
Prashant Singh 769f17a196 Fixed some syntax issue in cart rule controller 2019-06-13 19:00:33 +05:30
Prashant Singh 0aaf3d68e1 Ui package assets compiled for production 2019-06-13 18:20:09 +05:30
Jitendra Singh 72e56f4709
Merge pull request #1020 from prashant-webkul/development
added mass actions in admin customers grid
2019-06-13 18:10:05 +05:30
rahul shukla 7b14de69c6 changes in config & composer 2019-06-13 14:56:04 +05:30
rahul shukla 0fc78c5d83 Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development 2019-06-13 14:51:24 +05:30
Prashant Singh d2e8e822d7 Fixed issue #1007 2019-06-13 12:51:18 +05:30
Prashant Singh 6c0ee913ed added mass actions in admin customers grid 2019-06-13 12:47:58 +05:30
Prashant Singh a0b14391fb
Merge pull request #1019 from prashant-webkul/development
Development
2019-06-13 06:38:41 +05:30
Prashant Singh 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +05:30
Prashant Singh c86a699f69 Added status check in customer auth session creation function 2019-06-13 06:34:46 +05:30
Prashant Singh 86e918b041
Merge pull request #1018 from prashant-webkul/development
Added status and notes in customer model fillables
2019-06-13 06:31:36 +05:30