Commit Graph

2418 Commits

Author SHA1 Message Date
Prashant Singh c661992a1a Non couponable rules refactoring 2019-08-06 14:06:25 +05:30
Prashant Singh c751c16e6a Cart rule refactorization 2019-08-05 19:38:17 +05:30
Prashant Singh cff0b7f4b2 refactroring of vart rules 2019-08-05 05:06:51 +05:30
Prashant Singh e4a5e84fb6 Refactoring cart rules 2019-08-03 19:54:02 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30
Prashant Singh 2acad0e540 Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage 2019-07-23 13:43:37 +05:30
Prashant Singh dfd6ea8c25 Translations fixes in promotions sections 2019-07-23 13:07:22 +05:30
Prashant Singh 70267e29cb disabled catalog rule 2019-07-22 13:01:54 +05:30
Prashant Singh 0bd422db97 translation fixes in cart rule forms 2019-07-22 13:01:07 +05:30
Prashant Singh 9cf1ea2516 disabled catalog rule till final migrations 2019-07-22 12:54:46 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh 27ca4cb622 Minor fixes 2019-07-22 12:50:06 +05:30
Prashant Singh 38e029463e transition of cart rule from old method is now complete, now need to verify actions 2019-07-22 12:44:40 +05:30
Prashant Singh f8da943cea Removed a bug when attribute conditions applied with cart rule were not allowing the rule to get applied 2019-07-22 12:35:36 +05:30
Prashant Singh 7f3ed81554 Removed a bug from convertXToProductId from cart rule edit form causing it to exception when no criteria for products to be applied is done emtpy after having a previous criteria 2019-07-22 12:18:59 +05:30
Prashant Singh 38c5a115db Updated actions for cart rules with couple of new actions 2019-07-19 19:26:33 +05:30
Prashant Singh 85865ba939 Eliminated discount configuration 2019-07-19 15:47:01 +05:30
Prashant Singh bcdec8ec5a Removed old migrations of catalog rule and removed a bug in convertXToProductId 2019-07-19 15:44:15 +05:30
Prashant Singh a9994a3143 Translation issue fixes for cart rule create and edit forms 2019-07-19 10:49:19 +05:30
Prashant Singh f68428ca4d Fixed a bug in convertXToProductId when attribute result was empty it was throwing exception 2019-07-19 10:20:39 +05:30
Prashant Singh 48d068d760 ConvertXToProductID bug fix when left null 2019-07-18 18:20:21 +05:30
Prashant Singh 750842b2a9 ConvertXToProductId implemented now removal duplicated productIds left 2019-07-18 17:38:09 +05:30
Jitendra Singh c560dda2e9
Merge pull request #1186 from stoney024/master
Forgot password back link translation
2019-07-18 14:40:34 +05:30
Prashant Singh b512666ef1 ConvertXToProductId from attributes implemented 2019-07-18 14:08:36 +05:30
Prashant Singh 247b662b7e Position fixes for buttons used in tabbed forms 2019-07-18 10:45:59 +05:30
Prashant Singh 52e3a64380 Made all submit buttons of create and update buttons style to fixed 2019-07-18 10:10:49 +05:30
Prashant Singh 2a9b4220d6 Only finding product ids is left then apply them on cart rules 2019-07-17 18:54:43 +05:30
Arpad 4a941e461c Forget password notification Subject translation 2019-07-17 14:36:00 +02:00
Prashant Singh 3d53a221ef Has options check applied on frontend for options related to select and multiselect attributes 2019-07-17 16:18:10 +05:30
Prashant Singh 4017e3b16e ConvertXToProductId frontend complete now moving to converting X to ids 2019-07-17 16:14:04 +05:30
Arpad 2c3467e611 Forgot password back link translation 2019-07-17 09:30:36 +02:00
Prashant Singh 08f606c099 Worked on ConvertXToProductId and the bug in multiselect caused a huge delay but right now we have falled back to old select box 2019-07-16 19:02:40 +05:30
Prashant Singh 6ba5e0df0a Added back catalog rule migration, a bug is stuck in convert x to productid migrations 2019-07-15 19:54:38 +05:30
Prashant Singh 93a035b147 Fixer io disabled temporarily 2019-07-15 18:25:14 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Jitendra Singh 9d2a0f8572
Merge pull request #1184 from rahulshukla-webkul/development
Development
2019-07-15 18:06:10 +05:30
rahul shukla 27d6e8894c checkbox type attribute 2019-07-15 18:00:56 +05:30
rahul shukla 1ec288a182 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-15 17:04:10 +05:30
rahul shukla 67bb7704e7 merge with master 2019-07-15 17:03:54 +05:30
Prashant Singh d0b8a1f50f Added fixer-io api key provision in bagisto for exchange rated 2019-07-15 16:08:16 +05:30
Prashant Singh 7952253e18 Applied a fix for a bug related to shipping modules creating problem when being used with cart rules 2019-07-15 16:04:25 +05:30
Prashant Singh 9f9e0b6a68 Created a command to activate the usage of catalog rule 2019-07-15 16:02:39 +05:30
Prashant Singh 2a6e43de28 Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel 2019-07-15 14:11:00 +05:30
Prashant Singh 0b29f29022 Added property in customers model to check if the email exists or not 2019-07-15 12:46:33 +05:30
Jitendra Singh 12bc679fc1
Merge pull request #1181 from alkhachatryan/master
Update search.blade.php
2019-07-15 12:06:39 +05:30
Alexey 5856d00e4b
Update search.blade.php
Use TOTAL instead of COUNT
2019-07-14 17:27:34 +04:00
Prashant Singh 0d0a588c33 added products subselection in cart rules create page(in progress 50% done) 2019-07-14 17:20:09 +05:30