Commit Graph

4882 Commits

Author SHA1 Message Date
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 fb6f503c07
Merge pull request #2735 from jitendra-webkul/1.0
Issue #2706 fixed
2020-03-23 14:53:29 +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
Jitendra Singh 9c82b24950
Merge pull request #2730 from phillipcodes/patch-1
extend addresses API
2020-03-23 12:48:14 +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 755d97ef16 Updated changelog file 2020-03-20 15:51:48 +05:30
Pranshu Tomar af1846a814 Issue #2707 fixed 2020-03-20 15:46:42 +05:30
Jitendra Singh 1e7ae22f6f
Merge pull request #2710 from ghermans/env-fix
Env fix
2020-03-20 15:21:17 +05:30
Jitendra Singh 92445888ae
Merge pull request #2709 from shubhwebkul/patch-1
Issue #2640
2020-03-20 15:20:42 +05:30
Glenn Hermans c1ea7dcd78
Updated env file 2020-03-20 10:47:18 +01:00
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
Glenn Hermans 5fb643fad9
Merge pull request #10 from bagisto/master
Merge with original repo
2020-03-20 02:08:54 +01:00
Jitendra Singh 7dac9752b1
Merge pull request #2701 from jitendra-webkul/1.0
Version updated
2020-03-19 19:20:23 +05:30
Jitendra Singh 28f1ab7afe Merged with master 2020-03-19 19:18:59 +05:30
Jitendra Singh 792720354f Version updated 2020-03-19 19:04:33 +05:30
Jitendra Singh 374ae97647
Merge pull request #2700 from jitendra-webkul/1.0
Updated changelog file
2020-03-19 18:59:34 +05:30
Jitendra Singh c501a1c2be Updated changelog file 2020-03-19 18:55:36 +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
Jitendra Singh 9753ca4b6f
Merge pull request #2698 from jitendra-webkul/1.0
Updated changelog file
2020-03-19 18:44:55 +05:30
Jitendra Singh 68853bf955 Updated changelog file 2020-03-19 18:40:20 +05:30
Jitendra Singh 821f4677eb
Merge pull request #2642 from asif-webkul/translation
Translation
2020-03-19 18:22:36 +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
Jitendra Singh 0a595fc0d8
Merge pull request #2694 from Haendlerbund/missing-relations
introduce cart belongsTo Relation in Order Model
2020-03-19 14:33:35 +05:30
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