Commit Graph

377 Commits

Author SHA1 Message Date
rahulshukla-home b65601ecd0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-13 23:04:02 +05:30
rahulshukla-home b88e239ad2 Issue #2543 fixed 2020-04-13 23:03:45 +05:30
Jitendra Singh 9508c3d05c
Merge branch 'master' into webinstall 2020-04-11 18:53:30 +05:30
Jitendra Singh 9752f634e7
Merge pull request #2787 from Haendlerbund/add-option-for-set-current-channel
add option to set current channel
2020-04-10 11:45:04 +05:30
Herbert Maschke df6dc49313 Merge branch 'bagisto/master' into improve-have-product-faker 2020-04-04 11:14:29 +02:00
rahulshukla-home 961850b2e9 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-03 13:31:32 +05:30
rahulshukla-home 07f351322d revert back changes in format price 2020-04-03 13:31:09 +05:30
Herbert Maschke 2bf180e24f generate product as "buyable as guest" by default 2020-03-31 15:10:18 +02:00
Herbert Maschke 5219b03265 4,1,1000 2020-03-31 15:01:42 +02:00
Herbert Maschke e83917a2e6 attempt to fake 4 instead of 2 decimals in price 2020-03-31 14:50:54 +02:00
Herbert Maschke 5e89baf4e9 improve randomFloat faker values 2020-03-31 14:46:08 +02:00
Herbert Maschke 3048ae4a7b restore createInventory, its necessary... 2020-03-31 14:40:40 +02:00
Herbert Maschke 0f5913fbba various code style improvements 2020-03-31 14:35:01 +02:00
Herbert Maschke f7a69d4a30 optimize fetching of possible attributes in Laravel5Helper.php haveProduct() method 2020-03-30 15:03:27 +02:00
Herbert Maschke 613b3ea523 Merge branch 'bagisto/master' into improve-have-product-faker 2020-03-30 14:43:30 +02:00
Annika Wolff 505014266e fix still flickering locale factory 2020-03-30 11:05:45 +02:00
Florian Bosdorff 271c0e38ac add option to set current channel 2020-03-27 16:07:53 +01:00
Annika Wolff 8a2a84b1e6 get existing locale or create new one 2020-03-24 10:58:20 +01:00
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 663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
Order workflow improvements and tests
2020-03-18 14:50:48 +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