Commit Graph

3377 Commits

Author SHA1 Message Date
Jitendra Singh 236d6f32d2
Merge pull request #2569 from jitendra-webkul/1.0
Theme system updated to support module theming
2020-02-28 19:06:23 +05:30
shubhammehrotra.symfony@webkul.com a752e58ed1 resolved issues 2020-02-28 18:59:15 +05:30
Jitendra Singh c209beec69 Theme system updated to support module theming 2020-02-28 18:52:09 +05:30
shubhammehrotra.symfony@webkul.com db2d2e8079 drop table wrong name issue 2020-02-28 17:31:57 +05:30
shubhammehrotra.symfony@webkul.com f1bf2d6e17 revised naming convention 2020-02-28 17:30:30 +05:30
shubhammehrotra.symfony@webkul.com c5c1c9154a product compare updates 2020-02-28 17:23:01 +05:30
shubhammehrotra.symfony@webkul.com 772cdbd2ba product image issue fixed 2020-02-28 09:32:47 +05:30
shubhammehrotra.symfony@webkul.com ce56c13fd0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-27 20:21:37 +05:30
shubhammehrotra.symfony@webkul.com 0691f4a9dd minor bug fixes 2020-02-27 20:19:54 +05:30
shubhammehrotra.symfony@webkul.com 721d4c8141 minor bug fixes 2020-02-27 20:14:28 +05:30
shubhammehrotra.symfony@webkul.com 4df1895a38 minor bug fixes 2020-02-27 20:14:14 +05:30
shubhammehrotra.symfony@webkul.com b83ea26915 minor bug fixes 2020-02-27 19:37:37 +05:30
shubhammehrotra.symfony@webkul.com 817a4831ff minor bug fixes 2020-02-27 19:11:16 +05:30
Jitendra Singh 0dd0897e68
Merge pull request #2542 from ghermans/shipments
Improved order shipments info
2020-02-27 18:38:53 +05:30
shubhammehrotra.symfony@webkul.com f5c45972db minor bug fixes 2020-02-27 17:31:21 +05:30
shubhammehrotra.symfony@webkul.com 4485d3fb9c changes from master 2020-02-27 16:16:38 +05:30
shubhammehrotra.symfony@webkul.com 87f801dbce changes from master 2020-02-27 16:16:29 +05:30
shubhammehrotra.symfony@webkul.com 13312e8234 compare product's dynamic attributes 2020-02-27 16:14:00 +05:30
Herbert Maschke fa6103df09 code style improvements 2020-02-26 18:31:49 +01:00
Herbert Maschke 13d73a3b1c Merge branch 'bagisto/master' into discount-issue 2020-02-26 16:43:33 +01:00
Herbert Maschke 41bc76d72d Merge branch 'master' of https://github.com/bagisto/bagisto into bagisto/master 2020-02-26 16:42:40 +01:00
Herbert Maschke 6810339191 also fix discount apply WITH taxes (full amount) instead of BEFORE taxes 2020-02-26 16:41:59 +01:00
Herbert Maschke 427ba43743 grand total of cart discount apply calculation issue 2020-02-26 15:58:54 +01:00
rahul shukla b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
rahul shukla e37b4fed14 locale messgaes improvement 2020-02-26 16:34:41 +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
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
Glenn Hermans 9de680c47d
Fix conflicts 2020-02-24 17:49:43 +01:00
Annika Wolff 1691151683 entered translation keys 2020-02-24 13:57:24 +01:00
rahul shukla 10d8ec249a laguage updated for order 2020-02-24 15:04:18 +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
rahul shukla ab956a2a79 remove comment 2020-02-24 11:23:02 +05:30
Glenn Hermans ea69a74443
Added translations 2020-02-22 15:15:55 +01:00
Glenn Hermans e3413d5f45
Updated shipments table view 2020-02-22 15:15:09 +01:00
Glenn Hermans 6f6f1c66a5 translations 2020-02-21 17:09:26 +01:00