Commit Graph

2637 Commits

Author SHA1 Message Date
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
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
Jitendra Singh df0b4cbf95
Merge pull request #1178 from rahulshukla-webkul/development
Development
2019-07-11 19:56:04 +05:30
rahul shukla 64fb91f6a8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-11 19:53:30 +05:30
rahul shukla 78d44a8be0 rtl css for slider 2019-07-11 19:53:18 +05:30
rahul shukla 20a205deba locale id in cstegory trnaslation 2019-07-11 19:45:48 +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
Prashant Singh 457a26176d fixed issues and uploaded logo of client 2019-07-09 15:54:00 +05:30
Prashant Singh 5a8679b170 SAASPreorder blade files publish enabled for product card 2019-07-09 15:25:38 +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 6afef120b9 Show price after login translation fixed 2019-07-09 13:14:42 +05:30
Prashant Singh 68bba4d7e2 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-09 12:54:42 +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
Prashant Singh b91d8a07d6 Added excluded usernames list so that illegal domain entries cannot be done 2019-07-08 17:32:12 +05:30
rahul shukla 00a07f9ea2 yarn.lock file in git ignore 2019-07-08 17:20:40 +05:30
Prashant Singh e41ac8c144 Added excluded sites configuration to exclude subdomains from company registration 2019-07-08 17:20:28 +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
Prashant Singh 458fd9166f Fixed exception handling in SAASCustomizer 2019-07-08 17:15:27 +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