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
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
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
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
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
Herbert Maschke
f7219767ed
fix CartRuleRepository once more
2020-02-20 13:26:14 +01:00
Herbert Maschke
80724d2411
fix bin/test.sh
2020-02-20 12:51:23 +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
Jitendra Singh
42e4d88ff0
Merge pull request #2522 from rahulshukla-webkul/development
...
filter issue in category
2020-02-20 16:43:42 +05:30
rahul shukla
66ba69586d
filter issue in category
2020-02-20 16:31:46 +05:30
Herbert Maschke
8b5def9756
introduce CartRuleCest.php
2020-02-20 11:56:07 +01:00
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
Jitendra Singh
d4876d0148
Merge pull request #2516 from rahulshukla-webkul/development
...
Issue #2468
2020-02-20 13:28:26 +05:30
rahul shukla
6714b1d7c8
Issue #2468
2020-02-20 13:13:02 +05:30
Jitendra Singh
ad482fd8a0
Merge pull request #2515 from rahulshukla-webkul/development
...
Issue #2435 and change log updated
2020-02-20 12:35:16 +05:30
rahul shukla
aeb4d1a6ee
Change log update
2020-02-20 12:31:00 +05:30
rahul shukla
38f1251568
Issue #2468
2020-02-20 12:30:00 +05:30
rahul shukla
663e21a771
Issue #2435 and change log updated
2020-02-20 12:17:40 +05:30
Jitendra Singh
bd73f2b8e9
Merge pull request #2514 from rahulshukla-webkul/development
...
Issue #2500 and change log updated
2020-02-20 11:06:01 +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
Jitendra Singh
3ebfc9ec10
Merge pull request #2513 from rahulshukla-webkul/development
...
Development
2020-02-20 10:54:12 +05:30
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
07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
...
issue #2470 fixed
2020-02-19 18:47:16 +05:30
Jitendra Singh
be069d732c
Merge pull request #2510 from rahulshukla-webkul/development
...
change log updated
2020-02-19 18:47:09 +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
rahul shukla
d15354faf0
change log updated
2020-02-19 17:21:17 +05:30
Vivek Sharma
5f7b210a61
[Updated: same login user delete issue fixed.]
2020-02-19 17:11:56 +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
Jitendra Singh
3ea96d7837
Merge pull request #2508 from rahulshukla-webkul/development
...
Issue #2463
2020-02-19 16:24:20 +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
bd5659487f
Merge pull request #2506 from rahulshukla-webkul/development
...
code improvement
2020-02-19 15:43:09 +05:30