Commit Graph

357 Commits

Author SHA1 Message Date
Florian Bosdorff 910f76952f fix address-constrains; fix address global scopes 2020-04-17 15:54:02 +02:00
Florian Bosdorff 01d4cb026f fix address_type at many places; add tests for address relations 2020-04-17 11:09:59 +02:00
Florian Bosdorff 5a9dfd8561 add unified address-table and handling for models 2020-04-16 21:13:19 +02:00
Shubham Mehrotra 15c4e0686b compare products in default theme 2020-03-25 13:10:33 +05:30
Shubham Mehrotra 139bd36443 forget password message 2020-03-24 20:11:48 +05:30
Jitendra Singh 5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41
[Updated: Shop & admin email setting added in configuration.]
2020-03-19 15:36:27 +05:30
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
Herbert Maschke 7a3a1726bc Merge branch 'bagisto/master' into order-workflow-improvements 2020-03-06 15:50:26 +01:00
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
Jitendra Singh a6ce67151f Improved comments in code 2020-03-05 11:04:57 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
Herbert Maschke 3e9c68f01d introduce prepareCart() to be able to do checkout tests [wip] [ci-skip] 2020-02-28 11:41:48 +01:00
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
Herbert Maschke 95dfe3f8d0 propagate the company_name and vat_id from address through cart to order addresses 2020-02-26 07:37:17 +01:00
rahul shukla e82fb888ab merge with master 2020-02-20 11:00:34 +05:30
rahul shukla 229117c7b9 change log updated and Isssue #2500 fixed 2020-02-19 21:10:27 +05:30
Jitendra Singh ec52229567 Improved customer package code style 2020-02-19 19:20:57 +05:30
Jitendra Singh 107e4338e3 Improved customer package code style 2020-02-19 19:20:15 +05:30
Jitendra Singh 9e7e939479 Improved customer package code style 2020-02-19 19:18:54 +05:30
Herbert Maschke b0e37edd63 only send emails when configured so 2020-02-17 16:52:58 +01:00
shubhammehrotra.symfony@webkul.com 6f37c37dd1 resolved conflicts 2020-02-10 12:25:22 +05:30
shubhammehrotra.symfony@webkul.com 8fc51a7be4 rtl updates 2020-02-08 19:00:58 +05:30
Vivek Sharma d2a2b2a8c6 [Fixed: issue #2384 has been resolved.] 2020-02-08 12:59:08 +05:30
Vivek Sharma bc28c8c4fe [Fixed: issue #2313 resolved.] 2020-02-06 12:37:50 +05:30
Herbert Maschke 178f89165e add required validations 2020-01-31 06:06:13 +01:00
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 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
Herbert Maschke 08891a43b6 use correct vatId() formatter 2020-01-27 11:31:46 +01:00
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
Herbert Maschke 5ebb67dd81 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-23 14:18:17 +01:00
Florian Bosdorff db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
rahul shukla 2c0b7e4e54 try and catch in password section and wishlist add remove 2020-01-23 15:32:06 +05:30
rahul shukla 6147c3e5db Issue #2114 2020-01-23 11:01:04 +05:30
rahul shukla 2d8f5f412e Issue #2087 2020-01-23 10:42:09 +05:30
Herbert Maschke 6eacf880a4 use an locale from a country in europe so the vat id can be generated 2020-01-22 10:38:35 +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 e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
Herbert Maschke bc44867956 check if date_of_birth and oldpassword are set in request in profile edit action 2020-01-20 08:54:06 +01:00
Herbert Maschke d281aa373b remove factories (except necessary ones) from this pull request, as we deliver them as a separate PR 2020-01-16 09:54:04 +01:00
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 ab28b75eff add validation rule 2020-01-15 15:29:31 +01:00
Herbert Maschke 57aa522282 introduce company_name and vat_id also in shop admin backend 2020-01-15 14:02:51 +01:00
Herbert Maschke 95e37044de introduce some more factories and place them into the webkul core package to be available everywhere 2020-01-15 10:32:01 +01:00
Herbert Maschke df9fce8930 typo fix, minor refactoring 2020-01-14 14:02:32 +01:00
Herbert Maschke 298a3a68ab use faker->vat in factory 2020-01-14 13:43:06 +01:00
David Große 9524c78ad5 various code style improvements 2020-01-14 10:49:22 +01:00
David Große d42236974d removed redundant migration 2020-01-14 10:27:39 +01:00
David Große 72c3e289c7 remove the splitting into first_name and last_name again - it can be desastrous to drop a column in a productive environment 2020-01-14 10:25:26 +01:00
David Große 70d424527e adjust factory 2020-01-13 11:44:36 +01:00
David Große da7db34fe9 add customer_vat_id column to order table 2020-01-13 11:43:28 +01:00
David Große 7eee7e3134 split the 'name' column in the customer addresses into 'first_name' and 'last_name' - it is more common to save the data in this structure 2020-01-13 11:20:04 +01:00
David Große 81c928025b remove address3 from customer_addresses fillable 2020-01-13 09:38:48 +01:00
Jitendra Singh cf36d252a0 Issue #1764 fixed 2020-01-13 12:44:36 +05:30
Jitendra Singh 0b71abedbf Issue #1764 fixexcd 2020-01-13 12:26:53 +05:30
David Große 109b503609 display vat_id and company_name in edit.blade.php 2020-01-10 14:16:34 +01:00
David Große 7429d32072 introduce VatValidator.php 2020-01-10 14:07:58 +01:00
David Große 3af9a825c9 add optional vat_id to customer addresses 2020-01-10 11:59:53 +01:00
David Große f1090efa73 add factories necessary for testing customer and customer addresses 2020-01-10 11:51:03 +01:00
David Große 3ca5c99f27 introduce company_name column to customer_addresses 2020-01-10 11:05:09 +01:00
David Große e962dbc988 allow defaultCountry also in edit.blade 2020-01-08 14:56:22 +01:00
David Große 37a4f6adb6 ensure the api_token is being generated on customer/admin creation 2020-01-03 09:14:12 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
rahul shukla 2f0338bda3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-19 16:47:20 +05:30
rahul shukla 10d4613446 Issue #1879 and #1880 2019-12-19 16:47:00 +05:30
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
Jitendra Singh c26bf6c820
Merge pull request #1701 from MattApril/env-fix
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
Jitendra Singh a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
jitendra ab2d069ec7 Issue #1519 fixed 2019-10-31 17:07:49 +05:30
Matt April 3ebdde7681 Replaced direct env references of MAIL_SHOP_FROM with config file references. Also enabled optional usage of MAIL_FROM_NAME. 2019-10-26 11:09:46 -04:00
jitendra 62533d9df8 postcode column changed to varchar from int 2019-10-24 17:38:08 +05:30
jitendra 1050f4a82c Removed comment from WishlistController 2019-10-24 17:11:33 +05:30
jitendra dfb9c75e77 Move wishlist to cart issue fixed 2019-10-24 17:08:41 +05:30
naresh verma 2d2302c398 resolve conflicts 2019-10-21 13:38:29 +05:30
naresh verma bfddda8ce2 resolved conflicts [issue #1645] 2019-10-18 19:43:03 +05:30
Jitendra Singh 65d9c0b283
Merge pull request #1652 from vivek-webkul/patch-5
[Enhancement #737: Fields added to the customer DataGrid and customer…
2019-10-18 17:42:07 +05:30
Vivek f8767adc0d [Enhancement #737: Fields added to the customer DataGrid and customer addresses section added at admin end.] 2019-10-17 18:12:51 +05:30
naresh verma 205cb21aa8 added success notification after customer delete. 2019-10-17 17:56:24 +05:30