187c99ce54
#2834
2020-04-09 13:26:33 +05:30
c2022a9b50
checkout page email validation
2020-04-08 18:55:20 +05:30
81c6a1b538
Merge pull request #3 from bagisto/master
...
update
2020-04-08 20:43:49 +08:00
67a4720af9
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-04-08 11:31:50 +05:30
eda27956a5
margin added between wishlist icon and compare icon
2020-04-08 11:31:39 +05:30
61f27800fd
issue #2792 resolved
2020-04-07 19:51:42 +05:30
b3e326d5d7
Merge pull request #2839 from shivam-webkul/master
...
code changed for api
2020-04-07 15:28:50 +05:30
16d359a709
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-04-07 13:57:12 +05:30
9e768afa3c
#2329
2020-04-07 13:57:01 +05:30
c059d137b2
code changed for api
2020-04-07 12:50:40 +05:30
4ec82687cd
api changes
2020-04-06 21:47:17 +05:30
804dc01512
compare page update height after loading images
2020-04-06 14:48:54 +05:30
0e06a114af
customer accordian design update
2020-04-06 10:46:11 +05:30
26b0e253d1
customer panel accordian view and file picker view
2020-04-06 10:27:07 +05:30
df6dc49313
Merge branch 'bagisto/master' into improve-have-product-faker
2020-04-04 11:14:29 +02:00
b92e6796c3
Merge branch 'master' of https://github.com/bagisto/bagisto
2020-04-03 17:42:12 +05:30
9bcc6242dd
customer options click issue resolved
2020-04-03 17:41:57 +05:30
4c8ad5068b
category call get products method
2020-04-03 17:41:27 +05:30
961850b2e9
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-04-03 13:31:32 +05:30
07f351322d
revert back changes in format price
2020-04-03 13:31:09 +05:30
bc838a2269
remove irrelevant xhr
2020-04-03 11:20:52 +05:30
96e730f848
#2775
2020-04-02 20:35:26 +05:30
ff20147e23
remove irrelevant css
2020-04-02 19:50:59 +05:30
438aab3021
bundled assets
2020-04-02 19:22:11 +05:30
9f36a8847c
modal view update
2020-04-02 19:20:35 +05:30
0c0dc5da60
checkout page issue
2020-04-02 17:13:36 +05:30
efd96f8259
{git commit -m
2020-04-02 12:49:44 +05:30
f4249f25f6
Merge pull request #2815 from shubhwebkul/patch-2
...
misc. bug fixes
2020-04-01 18:39:13 +05:30
256c6fd4b5
Merge pull request #2802 from Haendlerbund/pr-2753/flickering-locale-factory
...
fix still flickering locale factory
2020-04-01 18:36:03 +05:30
6e18ea7f8e
Merge pull request #2803 from Haendlerbund/fix_tax_rate_rounding
...
Fix tax rate rounding
2020-04-01 18:35:53 +05:30
3f8741e671
resolved conflicts
2020-04-01 18:29:48 +05:30
a5e9c23530
checkout page margin added
2020-04-01 18:26:27 +05:30
e259d6b8bf
#2785
2020-04-01 17:58:10 +05:30
eabbbfe15a
#2808
2020-04-01 16:21:22 +05:30
dd88a81f92
remove line
2020-04-01 12:26:21 +05:30
292e7c5e08
raise generated default inventory quantity to _at least_ 100 to avoid sellout in checkout tests
2020-03-31 15:41:50 +02:00
62ceb45ee5
raise generated default inventory quantity to 80 to avoid sellout in checkout tests
2020-03-31 15:34:09 +02:00
2bf180e24f
generate product as "buyable as guest" by default
2020-03-31 15:10:18 +02:00
5219b03265
4,1,1000
2020-03-31 15:01:42 +02:00
e83917a2e6
attempt to fake 4 instead of 2 decimals in price
2020-03-31 14:50:54 +02:00
5e89baf4e9
improve randomFloat faker values
2020-03-31 14:46:08 +02:00
3048ae4a7b
restore createInventory, its necessary...
2020-03-31 14:40:40 +02:00
0f5913fbba
various code style improvements
2020-03-31 14:35:01 +02:00
1b884cdb42
refactoring, fix typo
2020-03-31 09:12:47 +02:00
c13ae36494
fix tax rate rounding
2020-03-30 19:30:10 +02:00
2bd1458990
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-30 21:09:59 +05:30
0005241794
misc. updates
2020-03-30 21:09:40 +05:30
f7a69d4a30
optimize fetching of possible attributes in Laravel5Helper.php haveProduct() method
2020-03-30 15:03:27 +02:00
613b3ea523
Merge branch 'bagisto/master' into improve-have-product-faker
2020-03-30 14:43:30 +02:00
505014266e
fix still flickering locale factory
2020-03-30 11:05:45 +02:00
88ce2bd320
Merge pull request #2799 from jitendra-webkul/1.0
...
Issue #2764 fixed
2020-03-29 16:25:41 +05:30
4fd49df5c5
Issue #2764 fixed
2020-03-29 16:20:43 +05:30
633db5e4bd
Merge pull request #2798 from jitendra-webkul/1.0
...
Issue #2763 fixed
2020-03-29 16:12:09 +05:30
b28ac37c8f
Issue #2763 fixed
2020-03-29 15:35:56 +05:30
271c0e38ac
add option to set current channel
2020-03-27 16:07:53 +01:00
200ac87cb1
#2780
2020-03-27 15:10:30 +05:30
965f9ae806
#2776
2020-03-27 12:13:48 +05:30
1b14466d19
#2779 #2778 #2775
2020-03-27 12:02:03 +05:30
1b6fee90ef
Add repository cacheable trait
...
self::findByField does not work for repository cache, so I change it to $this->findByField
2020-03-27 12:03:18 +08:00
6902057096
Merge pull request #2767 from shubhwebkul/patch-1
...
compare products in default theme
2020-03-26 13:27:11 +05:30
4f20e888bf
Added new translations for shop and velocity
2020-03-25 14:29:44 -03:00
3ab051c07a
Added translation to velocity and fixed some admin translations
2020-03-25 12:59:15 -03:00
15c4e0686b
compare products in default theme
2020-03-25 13:10:33 +05:30
38b65dd78f
resolved conflicts
2020-03-24 20:15:13 +05:30
139bd36443
forget password message
2020-03-24 20:11:48 +05:30
7e81f0bf4f
Fixed validation issue
2020-03-24 19:59:06 +05:30
6aaef49e2a
resolved conflicts
2020-03-24 19:32:07 +05:30
b079b6f83c
wishlist issue
2020-03-24 19:28:37 +05:30
411365d476
Revert "Upgraded velocity theme npm dependencies"
2020-03-24 19:23:01 +05:30
cf2610f239
cart move to wishlist issue resolved
2020-03-24 19:18:00 +05:30
11746a9ca6
resolved conflicts
2020-03-24 18:47:57 +05:30
3514612fe9
#2610
2020-03-24 18:44:38 +05:30
c01c70e776
Merge pull request #2758 from jitendra-webkul/1.0
...
Upgraded velocity theme npm dependencies
2020-03-24 18:20:03 +05:30
3d3a2d6036
Resolve conflicts
2020-03-24 18:13:58 +05:30
80508e7a06
Upgraded velocity theme npm dependencies
2020-03-24 18:09:02 +05:30
299cdfdde7
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-24 17:24:26 +05:30
23ddd66e7f
#2750
2020-03-24 17:24:03 +05:30
ce2c329e63
Merge pull request #2755 from shubhwebkul/patch-1
...
Issue #2600 resolved
2020-03-24 17:12:17 +05:30
10c39a8de2
resolved conflicts
2020-03-24 16:45:56 +05:30
1d9b2659b9
Merge pull request #2753 from Haendlerbund/prevent-locale-factory-from-flickering
...
prevent locale factory from flickering
2020-03-24 16:45:12 +05:30
cf314c964e
Fixed undefind variable issue in rental booking helper
2020-03-24 16:42:57 +05:30
f7187a3f2f
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-24 16:27:30 +05:30
773e41dab4
#2600
2020-03-24 16:27:12 +05:30
50decb81cb
Conflicts resolved
2020-03-24 16:25:10 +05:30
b1049ac3ea
Conflicts resolved
2020-03-24 16:23:42 +05:30
ded3591ea6
Issue #2670 fixed
2020-03-24 15:41:43 +05:30
8a2a84b1e6
get existing locale or create new one
2020-03-24 10:58:20 +01:00
e6e84dfdf9
Merge pull request #2751 from jitendra-webkul/1.0
...
Issue #2717 fixed
2020-03-24 14:01:00 +05:30
66213ab5f3
Issue #2717 fixed
2020-03-24 13:54:17 +05:30
80a342b20b
Merge pull request #2745 from shubhwebkul/patch-1
...
Issue #2610 resolved
2020-03-24 11:38:41 +05:30
c67f971a90
Merge pull request #2748 from rahulcs0082/development
...
Development
2020-03-24 11:37:13 +05:30
f19206ab6e
Issue #2593 fixed
2020-03-24 11:26:03 +05:30
1e84811539
Merge pull request #2747 from jitendra-webkul/1.0
...
Issue #2715 fixed
2020-03-24 11:06:37 +05:30
4b84b89251
Issue #2715 fixed
2020-03-24 11:05:34 +05:30
6b3a30645c
Removed commented code fom cart controller
2020-03-24 11:03:36 +05:30
3a4dfa3180
Merge pull request #2746 from jitendra-webkul/1.0
...
Issue #2724 fixed
2020-03-24 10:57:28 +05:30
2334cf4cc7
Issue #2724 fixed
2020-03-24 10:52:45 +05:30
0af1f87929
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-24 10:33:22 +05:30
7e082f7aa3
#2610
2020-03-24 10:33:03 +05:30
4510a42d34
testing
2020-03-24 02:17:17 +05:30
1f5ec6aa72
Merge pull request #2743 from jitendra-webkul/1.0
...
Issue #2722 fixed
2020-03-23 22:57:33 +05:30
6d5cc8a456
Issue #2722 fixed
2020-03-23 22:53:23 +05:30
e0a4051f71
Merge pull request #2742 from jitendra-webkul/1.0
...
Issue #2728 fixed
2020-03-23 22:16:18 +05:30
b03f0075aa
Issue #2728 fixed
2020-03-23 22:12:21 +05:30
e20aa40e06
Merge pull request #2741 from jitendra-webkul/1.0
...
Issue #2719 fixed
2020-03-23 22:03:30 +05:30
b158c54480
Issue #2719 fixed
2020-03-23 21:54:55 +05:30
076dcdc3e0
Merge pull request #2740 from jitendra-webkul/1.0
...
Issue #2716 fixed
2020-03-23 20:25:51 +05:30
7b88e20153
Issue #2716 fixed
2020-03-23 20:21:48 +05:30
7495116893
Merge pull request #2737 from shubhwebkul/patch-1
...
misc. bug fixes
2020-03-23 19:18:17 +05:30
f8194ff430
Issue #2714 fixed
2020-03-23 18:59:04 +05:30
129abae0f6
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-23 18:43:36 +05:30
2ccf0271a2
#2713
2020-03-23 18:43:12 +05:30
c181ef7ec8
Issue #2712 fixed
2020-03-23 18:01:06 +05:30
5cd33c9c0e
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-23 17:49:46 +05:30
4b1abde920
wishlist products update logged-in customer
2020-03-23 17:49:21 +05:30
45b6849006
Issue #2708 fixed
2020-03-23 15:29:40 +05:30
0f3651783e
Issue #2708 fixed
2020-03-23 15:28:33 +05:30
9b2589ad45
Merge pull request #2734 from shubhwebkul/patch-1
...
misc. bug fixes
2020-03-23 14:56:00 +05:30
1ff5aaab92
Issue #2706 fixed
2020-03-23 14:48:03 +05:30
9cf7b960e8
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-23 14:14:49 +05:30
59ba5a56f9
#2732 #2579
2020-03-23 14:14:11 +05:30
80d64146e1
Merge pull request #2733 from jitendra-webkul/1.0
...
Issue #2704 fixed
2020-03-23 13:53:09 +05:30
6380d9096e
Merge pull request #2731 from SteffenMahler/patch-5
...
add CartRuleCouponFactory
2020-03-23 13:49:06 +05:30
93e31b3ac8
Issue #2704 fixed
2020-03-23 13:47:08 +05:30
85319272a2
add CartRuleCouponFactory
...
this is for testing purposes
2020-03-23 08:15:02 +01:00
1486576840
Update CustomerAddress.php
2020-03-23 08:01:28 +01:00
10381769df
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
2020-03-23 10:56:38 +05:30
198088f728
responsive console error resolved
2020-03-23 10:56:27 +05:30
cea497812e
fixed typo
2020-03-23 04:51:32 +01:00
bd6c3aa1df
Added dutch locale
2020-03-23 04:31:33 +01:00
c1d39a22f4
product card default image
2020-03-20 16:41:18 +05:30
6de80fff2f
Merge pull request #2711 from jitendra-webkul/1.0
...
Issue #2707 fixed
2020-03-20 16:13:54 +05:30
af1846a814
Issue #2707 fixed
2020-03-20 15:46:42 +05:30
5e82c8c1e6
responsive cart page update
2020-03-20 15:05:44 +05:30
b7ccb5c214
#2640
2020-03-20 13:25:49 +05:30
28f1ab7afe
Merged with master
2020-03-19 19:18:59 +05:30
0f827ff64c
Merge pull request #2699 from shubhwebkul/velocity-updated
...
Issue #2592 Resolved
2020-03-19 18:53:05 +05:30
7de8e6a0d4
misc. updates
2020-03-19 18:45:43 +05:30
a1124fc7b6
resolved conflicts
2020-03-19 18:07:25 +05:30
3e2dd34ddd
#2592
2020-03-19 17:57:52 +05:30
3ae60bf94e
Merge pull request #2697 from jitendra-webkul/1.0
...
Issue #2594 fixed
2020-03-19 17:12:22 +05:30
deda73af48
Issue #2594 fixed
2020-03-19 17:07:46 +05:30
edee5c2f16
Merge pull request #2696 from shubhwebkul/velocity-updated
...
misc. bug fixes
2020-03-19 16:53:54 +05:30
9f45675399
remove debugger
2020-03-19 16:44:12 +05:30
c80bf519e8
#2693 , #2641
2020-03-19 16:39:29 +05:30
4ee1ad8e76
Merge pull request #2695 from SteffenMahler/patch-4
...
update Cart.php
2020-03-19 16:38:02 +05:30
14efa58c0a
tiny fixes, add before event
2020-03-19 12:02:11 +01:00
5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41
...
[Updated: Shop & admin email setting added in configuration.]
2020-03-19 15:36:27 +05:30
62eaad1091
update Cart.php
...
Dispatch an event after function calculateItemsTax() is finished
2020-03-19 10:38:47 +01:00
c76c7a1d88
introduce cart belongsTo Relation in Order Model
2020-03-19 08:17:29 +01:00
787304b6f2
quick view update
2020-03-19 11:25:05 +05:30
b8e4692114
refactor haveProduct() method to allow custom attribute handling
2020-03-18 14:59:10 +01:00
7faf5bb97f
Merge pull request #2690 from rahulshukla-webkul/development
...
Issue #2549
2020-03-18 18:52:02 +05:30
7174ccbfd0
Issue #2549
2020-03-18 18:48:02 +05:30
001262e6de
Merge pull request #2688 from jitendra-webkul/1.0
...
Issue #2518 fixed
2020-03-18 17:19:27 +05:30
893564977f
Issue #2518 fixed
2020-03-18 17:15:44 +05:30
d9a391f1cc
Issue #2593 fixed
2020-03-18 16:15:33 +05:30
7b5930f8bc
Merge pull request #2686 from jitendra-webkul/1.0
...
Issue #2613 fixed
2020-03-18 14:54:31 +05:30
663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
...
Order workflow improvements and tests
2020-03-18 14:50:48 +05:30
bc39a19f49
Issue #2613 fixed
2020-03-18 14:50:20 +05:30
3002723e78
Merge pull request #2683 from phillipcodes/patch-1
...
Fix cart discount naming in API
2020-03-18 13:41:12 +05:30
45ce9b03db
Merge pull request #2685 from jitendra-webkul/1.0
...
Issue #2677 fixed
2020-03-18 13:34:29 +05:30
17abfdb1d6
Issue #2677 fixed
2020-03-18 13:24:12 +05:30
7fdc8fd4a6
Update Cart.php
2020-03-17 15:05:00 +01:00
ad76426fb5
[Updated: Shop & admin email setting added in configuration.]
2020-03-17 16:10:47 +05:30
e96c6011e0
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-03-17 15:48:29 +05:30
c06aeadb37
product add to cart issue resolved on PDP
2020-03-17 15:48:10 +05:30
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
Shubham Mehrotra
hexu
shivam kumar
Jitendra Singh
Herbert Maschke
rahulshukla-home
Herbert Maschke
Steffen Mahler
Annika Wolff
Pranshu Tomar
Florian Bosdorff
Carlos Augusto Gartner
Annika Wolff
Jitendra Singh
SteffenMahler
phillipcodes
ghermans
shubhammehrotra.symfony@webkul.com
mohd asif
rahul shukla
Vivek
Annika Wolff
monter08