mohd asif
dd4875004a
updated translation for arabic and persia for admin package
2020-03-13 12:29:51 +05:30
Herbert Maschke
c14b1c8946
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-12 16:26:27 +01:00
mohd asif
f01ab851fb
fixed some more language translation issue in arabic and persia
2020-03-12 19:30:39 +05:30
mohd asif
f797456d1a
added missing translation for the arabic of velocity packages
2020-03-12 17:39:17 +05:30
mohd asif
54d8ff9487
added tranlation fa for velocity package
2020-03-12 16:09:05 +05:30
mohd asif
ed2045b1b8
language for fa and pt_br
2020-03-12 15:29:11 +05:30
Jitendra Singh
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
mohd asif
9e6ed6f09d
fixed translation in all packages
2020-03-12 13:32:56 +05:30
Jitendra Singh
00f8f7ddb0
Issue #2630 fixed
2020-03-11 16:45:06 +05:30
Jitendra Singh
ec3be668b6
Issue #2630 fixed
2020-03-11 15:36:45 +05:30
Annika Wolff
04c35bb88d
uncommented factory loading in TaxServiceProvider, bc. tests will miss it
2020-03-11 11:06:17 +01:00
Annika Wolff
65b5ec9232
bugfix: show multiple flash messages in admin panel
2020-03-11 10:45:18 +01:00
Jitendra Singh
6063c113bf
Removed static text from shop datagrid
2020-03-11 12:15:03 +05:30
Herbert Maschke
e20bb9cc97
remove <<<<HEAD merge conflict marker artifact
2020-03-10 10:00:04 +01:00
Vivek Sharma
ffd918af20
[Updated: Changed Velocity's models related code.]
2020-03-07 11:43:22 +05:30
Herbert Maschke
7a3a1726bc
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-06 15:50:26 +01:00
Jitendra Singh
5859d8dfc2
Merge pull request #2625 from jitendra-webkul/booking-product
...
Remove static text from grid
2020-03-06 20:06:21 +05:30
Jitendra Singh
101df848d6
Remove static text from grid
2020-03-06 20:03:32 +05:30
Jitendra Singh
8ca9bd864c
Remove static text from grid
2020-03-06 19:49:47 +05:30
Jitendra Singh
741c1f25ee
Merge pull request #2624 from jitendra-webkul/booking-product
...
Up down icon issue fixed
2020-03-06 19:10:54 +05:30
Jitendra Singh
27aa309754
Up down icon issue fixed
2020-03-06 19:04:58 +05:30
Jitendra Singh
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
Jitendra Singh
2f9724e03d
attributeOptionRepository undefined variable issue fixed
2020-03-06 17:47:20 +05:30
Annika Wolff
f4f5d2ea71
make invoice factory php7.3 compatible
2020-03-06 12:52:35 +01:00
Jitendra Singh
fcf043ca6f
Improved code style
2020-03-06 16:09:53 +05:30
Jitendra Singh
73ce8a4dd7
Resolved conflicts
2020-03-06 16:04:17 +05:30
Jitendra Singh
010ae65691
Resolved conflicts
2020-03-06 16:02:52 +05:30
Jitendra Singh
276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development
...
Revert "Development"
2020-03-06 15:16:08 +05:30
shubhammehrotra.symfony@webkul.com
5ad2b9109f
use product flat instead of product entity
2020-03-06 14:41:33 +05:30
shubhammehrotra.symfony@webkul.com
d212536170
image resolution & quick view price issue resolved
2020-03-06 13:24:31 +05:30
shubhammehrotra.symfony@webkul.com
b564e63ad7
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-06 12:26:13 +05:30
shubhammehrotra.symfony@webkul.com
8d167c7b76
#2609 , #2602 & misc.
2020-03-06 12:25:59 +05:30
Herbert Maschke
e40d3ec619
fill in correct address attributes
2020-03-05 16:16:17 +01:00
Herbert Maschke
7c634046db
add ?? operator in case address data fails
2020-03-05 16:00:21 +01:00
Herbert Maschke
19ebc48fbc
further refactoring of Cart Component
2020-03-05 15:52:20 +01:00
Jitendra Singh
955da20b45
Improved comments in code
2020-03-05 19:49:14 +05:30
Jitendra Singh
b503c50e0b
Fixed bug
2020-03-05 19:40:47 +05:30
Jitendra Singh
3068ecd9ae
Improved comments in code
2020-03-05 19:34:30 +05:30
Jitendra Singh
10db1838f2
Removed author information from every class
2020-03-05 19:28:42 +05:30
Jitendra Singh
42c16cbbfd
Improved comments in code
2020-03-05 19:13:42 +05:30
Jitendra Singh
d0fa3b2705
Replace DB alias with complete class name
2020-03-05 19:11:53 +05:30
Jitendra Singh
92261d4214
Improved comments in code
2020-03-05 19:07:08 +05:30
rahul shukla
b024a0b176
Issue #2606
2020-03-05 16:44:52 +05:30
rahul shukla
3ebff8d0c8
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-03-05 16:28:39 +05:30
rahul shukla
caccfcf840
Issue #2605
2020-03-05 16:28:19 +05:30
Jitendra Singh
70192f2689
Merge pull request #2615 from shubhwebkul/velocity-updated
...
misc. updates
2020-03-05 16:20:29 +05:30
Jitendra Singh
00a19d6472
Merge pull request #2617 from rahulshukla-webkul/development
...
Issue #2616
2020-03-05 16:19:33 +05:30
Jitendra Singh
092ce8dbb7
Merge pull request #2598 from monter08/patch-1
...
Replace diacritics
2020-03-05 16:19:20 +05:30
rahul shukla
72d7ca8851
Issue #2616
2020-03-05 16:04:12 +05:30
shubhammehrotra.symfony@webkul.com
46ad282d2f
misc. minor updates
2020-03-05 14:00:27 +05:30
shubhammehrotra.symfony@webkul.com
6d0157fd84
misc. minor updates
2020-03-05 13:44:58 +05:30
shubhammehrotra.symfony@webkul.com
85b5261e4b
misc. minor updates
2020-03-05 13:44:34 +05:30
Jitendra Singh
a6ce67151f
Improved comments in code
2020-03-05 11:04:57 +05:30
Annika Wolff
152cde9e5c
Revert "Development"
2020-03-04 11:27:34 +01:00
Herbert Maschke
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
shubhammehrotra.symfony@webkul.com
133dd6ebd4
velocity sidebar issue and default theme velocity update
2020-03-04 13:12:00 +05:30
shubhammehrotra.symfony@webkul.com
e5afdf23cb
card minor update
2020-03-04 12:35:00 +05:30
Jitendra Singh
41e06d5dc5
Improved code style
2020-03-04 12:02:53 +05:30
shubhammehrotra.symfony@webkul.com
f3a3c020d8
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-04 11:41:32 +05:30
shubhammehrotra.symfony@webkul.com
1713cf8c03
misc. updates
2020-03-04 11:41:09 +05:30
Jitendra Singh
2af7e35ceb
Removed static text for slot duration
2020-03-04 10:36:33 +05:30
shubhammehrotra.symfony@webkul.com
d09c4b0ea7
misc. updates
2020-03-03 20:31:43 +05:30
Jitendra Singh
33bff0088f
Slots save validation implemented
2020-03-03 18:51:37 +05:30
rahul shukla
e8ad719112
product datagrid locale and channel query improvement
2020-03-03 18:48:23 +05:30
rahul shukla
641b80d28a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-03-03 18:34:00 +05:30
rahul shukla
77b86ee786
query chnages for product datagrid
2020-03-03 18:33:38 +05:30
monter08
934e60f46e
Replace diacritics
...
Replace diacritics (ó, ł, ź, ă,ş,ţ etc) with their "normal" form (o, ł, z, a,s,t)
2020-03-03 12:15:20 +01:00
Jitendra Singh
45ec4532fa
Resolved conflicts
2020-03-03 15:59:47 +05:30
Herbert Maschke
e094dfd09c
add additional assertions to OrderCest.php
2020-03-03 11:18:18 +01:00
Jitendra Singh
d1332bb2de
Made booking pproduct compatible with velocity theme
2020-03-03 15:28:10 +05:30
shubhammehrotra.symfony@webkul.com
253131668b
initial for guest customer wishlist
2020-03-03 11:53:11 +05:30
shubhammehrotra.symfony@webkul.com
8a1ab165da
ajaxified add to cart, modified controllers
2020-03-02 16:54:38 +05:30
Herbert Maschke
895978e600
finish testCheckoutAsCustomer
2020-03-02 09:08:51 +01:00
Herbert Maschke
781d360ce7
add setSession and invalidateSession helper methods
2020-03-02 08:24:51 +01:00
shubhammehrotra.symfony@webkul.com
8b2c955dd3
mini-cart component added
2020-03-01 18:46:32 +05:30
shubhammehrotra.symfony@webkul.com
a750509948
#2580 , #2579
2020-03-01 16:39:17 +05:30
shubhammehrotra.symfony@webkul.com
34f944f5aa
misc. bug fixes
2020-03-01 11:03:44 +05:30
Shubham Mehrotra
c943a42a65
misc. bug fixes
2020-02-29 15:50:23 +05:30
Shubham Mehrotra
ab612d064f
misc. bug fixes
2020-02-29 15:35:50 +05:30
Jitendra Singh
d3137711a1
Added view for velocity theme
2020-02-28 19:21:16 +05:30
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
Herbert Maschke
3e9c68f01d
introduce prepareCart() to be able to do checkout tests [wip] [ci-skip]
2020-02-28 11:41:48 +01:00
Jitendra Singh
4a6ac73bb6
Improved code style
2020-02-28 15:55:53 +05:30
Herbert Maschke
6c5e9a73f9
remove unnecessary database columns in order table
2020-02-28 10:54:00 +01:00
Jitendra Singh
0e990164e5
Qty box added for event booking
2020-02-28 13:34:18 +05:30
Jitendra Singh
0b2d8a89c1
Translations added for cart item attribute labels
2020-02-28 13:21:29 +05:30
Jitendra Singh
131e3f1e18
Quantity box checks added for booking product
2020-02-28 13:00:29 +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
Jitendra Singh
4cd1971a12
Removed duplicate function
2020-02-27 20:04:55 +05:30
Jitendra Singh
dbb5f25594
Inventory check implemented for table booking
2020-02-27 19:55:34 +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
Jitendra Singh
05be7a070a
Improved code style
2020-02-27 13:33:03 +05:30
Jitendra Singh
0f42e8ff8f
Resolved conflicts
2020-02-27 12:07:20 +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
Jitendra Singh
e08f09f7d2
Quantity availability check implemented for rental booking
2020-02-26 19:49:04 +05:30
rahul shukla
b0b4935006
time added in cart rules
2020-02-26 16:58:53 +05:30
Jitendra Singh
13c51b32d5
Quantity availability check implemented for event booking
2020-02-26 16:53:17 +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
Jitendra Singh
53da36dd2c
Quantity availability check implemented for default booking
2020-02-26 15:06:08 +05:30
Jitendra Singh
91064cd0bc
Quantity availability check implemented for default booking
2020-02-26 13:11:24 +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
Jitendra Singh
d5b54b393b
Event booking type add cart updated
2020-02-25 16:42:32 +05:30
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
Jitendra Singh
e04d04e204
Added qty field to default and rental booking tyoe
2020-02-25 11:55:12 +05:30
Jitendra Singh
7d2ff93f43
Resolve conflicts
2020-02-25 11:44:34 +05:30
Jitendra Singh
c553fc945b
Time component added
2020-02-25 11:40:27 +05:30
Glenn Hermans
9de680c47d
Fix conflicts
2020-02-24 17:49:43 +01:00
Jitendra Singh
9eb7113aa4
Fixed else if indentation in javascript
2020-02-24 18:53:34 +05:30
Annika Wolff
1691151683
entered translation keys
2020-02-24 13:57:24 +01:00
Jitendra Singh
195eb82802
Replace else if with elseif
2020-02-24 17:49:12 +05:30
Jitendra Singh
95d198c1d6
Fixed merge cart issue for booking product
2020-02-24 16:40:44 +05:30
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
Jitendra Singh
5c696f8d00
Resolved conflicts
2020-02-21 19:36:17 +05:30
Jitendra Singh
2e24c2e2e5
Updated event booking system
2020-02-21 19:13:15 +05:30
rahul shukla
30cb18c1f5
Issue #2538 fixed and change log updated
2020-02-21 17:45:47 +05:30
Glenn Hermans
0f233f08fe
Updating translations
2020-02-21 12:36:26 +01:00
rahul shukla
253ac52cc1
post code in shipping address
2020-02-21 16:56:57 +05:30
Glenn Hermans
fc84c4a047
#2512 - Added more shop translations
2020-02-21 11:23:46 +01:00
rahul shukla
78e50e4e6b
tax in velocity theme
2020-02-21 15:38:42 +05:30
Jitendra Singh
24e69e2cd9
Merge pull request #2247 from Haendlerbund/fix-tax-handling
...
Fix tax handling
2020-02-21 15:20:35 +05:30
Jitendra Singh
6396194862
Merge pull request #2534 from rahulshukla-webkul/development
...
Issue #2533 fixed and change log updated
2020-02-21 15:10:42 +05:30
rahul shukla
a4b3316b29
Issue #2533 fixed and change log updated
2020-02-21 14:41:42 +05:30
ghermans
d4ce50da9f
#2512 more translations
2020-02-21 09:44:12 +01:00
ghermans
283c6e437c
#2512 starting to translate the shop files
2020-02-21 09:30:04 +01:00
Annika Wolff
d50510a626
resolve merge issue, add type hints in Cart helper function
2020-02-21 08:36:52 +01:00
Jitendra Singh
35522da97d
Merge pull request #2532 from rahulshukla-webkul/development
...
change log updated
2020-02-21 12:02:47 +05:30
rahul shukla
5ad6afd298
change log updated
2020-02-21 11:58:33 +05:30
Jitendra Singh
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
Jitendra Singh
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
Jitendra Singh
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
rahul shukla
c87562622b
cart product quantitiy for bundle product in velocity and change log updated
2020-02-21 10:53:59 +05:30
ghermans
22f5391f5c
More translations
2020-02-21 01:48:25 +01:00
ghermans
6174a78926
More translations
2020-02-21 01:16:32 +01:00
ghermans
89ebea48e6
removed spacing
2020-02-20 20:24:39 +01:00
ghermans
fbfb493629
Fixed #2530
2020-02-20 20:22:17 +01:00
Annika Wolff
623b7893a2
resolve merge conflicts
2020-02-20 19:23:01 +01:00
Annika Wolff
154a933dc6
Merge branch 'master' into fix-tax-handling
2020-02-20 17:19:28 +01:00
Glenn Hermans
9e08585b85
#2512 - Added more dutch translations
2020-02-20 17:06:30 +01:00
Jitendra Singh
f3c19efa26
Merge pull request #2528 from rahulshukla-webkul/development
...
Issue #2526
2020-02-20 19:54:32 +05:30
rahul shukla
9937f52de2
Issue #2526
2020-02-20 19:50:27 +05:30
Glenn Hermans
361ef64fa7
#2527 Added translations for order status
2020-02-20 15:12:05 +01:00
Glenn Hermans
1688342f18
#2527 Replaced static text in order datagrid
2020-02-20 15:11:37 +01:00
SteffenMahler
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
ghermans
79a78cc9c9
#2512 - Added more dutch translations
2020-02-20 13:27:01 +01:00
Herbert Maschke
f7219767ed
fix CartRuleRepository once more
2020-02-20 13:26:14 +01:00
Glenn Hermans
416a7b849a
2512 - Added more dutch translations
2020-02-20 12:37:00 +01:00
Glenn Hermans
d71d39208d
2512 - Removed static text and wrong translations
2020-02-20 12:36:13 +01:00
Jitendra Singh
d8bd2cb31e
Merge pull request #2520 from shubhwebkul/bug-fixes
...
quick view short description issue
2020-02-20 16:44:03 +05:30
rahul shukla
66ba69586d
filter issue in category
2020-02-20 16:31:46 +05:30
shubhammehrotra.symfony@webkul.com
ac3a093687
quick view short description issue
2020-02-20 16:12:23 +05:30
Herbert Maschke
75d22eaf3a
improve validation style of starts_from and ends_till in CartRuleRepository
2020-02-20 11:26:12 +01:00
shubhammehrotra.symfony@webkul.com
b56dc467f9
compare minor updates
2020-02-20 15:38:19 +05:30
ghermans
f45f83ab89
#2512 - Added more dutch translations
2020-02-20 09:59:27 +01:00
Jitendra Singh
521fc4b6b6
Improved booking product package code style
2020-02-20 13:43:06 +05:30
rahul shukla
6714b1d7c8
Issue #2468
2020-02-20 13:13:02 +05:30
Jitendra Singh
96cba32d8b
Improved velocity package code style
2020-02-20 13:08:52 +05:30
shubhammehrotra.symfony@webkul.com
0ca4eb66f1
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-20 12:59:00 +05:30
shubhammehrotra.symfony@webkul.com
179cac23ce
guest customer compare item
2020-02-20 12:58:49 +05:30
Jitendra Singh
62c3d48b4b
Improved user package code style
2020-02-20 12:44:00 +05:30
Jitendra Singh
1ef5376a53
Improved ui package code style
2020-02-20 12:41:17 +05:30
Jitendra Singh
062bd52174
Improved theme package code style
2020-02-20 12:39:39 +05:30
Jitendra Singh
0740527b54
Improved tax package code style
2020-02-20 12:37:53 +05:30
Jitendra Singh
5f6e3be796
Improved shop package code style
2020-02-20 12:35:51 +05:30
rahul shukla
38f1251568
Issue #2468
2020-02-20 12:30:00 +05:30
Jitendra Singh
a4d565e46e
Improved shipping package code style
2020-02-20 12:24:38 +05:30
Jitendra Singh
7b8cf802f4
Improved sales package code style
2020-02-20 12:17:44 +05:30
Jitendra Singh
aa1d6d145c
Improved product package code style
2020-02-20 11:42:17 +05:30
rahul shukla
e82fb888ab
merge with master
2020-02-20 11:00:34 +05:30
rahul shukla
8835ab75dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-20 10:59:29 +05:30
rahul shukla
e5a0bc8a0e
Issue #2500 and chaneelog updated
2020-02-20 10:56:59 +05:30
shubhammehrotra.symfony@webkul.com
ec12a677f6
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-20 10:56:25 +05:30
shubhammehrotra.symfony@webkul.com
9480b95d00
compare items updates
2020-02-20 10:56:11 +05:30
ghermans
cb99ea652b
#2512 - Started dutch translations
2020-02-20 04:08:19 +01:00
rahul shukla
d999bc18d9
Issue #2500 fixed
2020-02-19 21:16:20 +05:30
rahul shukla
b5727a1152
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-19 21:13:37 +05:30
rahul shukla
229117c7b9
change log updated and Isssue #2500 fixed
2020-02-19 21:10:27 +05:30
Jitendra Singh
c81c46f9d6
Improved payment package code style
2020-02-19 19:31:17 +05:30
Jitendra Singh
ad4ab855e0
Improved inventory package code style
2020-02-19 19:22:29 +05:30
Jitendra Singh
ec52229567
Improved customer package code style
2020-02-19 19:20:57 +05:30
Jitendra Singh
107e4338e3
Improved customer package code style
2020-02-19 19:20:15 +05:30
Jitendra Singh
9e7e939479
Improved customer package code style
2020-02-19 19:18:54 +05:30
shubhammehrotra.symfony@webkul.com
e16fad3ac8
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-19 18:59:52 +05:30
shubhammehrotra.symfony@webkul.com
a11c8e67b0
compare product updates
2020-02-19 18:59:38 +05:30
Jitendra Singh
07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
...
issue #2470 fixed
2020-02-19 18:47:16 +05:30
Jitendra Singh
bc04b34074
Merge pull request #2509 from vivek-webkul/patch-38
...
[Updated: resolved admin user delete issue.]
2020-02-19 18:46:51 +05:30
Jitendra Singh
5fb33d4fc9
Improved core package code style
2020-02-19 17:56:12 +05:30
Jitendra Singh
687df3dbdd
Improved cms package code style
2020-02-19 17:45:43 +05:30
Jitendra Singh
973d8ebc60
Improved checkout package code style
2020-02-19 17:44:07 +05:30
Jitendra Singh
98b373d0cb
Improved category package code style
2020-02-19 17:34:50 +05:30
Jitendra Singh
46b4b533c3
Improved catalog rule package code style
2020-02-19 17:32:35 +05:30
Jitendra Singh
a31fba56b1
Resolved conflicts
2020-02-19 17:23:18 +05:30
Jitendra Singh
9c78f3b4db
Improved cart rule package code style
2020-02-19 17:19:52 +05:30
Vivek Sharma
5f7b210a61
[Updated: same login user delete issue fixed.]
2020-02-19 17:11:56 +05:30
Jitendra Singh
a72401dbba
Improved attribute package code style
2020-02-19 17:09:17 +05:30
Jitendra Singh
c5cc8fa541
Improved api package code style
2020-02-19 16:54:04 +05:30
prateek srivastava
e1cdff607b
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-02-19 16:26:06 +05:30
prateek srivastava
36f795f09a
assets for production
2020-02-19 16:25:40 +05:30
Vivek Sharma
20b7d78359
[Updated: resolved admin user delete issue.]
2020-02-19 16:22:19 +05:30
rahul shukla
86e31346d0
remove console
2020-02-19 16:17:31 +05:30
rahul shukla
d62b61b19c
Issue #2463
2020-02-19 16:12:54 +05:30
Jitendra Singh
99d506db94
Improved admin package code standard
2020-02-19 15:56:44 +05:30
Jitendra Singh
b4c68c7f0b
Improved datagrid code
2020-02-19 15:44:27 +05:30
prateek srivastava
6052b6355d
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-02-19 15:42:35 +05:30
prateek srivastava
74251ef2d2
issue 2470 fixed
2020-02-19 15:42:00 +05:30
rahul shukla
33f882209a
code improvement
2020-02-19 15:32:52 +05:30
rahul shukla
b6cdcad01d
change depandeciy of slider component, hide attribute with option
2020-02-19 15:03:57 +05:30
rahul shukla
bfd55c345f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-02-19 11:53:34 +05:30
rahul shukla
6133f84690
Product quantitity in datagrid
2020-02-19 11:53:14 +05:30
Jitendra Singh
4948c6f059
Merge pull request #2501 from ghermans/euro
...
Added euro currency
2020-02-19 10:49:38 +05:30
Jitendra Singh
a48be0f32a
Merge pull request #2499 from prateek-webkul/master
...
issue #2479 fixed
2020-02-19 10:48:29 +05:30
Glenn Hermans
c034c23d10
Added euro currency symbol
2020-02-19 00:53:49 +01:00