Commit Graph

4529 Commits

Author SHA1 Message Date
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
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 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
Jitendra Singh 35522da97d
Merge pull request #2532 from rahulshukla-webkul/development
change log updated
2020-02-21 12:02:47 +05:30
rahul shukla 5ad6afd298 change log updated 2020-02-21 11:58:33 +05:30
Jitendra Singh f9c608bbda
Merge pull request #2521 from Haendlerbund/improve-cart-item-validation
Automated test for Cart Rule Creation in Admin Backend
2020-02-21 11:29:34 +05:30
Jitendra Singh e0b61c8a58
Merge pull request #2524 from SteffenMahler/patch-2
Fire event if customer wants to "buy now"
2020-02-21 11:29:17 +05:30
Jitendra Singh fa68e2ad2a
Merge pull request #2531 from rahulshukla-webkul/development
cart product quantity for bundle product in velocity and change log …
2020-02-21 11:03:01 +05:30
rahul shukla c87562622b cart product quantitiy for bundle product in velocity and change log updated 2020-02-21 10:53:59 +05:30
ghermans 22f5391f5c More translations 2020-02-21 01:48:25 +01:00
ghermans 6174a78926 More translations 2020-02-21 01:16:32 +01:00
ghermans 89ebea48e6 removed spacing 2020-02-20 20:24:39 +01:00
ghermans fbfb493629 Fixed #2530 2020-02-20 20:22:17 +01:00
Annika Wolff 623b7893a2
resolve merge conflicts 2020-02-20 19:23:01 +01:00
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
Glenn Hermans 9e08585b85 #2512 - Added more dutch translations 2020-02-20 17:06:30 +01:00
Jitendra Singh f3c19efa26
Merge pull request #2528 from rahulshukla-webkul/development
Issue #2526
2020-02-20 19:54:32 +05:30
rahul shukla 9937f52de2 Issue #2526 2020-02-20 19:50:27 +05:30
Glenn Hermans 361ef64fa7 #2527 Added translations for order status 2020-02-20 15:12:05 +01:00
Glenn Hermans 1688342f18 #2527 Replaced static text in order datagrid 2020-02-20 15:11:37 +01:00
SteffenMahler 75f4d9925c
Fire event if customer wants to "buy now"
If a customer wants to buy a single product directly, the CartController add() method fires an event. The same event has to be fired via api request. In this case it's store() method.
2020-02-20 13:58:10 +01:00
ghermans 79a78cc9c9 #2512 - Added more dutch translations 2020-02-20 13:27:01 +01:00