Commit Graph

360 Commits

Author SHA1 Message Date
SteffenMahler 85319272a2
add CartRuleCouponFactory
this is for testing purposes
2020-03-23 08:15:02 +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
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