SteffenMahler
|
85319272a2
|
add CartRuleCouponFactory
this is for testing purposes
|
2020-03-23 08:15:02 +01:00 |
ghermans
|
cea497812e
|
fixed typo
|
2020-03-23 04:51:32 +01:00 |
|
ghermans
|
bd6c3aa1df
|
Added dutch locale
|
2020-03-23 04:31:33 +01:00 |
Jitendra Singh
|
5902f0050c
|
Merge pull request #2681 from vivek-webkul/patch-41
[Updated: Shop & admin email setting added in configuration.]
|
2020-03-19 15:36:27 +05:30 |
Herbert Maschke
|
b8e4692114
|
refactor haveProduct() method to allow custom attribute handling
|
2020-03-18 14:59:10 +01:00 |
|
Jitendra Singh
|
001262e6de
|
Merge pull request #2688 from jitendra-webkul/1.0
Issue #2518 fixed
|
2020-03-18 17:19:27 +05:30 |
Jitendra Singh
|
893564977f
|
Issue #2518 fixed
|
2020-03-18 17:15:44 +05:30 |
|
Jitendra Singh
|
7b5930f8bc
|
Merge pull request #2686 from jitendra-webkul/1.0
Issue #2613 fixed
|
2020-03-18 14:54:31 +05:30 |
|
Jitendra Singh
|
663a679a5d
|
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
Order workflow improvements and tests
|
2020-03-18 14:50:48 +05:30 |
|
Jitendra Singh
|
bc39a19f49
|
Issue #2613 fixed
|
2020-03-18 14:50:20 +05:30 |
Vivek
|
ad76426fb5
|
[Updated: Shop & admin email setting added in configuration.]
|
2020-03-17 16:10:47 +05:30 |
|
Vivek
|
e1ed114d74
|
[Updated: Core/Config.php modified.]
|
2020-03-16 13:13:57 +05:30 |
|
Herbert Maschke
|
c14b1c8946
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-12 16:26:27 +01:00 |
|
Jitendra Singh
|
00f8f7ddb0
|
Issue #2630 fixed
|
2020-03-11 16:45:06 +05:30 |
|
Herbert Maschke
|
e20bb9cc97
|
remove <<<<HEAD merge conflict marker artifact
|
2020-03-10 10:00:04 +01:00 |
|
Herbert Maschke
|
7a3a1726bc
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-06 15:50:26 +01:00 |
|
Jitendra Singh
|
010ae65691
|
Resolved conflicts
|
2020-03-06 16:02:52 +05:30 |
|
Jitendra Singh
|
955da20b45
|
Improved comments in code
|
2020-03-05 19:49:14 +05:30 |
|
Jitendra Singh
|
10db1838f2
|
Removed author information from every class
|
2020-03-05 19:28:42 +05:30 |
|
Jitendra Singh
|
d0fa3b2705
|
Replace DB alias with complete class name
|
2020-03-05 19:11:53 +05:30 |
|
Jitendra Singh
|
92261d4214
|
Improved comments in code
|
2020-03-05 19:07:08 +05:30 |
|
Jitendra Singh
|
a6ce67151f
|
Improved comments in code
|
2020-03-05 11:04:57 +05:30 |
shubhammehrotra.symfony@webkul.com
|
133dd6ebd4
|
velocity sidebar issue and default theme velocity update
|
2020-03-04 13:12:00 +05:30 |
|
Jitendra Singh
|
41e06d5dc5
|
Improved code style
|
2020-03-04 12:02:53 +05:30 |
|
Herbert Maschke
|
e094dfd09c
|
add additional assertions to OrderCest.php
|
2020-03-03 11:18:18 +01:00 |
|
Herbert Maschke
|
895978e600
|
finish testCheckoutAsCustomer
|
2020-03-02 09:08:51 +01:00 |
|
Herbert Maschke
|
781d360ce7
|
add setSession and invalidateSession helper methods
|
2020-03-02 08:24:51 +01:00 |
|
Herbert Maschke
|
3e9c68f01d
|
introduce prepareCart() to be able to do checkout tests [wip] [ci-skip]
|
2020-02-28 11:41:48 +01:00 |
|
Jitendra Singh
|
4a6ac73bb6
|
Improved code style
|
2020-02-28 15:55:53 +05:30 |
|
Jitendra Singh
|
05be7a070a
|
Improved code style
|
2020-02-27 13:33:03 +05:30 |
|
Jitendra Singh
|
7d2ff93f43
|
Resolve conflicts
|
2020-02-25 11:44:34 +05:30 |
|
Jitendra Singh
|
195eb82802
|
Replace else if with elseif
|
2020-02-24 17:49:12 +05:30 |
rahul shukla
|
8fa7bc8c10
|
Issue #2451 fixed
|
2020-02-24 13:45:11 +05:30 |
|
Jitendra Singh
|
5c696f8d00
|
Resolved conflicts
|
2020-02-21 19:36:17 +05:30 |
Annika Wolff
|
154a933dc6
|
Merge branch 'master' into fix-tax-handling
|
2020-02-20 17:19:28 +01:00 |
|
Jitendra Singh
|
5fb33d4fc9
|
Improved core package code style
|
2020-02-19 17:56:12 +05:30 |
|
Glenn Hermans
|
c034c23d10
|
Added euro currency symbol
|
2020-02-19 00:53:49 +01:00 |
|
Glenn Hermans
|
e13d767506
|
Added euro currency
|
2020-02-19 00:28:25 +01:00 |
rahulshukla-webkul
|
5bfe263e10
|
Revert "add improvements to locale determination on product creation"
|
2020-02-18 18:14:22 +05:30 |
|
Jitendra Singh
|
11e4004954
|
Merge pull request #2487 from vivek-webkul/patch-37
[Fixed: Currency event related code fixed. ]
|
2020-02-18 15:56:42 +05:30 |
|
Vivek Sharma
|
c1d7ab810d
|
[Fixed: Currency event related code fixed. ]
|
2020-02-18 15:49:19 +05:30 |
|
Jitendra Singh
|
7d161e31ef
|
Merge pull request #2373 from Haendlerbund/locale-improvements
add improvements to locale determination on product creation
|
2020-02-18 15:10:14 +05:30 |
|
Herbert Maschke
|
b0e37edd63
|
only send emails when configured so
|
2020-02-17 16:52:58 +01:00 |
|
Herbert Maschke
|
cdc292c196
|
enable all notifications by default
|
2020-02-17 16:44:13 +01:00 |
|
Herbert Maschke
|
a889b1f31f
|
add mail notification defaults (everything true) to Config/system.php
|
2020-02-17 16:25:14 +01:00 |
|
Herbert Maschke
|
5129507456
|
add mail notification defaults (everything true) to ConfigTableSeeder.php
|
2020-02-17 16:04:59 +01:00 |
|
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 |
|
Herbert Maschke
|
d574ab1beb
|
Merge branch 'bagisto/master' into locale-improvements
|
2020-02-10 15:11:43 +01:00 |
|
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 |
|
Herbert Maschke
|
35a9e90780
|
add improvements to locale determination on product creation
|
2020-02-07 11:16:00 +01:00 |
Steffen Mahler
|
b94fc9fc8c
|
merge master and resolve conflicts
|
2020-02-07 10:44:04 +01:00 |
|
Steffen Mahler
|
e678a467fc
|
call collectTotals in saveCustomerAddress
|
2020-02-05 11:18:21 +01:00 |
|
rahul shukla
|
ff37467e70
|
Issue #2239
|
2020-02-05 12:06:16 +05:30 |
|
SteffenMahler
|
0380628fa3
|
Merge branch 'master' into fix-tax-handling
|
2020-02-04 17:51:09 +01:00 |
|
Annika Wolff
|
53c5d107a6
|
Merge branch 'master' into small-bugfix-and-tiny-refactoring
|
2020-02-04 14:08:46 +01:00 |
|
Steffen Mahler
|
7c661efd88
|
add unit tests, refactoring
|
2020-02-04 11:18:40 +01:00 |
|
Steffen Mahler
|
cb5e3a47f6
|
fix tax handling, add functional cest for cart
|
2020-02-04 08:50:37 +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 |