Commit Graph

2875 Commits

Author SHA1 Message Date
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
Florian Bosdorff 5188b1b7f9 Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-28 08:15:11 +01:00
Jitendra Singh 50e028d28d
Merge pull request #2161 from rahulshukla-webkul/development
Issue #2155
2020-01-28 11:42:45 +05:30
rahul shukla 905bbeb4a8 test case changes 2020-01-28 11:32:26 +05:30
rahul shukla e3e7c47b15 updated comment 2020-01-28 10:57:17 +05:30
rahul shukla 469ed35ede Issue #2155 2020-01-28 10:55:00 +05:30
Florian Bosdorff bf53dd49f3 remove unused use statement 2020-01-27 17:25:37 +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
Jitendra Singh b8115c808e
Merge pull request #2144 from Haendlerbund/trigger-db-prefixes
fix trigger according to optional db-prefix
2020-01-27 17:21:26 +05:30
Jitendra Singh 0b3a7a6c6a
Merge pull request #2157 from jitendra-webkul/1.0
Removed commented code
2020-01-27 16:52:08 +05:30
Jitendra Singh 8176317a59 Removed commented code 2020-01-27 16:46:58 +05:30
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Herbert Maschke 20c2232710 remove |alpha_spaces validation from customer addresses city 2020-01-27 12:00:25 +01:00
Herbert Maschke 511d812333 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-27 11:40:18 +01:00
Herbert Maschke 08891a43b6 use correct vatId() formatter 2020-01-27 11:31:46 +01:00
Jitendra Singh 3a69b97bd2
Merge pull request #2151 from rahulshukla-webkul/development
Development
2020-01-27 13:35:08 +05:30
rahul shukla 41ae3048ff Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-27 13:24:37 +05:30
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Jitendra Singh 3a2fb2c03a Issue #2054 fixed 2020-01-27 13:10:30 +05:30
Jitendra Singh edf5dc34fd Issue #2146 fixed 2020-01-27 12:38:13 +05:30
Florian Bosdorff d2a8911aaa fix trigger according to optional db-prefix 2020-01-26 21:10:57 +01:00
rahul shukla cbaebaa388 query optimization and hide of expose model 2020-01-25 17:00:31 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
Herbert Maschke 8a927d32c1 repair italian factory 2020-01-24 15:26:33 +01:00
Herbert Maschke 80dc92efa4 remove redundant factory registration 2020-01-24 15:21:27 +01:00
Herbert Maschke bd03852619 remove redundant function 2020-01-24 15:17:17 +01:00
Herbert Maschke 6c83e03fe4 remove redundant use statement 2020-01-24 15:16:26 +01:00
Herbert Maschke e948b30e35 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-24 15:13:16 +01:00
shubhammehrotra.symfony@webkul.com 221aa5ba66 updates from bagisto 2020-01-24 19:03:22 +05:30