0f42e8ff8f
Resolved conflicts
2020-02-27 12:07:20 +05:30
ed6a345d34
Merge pull request #2561 from Haendlerbund/discount-issue
...
grand total of cart discount apply calculation issue
2020-02-27 12:04:49 +05:30
706f2c5de5
Merge pull request #2565 from papnoisanjeev/master
...
spelling mistake in bug report template
2020-02-27 11:58:40 +05:30
c1368cd03a
spelling mistake in bug report template
2020-02-27 11:53:24 +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
68011106cf
Merge pull request #2560 from rahulshukla-webkul/development
...
Development
2020-02-26 17:20:01 +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
22f6483b9e
Merge pull request #2551 from ghermans/webinstall
...
#2525 - Console command update
2020-02-26 16:07:27 +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
526ba3b9c0
Merge pull request #2554 from SteffenMahler/patch-3
...
fix issue in coupon handling
2020-02-25 16:33:50 +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
a48fe56e37
#2525 fixed typos
2020-02-25 03:57:05 +01:00
5465963e9a
#2525 fixed typo
2020-02-25 03:46:39 +01:00
b9a6d2e6e9
#2525 fixed php docs
2020-02-25 03:38:36 +01:00
3365924529
#2525 updated config file
2020-02-25 03:30:13 +01:00
bb9c90d0a2
#2525 Added locale, timezone and currency
2020-02-25 03:29:33 +01:00
5df38b73a4
Merge pull request #4 from bagisto/master
...
Merge with original repo
2020-02-24 20:55:10 +01:00
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
3cee45b4a5
Merge pull request #2548 from rahulshukla-webkul/development
...
laguage updated for order
2020-02-24 15:06:15 +05:30
10d8ec249a
laguage updated for order
2020-02-24 15:04:18 +05:30
fe3e757a23
Merge pull request #2547 from rahulshukla-webkul/development
...
change log updated for 1.x.x
2020-02-24 14:57:42 +05:30
b1f34c095a
date updated in changelog
2020-02-24 14:39:42 +05:30
19016b4076
change log updated for 1.x.x
2020-02-24 14:35:51 +05:30
c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
...
Development
2020-02-24 13:47:58 +05:30
Jitendra Singh
Jitendra Singh
Sanjeev Papnoi
Herbert Maschke
rahul shukla
Herbert Maschke
Annika Wolff
Steffen Mahler
SteffenMahler
ghermans