Commit Graph

310 Commits

Author SHA1 Message Date
Jitendra Singh 881027ca4e Converted configuration boolean type to switch 2020-02-12 13:45:26 +05:30
Jitendra Singh c78b76f3aa
Merge pull request #2432 from jitendra-webkul/1.0
Fixed intentation in CoreConfigRepository
2020-02-11 19:18:15 +05:30
Jitendra Singh fab5cc7a4f Fixed intentation in CoreConfigRepository 2020-02-11 19:13:39 +05:30
shubhammehrotra.symfony@webkul.com afa4ea627c Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com d331c36bd8 misc. bug fixes 2020-02-11 17:49:48 +05:30
Jitendra Singh 0caa8010d2 Issue #2424 fixed 2020-02-11 16:37:10 +05:30
Jitendra Singh 9b738f60bb
Merge pull request #2375 from shivam-webkul/master
#2070 issue fixed
2020-02-11 10:50:51 +05:30
rahul shukla d39201c877 Issue #2377 2020-02-07 17:17:30 +05:30
shivam kumar 15a6a25256 #2070 issue fixed 2020-02-07 16:40:03 +05:30
rahul shukla ff37467e70 Issue #2239 2020-02-05 12:06:16 +05:30
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Herbert Maschke 4833d9f8ec obey the default channel that has been set in config/app.php 2020-02-03 13:34:05 +01:00
rahul shukla ee97642b7a Issue #2226 2020-02-03 13:39:13 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Florian Bosdorff 389b40fdce Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid 2020-01-30 16:04:57 +01:00
Jitendra Singh 25d99cc10a
Merge pull request #2200 from jitendra-webkul/1.0
Issue #2176, #2196 fixed
2020-01-29 16:40:54 +05:30
Jitendra Singh 813f61eeaa Issue #2176, #2196 fixed 2020-01-29 16:37:20 +05:30
Jitendra Singh 62060fcbea
Merge pull request #2193 from jitendra-webkul/1.0
Issue #1988 fixed
2020-01-29 12:53:02 +05:30
Jitendra Singh b4dacd4db6 Added translation seeder to DatabaseSeeder class 2020-01-29 12:52:06 +05:30
Jitendra Singh 0b67488a0b Issue #1988 fixed 2020-01-29 12:51:12 +05:30
Steffen Mahler 90e638582b fix wrong product state in haveVirtualProduct 2020-01-28 16:49:26 +01:00
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
Florian Bosdorff 5188b1b7f9 Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-28 08:15:11 +01:00
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Jitendra Singh 0cd4a2678a
Merge pull request #1996 from Haendlerbund/introduce-api-token-columns-into-database
add missing api_token columns to database (table customers and admins)
2020-01-27 18:31:13 +05:30
Herbert Maschke e948b30e35 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-24 15:13:16 +01:00
MonaHartdegen f54117aabf removed test and factory (did not work properly) 2020-01-24 15:04:34 +01:00
MonaHartdegen ccc2188ef1 merge bagisto master 2020-01-24 10:22:15 +01:00
Herbert Maschke 9cab15afcd load core factories 2020-01-23 14:24:40 +01:00
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 db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
MonaHartdegen 806e3f93db added ProductsIndexCest; added factories 2020-01-23 08:33:47 +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
Annika Wolff 976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master (#14)
* added bagisto:install command

* updates for uploading attachments

* Issue #1808

* Issue #1779 fixed

* Issue #2045

* Issue #1971

* Issue #1779 fixed

* fire event on creating/updating slider

* Issue #1863 fixed

* Issue #1863 fixed

* Removed ')' in page edit blade

* Issue #2054 fixed

* Issue #2054 fixed

* Added mail from name field in .env.example file, Issue #2051

Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-16 13:54:18 +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
David Große 37a4f6adb6 ensure the api_token is being generated on customer/admin creation 2020-01-03 09:14:12 +01:00