4df1895a38
minor bug fixes
2020-02-27 20:14:14 +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
b83ea26915
minor bug fixes
2020-02-27 19:37:37 +05:30
817a4831ff
minor bug fixes
2020-02-27 19:11:16 +05:30
0dd0897e68
Merge pull request #2542 from ghermans/shipments
...
Improved order shipments info
2020-02-27 18:38:53 +05:30
f5c45972db
minor bug fixes
2020-02-27 17:31:21 +05:30
4485d3fb9c
changes from master
2020-02-27 16:16:38 +05:30
87f801dbce
changes from master
2020-02-27 16:16:29 +05:30
13312e8234
compare product's dynamic attributes
2020-02-27 16:14:00 +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
9de680c47d
Fix conflicts
2020-02-24 17:49:43 +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
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
ea69a74443
Added translations
2020-02-22 15:15:55 +01:00
e3413d5f45
Updated shipments table view
2020-02-22 15:15:09 +01:00
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
253ac52cc1
post code in shipping address
2020-02-21 16:56:57 +05:30
fc84c4a047
#2512 - Added more shop translations
2020-02-21 11:23:46 +01:00
78e50e4e6b
tax in velocity theme
2020-02-21 15:38:42 +05:30
24e69e2cd9
Merge pull request #2247 from Haendlerbund/fix-tax-handling
...
Fix tax handling
2020-02-21 15:20:35 +05:30
6396194862
Merge pull request #2534 from rahulshukla-webkul/development
...
Issue #2533 fixed and change log updated
2020-02-21 15:10:42 +05:30
a4b3316b29
Issue #2533 fixed and change log updated
2020-02-21 14:41:42 +05:30
d4ce50da9f
#2512 more translations
2020-02-21 09:44:12 +01:00
283c6e437c
#2512 starting to translate the shop files
2020-02-21 09:30:04 +01:00
d50510a626
resolve merge issue, add type hints in Cart helper function
2020-02-21 08:36:52 +01:00
35522da97d
Merge pull request #2532 from rahulshukla-webkul/development
...
change log updated
2020-02-21 12:02:47 +05:30
5ad6afd298
change log updated
2020-02-21 11:58:33 +05:30
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
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
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
c87562622b
cart product quantitiy for bundle product in velocity and change log updated
2020-02-21 10:53:59 +05:30
22f5391f5c
More translations
2020-02-21 01:48:25 +01:00
6174a78926
More translations
2020-02-21 01:16:32 +01:00
89ebea48e6
removed spacing
2020-02-20 20:24:39 +01:00
fbfb493629
Fixed #2530
2020-02-20 20:22:17 +01:00
623b7893a2
resolve merge conflicts
2020-02-20 19:23:01 +01:00
154a933dc6
Merge branch 'master' into fix-tax-handling
2020-02-20 17:19:28 +01:00
9e08585b85
#2512 - Added more dutch translations
2020-02-20 17:06:30 +01:00
f3c19efa26
Merge pull request #2528 from rahulshukla-webkul/development
...
Issue #2526
2020-02-20 19:54:32 +05:30
9937f52de2
Issue #2526
2020-02-20 19:50:27 +05:30
361ef64fa7
#2527 Added translations for order status
2020-02-20 15:12:05 +01:00
1688342f18
#2527 Replaced static text in order datagrid
2020-02-20 15:11:37 +01:00
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
79a78cc9c9
#2512 - Added more dutch translations
2020-02-20 13:27:01 +01:00
f7219767ed
fix CartRuleRepository once more
2020-02-20 13:26:14 +01:00
416a7b849a
2512 - Added more dutch translations
2020-02-20 12:37:00 +01:00
d71d39208d
2512 - Removed static text and wrong translations
2020-02-20 12:36:13 +01:00
d8bd2cb31e
Merge pull request #2520 from shubhwebkul/bug-fixes
...
quick view short description issue
2020-02-20 16:44:03 +05:30
66ba69586d
filter issue in category
2020-02-20 16:31:46 +05:30
ac3a093687
quick view short description issue
2020-02-20 16:12:23 +05:30
75d22eaf3a
improve validation style of starts_from and ends_till in CartRuleRepository
2020-02-20 11:26:12 +01:00
b56dc467f9
compare minor updates
2020-02-20 15:38:19 +05:30
f45f83ab89
#2512 - Added more dutch translations
2020-02-20 09:59:27 +01:00
521fc4b6b6
Improved booking product package code style
2020-02-20 13:43:06 +05:30
6714b1d7c8
Issue #2468
2020-02-20 13:13:02 +05:30
96cba32d8b
Improved velocity package code style
2020-02-20 13:08:52 +05:30
0ca4eb66f1
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-20 12:59:00 +05:30
179cac23ce
guest customer compare item
2020-02-20 12:58:49 +05:30
62c3d48b4b
Improved user package code style
2020-02-20 12:44:00 +05:30
1ef5376a53
Improved ui package code style
2020-02-20 12:41:17 +05:30
062bd52174
Improved theme package code style
2020-02-20 12:39:39 +05:30
0740527b54
Improved tax package code style
2020-02-20 12:37:53 +05:30
5f6e3be796
Improved shop package code style
2020-02-20 12:35:51 +05:30
38f1251568
Issue #2468
2020-02-20 12:30:00 +05:30
a4d565e46e
Improved shipping package code style
2020-02-20 12:24:38 +05:30
7b8cf802f4
Improved sales package code style
2020-02-20 12:17:44 +05:30
aa1d6d145c
Improved product package code style
2020-02-20 11:42:17 +05:30
e82fb888ab
merge with master
2020-02-20 11:00:34 +05:30
8835ab75dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-20 10:59:29 +05:30
e5a0bc8a0e
Issue #2500 and chaneelog updated
2020-02-20 10:56:59 +05:30
ec12a677f6
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-20 10:56:25 +05:30
9480b95d00
compare items updates
2020-02-20 10:56:11 +05:30
cb99ea652b
#2512 - Started dutch translations
2020-02-20 04:08:19 +01:00
d999bc18d9
Issue #2500 fixed
2020-02-19 21:16:20 +05:30
b5727a1152
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-19 21:13:37 +05:30
229117c7b9
change log updated and Isssue #2500 fixed
2020-02-19 21:10:27 +05:30
c81c46f9d6
Improved payment package code style
2020-02-19 19:31:17 +05:30
ad4ab855e0
Improved inventory package code style
2020-02-19 19:22:29 +05:30
ec52229567
Improved customer package code style
2020-02-19 19:20:57 +05:30
107e4338e3
Improved customer package code style
2020-02-19 19:20:15 +05:30
9e7e939479
Improved customer package code style
2020-02-19 19:18:54 +05:30
e16fad3ac8
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-19 18:59:52 +05:30
a11c8e67b0
compare product updates
2020-02-19 18:59:38 +05:30
07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
...
issue #2470 fixed
2020-02-19 18:47:16 +05:30
bc04b34074
Merge pull request #2509 from vivek-webkul/patch-38
...
[Updated: resolved admin user delete issue.]
2020-02-19 18:46:51 +05:30
5fb33d4fc9
Improved core package code style
2020-02-19 17:56:12 +05:30
687df3dbdd
Improved cms package code style
2020-02-19 17:45:43 +05:30
973d8ebc60
Improved checkout package code style
2020-02-19 17:44:07 +05:30
98b373d0cb
Improved category package code style
2020-02-19 17:34:50 +05:30
46b4b533c3
Improved catalog rule package code style
2020-02-19 17:32:35 +05:30
a31fba56b1
Resolved conflicts
2020-02-19 17:23:18 +05:30
9c78f3b4db
Improved cart rule package code style
2020-02-19 17:19:52 +05:30
5f7b210a61
[Updated: same login user delete issue fixed.]
2020-02-19 17:11:56 +05:30
a72401dbba
Improved attribute package code style
2020-02-19 17:09:17 +05:30
c5cc8fa541
Improved api package code style
2020-02-19 16:54:04 +05:30
e1cdff607b
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-02-19 16:26:06 +05:30
36f795f09a
assets for production
2020-02-19 16:25:40 +05:30
20b7d78359
[Updated: resolved admin user delete issue.]
2020-02-19 16:22:19 +05:30
86e31346d0
remove console
2020-02-19 16:17:31 +05:30
d62b61b19c
Issue #2463
2020-02-19 16:12:54 +05:30
99d506db94
Improved admin package code standard
2020-02-19 15:56:44 +05:30
b4c68c7f0b
Improved datagrid code
2020-02-19 15:44:27 +05:30
6052b6355d
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-02-19 15:42:35 +05:30
74251ef2d2
issue 2470 fixed
2020-02-19 15:42:00 +05:30
33f882209a
code improvement
2020-02-19 15:32:52 +05:30
b6cdcad01d
change depandeciy of slider component, hide attribute with option
2020-02-19 15:03:57 +05:30
bfd55c345f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-19 11:53:34 +05:30
shubhammehrotra.symfony@webkul.com
Jitendra Singh
Jitendra Singh
Herbert Maschke
rahul shukla
Herbert Maschke
Annika Wolff
Steffen Mahler
SteffenMahler
Glenn Hermans
Annika Wolff
Vivek Sharma
prateek srivastava