Commit Graph

749 Commits

Author SHA1 Message Date
Prashant Singh 813bccf758 Totally fixed registration form 2019-06-22 13:04:13 +05:30
Jitendra Singh d547ab5058
Merge pull request #1090 from prashant-webkul/development
Development
2019-06-21 16:28:59 +05:30
rahul shukla 9080f1e278 removed inline css 2019-06-21 11:37:31 +05:30
rahul shukla b0c35ead9f icon issue in admin dashboard 2019-06-21 11:23:27 +05:30
Prashant Singh 8c9fb32ab1 Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days 2019-06-21 04:15:45 +05:30
Prashant Singh 937d91ea5b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-20 18:10:07 +05:30
rahul shukla 048585853d repository insted of model in attribute create & edit for locale 2019-06-20 15:12:28 +05:30
Jitendra Singh bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development
issue of discount amount in order #1053
2019-06-20 14:34:11 +05:30
Prashant Singh 264d2e3c9e Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule 2019-06-20 13:03:01 +05:30
rahul shukla f72529f0fb issue of discount amount in order #1053 2019-06-20 12:17:11 +05:30
Prashant Singh acad17af67 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-19 18:21:26 +05:30
Prashant Singh 052afb4faf Fixed issues with apply to shipping and free shipping in create and edit of cart rules 2019-06-19 18:18:21 +05:30
Prashant Singh 423824b531 Fixed issue #1075 and #1074 2019-06-19 18:13:41 +05:30
rahul shukla 5b98b9a86d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-19 16:32:48 +05:30
rahul shukla be8c11aa98 issue #1069 2019-06-19 16:32:38 +05:30
Prashant Singh de445279d2 Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules 2019-06-19 16:27:32 +05:30
Prashant Singh 68e0ba1ac1 Fixed issue #1054 2019-06-19 10:58:02 +05:30
rahul shukla d25cc60351 issues #1056 & 1058 2019-06-18 18:05:52 +05:30
rahul shukla 9166daa31b issues #1056 & 1058 2019-06-18 17:58:34 +05:30
rahul shukla 1144ce7e10 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-17 18:32:12 +05:30
rahul shukla 94b67d00c1 admin css changes 2019-06-17 18:31:52 +05:30
rahul shukla 0b5f50f1b0 depandent field added in configuaration 2019-06-17 18:22:23 +05:30
Prashant Singh d18667351c Base sync 2019-06-17 12:38:29 +05:30
Prashant Singh ea185aad7b Discount package bug fixes and complete refactor with overriding features for actions 2019-06-17 08:56:30 +05:30
Prashant Singh ba31ecd527 Cart rule create and edit forms bug fixes 2019-06-16 22:18:19 +05:30
Prashant Singh 15abe379e0 Changed frontend attributes and syntax fixes in checkout 2019-06-16 17:26:06 +05:30
jitendra a2d1e1aa85 Column 'code' added in customer_groups table 2019-06-15 18:50:38 +05:30
Prashant Singh 9ae4f8a801 Fixed issues with cart rule customer groups 2019-06-15 18:47:53 +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 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 7ac715e93d
Revert "Fixed issue with order summary rendering on cart page" 2019-06-15 15:09:59 +05:30
Prashant Singh 0927786cee Fixed issue with order summary rendering on cart page 2019-06-15 14:56:24 +05:30
Prashant Singh 1e865986c4 improved conditions check in applying cart rules 2019-06-14 19:24:15 +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
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
rahul shukla 5afef79ac2 merge with master 2019-06-13 20:24:52 +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
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
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 ec27ed4c8d added credit max in configuration 2019-06-13 01:05:29 +05:30
Prashant Singh 76e43dcd58 added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated 2019-06-12 01:05:24 +05:30