Commit Graph

1202 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 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
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 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
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
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
rahul shukla cbaebaa388 query optimization and hide of expose model 2020-01-25 17:00:31 +05:30
Herbert Maschke e948b30e35 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-24 15:13:16 +01:00
Jitendra Singh f80109ba8b Issue #2124 fixed 2020-01-24 16:11:17 +05:30
Jitendra Singh 4a38df3279 Fixed letter case issue in translation 2020-01-24 14:04:29 +05:30
Jitendra Singh d1ab679e3e Issue #2128 fixed 2020-01-24 13:54:54 +05:30
Jitendra Singh d5c0891055 Issue #2128 fixed 2020-01-24 13:50:40 +05:30
Herbert Maschke 5ebb67dd81 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-23 14:18:17 +01:00
Jitendra Singh da4980bfbe
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
Issue 1183/guest checkout configuration
2020-01-23 11:51:08 +05:30
Herbert Maschke 4629a3bb0f Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-22 14:59:18 +01:00
rahul shukla 0337959327 merge conflicts 2020-01-22 18:50:01 +05:30
rahul shukla 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Jitendra Singh 80a2ddb88d Issue #1397 fixed 2020-01-22 14:58:39 +05:30
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
rahulshukla-webkul 8bd9f0bc9d
Revert "Resolve #1183 guest checkout configuration" 2020-01-22 11:58:56 +05:30
Jitendra Singh 3aec5047f6
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
Resolve #1183 guest checkout configuration
2020-01-22 11:32:45 +05:30
Herbert Maschke 4596a77c07 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 11:36:26 +01:00
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 176feecb55 Resolved conflicts 2020-01-20 19:59:04 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Jitendra Singh 8612bd1385
Merge pull request #2069 from jitendra-webkul/1.0
Fixed cms textarea field issue
2020-01-17 14:58:27 +05:30
Jitendra Singh 6535afb52c Fixed cms textarea field issue 2020-01-17 14:57:36 +05:30
Jitendra Singh a6960f2916
Merge pull request #2068 from jitendra-webkul/1.0
Removed Developement menu
2020-01-17 14:49:25 +05:30
Jitendra Singh eb3fdc12c6 Removed Developement menu 2020-01-17 14:48:39 +05:30
Jitendra Singh 880868738a
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
2020-01-17 12:06:06 +05:30
Jitendra Singh 7d7e86e85c Issue #2058 fixed 2020-01-17 12:05:28 +05:30
shubhammehrotra.symfony@webkul.com 0468b7fa58 pass locale data in view_render_event 2020-01-16 12:37:52 +05:30
Herbert Maschke e0c2814f2e Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-15 15:29:55 +01:00
Herbert Maschke 3ab9b62028 add vat_id to AddressDataGrid.php 2020-01-15 14:17:13 +01:00
Jitendra Singh d80a3c7a5f
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
2020-01-15 18:42:24 +05:30
Jitendra Singh b552aba450 Removed ')' in page edit blade 2020-01-15 18:40:57 +05:30
Herbert Maschke 57aa522282 introduce company_name and vat_id also in shop admin backend 2020-01-15 14:02:51 +01:00
Jitendra Singh 915213711d
Merge pull request #2057 from jitendra-webkul/1.0
Issue #1863 fixed
2020-01-15 17:46:03 +05:30
Jitendra Singh 1e73cc9bc8 Issue #1863 fixed 2020-01-15 17:45:15 +05:30
Jitendra Singh 2049c45b0f
Merge pull request #2056 from jitendra-webkul/1.0
Issue #1863 fixed
2020-01-15 17:09:20 +05:30