279ab5b237
Merge pull request #2679 from jitendra-webkul/1.0
...
Issue #2669 fixed
2020-03-17 15:38:48 +05:30
d76a8d8dec
Issue #2669 fixed
2020-03-17 15:34:33 +05:30
d5b1e84fdb
#2678
2020-03-17 14:00:07 +05:30
32701de737
#2666
2020-03-17 13:34:44 +05:30
ca4ae665f1
#2667
2020-03-17 13:13:24 +05:30
8ac4946352
Merge pull request #2676 from jitendra-webkul/1.0
...
Issue #2671 fixed
2020-03-17 13:02:41 +05:30
cdc1eb7bc1
Issue #2671 fixed
2020-03-17 13:01:37 +05:30
df9611d030
Merge pull request #2673 from jitendra-webkul/1.0
...
Issue #2672 fixed
2020-03-17 12:26:23 +05:30
bf5ad13dac
Issue #2672 fixed
2020-03-17 12:25:04 +05:30
f354d0aafa
shimmer effect added in wishlist and comparison
2020-03-17 11:44:22 +05:30
47c4a5ef42
upadated missing translation for dutch and protoguese in velocity package
2020-03-17 10:12:33 +05:30
d2caa2af98
resolved commit
2020-03-17 09:36:45 +05:30
255b50454b
updated missing translation for the Persia for the shop front
2020-03-16 19:09:38 +05:30
ce90035edb
hide compare, wishlist icon
2020-03-16 18:52:37 +05:30
d83bc00289
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-16 18:47:10 +05:30
61f949f43e
#2646
2020-03-16 18:46:56 +05:30
8ac262ffa8
updated the missing translation for shop front for arabic and removed repated translation from english
2020-03-16 18:09:32 +05:30
bc362144c3
added shimmer effect product cards
2020-03-16 16:33:53 +05:30
e7a9303b51
updated missing translation for portoguese in admin package
2020-03-16 16:24:04 +05:30
1eb1954a4f
Merge pull request #2665 from shubhwebkul/velocity-updated
...
misc. bug fixes
2020-03-16 15:10:48 +05:30
65814e0f04
upadated missing translation for Dutch for admin package
2020-03-16 14:07:08 +05:30
cc12549336
#2636
2020-03-16 13:40:21 +05:30
ee4f81004c
#2639
2020-03-16 13:34:01 +05:30
9901209a4b
upadated missing translation for persian in admin package
2020-03-16 13:25:14 +05:30
e1ed114d74
[Updated: Core/Config.php modified.]
2020-03-16 13:13:57 +05:30
96ab5e390e
Merge pull request #2662 from jitendra-webkul/1.0
...
Issue #2660 fixed
2020-03-16 11:57:51 +05:30
282545e1c4
Issue #2660 fixed
2020-03-16 11:53:39 +05:30
1572075443
[Updated: worked on conflict.]
2020-03-16 11:10:07 +05:30
355a6a5c5d
Merge pull request #2659 from jitendra-webkul/1.0
...
Issue #2658 fixed
2020-03-16 11:03:00 +05:30
7182400059
Issue #2658 fixed
2020-03-16 11:02:14 +05:30
1e5baab3a4
added missed translation for arabic
2020-03-16 10:56:10 +05:30
7072a60cda
Merge pull request #2657 from jitendra-webkul/1.0
...
Issue #2654 fixed
2020-03-13 19:16:48 +05:30
7413e1577e
Issue #2654 fixed
2020-03-13 19:15:59 +05:30
65b34add4b
Merge pull request #2656 from jitendra-webkul/1.0
...
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:08:08 +05:30
e38a95cb3f
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:07:14 +05:30
cae24088da
Merge pull request #2655 from jitendra-webkul/1.0
...
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:04:20 +05:30
4e10d706f5
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:03:19 +05:30
ae1215834b
upadated remaining translation for ar
2020-03-13 18:43:14 +05:30
195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0
...
Issue #2638 fixed
2020-03-13 18:31:15 +05:30
9b60f0b8ec
Issue #2638 fixed
2020-03-13 17:51:46 +05:30
46ab49c489
Merge pull request #2652 from jitendra-webkul/1.0
...
Issue #2649 fixed
2020-03-13 17:43:57 +05:30
fd15942132
Issue #2649 fixed
2020-03-13 17:37:25 +05:30
c0f174e86b
Merge pull request #2651 from jitendra-webkul/1.0
...
Issue #2650 fixed
2020-03-13 17:21:36 +05:30
ef7dac9fec
Issue #2650 fixed
2020-03-13 17:04:00 +05:30
3a9fbbaff3
Merge pull request #2648 from jitendra-webkul/1.0
...
Issue #2643 fixed
2020-03-13 16:47:43 +05:30
fbf4ffa1c3
Issue #2643 fixed
2020-03-13 16:42:04 +05:30
4c1f1ff738
translation updated for the velocity package
2020-03-13 14:52:30 +05:30
121dc5f395
updated translation for the shop package for arabic and persia
2020-03-13 13:56:39 +05:30
c2633d06c0
Merge pull request #2647 from jitendra-webkul/1.0
...
Issues #2634 , #2635 fixed
2020-03-13 12:56:41 +05:30
557e619bdc
Issues #2634 , #2635 fixed
2020-03-13 12:52:26 +05:30
dd4875004a
updated translation for arabic and persia for admin package
2020-03-13 12:29:51 +05:30
c14b1c8946
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-12 16:26:27 +01:00
f01ab851fb
fixed some more language translation issue in arabic and persia
2020-03-12 19:30:39 +05:30
f797456d1a
added missing translation for the arabic of velocity packages
2020-03-12 17:39:17 +05:30
54d8ff9487
added tranlation fa for velocity package
2020-03-12 16:09:05 +05:30
ed2045b1b8
language for fa and pt_br
2020-03-12 15:29:11 +05:30
30f94375f3
Merge pull request #2631 from Haendlerbund/show-multiple-flash-messages-in-admin-panel
...
bugfix: show multiple flash messages in admin panel
2020-03-12 14:53:46 +05:30
9e6ed6f09d
fixed translation in all packages
2020-03-12 13:32:56 +05:30
00f8f7ddb0
Issue #2630 fixed
2020-03-11 16:45:06 +05:30
ec3be668b6
Issue #2630 fixed
2020-03-11 15:36:45 +05:30
04c35bb88d
uncommented factory loading in TaxServiceProvider, bc. tests will miss it
2020-03-11 11:06:17 +01:00
65b5ec9232
bugfix: show multiple flash messages in admin panel
2020-03-11 10:45:18 +01:00
6063c113bf
Removed static text from shop datagrid
2020-03-11 12:15:03 +05:30
e20bb9cc97
remove <<<<HEAD merge conflict marker artifact
2020-03-10 10:00:04 +01:00
ffd918af20
[Updated: Changed Velocity's models related code.]
2020-03-07 11:43:22 +05:30
7a3a1726bc
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-06 15:50:26 +01:00
5859d8dfc2
Merge pull request #2625 from jitendra-webkul/booking-product
...
Remove static text from grid
2020-03-06 20:06:21 +05:30
101df848d6
Remove static text from grid
2020-03-06 20:03:32 +05:30
8ca9bd864c
Remove static text from grid
2020-03-06 19:49:47 +05:30
741c1f25ee
Merge pull request #2624 from jitendra-webkul/booking-product
...
Up down icon issue fixed
2020-03-06 19:10:54 +05:30
27aa309754
Up down icon issue fixed
2020-03-06 19:04:58 +05:30
9846fb9408
Merge pull request #2623 from jitendra-webkul/booking-product
...
Booking product added and improved code style and code comments
2020-03-06 17:51:25 +05:30
2f9724e03d
attributeOptionRepository undefined variable issue fixed
2020-03-06 17:47:20 +05:30
f4f5d2ea71
make invoice factory php7.3 compatible
2020-03-06 12:52:35 +01:00
fcf043ca6f
Improved code style
2020-03-06 16:09:53 +05:30
73ce8a4dd7
Resolved conflicts
2020-03-06 16:04:17 +05:30
010ae65691
Resolved conflicts
2020-03-06 16:02:52 +05:30
276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development
...
Revert "Development"
2020-03-06 15:16:08 +05:30
5ad2b9109f
use product flat instead of product entity
2020-03-06 14:41:33 +05:30
d212536170
image resolution & quick view price issue resolved
2020-03-06 13:24:31 +05:30
b564e63ad7
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-06 12:26:13 +05:30
8d167c7b76
#2609 , #2602 & misc.
2020-03-06 12:25:59 +05:30
e40d3ec619
fill in correct address attributes
2020-03-05 16:16:17 +01:00
7c634046db
add ?? operator in case address data fails
2020-03-05 16:00:21 +01:00
19ebc48fbc
further refactoring of Cart Component
2020-03-05 15:52:20 +01:00
955da20b45
Improved comments in code
2020-03-05 19:49:14 +05:30
b503c50e0b
Fixed bug
2020-03-05 19:40:47 +05:30
3068ecd9ae
Improved comments in code
2020-03-05 19:34:30 +05:30
10db1838f2
Removed author information from every class
2020-03-05 19:28:42 +05:30
42c16cbbfd
Improved comments in code
2020-03-05 19:13:42 +05:30
d0fa3b2705
Replace DB alias with complete class name
2020-03-05 19:11:53 +05:30
92261d4214
Improved comments in code
2020-03-05 19:07:08 +05:30
b024a0b176
Issue #2606
2020-03-05 16:44:52 +05:30
3ebff8d0c8
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-03-05 16:28:39 +05:30
caccfcf840
Issue #2605
2020-03-05 16:28:19 +05:30
70192f2689
Merge pull request #2615 from shubhwebkul/velocity-updated
...
misc. updates
2020-03-05 16:20:29 +05:30
00a19d6472
Merge pull request #2617 from rahulshukla-webkul/development
...
Issue #2616
2020-03-05 16:19:33 +05:30
092ce8dbb7
Merge pull request #2598 from monter08/patch-1
...
Replace diacritics
2020-03-05 16:19:20 +05:30
72d7ca8851
Issue #2616
2020-03-05 16:04:12 +05:30
46ad282d2f
misc. minor updates
2020-03-05 14:00:27 +05:30
6d0157fd84
misc. minor updates
2020-03-05 13:44:58 +05:30
85b5261e4b
misc. minor updates
2020-03-05 13:44:34 +05:30
a6ce67151f
Improved comments in code
2020-03-05 11:04:57 +05:30
152cde9e5c
Revert "Development"
2020-03-04 11:27:34 +01:00
d9072508cd
introduce a fallback in case the customer profile is not filled completely. Take the billing address information then.
2020-03-04 10:38:29 +01:00
133dd6ebd4
velocity sidebar issue and default theme velocity update
2020-03-04 13:12:00 +05:30
e5afdf23cb
card minor update
2020-03-04 12:35:00 +05:30
41e06d5dc5
Improved code style
2020-03-04 12:02:53 +05:30
f3a3c020d8
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-04 11:41:32 +05:30
1713cf8c03
misc. updates
2020-03-04 11:41:09 +05:30
2af7e35ceb
Removed static text for slot duration
2020-03-04 10:36:33 +05:30
d09c4b0ea7
misc. updates
2020-03-03 20:31:43 +05:30
33bff0088f
Slots save validation implemented
2020-03-03 18:51:37 +05:30
e8ad719112
product datagrid locale and channel query improvement
2020-03-03 18:48:23 +05:30
641b80d28a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-03-03 18:34:00 +05:30
77b86ee786
query chnages for product datagrid
2020-03-03 18:33:38 +05:30
934e60f46e
Replace diacritics
...
Replace diacritics (ó, ł, ź, ă,ş,ţ etc) with their "normal" form (o, ł, z, a,s,t)
2020-03-03 12:15:20 +01:00
45ec4532fa
Resolved conflicts
2020-03-03 15:59:47 +05:30
e094dfd09c
add additional assertions to OrderCest.php
2020-03-03 11:18:18 +01:00
d1332bb2de
Made booking pproduct compatible with velocity theme
2020-03-03 15:28:10 +05:30
253131668b
initial for guest customer wishlist
2020-03-03 11:53:11 +05:30
8a1ab165da
ajaxified add to cart, modified controllers
2020-03-02 16:54:38 +05:30
895978e600
finish testCheckoutAsCustomer
2020-03-02 09:08:51 +01:00
781d360ce7
add setSession and invalidateSession helper methods
2020-03-02 08:24:51 +01:00
8b2c955dd3
mini-cart component added
2020-03-01 18:46:32 +05:30
a750509948
#2580 , #2579
2020-03-01 16:39:17 +05:30
34f944f5aa
misc. bug fixes
2020-03-01 11:03:44 +05:30
c943a42a65
misc. bug fixes
2020-02-29 15:50:23 +05:30
ab612d064f
misc. bug fixes
2020-02-29 15:35:50 +05:30
d3137711a1
Added view for velocity theme
2020-02-28 19:21:16 +05:30
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
a752e58ed1
resolved issues
2020-02-28 18:59:15 +05:30
c209beec69
Theme system updated to support module theming
2020-02-28 18:52:09 +05:30
db2d2e8079
drop table wrong name issue
2020-02-28 17:31:57 +05:30
f1bf2d6e17
revised naming convention
2020-02-28 17:30:30 +05:30
c5c1c9154a
product compare updates
2020-02-28 17:23:01 +05:30
3e9c68f01d
introduce prepareCart() to be able to do checkout tests [wip] [ci-skip]
2020-02-28 11:41:48 +01:00
4a6ac73bb6
Improved code style
2020-02-28 15:55:53 +05:30
6c5e9a73f9
remove unnecessary database columns in order table
2020-02-28 10:54:00 +01:00
0e990164e5
Qty box added for event booking
2020-02-28 13:34:18 +05:30
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
772cdbd2ba
product image issue fixed
2020-02-28 09:32:47 +05:30
ce56c13fd0
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-27 20:21:37 +05:30
0691f4a9dd
minor bug fixes
2020-02-27 20:19:54 +05:30
721d4c8141
minor bug fixes
2020-02-27 20:14:28 +05:30
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
Jitendra Singh
Jitendra Singh
shubhammehrotra.symfony@webkul.com
mohd asif
Vivek
Herbert Maschke
Annika Wolff
rahul shukla
Annika Wolff
monter08
Shubham Mehrotra
Herbert Maschke
Steffen Mahler
SteffenMahler
Glenn Hermans