Commit Graph

2391 Commits

Author SHA1 Message Date
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
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
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
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
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
Prashant Singh 0d0a588c33 added products subselection in cart rules create page(in progress 50% done) 2019-07-14 17:20:09 +05:30
Prashant Singh d860466dfc mass action index now totally dependent on datagrid's index property 2019-07-14 14:30:44 +05:30
Prashant Singh f8a4f1ba1c product card hover transition applied and reduced hover padding by 33% 2019-07-14 12:38:15 +05:30
Prashant Singh caf165d06c Fixed issue with image of product card getting cropped due to CSS 2019-07-14 12:25:57 +05:30
Prashant Singh 42d067c44a Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development 2019-07-14 07:30:16 +05:30
Prashant Singh 5f08f2b9f4 Fixed sort order for configuration in admin panel 2019-07-14 00:46:33 +05:30
Prashant Singh 94dd71c770 Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-07-13 23:51:05 +05:30
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30
Prashant Singh 7ffbee95ad Shipping methods and payment methods description converted to translation string 2019-07-11 10:16:58 +05:30
Prashant Singh 88611c9d84 Fixed issue #1172 2019-07-11 09:49:32 +05:30
Prashant Singh 093a485470 Opted out Dusk & Debugbar packages out of auto discovery 2019-07-10 13:59:33 +05:30
Prashant Singh ade06ac9f1 Cleaned tests 2019-07-10 13:44:33 +05:30
Prashant Singh 4a4690d479 Cleaned tests directory 2019-07-10 13:33:00 +05:30
Prashant Singh abd3913d45 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-10 10:37:29 +05:30
Jitendra Singh a3ec809d15
Merge pull request #1170 from rahulshukla-webkul/development
Development
2019-07-09 14:49:54 +05:30
rahul shukla 135450c445 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-09 14:47:55 +05:30
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +05:30
Prashant Singh 316ec39aaf Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title 2019-07-09 11:18:02 +05:30
Prashant Singh 869265e7a5 Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields 2019-07-09 10:11:19 +05:30
Jitendra Singh e91b2c2125
Merge pull request #1165 from rahulshukla-webkul/development
yarn.lock file in git ignore
2019-07-08 17:50:59 +05:30
rahul shukla 99fbb1b9d9 cached clear for git ignore 2019-07-08 17:50:00 +05:30
rahul shukla 00a07f9ea2 yarn.lock file in git ignore 2019-07-08 17:20:40 +05:30
Jitendra Singh 3129ecc8f3
Merge pull request #1156 from am-shb/master
Add intl extension to composer.json
2019-07-08 17:16:03 +05:30
rahul shukla 8d939e13c1 yarn.lock file in git ignore 2019-07-08 17:15:18 +05:30