Commit Graph

273 Commits

Author SHA1 Message Date
Herbert Maschke 5ebb67dd81 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-23 14:18:17 +01:00
Herbert Maschke 3017fa337d add necessary packages/Webkul/Core/src/Database/Factories/LocaleFactory.php 2020-01-23 14:11:56 +01:00
Florian Bosdorff 478533ae60 fix laravel 6 compartibility of tests; remove duplicated pipeline execution 2020-01-22 08:14:06 +01:00
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
Herbert Maschke 4596a77c07 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 11:36:26 +01:00
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
shubhammehrotra.symfony@webkul.com ba355a6f31 passing data from slider repository instead of id 2020-01-16 16:22:00 +05:30
Herbert Maschke d281aa373b remove factories (except necessary ones) from this pull request, as we deliver them as a separate PR 2020-01-16 09:54:04 +01:00
Herbert Maschke e0c2814f2e Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-15 15:29:55 +01:00
shubhammehrotra.symfony@webkul.com eab9fdebb0 fire event on creating/updating slider 2020-01-15 15:48:02 +05:30
Herbert Maschke 95e37044de introduce some more factories and place them into the webkul core package to be available everywhere 2020-01-15 10:32:01 +01:00
Jitendra Singh 122debdf1b Issue #1795 fixed 2020-01-13 13:43:53 +05:30
Jitendra Singh e13a268fe0 Eager loaded translations for country and country state models 2020-01-10 17:50:17 +05:30
Jitendra Singh c7449aed48 Transation models added for country and state 2020-01-08 18:59:36 +05:30
rahul shukla 4b2088e66e upgrade to laravel 6 2019-12-30 17:10:38 +05:30
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
Dirk Helbert 02ca34affa Take the fallback_locale from app.config when locale is not defined in shop 2019-12-01 22:59:16 +01:00
shubhammehrotra.symfony@webkul.com 26b85fca06 template correction 2019-11-29 19:03:30 +05:30
shubhammehrotra.symfony@webkul.com c22e8f7c9c Bagisto content added using post create-project event 2019-11-25 14:59:51 +05:30
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
jitendra 658fab644a Issue #1753 fixed 2019-11-12 11:27:23 +05:30
Jitendra Singh a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
Jitendra Singh 2af8157a81
Merge pull request #1725 from jitendra-webkul/jitendra
Issue #1724 fixed
2019-11-01 11:04:34 +05:30
jitendra 973332f6c0 Issue #1724 fixed 2019-11-01 11:03:40 +05:30
Jitendra Singh 1a9989ed91
Merge pull request #1708 from bosix/feature-1707
add option to allow params in menu.php
2019-10-31 19:18:46 +05:30
Jitendra Singh 9baf4cac3a
Merge pull request #1709 from prashant-webkul/bugs_patch_1
Added logo, favicon in fillable of channel model
2019-10-31 12:21:03 +05:30
Prashant Singh e5082cca3b Added logo, favicon in fillable of channel model 2019-10-30 10:40:12 +05:30
Florian Bosdorff 69854838eb add option to allow params in menu.php 2019-10-29 11:43:03 +01:00
jitendra ce52c1832e Issue #1684 fixed 2019-10-23 18:45:48 +05:30
jitendra 937fda187f Issue #1620, #1671 fixed 2019-10-22 17:38:35 +05:30
jitendra 822b6014b4 Issue #1676 fixed 2019-10-22 11:03:42 +05:30
jitendra 2695e88630 Issues #1620, #1671 fixed 2019-10-21 13:37:19 +05:30
Webkul 3819e6e2ed resolved issue #1522 2019-10-10 13:35:41 +05:30
Webkul baad7ecb0a Footer links issue is resolved 2019-10-10 13:17:46 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Prashant Singh 3bd2fd571d Fixed issue #1539 2019-10-03 10:57:07 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
CodeInnovers 3d03bc099c fixed issue #1460 2019-09-15 23:33:35 +05:30
jitendra d8403bf162 Fixed exchange rate exception 2019-09-06 15:48:59 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
jitendra 0f2876a1da Conflict resolved in ChannelController 2019-09-05 17:01:17 +05:30
rahul shukla ddf754e2a7 Issue #1384 2019-09-05 16:41:26 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30