Commit Graph

1083 Commits

Author SHA1 Message Date
rahul shukla cd739789f0 Issue #2317 2020-02-06 13:46:02 +05:30
rahul shukla 570ce2610d Change validation way in vat_id 2020-02-06 12:08:27 +05:30
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Jitendra Singh 453908a768
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
2020-02-04 11:40:39 +05:30
rahul shukla 7ea4c4219c Issue #2227 2020-02-03 18:57:50 +05:30
rahul shukla 9a9400fe23 Issue #2219 2020-02-03 17:01:23 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Herbert Maschke 76b58e9bd8 some first_name and last_name input fields 2020-01-31 05:59:12 +01:00
Herbert Maschke 6be3d086f8 add ability to provide company_name in address during checkout (optional) 2020-01-30 20:56:01 +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
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 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
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 d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Steffen Mahler 223c96b205 . 2020-01-27 13:06:31 +01:00
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 511d812333 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-27 11:40:18 +01:00
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Florian Bosdorff d2a8911aaa fix trigger according to optional db-prefix 2020-01-26 21:10:57 +01:00
Steffen Mahler a5c49e4b76 button 'update cart' will only be shown if corresponding products are in cart 2020-01-24 07:15:49 +01:00
Herbert Maschke 5ebb67dd81 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-23 14:18:17 +01:00
rahul shukla 2c0b7e4e54 try and catch in password section and wishlist add remove 2020-01-23 15:32:06 +05:30
Jitendra Singh 956259cc32
Merge pull request #2123 from rahulshukla-webkul/development
Issue #2087
2020-01-23 11:51:19 +05:30
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
rahul shukla 2d8f5f412e Issue #2087 2020-01-23 10:42:09 +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 01f0fc9a57 2089 and updated codeception dependencies 2020-01-22 18:44:53 +05:30
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
Herbert Maschke 8d1d03d25b Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 13:44:09 +01:00
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +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 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
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
Jitendra Singh dfa4272cf2
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
2020-01-20 13:27:04 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Herbert Maschke 7c9908401f improve the way server side validation errors are being displayed 2020-01-17 12:54:02 +01:00
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
Annika Wolff 976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master (#14)
* added bagisto:install command

* updates for uploading attachments

* Issue #1808

* Issue #1779 fixed

* Issue #2045

* Issue #1971

* Issue #1779 fixed

* fire event on creating/updating slider

* Issue #1863 fixed

* Issue #1863 fixed

* Removed ')' in page edit blade

* Issue #2054 fixed

* Issue #2054 fixed

* Added mail from name field in .env.example file, Issue #2051

Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-16 13:54:18 +01:00