Herbert Maschke
|
e20bb9cc97
|
remove <<<<HEAD merge conflict marker artifact
|
2020-03-10 10:00:04 +01:00 |
|
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 |