Commit Graph

4548 Commits

Author SHA1 Message Date
Jitendra Singh 22f6483b9e
Merge pull request #2551 from ghermans/webinstall
#2525 - Console command update
2020-02-26 16:07:27 +05:30
Jitendra Singh 919be311cc
Merge pull request #2553 from Haendlerbund/add-german-localisation-to-vee-validate-in-shop
German localisation for vee-validate in Shop
2020-02-26 15:49:07 +05:30
Jitendra Singh d088adb6e7
Merge pull request #2555 from Haendlerbund/repair-bagisto-generate
generate a dummy brand in GenerateProducts.php
2020-02-26 15:27:02 +05:30
Jitendra Singh f0c65fa319
Merge pull request #2557 from Haendlerbund/company-name-propagation
company_name and vat_id address->cart->order (addresses) fixes
2020-02-26 15:15:21 +05:30
Jitendra Singh 0b979ad524
Merge pull request #2550 from Haendlerbund/translations-hard-coded-in-api-cart
Add translation keys in API/Cart
2020-02-26 15:10:53 +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
Annika Wolff a8b3691564 update dependency: lift vue version up to same as vue-template-compiler 2020-02-25 15:17:59 +01:00
Herbert Maschke 7083aed97a generate a dummy brand in GenerateProducts.php to fix brand linking issue after checkout of generated product 2020-02-25 14:23:00 +01:00
Jitendra Singh 526ba3b9c0
Merge pull request #2554 from SteffenMahler/patch-3
fix issue in coupon handling
2020-02-25 16:33:50 +05:30
Steffen Mahler d3c7682974 remove unnecessary line 2020-02-25 10:33:13 +01:00
Steffen Mahler c7cd5f5f51 remove line 2020-02-25 10:09:00 +01:00
SteffenMahler 24dd893de1
fix issue in coupon handling
I found a little issue on handling coupons in cart.

To reproduce this issue you have to do:
- create three simple products
- create a cart rule with coupon
- assign conditions, so that sku of product 1 and product 2 will match the coupon
- add product 1 to cart
- add product 2 to cart
- last add product 3 to cart (which has no coupon matching)
- apply the coupon

You get an error message.

So therefore I made some little changes.
2020-02-25 09:33:47 +01:00
Annika Wolff 06277834ab ran npm prod 2020-02-25 09:21:37 +01:00
Annika Wolff d6879bb7b9 configure vee-validate to german localisation 2020-02-25 08:30:56 +01:00
ghermans a48fe56e37 #2525 fixed typos 2020-02-25 03:57:05 +01:00
ghermans 5465963e9a #2525 fixed typo 2020-02-25 03:46:39 +01:00
ghermans b9a6d2e6e9 #2525 fixed php docs 2020-02-25 03:38:36 +01:00
ghermans 3365924529 #2525 updated config file 2020-02-25 03:30:13 +01:00
ghermans bb9c90d0a2 #2525 Added locale, timezone and currency 2020-02-25 03:29:33 +01:00
Glenn Hermans 5df38b73a4
Merge pull request #4 from bagisto/master
Merge with original repo
2020-02-24 20:55:10 +01:00
Annika Wolff 1691151683 entered translation keys 2020-02-24 13:57:24 +01:00
Jitendra Singh 3cee45b4a5
Merge pull request #2548 from rahulshukla-webkul/development
laguage updated for order
2020-02-24 15:06:15 +05:30
rahul shukla 10d8ec249a laguage updated for order 2020-02-24 15:04:18 +05:30
Jitendra Singh fe3e757a23
Merge pull request #2547 from rahulshukla-webkul/development
change log updated for 1.x.x
2020-02-24 14:57:42 +05:30
rahul shukla b1f34c095a date updated in changelog 2020-02-24 14:39:42 +05:30
rahul shukla 19016b4076 change log updated for 1.x.x 2020-02-24 14:35:51 +05:30
Jitendra Singh c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
Development
2020-02-24 13:47:58 +05:30
Jitendra Singh 8bdadf7a38
Merge pull request #2545 from shubhwebkul/bug-fixes
[Velocity] product view page add to cart button issue resolved
2020-02-24 13:46:38 +05:30
rahul shukla 8fa7bc8c10 Issue #2451 fixed 2020-02-24 13:45:11 +05:30
shubhammehrotra.symfony@webkul.com 9b2dc0b8c7 product view add to cart button issue resolved 2020-02-24 13:43:21 +05:30
Jitendra Singh e552183e9a
Merge pull request #2523 from ghermans/dutch
#2512 - Dutch translations and removing static text
2020-02-24 13:34:27 +05:30
rahul shukla e927ebd821 product name issue 2020-02-24 12:31:18 +05:30
Jitendra Singh 6fc2f78f52
Merge pull request #2544 from rahulshukla-webkul/development
Uncomment code
2020-02-24 11:33:08 +05:30
rahul shukla ab956a2a79 remove comment 2020-02-24 11:23:02 +05:30
Glenn Hermans d25c9bbec0
Merge pull request #2 from bagisto/master
Update from original repo
2020-02-22 15:03:17 +01:00
Glenn Hermans 6f6f1c66a5 translations 2020-02-21 17:09:26 +01:00
Jitendra Singh 1b37a5f796
Merge pull request #2539 from rahulshukla-webkul/development
Issue #2538 fixed and change log updated
2020-02-21 17:51:22 +05:30
rahul shukla 30cb18c1f5 Issue #2538 fixed and change log updated 2020-02-21 17:45:47 +05:30
Jitendra Singh af01fa6103
Merge pull request #2536 from rahulshukla-webkul/development
post code in shipping address
2020-02-21 17:24:55 +05:30
Glenn Hermans 0f233f08fe Updating translations 2020-02-21 12:36:26 +01:00
rahul shukla 253ac52cc1 post code in shipping address 2020-02-21 16:56:57 +05:30
Jitendra Singh 84e826d1a0
Merge pull request #2535 from rahulshukla-webkul/development
tax in velocity theme
2020-02-21 16:32:27 +05:30
Glenn Hermans fc84c4a047 #2512 - Added more shop translations 2020-02-21 11:23:46 +01:00
rahul shukla 78e50e4e6b tax in velocity theme 2020-02-21 15:38:42 +05:30
Jitendra Singh 24e69e2cd9
Merge pull request #2247 from Haendlerbund/fix-tax-handling
Fix tax handling
2020-02-21 15:20:35 +05:30
Jitendra Singh 6396194862
Merge pull request #2534 from rahulshukla-webkul/development
Issue #2533 fixed and change log updated
2020-02-21 15:10:42 +05:30
rahul shukla a4b3316b29 Issue #2533 fixed and change log updated 2020-02-21 14:41:42 +05:30
ghermans d4ce50da9f #2512 more translations 2020-02-21 09:44:12 +01:00
ghermans 283c6e437c #2512 starting to translate the shop files 2020-02-21 09:30:04 +01:00
Annika Wolff d50510a626 resolve merge issue, add type hints in Cart helper function 2020-02-21 08:36:52 +01:00