Commit Graph

1186 Commits

Author SHA1 Message Date
Shubham Mehrotra eda27956a5 margin added between wishlist icon and compare icon 2020-04-08 11:31:39 +05:30
Shubham Mehrotra 0c0dc5da60 checkout page issue 2020-04-02 17:13:36 +05:30
Shubham Mehrotra e259d6b8bf #2785 2020-04-01 17:58:10 +05:30
Shubham Mehrotra 965f9ae806 #2776 2020-03-27 12:13:48 +05:30
Shubham Mehrotra 1b14466d19 #2779 #2778 #2775 2020-03-27 12:02:03 +05:30
Jitendra Singh 6902057096
Merge pull request #2767 from shubhwebkul/patch-1
compare products in default theme
2020-03-26 13:27:11 +05:30
Carlos Augusto Gartner 4f20e888bf Added new translations for shop and velocity 2020-03-25 14:29:44 -03:00
Shubham Mehrotra 15c4e0686b compare products in default theme 2020-03-25 13:10:33 +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
rahulshukla-home f19206ab6e Issue #2593 fixed 2020-03-24 11:26:03 +05:30
Pranshu Tomar 6b3a30645c Removed commented code fom cart controller 2020-03-24 11:03:36 +05:30
Pranshu Tomar 2334cf4cc7 Issue #2724 fixed 2020-03-24 10:52:45 +05:30
Shubham Mehrotra 2ccf0271a2 #2713 2020-03-23 18:43:12 +05:30
Jitendra Singh 28f1ab7afe Merged with master 2020-03-19 19:18:59 +05:30
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
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
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
rahul shukla d9a391f1cc Issue #2593 fixed 2020-03-18 16:15:33 +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
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
Jitendra Singh bf5ad13dac Issue #2672 fixed 2020-03-17 12:25:04 +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
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
mohd asif 121dc5f395 updated translation for the shop package for arabic and persia 2020-03-13 13:56:39 +05:30
Herbert Maschke c14b1c8946 Merge branch 'bagisto/master' into order-workflow-improvements 2020-03-12 16:26:27 +01:00
mohd asif 9e6ed6f09d fixed translation in all packages 2020-03-12 13:32:56 +05:30
Jitendra Singh 6063c113bf Removed static text from shop datagrid 2020-03-11 12:15:03 +05:30
Herbert Maschke 7a3a1726bc Merge branch 'bagisto/master' into order-workflow-improvements 2020-03-06 15:50:26 +01:00
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
shubhammehrotra.symfony@webkul.com d09c4b0ea7 misc. updates 2020-03-03 20:31:43 +05:30
Jitendra Singh 45ec4532fa Resolved conflicts 2020-03-03 15:59:47 +05:30
shubhammehrotra.symfony@webkul.com 8a1ab165da ajaxified add to cart, modified controllers 2020-03-02 16:54:38 +05:30
Herbert Maschke 895978e600 finish testCheckoutAsCustomer 2020-03-02 09:08:51 +01:00
Shubham Mehrotra ab612d064f misc. bug fixes 2020-02-29 15:35:50 +05:30
shubhammehrotra.symfony@webkul.com a752e58ed1 resolved issues 2020-02-28 18:59:15 +05:30
Jitendra Singh 131e3f1e18 Quantity box checks added for booking product 2020-02-28 13:00:29 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
rahul shukla e37b4fed14 locale messgaes improvement 2020-02-26 16:34:41 +05:30
Jitendra Singh 91064cd0bc Quantity availability check implemented for default booking 2020-02-26 13:11:24 +05:30
Jitendra Singh d5b54b393b Event booking type add cart updated 2020-02-25 16:42:32 +05:30
Jitendra Singh 7d2ff93f43 Resolve conflicts 2020-02-25 11:44:34 +05:30
Jitendra Singh 9eb7113aa4 Fixed else if indentation in javascript 2020-02-24 18:53:34 +05:30
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30