Commit Graph

2491 Commits

Author SHA1 Message Date
rahul shukla 120851ce0c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-25 11:11:32 +05:30
rahul shukla fca1d6d15c filter code updated 2019-07-25 11:11:18 +05:30
Jitendra Singh 9fa5e2396b
Merge pull request #1210 from rahulshukla-webkul/development
Development
2019-07-25 10:04:14 +05:30
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
rahul shukla 13a982f480 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-24 18:51:03 +05:30
rahul shukla 29763b902e issue of image at checkout #1209 2019-07-24 18:50:44 +05:30
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
ArmCM ae6c6fa193 WIP - fix code style laravel 2019-07-24 02:50:22 -05:00
Jitendra Singh 871bc8c190
Merge pull request #1205 from rahulshukla-webkul/development
assests compile for production
2019-07-24 12:39:48 +05:30
Jitendra Singh d37d5613c6
Merge pull request #1201 from HansSchouten/patch-1
Fix firing the wrong event after storing user
2019-07-24 11:30:08 +05:30
rahul shukla 97320b52ea assests compile for production 2019-07-24 10:40:51 +05:30
moe2566 e038416f55
Update 2019_07_23_033128_alter_locales_table.php 2019-07-23 19:22:03 -04:00
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
Hans Schouten cfb4b8d682
Fix firing the wrong event after storing user 2019-07-23 21:59:28 +02:00
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30
Jitendra Singh e1628196a8
Merge pull request #1199 from rahulshukla-webkul/development
Development
2019-07-23 17:50:10 +05:30
rahul shukla cff63acfc8 reverting changes 2019-07-23 17:49:24 +05:30
rahul shukla 9cd9846d65 set locale on session if not available 2019-07-23 17:47:19 +05:30
rahul shukla 9186c0c5d1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-23 15:58:04 +05:30
rahul shukla f4eb973ba6 reduces number of loop for filter attribute #1192 2019-07-23 15:57: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
Jitendra Singh eb90bad4ad
Merge pull request #1188 from rahulshukla-webkul/development
Development
2019-07-23 12:52:13 +05:30
rahul shukla bcd84d9e7f corrction in route 2019-07-23 12:04:09 +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
rahul shukla ef5eb1356c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-19 16:30:28 +05:30
rahul shukla 3200cbafc6 Issue #1190. 2019-07-19 16:30:01 +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
rahul shukla 5ab552fb0b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-18 13:12:29 +05:30
rahul shukla 383e782d3c route correction for customer after login 2019-07-18 13:10:10 +05:30
rahul shukla f61554c5a6 configuration changes for dependent field 2019-07-18 12:51:22 +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