Commit Graph

3987 Commits

Author SHA1 Message Date
Steffen Mahler 721091cf32 unit test 2020-02-04 13:27:47 +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
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
Steffen Mahler 8b196c9c9c merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-01-29 14:12:43 +01:00
Jitendra Singh 217412a563
Merge pull request #2201 from rahulshukla-webkul/development
Development
2020-01-29 17:08:53 +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
Jitendra Singh c197bf2508
Merge pull request #2199 from rahulshukla-webkul/development
Development
2020-01-29 16:14:58 +05:30
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
Jitendra Singh 2530792649
Merge pull request #2195 from rahulshukla-webkul/development
Issue #2192
2020-01-29 13:55:41 +05:30
rahul shukla 906366b6d4 Issue #2192 2020-01-29 13:48:31 +05:30
Jitendra Singh 7daf5ebdd4
Merge pull request #2194 from rahulshukla-webkul/development
#Issue 2190
2020-01-29 13:37:43 +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
Jitendra Singh c0209743c9
Merge pull request #2188 from rahulshukla-webkul/development
Development
2020-01-29 12:45:15 +05:30
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
Jitendra Singh 4b376b5ed7
Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
Introduce optional company name and sales tax id columns to customer addresses
2020-01-28 17:00:36 +05:30
rahul shukla 4ecfaac44d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-28 16:54:11 +05:30
rahul shukla c3d3473738 Issue #2143 2020-01-28 16:06:25 +05:30
Jitendra Singh c75e4a0042
Merge pull request #2174 from jitendra-webkul/1.0
Issue #2173 fixed
2020-01-28 15:19:39 +05:30
Jitendra Singh c9769717d0 Issue #2173 fixed 2020-01-28 15:18:51 +05:30
Jitendra Singh dae09859f3
Merge pull request #2172 from jitendra-webkul/1.0
Issue #2162 fixed
2020-01-28 15:16:43 +05:30
Jitendra Singh fec990a149 Issue #2162 fixed 2020-01-28 15:15:36 +05:30
Jitendra Singh a10a906759
Merge pull request #2171 from jitendra-webkul/1.0
Issue #2167 fixed
2020-01-28 15:10:43 +05:30
Jitendra Singh f9b2ee4ae7 Issue #2167 fixed 2020-01-28 15:03:00 +05:30
Jitendra Singh 7293716b1b
Merge pull request #2170 from rahulshukla-webkul/development
Issue #742 and #2165
2020-01-28 15:02:47 +05:30
rahul shukla 3144720c48 Issue #742 and #2165 2020-01-28 14:56:05 +05:30
Jitendra Singh 7a77cf380a
Merge pull request #2169 from jitendra-webkul/1.0
Issue #2168 fixed
2020-01-28 13:58:29 +05:30
Jitendra Singh 64fd205298 Issue #2168 fixed 2020-01-28 13:47:44 +05:30
Jitendra Singh ed2de87d06
Merge pull request #2166 from jitendra-webkul/1.0
Issues #1189, #1148 fixed
2020-01-28 13:24:03 +05:30
Jitendra Singh 7b32b2e516 Issues #1189, #1148 fixed 2020-01-28 13:18:30 +05:30