Commit Graph

2369 Commits

Author SHA1 Message Date
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
Jitendra Singh 9d23e931ad
Merge pull request #1164 from rahulshukla-webkul/development
slider delete issue
2019-07-08 17:12:42 +05:30
rahul shukla f9e9dfbae1 slider delete issue 2019-07-08 17:10:42 +05:30
Jitendra Singh 89132ca1ff
Merge pull request #1163 from rahulshukla-webkul/development
issue #1062
2019-07-08 15:46:29 +05:30
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
Jitendra Singh 10081847f4
Merge pull request #1161 from rahulshukla-webkul/development
Development
2019-07-08 15:11:08 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
rahul shukla 746a17dcf6 conflict resolve 2019-07-08 13:13:34 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
Jitendra Singh 2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
Updating translations of languages ​​in pt_BR
2019-07-08 12:13:54 +05:30
Jitendra Singh 0e84ac682f
Merge pull request #1158 from danielpinon/patch-2
Clearing duplicity
2019-07-08 12:08:42 +05:30
Daniel Pinon 723f6ad639
Clearing duplicity 2019-07-06 23:59:59 -03:00
Daniel Pinon c5fe78014c
Updating translations of languages ​​in pt_BR 2019-07-06 23:58:01 -03:00
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
Amir Shahbandegan ec40ccb41b
Added intl extension to composer.json 2019-07-06 12:01:26 +04:30
Jitendra Singh 729aaff1aa
Merge pull request #1152 from rahulshukla-webkul/development
slider edit issue
2019-07-05 18:48:40 +05:30
rahul shukla 54481ebbfe slider edit issue 2019-07-05 18:15:22 +05:30
Jitendra Singh aae9ffa9a8
Merge pull request #1151 from rahulshukla-webkul/development
Development
2019-07-05 14:18:13 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
rahul shukla f9863f440f category check condition for sorting 2019-07-05 13:24:46 +05:30
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30