0b2d8a89c1
Translations added for cart item attribute labels
2020-02-28 13:21:29 +05:30
131e3f1e18
Quantity box checks added for booking product
2020-02-28 13:00:29 +05:30
4cd1971a12
Removed duplicate function
2020-02-27 20:04:55 +05:30
dbb5f25594
Inventory check implemented for table booking
2020-02-27 19:55:34 +05:30
05be7a070a
Improved code style
2020-02-27 13:33:03 +05:30
0f42e8ff8f
Resolved conflicts
2020-02-27 12:07:20 +05:30
fa6103df09
code style improvements
2020-02-26 18:31:49 +01:00
13d73a3b1c
Merge branch 'bagisto/master' into discount-issue
2020-02-26 16:43:33 +01:00
41bc76d72d
Merge branch 'master' of https://github.com/bagisto/bagisto into bagisto/master
2020-02-26 16:42:40 +01:00
6810339191
also fix discount apply WITH taxes (full amount) instead of BEFORE taxes
2020-02-26 16:41:59 +01:00
427ba43743
grand total of cart discount apply calculation issue
2020-02-26 15:58:54 +01:00
e08f09f7d2
Quantity availability check implemented for rental booking
2020-02-26 19:49:04 +05:30
b0b4935006
time added in cart rules
2020-02-26 16:58:53 +05:30
13c51b32d5
Quantity availability check implemented for event booking
2020-02-26 16:53:17 +05:30
e37b4fed14
locale messgaes improvement
2020-02-26 16:34:41 +05:30
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
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
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
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
53da36dd2c
Quantity availability check implemented for default booking
2020-02-26 15:06:08 +05:30
91064cd0bc
Quantity availability check implemented for default booking
2020-02-26 13:11:24 +05:30
95dfe3f8d0
propagate the company_name and vat_id from address through cart to order addresses
2020-02-26 07:37:17 +01:00
a8b3691564
update dependency: lift vue version up to same as vue-template-compiler
2020-02-25 15:17:59 +01:00
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
d5b54b393b
Event booking type add cart updated
2020-02-25 16:42:32 +05:30
d3c7682974
remove unnecessary line
2020-02-25 10:33:13 +01:00
c7cd5f5f51
remove line
2020-02-25 10:09:00 +01:00
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
06277834ab
ran npm prod
2020-02-25 09:21:37 +01:00
d6879bb7b9
configure vee-validate to german localisation
2020-02-25 08:30:56 +01:00
e04d04e204
Added qty field to default and rental booking tyoe
2020-02-25 11:55:12 +05:30
7d2ff93f43
Resolve conflicts
2020-02-25 11:44:34 +05:30
c553fc945b
Time component added
2020-02-25 11:40:27 +05:30
9eb7113aa4
Fixed else if indentation in javascript
2020-02-24 18:53:34 +05:30
1691151683
entered translation keys
2020-02-24 13:57:24 +01:00
195eb82802
Replace else if with elseif
2020-02-24 17:49:12 +05:30
95d198c1d6
Fixed merge cart issue for booking product
2020-02-24 16:40:44 +05:30
10d8ec249a
laguage updated for order
2020-02-24 15:04:18 +05:30
c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
...
Development
2020-02-24 13:47:58 +05:30
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
8fa7bc8c10
Issue #2451 fixed
2020-02-24 13:45:11 +05:30
9b2dc0b8c7
product view add to cart button issue resolved
2020-02-24 13:43:21 +05:30
e552183e9a
Merge pull request #2523 from ghermans/dutch
...
#2512 - Dutch translations and removing static text
2020-02-24 13:34:27 +05:30
e927ebd821
product name issue
2020-02-24 12:31:18 +05:30
ab956a2a79
remove comment
2020-02-24 11:23:02 +05:30
6f6f1c66a5
translations
2020-02-21 17:09:26 +01:00
5c696f8d00
Resolved conflicts
2020-02-21 19:36:17 +05:30
2e24c2e2e5
Updated event booking system
2020-02-21 19:13:15 +05:30
30cb18c1f5
Issue #2538 fixed and change log updated
2020-02-21 17:45:47 +05:30
0f233f08fe
Updating translations
2020-02-21 12:36:26 +01:00
Jitendra Singh
Herbert Maschke
rahul shukla
Jitendra Singh
Herbert Maschke
Annika Wolff
Steffen Mahler
SteffenMahler
shubhammehrotra.symfony@webkul.com
Glenn Hermans