Commit Graph

3710 Commits

Author SHA1 Message Date
Shubham Mehrotra 139bd36443 forget password message 2020-03-24 20:11:48 +05:30
Pranshu Tomar 7e81f0bf4f Fixed validation issue 2020-03-24 19:59:06 +05:30
Shubham Mehrotra 6aaef49e2a resolved conflicts 2020-03-24 19:32:07 +05:30
Shubham Mehrotra b079b6f83c wishlist issue 2020-03-24 19:28:37 +05:30
Jitendra Singh 411365d476
Revert "Upgraded velocity theme npm dependencies" 2020-03-24 19:23:01 +05:30
Shubham Mehrotra cf2610f239 cart move to wishlist issue resolved 2020-03-24 19:18:00 +05:30
Shubham Mehrotra 11746a9ca6 resolved conflicts 2020-03-24 18:47:57 +05:30
Shubham Mehrotra 3514612fe9 #2610 2020-03-24 18:44:38 +05:30
Jitendra Singh c01c70e776
Merge pull request #2758 from jitendra-webkul/1.0
Upgraded velocity theme npm dependencies
2020-03-24 18:20:03 +05:30
Pranshu Tomar 3d3a2d6036 Resolve conflicts 2020-03-24 18:13:58 +05:30
Pranshu Tomar 80508e7a06 Upgraded velocity theme npm dependencies 2020-03-24 18:09:02 +05:30
Shubham Mehrotra 299cdfdde7 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 17:24:26 +05:30
Shubham Mehrotra 23ddd66e7f #2750 2020-03-24 17:24:03 +05:30
Jitendra Singh ce2c329e63
Merge pull request #2755 from shubhwebkul/patch-1
Issue #2600 resolved
2020-03-24 17:12:17 +05:30
Shubham Mehrotra 10c39a8de2 resolved conflicts 2020-03-24 16:45:56 +05:30
Jitendra Singh 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
Pranshu Tomar cf314c964e Fixed undefind variable issue in rental booking helper 2020-03-24 16:42:57 +05:30
Shubham Mehrotra f7187a3f2f Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 16:27:30 +05:30
Shubham Mehrotra 773e41dab4 #2600 2020-03-24 16:27:12 +05:30
Pranshu Tomar 50decb81cb Conflicts resolved 2020-03-24 16:25:10 +05:30
Pranshu Tomar b1049ac3ea Conflicts resolved 2020-03-24 16:23:42 +05:30
Pranshu Tomar ded3591ea6 Issue #2670 fixed 2020-03-24 15:41:43 +05:30
Annika Wolff 8a2a84b1e6 get existing locale or create new one 2020-03-24 10:58:20 +01:00
Jitendra Singh e6e84dfdf9
Merge pull request #2751 from jitendra-webkul/1.0
Issue #2717 fixed
2020-03-24 14:01:00 +05:30
Pranshu Tomar 66213ab5f3 Issue #2717 fixed 2020-03-24 13:54:17 +05:30
Jitendra Singh 80a342b20b
Merge pull request #2745 from shubhwebkul/patch-1
Issue #2610 resolved
2020-03-24 11:38:41 +05:30
Jitendra Singh c67f971a90
Merge pull request #2748 from rahulcs0082/development
Development
2020-03-24 11:37:13 +05:30
rahulshukla-home f19206ab6e Issue #2593 fixed 2020-03-24 11:26:03 +05:30
Jitendra Singh 1e84811539
Merge pull request #2747 from jitendra-webkul/1.0
Issue #2715 fixed
2020-03-24 11:06:37 +05:30
Pranshu Tomar 4b84b89251 Issue #2715 fixed 2020-03-24 11:05:34 +05:30
Pranshu Tomar 6b3a30645c Removed commented code fom cart controller 2020-03-24 11:03:36 +05:30
Jitendra Singh 3a4dfa3180
Merge pull request #2746 from jitendra-webkul/1.0
Issue #2724 fixed
2020-03-24 10:57:28 +05:30
Pranshu Tomar 2334cf4cc7 Issue #2724 fixed 2020-03-24 10:52:45 +05:30
Shubham Mehrotra 0af1f87929 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-24 10:33:22 +05:30
Shubham Mehrotra 7e082f7aa3 #2610 2020-03-24 10:33:03 +05:30
rahulshukla-home 4510a42d34 testing 2020-03-24 02:17:17 +05:30
Jitendra Singh 1f5ec6aa72
Merge pull request #2743 from jitendra-webkul/1.0
Issue #2722 fixed
2020-03-23 22:57:33 +05:30
Pranshu Tomar 6d5cc8a456 Issue #2722 fixed 2020-03-23 22:53:23 +05:30
Jitendra Singh e0a4051f71
Merge pull request #2742 from jitendra-webkul/1.0
Issue #2728 fixed
2020-03-23 22:16:18 +05:30
Pranshu Tomar b03f0075aa Issue #2728 fixed 2020-03-23 22:12:21 +05:30
Jitendra Singh e20aa40e06
Merge pull request #2741 from jitendra-webkul/1.0
Issue #2719 fixed
2020-03-23 22:03:30 +05:30
Pranshu Tomar b158c54480 Issue #2719 fixed 2020-03-23 21:54:55 +05:30
Jitendra Singh 076dcdc3e0
Merge pull request #2740 from jitendra-webkul/1.0
Issue #2716 fixed
2020-03-23 20:25:51 +05:30
Pranshu Tomar 7b88e20153 Issue #2716 fixed 2020-03-23 20:21:48 +05:30
Jitendra Singh 7495116893
Merge pull request #2737 from shubhwebkul/patch-1
misc. bug fixes
2020-03-23 19:18:17 +05:30
Pranshu Tomar f8194ff430 Issue #2714 fixed 2020-03-23 18:59:04 +05:30
Shubham Mehrotra 129abae0f6 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-23 18:43:36 +05:30
Shubham Mehrotra 2ccf0271a2 #2713 2020-03-23 18:43:12 +05:30
Pranshu Tomar c181ef7ec8 Issue #2712 fixed 2020-03-23 18:01:06 +05:30
Shubham Mehrotra 5cd33c9c0e Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-23 17:49:46 +05:30
Shubham Mehrotra 4b1abde920 wishlist products update logged-in customer 2020-03-23 17:49:21 +05:30
Pranshu Tomar 45b6849006 Issue #2708 fixed 2020-03-23 15:29:40 +05:30
Pranshu Tomar 0f3651783e Issue #2708 fixed 2020-03-23 15:28:33 +05:30
Jitendra Singh 9b2589ad45
Merge pull request #2734 from shubhwebkul/patch-1
misc. bug fixes
2020-03-23 14:56:00 +05:30
Jitendra Singh 1ff5aaab92 Issue #2706 fixed 2020-03-23 14:48:03 +05:30
Shubham Mehrotra 9cf7b960e8 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-23 14:14:49 +05:30
Shubham Mehrotra 59ba5a56f9 #2732 #2579 2020-03-23 14:14:11 +05:30
Jitendra Singh 80d64146e1
Merge pull request #2733 from jitendra-webkul/1.0
Issue #2704 fixed
2020-03-23 13:53:09 +05:30
Jitendra Singh 6380d9096e
Merge pull request #2731 from SteffenMahler/patch-5
add CartRuleCouponFactory
2020-03-23 13:49:06 +05:30
Pranshu Tomar 93e31b3ac8 Issue #2704 fixed 2020-03-23 13:47:08 +05:30
SteffenMahler 85319272a2
add CartRuleCouponFactory
this is for testing purposes
2020-03-23 08:15:02 +01:00
phillipcodes 1486576840
Update CustomerAddress.php 2020-03-23 08:01:28 +01:00
Shubham Mehrotra 10381769df Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-03-23 10:56:38 +05:30
Shubham Mehrotra 198088f728 responsive console error resolved 2020-03-23 10:56:27 +05:30
Shubham Mehrotra c1d39a22f4 product card default image 2020-03-20 16:41:18 +05:30
Jitendra Singh 6de80fff2f
Merge pull request #2711 from jitendra-webkul/1.0
Issue #2707 fixed
2020-03-20 16:13:54 +05:30
Pranshu Tomar af1846a814 Issue #2707 fixed 2020-03-20 15:46:42 +05:30
Shubham Mehrotra 5e82c8c1e6 responsive cart page update 2020-03-20 15:05:44 +05:30
Shubham Mehrotra b7ccb5c214 #2640 2020-03-20 13:25:49 +05:30
Jitendra Singh 28f1ab7afe Merged with master 2020-03-19 19:18:59 +05:30
Jitendra Singh 0f827ff64c
Merge pull request #2699 from shubhwebkul/velocity-updated
Issue #2592 Resolved
2020-03-19 18:53:05 +05:30
shubhammehrotra.symfony@webkul.com 7de8e6a0d4 misc. updates 2020-03-19 18:45:43 +05:30
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
shubhammehrotra.symfony@webkul.com 3e2dd34ddd #2592 2020-03-19 17:57:52 +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