Commit Graph

192 Commits

Author SHA1 Message Date
Jitendra Singh 5ec6559a07 Issue #2395 fixed 2020-02-11 13:10:14 +05:30
Jitendra Singh e06a35b282 Move to wishlist issues fixed if product is already in wishlist 2020-02-06 17:49:23 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Steffen Mahler d722ba8665 change annotation comment 2020-01-29 11:43:19 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
Steffen Mahler a5c49e4b76 button 'update cart' will only be shown if corresponding products are in cart 2020-01-24 07:15:49 +01:00
rahul shukla 8548884d3e removed dd 2020-01-23 19:49:41 +05:30
rahul shukla 259f5a8c00 Issue #2088 2020-01-23 19:43:03 +05:30
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Annika Wolff 91d6586ad8 resolve exception, rename function haveDownloadableItems 2020-01-15 11:53:48 +01:00
Annika Wolff a75f3dab51 resolve conflicts 2020-01-15 11:37:38 +01:00
Jitendra Singh 6ed1410821
Merge pull request #2019 from jitendra-webkul/1.0
Issue #1979 fixed
2020-01-09 17:14:16 +05:30
Jitendra Singh 14869df230 Issue #1979 fixexd 2020-01-09 17:03:58 +05:30
rahul shukla 830367ef93 loop issue in tax calculate, #1994 2020-01-09 12:48:59 +05:30
Jitendra Singh ca0f8bca49 Issues #1997, #1994 fixed 2020-01-08 17:01:50 +05:30
rahul shukla 4b2088e66e upgrade to laravel 6 2019-12-30 17:10:38 +05:30
Annika Wolff d47201af75 bugfixed quantity update when showQuantityBox is false 2019-12-27 14:41:32 +01:00
Annika Wolff 9fd5ff7f47 small refactor on checks if downloadable product 2019-12-27 10:03:01 +01:00
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
Jitendra Singh ede889703e
Merge pull request #1737 from jitendra-webkul/jitendra
Issue #1347 fixed
2019-11-05 12:45:22 +05:30
jitendra 8347e1770b Issue #1347 fixed 2019-11-05 12:44:26 +05:30
Jitendra Singh a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
jitendra 973332f6c0 Issue #1724 fixed 2019-11-01 11:03:40 +05:30
jitendra ab2d069ec7 Issue #1519 fixed 2019-10-31 17:07:49 +05:30
jitendra 62533d9df8 postcode column changed to varchar from int 2019-10-24 17:38:08 +05:30
jitendra dfb9c75e77 Move wishlist to cart issue fixed 2019-10-24 17:08:41 +05:30
jitendra 5f0b26f038 Bundle product add to cart issue fixed 2019-10-24 16:29:09 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
jitendra 0864dd5d1a Issue #1592 fixed 2019-10-11 12:11:07 +05:30
jitendra 210a19757f Issue #1574 fixed 2019-10-10 17:41:30 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
jitendra e250bc0602 Tax not getting applied if only order is placed for virtual product and downloadable product or for both. 2019-09-11 12:31:25 +05:30
jitendra 1ce4dfea95 Merge cart issue fixed for downloadable product 2019-09-11 11:21:12 +05:30
Matt April a8141c3fb3 Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model. 2019-09-07 20:14:27 -04:00
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
Prashant Singh 1e0da3c42a Fixed issue #778 2019-08-29 16:11:12 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30