Commit Graph

3587 Commits

Author SHA1 Message Date
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
Jitendra Singh 3ae60bf94e
Merge pull request #2697 from jitendra-webkul/1.0
Issue #2594 fixed
2020-03-19 17:12:22 +05:30
Jitendra Singh deda73af48 Issue #2594 fixed 2020-03-19 17:07:46 +05:30
Jitendra Singh edee5c2f16
Merge pull request #2696 from shubhwebkul/velocity-updated
misc. bug fixes
2020-03-19 16:53:54 +05:30
shubhammehrotra.symfony@webkul.com 9f45675399 remove debugger 2020-03-19 16:44:12 +05:30
shubhammehrotra.symfony@webkul.com c80bf519e8 #2693, #2641 2020-03-19 16:39:29 +05:30
Jitendra Singh 4ee1ad8e76
Merge pull request #2695 from SteffenMahler/patch-4
update Cart.php
2020-03-19 16:38:02 +05:30
SteffenMahler 14efa58c0a
tiny fixes, add before event 2020-03-19 12:02:11 +01:00
Jitendra Singh 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
SteffenMahler 62eaad1091
update Cart.php
Dispatch an event after function calculateItemsTax() is finished
2020-03-19 10:38:47 +01:00
Herbert Maschke c76c7a1d88 introduce cart belongsTo Relation in Order Model 2020-03-19 08:17:29 +01:00
shubhammehrotra.symfony@webkul.com 787304b6f2 quick view update 2020-03-19 11:25:05 +05:30
Jitendra Singh 7faf5bb97f
Merge pull request #2690 from rahulshukla-webkul/development
Issue #2549
2020-03-18 18:52:02 +05:30
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
Jitendra Singh 001262e6de
Merge pull request #2688 from jitendra-webkul/1.0
Issue #2518 fixed
2020-03-18 17:19:27 +05:30
Jitendra Singh 893564977f Issue #2518 fixed 2020-03-18 17:15:44 +05:30
rahul shukla d9a391f1cc Issue #2593 fixed 2020-03-18 16:15:33 +05:30
Jitendra Singh 7b5930f8bc
Merge pull request #2686 from jitendra-webkul/1.0
Issue #2613 fixed
2020-03-18 14:54:31 +05:30
Jitendra Singh 663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
Order workflow improvements and tests
2020-03-18 14:50:48 +05:30
Jitendra Singh bc39a19f49 Issue #2613 fixed 2020-03-18 14:50:20 +05:30
Jitendra Singh 3002723e78
Merge pull request #2683 from phillipcodes/patch-1
Fix cart discount naming in API
2020-03-18 13:41:12 +05:30
Jitendra Singh 45ce9b03db
Merge pull request #2685 from jitendra-webkul/1.0
Issue #2677 fixed
2020-03-18 13:34:29 +05:30
Jitendra Singh 17abfdb1d6 Issue #2677 fixed 2020-03-18 13:24:12 +05:30
phillipcodes 7fdc8fd4a6
Update Cart.php 2020-03-17 15:05:00 +01:00
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
shubhammehrotra.symfony@webkul.com e96c6011e0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-17 15:48:29 +05:30
shubhammehrotra.symfony@webkul.com c06aeadb37 product add to cart issue resolved on PDP 2020-03-17 15:48:10 +05:30
Jitendra Singh 279ab5b237
Merge pull request #2679 from jitendra-webkul/1.0
Issue #2669 fixed
2020-03-17 15:38:48 +05:30
Jitendra Singh d76a8d8dec Issue #2669 fixed 2020-03-17 15:34:33 +05:30
shubhammehrotra.symfony@webkul.com d5b1e84fdb #2678 2020-03-17 14:00:07 +05:30
shubhammehrotra.symfony@webkul.com 32701de737 #2666 2020-03-17 13:34:44 +05:30
shubhammehrotra.symfony@webkul.com ca4ae665f1 #2667 2020-03-17 13:13:24 +05:30
Jitendra Singh 8ac4946352
Merge pull request #2676 from jitendra-webkul/1.0
Issue #2671 fixed
2020-03-17 13:02:41 +05:30
Jitendra Singh cdc1eb7bc1 Issue #2671 fixed 2020-03-17 13:01:37 +05:30
Jitendra Singh df9611d030
Merge pull request #2673 from jitendra-webkul/1.0
Issue #2672 fixed
2020-03-17 12:26:23 +05:30
Jitendra Singh bf5ad13dac Issue #2672 fixed 2020-03-17 12:25:04 +05:30
shubhammehrotra.symfony@webkul.com f354d0aafa shimmer effect added in wishlist and comparison 2020-03-17 11:44:22 +05:30
mohd asif 47c4a5ef42 upadated missing translation for dutch and protoguese in velocity package 2020-03-17 10:12:33 +05:30
mohd asif d2caa2af98 resolved commit 2020-03-17 09:36:45 +05:30
mohd asif 255b50454b updated missing translation for the Persia for the shop front 2020-03-16 19:09:38 +05:30
shubhammehrotra.symfony@webkul.com ce90035edb hide compare, wishlist icon 2020-03-16 18:52:37 +05:30
shubhammehrotra.symfony@webkul.com d83bc00289 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-16 18:47:10 +05:30
shubhammehrotra.symfony@webkul.com 61f949f43e #2646 2020-03-16 18:46:56 +05:30
mohd asif 8ac262ffa8 updated the missing translation for shop front for arabic and removed repated translation from english 2020-03-16 18:09:32 +05:30
shubhammehrotra.symfony@webkul.com bc362144c3 added shimmer effect product cards 2020-03-16 16:33:53 +05:30
mohd asif e7a9303b51 updated missing translation for portoguese in admin package 2020-03-16 16:24:04 +05:30
Jitendra Singh 1eb1954a4f
Merge pull request #2665 from shubhwebkul/velocity-updated
misc. bug fixes
2020-03-16 15:10:48 +05:30
mohd asif 65814e0f04 upadated missing translation for Dutch for admin package 2020-03-16 14:07:08 +05:30
shubhammehrotra.symfony@webkul.com cc12549336 #2636 2020-03-16 13:40:21 +05:30
shubhammehrotra.symfony@webkul.com ee4f81004c #2639 2020-03-16 13:34:01 +05:30