Commit Graph

2937 Commits

Author SHA1 Message Date
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Annika Wolff ab9300bbef merged conflicting factory manually 2020-01-31 09:40:12 +01:00
Jitendra Singh 09fe8cea1c
Merge pull request #2220 from rahulshukla-webkul/development
Development
2020-01-31 13:58:47 +05:30
Jitendra Singh a378c09f23
Merge pull request #2208 from vivek-webkul/patch-2
[Fixed: changed customer group code for newly created customer.]
2020-01-31 13:58:26 +05:30
rahul shukla 7fdf5b66ab Issue #2173 2020-01-31 13:31:38 +05:30
rahul shukla c64bb4f85b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-31 13:19:00 +05:30
rahul shukla 6565f25153 Issue #2182 2020-01-31 13:18:40 +05:30
Jitendra Singh 37dba8eabf
Merge pull request #2218 from jitendra-webkul/1.0
Issue #2203 fixed
2020-01-31 12:53:17 +05:30
Jitendra Singh 48398597bf Issue #2203 fixed 2020-01-31 12:48:35 +05:30
Jitendra Singh d9d7c2bc40
Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories
add some factories
2020-01-31 12:35:25 +05:30
Jitendra Singh 4ebc76cc64
Merge pull request #2217 from jitendra-webkul/1.0
Issue #2207 fixed
2020-01-31 12:28:22 +05:30
Jitendra Singh dd634691fe Issue #2207 fixed 2020-01-31 12:23:52 +05:30
Jitendra Singh 3c16599ddb
Merge pull request #2211 from Haendlerbund/add-channel-and-locale-filter-to-product-grid
Add channel and locale filter to product grid
2020-01-31 12:03:59 +05:30
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Herbert Maschke e76c1794b9 add some factories into webkul core package to enhance testing potential 2020-01-30 21:01:45 +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
rahul shukla ebab486fc1 merge with master 2020-01-30 16:21:00 +05:30
Vivek Sharma 2ff9ebfa17 [Fixed: changed customer group code for newly created customer.] 2020-01-30 15:57:56 +05:30
rahul shukla b40c2173a8 Issue #2204 2020-01-30 15:22:39 +05:30
rahul shukla 3ac48ee883 Issue #2192 2020-01-29 18:27:47 +05:30
rahul shukla 7c3c63e445 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-29 16:46:23 +05:30
rahul shukla 40e85523a1 Issue #2185 2020-01-29 16:46:10 +05:30
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
Steffen Mahler d722ba8665 change annotation comment 2020-01-29 11:43:19 +01:00
rahul shukla a5853bb030 Issue #2198 2020-01-29 16:09:49 +05:30
rahul shukla 97332a1fc3 Issue #2192 2020-01-29 16:06:56 +05:30
rahul shukla 906366b6d4 Issue #2192 2020-01-29 13:48:31 +05:30
rahul shukla 50c6970c74 #Issue 2190 2020-01-29 13:32:16 +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 d3e00d4543 add functional test for cart, fix tests with usage of 2020-01-28 16:28:29 +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
rahul shukla 434b681962 Issue #2186 2020-01-28 19:09:15 +05:30
rahul shukla a71cc1c887 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-28 19:08:08 +05:30
Jitendra Singh 9ccc8b26c5
Merge pull request #2187 from jitendra-webkul/1.0
Issue #2182 fixed
2020-01-28 19:03:14 +05:30
rahul shukla c69f19701f Issue #2185 2020-01-28 18:51:13 +05:30
rahul shukla ff52bc6708 change log updated and Issue #2182 2020-01-28 18:09:22 +05:30
rahul shukla 016c3a0ea7 change log updated and Issue #2182 2020-01-28 18:07:48 +05:30
Jitendra Singh 2e6d7aff95 Issue #2182 fixed 2020-01-28 18:01:10 +05:30
Jitendra Singh ee7a68ba77
Merge pull request #2184 from jitendra-webkul/1.0
Issue #2183 fixed
2020-01-28 17:44:54 +05:30
Jitendra Singh 96b607d5f6 Issue #2183 fixed 2020-01-28 17:40:48 +05:30
Jitendra Singh 321dc84a91
Merge pull request #2179 from jitendra-webkul/1.0
Shipping discount issue fixed during refund creation
2020-01-28 17:37:20 +05:30
Jitendra Singh efc4a6b8c3 Issue #2177 fixed 2020-01-28 17:33:08 +05:30
Jitendra Singh 7cf72f16fe Issue #2177 fixed 2020-01-28 17:28:58 +05:30
Jitendra Singh 2db836c201 Shipping discount issue fixed during refund creation 2020-01-28 17:14:37 +05:30
Jitendra Singh 700949619b
Merge pull request #2175 from rahulshukla-webkul/development
Issue #2143
2020-01-28 17:00:51 +05:30