Commit Graph

674 Commits

Author SHA1 Message Date
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0
Product multiple image select feature added
2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
Matt April e31db32515 Added missing space for configurable/grouped product price. 2020-05-04 18:01:50 -04:00
rahulshukla-home fee6645138 Issue #2942 2020-04-29 14:35:49 +05:30
rahulshukla-home 65f894689b Issue #2942 2020-04-29 14:32:56 +05:30
rahulshukla-home 837c5d44fa fix category issue and change country,state order 2020-04-28 08:14:53 +05:30
Vivek d653cbd1b4 [Updated: getBaseImage() method updated for configurable product.] 2020-04-24 22:25:08 +05:30
Pranshu Tomar 8030b097e7 Moved command to packages 2020-04-23 13:46:47 +05:30
rahulshukla-home 10f76b2631 Issue #2793 2020-04-17 15:17:32 +05:30
rahulshukla-home 29ecd9aa15 Issue #2863 fixed 2020-04-17 14:27:35 +05:30
Jitendra Singh fa8120b1bf
Merge pull request #2692 from Haendlerbund/improve-have-product-faker
refactor haveProduct() method to allow custom attribute handling
2020-04-10 11:43:34 +05:30
Jitendra Singh 8bee45f7f5
Merge pull request #2857 from shubhwebkul/master
misc. bug fixes
2020-04-10 11:13:02 +05:30
rahulshukla-home f887f070c7 Issue #2793 2020-04-09 22:07:04 +05:30
Shubham Mehrotra bc23025ccc #2856 2020-04-09 18:28:52 +05:30
shivam kumar c059d137b2 code changed for api 2020-04-07 12:50:40 +05:30
shivam kumar 4ec82687cd api changes 2020-04-06 21:47:17 +05:30
Herbert Maschke 292e7c5e08 raise generated default inventory quantity to _at least_ 100 to avoid sellout in checkout tests 2020-03-31 15:41:50 +02:00
Herbert Maschke 62ceb45ee5 raise generated default inventory quantity to 80 to avoid sellout in checkout tests 2020-03-31 15:34:09 +02:00
Herbert Maschke 613b3ea523 Merge branch 'bagisto/master' into improve-have-product-faker 2020-03-30 14:43:30 +02:00
Pranshu Tomar 93e31b3ac8 Issue #2704 fixed 2020-03-23 13:47:08 +05:30
Herbert Maschke b8e4692114 refactor haveProduct() method to allow custom attribute handling 2020-03-18 14:59:10 +01:00
Jitendra Singh cdc1eb7bc1 Issue #2671 fixed 2020-03-17 13:01:37 +05:30
Jitendra Singh 4e10d706f5 Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:03:19 +05:30
Jitendra Singh 6063c113bf Removed static text from shop datagrid 2020-03-11 12:15:03 +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
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +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
Herbert Maschke 7083aed97a generate a dummy brand in GenerateProducts.php to fix brand linking issue after checkout of generated product 2020-02-25 14:23:00 +01:00
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
rahul shukla 66ba69586d filter issue in category 2020-02-20 16:31:46 +05:30
Jitendra Singh aa1d6d145c Improved product package code style 2020-02-20 11:42:17 +05:30
Jitendra Singh a31fba56b1 Resolved conflicts 2020-02-19 17:23:18 +05:30
rahul shukla 33f882209a code improvement 2020-02-19 15:32:52 +05:30
Jitendra Singh 415eac6766 Booking migration added 2020-02-18 19:31:04 +05:30
rahulshukla-webkul 5bfe263e10
Revert "add improvements to locale determination on product creation" 2020-02-18 18:14:22 +05:30
Jitendra Singh 87c2fc35dd
Merge pull request #2481 from prateek-webkul/master
issue #2479 fixed
2020-02-18 15:28:20 +05:30
prateek srivastava 4f7cfab704 issue #2480 fixed 2020-02-18 13:56:09 +05:30
Jitendra Singh ead65981dc Add to cart completed for booking product 2020-02-17 19:25:20 +05:30
Herbert Maschke 38dbb6384d obey the default channel and configured default locale in product edit form 2020-02-10 15:05:03 +01:00
Herbert Maschke 35a9e90780 add improvements to locale determination on product creation 2020-02-07 11:16:00 +01:00
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler 0d6aee18e4 merge remote-tracking branch 'bagisto/master' into fix-tax-handling 2020-02-04 17:55:53 +01:00
Annika Wolff 53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-02-04 14:08:46 +01:00
Steffen Mahler cb5e3a47f6 fix tax handling, add functional cest for cart 2020-02-04 08:50:37 +01:00
Herbert Maschke 4833d9f8ec obey the default channel that has been set in config/app.php 2020-02-03 13:34:05 +01:00
Jitendra Singh 09a7cc949a
Merge pull request #2222 from jitendra-webkul/1.0
Issue #2202 fixed
2020-01-31 19:17:19 +05:30
Jitendra Singh 677cd7e542 Issue #2202 fixed 2020-01-31 19:16:45 +05:30
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Annika Wolff ab9300bbef merged conflicting factory manually 2020-01-31 09:40:12 +01:00
Jitendra Singh d9d7c2bc40
Merge pull request #2215 from Haendlerbund/introduce-some-cart-factories
add some factories
2020-01-31 12:35:25 +05:30
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Florian Bosdorff 389b40fdce Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid 2020-01-30 16:04:57 +01:00
rahul shukla 40e85523a1 Issue #2185 2020-01-29 16:46:10 +05:30
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +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
rahul shukla c69f19701f Issue #2185 2020-01-28 18:51:13 +05:30
Jitendra Singh dae09859f3
Merge pull request #2172 from jitendra-webkul/1.0
Issue #2162 fixed
2020-01-28 15:16:43 +05:30
Jitendra Singh fec990a149 Issue #2162 fixed 2020-01-28 15:15:36 +05:30
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Steffen Mahler 223c96b205 . 2020-01-27 13:06:31 +01:00
Jitendra Singh 3e2e6f2c75
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
2020-01-27 16:42:01 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Jitendra Singh 3a69b97bd2
Merge pull request #2151 from rahulshukla-webkul/development
Development
2020-01-27 13:35:08 +05:30
rahul shukla 41ae3048ff Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-27 13:24:37 +05:30
rahul shukla 4fd6599bda Issue #2147 2020-01-27 13:24:22 +05:30
Jitendra Singh 3a2fb2c03a Issue #2054 fixed 2020-01-27 13:10:30 +05:30
Jitendra Singh edf5dc34fd Issue #2146 fixed 2020-01-27 12:38:13 +05:30
Jitendra Singh f4ee571dc7
Merge pull request #2127 from Haendlerbund/basic-backend-tests
add basic backend tests
2020-01-24 18:50:50 +05:30
Jitendra Singh eec113ad80 Resolve conflict 2020-01-24 16:48:30 +05:30
Jitendra Singh 195a37fea3 Issue #1779 fixed 2020-01-24 16:44:45 +05:30
MonaHartdegen 4c56a8de4f removed redundant use statement from ProductServiceProvider 2020-01-24 10:28:05 +01:00
MonaHartdegen ccc2188ef1 merge bagisto master 2020-01-24 10:22:15 +01:00
rahul shukla e71d0035fe condtion added for bundle product while adding cart 2020-01-24 11:54:47 +05:30
Florian Bosdorff db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
MonaHartdegen 806e3f93db added ProductsIndexCest; added factories 2020-01-23 08:33:47 +01:00
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 6b3415f0e8
Merge pull request #2076 from jitendra-webkul/1.0
Issue #2074 fixed
2020-01-20 15:27:59 +05:30
Jitendra Singh 7e14737f8c Issue #2074 fixed 2020-01-20 15:26:31 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Annika Wolff 976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master (#14)
* added bagisto:install command

* updates for uploading attachments

* Issue #1808

* Issue #1779 fixed

* Issue #2045

* Issue #1971

* Issue #1779 fixed

* fire event on creating/updating slider

* Issue #1863 fixed

* Issue #1863 fixed

* Removed ')' in page edit blade

* Issue #2054 fixed

* Issue #2054 fixed

* Added mail from name field in .env.example file, Issue #2051

Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-16 13:54:18 +01:00
Jitendra Singh d931571c35
Merge pull request #2061 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-15 19:03:59 +05:30
Jitendra Singh 9e5fc5bf1e Issue #2054 fixed 2020-01-15 19:03:07 +05:30
Jitendra Singh 6fb3f78f2d
Merge pull request #2052 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-14 19:10:30 +05:30
Jitendra Singh dd1ca9336b Issue #1779 fixed 2020-01-14 19:09:59 +05:30
Jitendra Singh 0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-14 13:24:26 +05:30
Jitendra Singh 05a619d39b Issue #1779 fixed 2020-01-14 13:23:49 +05:30
Jitendra Singh 939895cb88
Merge pull request #2041 from jitendra-webkul/1.0
Issue #1760 fixed
2020-01-13 18:51:37 +05:30
Jitendra Singh c435b6c121 Issue #1760 fixed 2020-01-13 18:50:36 +05:30
Jitendra Singh 9eb107a87f
Merge pull request #2039 from jitendra-webkul/1.0
Issue #1795 fixed
2020-01-13 13:44:37 +05:30
Jitendra Singh 122debdf1b Issue #1795 fixed 2020-01-13 13:43:53 +05:30
Jitendra Singh a42724d5f3
Merge pull request #2038 from jitendra-webkul/1.0
Issue #1795 fixed
2020-01-13 13:18:25 +05:30
Jitendra Singh 3368eb5ba5 Issue #1795 fixed 2020-01-13 13:17:27 +05:30
Jitendra Singh 40f34d2ab0
Merge pull request #2030 from jitendra-webkul/1.0
Issue #1781 fixed
2020-01-10 19:23:10 +05:30
Jitendra Singh 5e1192a744 Issue #1781 fixed 2020-01-10 19:21:35 +05:30
Jitendra Singh da829718a5
Merge pull request #1989 from Haendlerbund/bugfix-types-having-variants-pr-1798
Bugfix: Exception while applying catalog rule
2020-01-10 13:20:59 +05:30
Jitendra Singh 55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
Issues #1997, #1994 fixed
2020-01-08 17:02:39 +05:30
Jitendra Singh ca0f8bca49 Issues #1997, #1994 fixed 2020-01-08 17:01:50 +05:30
Jitendra Singh d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
jitendra fafa0df14a Catalog rule and cart rule applied on all product types 2020-01-06 17:47:43 +05:30
jitendra 77563c57f1 Catalog rules working for all product types 2020-01-06 13:00:01 +05:30
Annika Wolff 74348ac5be resolve warning exception occurring on apply of catalog rule 2019-12-30 11:03:50 +01:00
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
Jitendra Singh 3b1b3e819f
Merge pull request #1945 from rahulshukla-webkul/development
Development
2019-12-24 13:12:52 +05:30
Jitendra Singh a3aa23fcbc
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
Allow empty option for attributes
2019-12-24 13:12:22 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
MonaHartdegen 6f58fc041f increase maintainability by replacing hard coded class names by <Classname>::class in ProductRepository 2019-12-20 09:56:47 +01:00
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
MonaHartdegen 2b0385c14e Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes 2019-12-13 14:12:14 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 2d1afb988a Issue #1877 2019-12-13 17:12:03 +05:30
MonaHartdegen 7b1378fded added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view 2019-12-12 10:32:51 +01:00
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
Annika Wolff 406c32012d add check if property is set 2019-11-27 09:53:11 +01:00
Annika Wolff 2d23123660 adapt to code standard 2019-11-26 13:45:02 +01:00
Annika Wolff 71e8e687c2 PR 1782 Enhancement: Let variants be of other types than simple 2019-11-26 13:32:42 +01:00
Jitendra Singh 840290f0bb
Merge pull request #1782 from Haendlerbund/introduce-product-type-helper
introduce ProductType Helper
2019-11-22 17:05:21 +05:30
Annika Wolff 11e471e615 changed code indents 2019-11-22 11:57:07 +01:00
Annika Wolff 9a43776cc0 introduce ProductType Helper 2019-11-21 16:56:21 +01:00
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
jitendra 257392cd2a Issue #1118 fixed 2019-11-07 17:39:59 +05:30
jitendra 45815b7230 Issue #1745 fixed 2019-11-07 15:28:10 +05:30
jitendra faef8adcdb Issue #1745 fixed' 2019-11-07 12:50:40 +05:30
jitendra 19b8de0ffb Issue #1167 fixed 2019-11-06 13:54:57 +05:30
jitendra f4a562da5c Issue #1639 fixed 2019-11-05 15:23:01 +05:30
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 c0a4e2fe26 Issue #1721 fixed 2019-10-31 19:06:52 +05:30
jitendra 00deebd3fd Issue #1644 fixed 2019-10-31 17:36:41 +05:30
Jitendra Singh 2a00d797ca
Merge pull request #1703 from phillipcodes/bugfix-979/image-scaling
#979 fix image scaling issues
2019-10-29 12:31:19 +05:30
jitendra 90c73e152c Issue #1657 fixed 2019-10-29 11:47:21 +05:30
phillipmohr b5178cf013 fix image scaling issues 2019-10-28 16:17:48 +01:00
jitendra 1b21c39ee5 Issue #1638 fixed 2019-10-24 17:47:46 +05:30
Jitendra Singh 70b7a712c7
Merge pull request #1691 from prashant-webkul/bugs_patch_1
Fixed issues related to Promotions: Cart Rule
2019-10-24 10:29:39 +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 ce52c1832e Issue #1684 fixed 2019-10-23 18:45:48 +05:30
jitendra 822b6014b4 Issue #1676 fixed 2019-10-22 11:03:42 +05:30
jitendra 94d7289927 Issue #1631 fixed 2019-10-15 18:59:54 +05:30
Jitendra Singh f555a38d18
Merge pull request #1586 from jitendra-webkul/jitendra
Issue #1574 fixed
2019-10-10 17:46:36 +05:30
jitendra 210a19757f Issue #1574 fixed 2019-10-10 17:41:30 +05:30
Webkul 0cbf50b657 Generate product command bug fix 2019-10-10 12:33:20 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Jitendra Singh fc920e14c5
Merge pull request #1549 from rahulshukla-webkul/development
Issue #1548
2019-10-09 16:21:34 +05:30
Prashant Singh 0792a7ff96 Release version updated. 2019-10-09 11:20:01 +05:30
rahul shukla 878c0eb8e5 Issue #1463 2019-10-07 16:36:16 +05:30
Jitendra Singh 0d5245690b
Merge pull request #1538 from prashant-webkul/development
Development
2019-10-01 16:38:48 +05:30
Webkul f1785894d0 Attribute family id in GenerateProduct class was hardcoded replaced it with a dyamic query 2019-10-01 14:57:56 +05:30
rahul shukla 45ff0b5602 route update for product create command 2019-10-01 14:50:56 +05:30
Webkul 73686a86fe Create simple product with random data using command php artisan generate:product/products {quantity}, helpful for testing framework right out of the box 2019-10-01 11:00:11 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
jitendra 484fb56e54 Price added to downloadable product links 2019-09-11 13:46:33 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Prashant Singh 1e22e61282 Base sync 2019-09-11 03:11:55 +05:30
Prashant Singh 98e8f3c57d All datagrids are generating before add column, action and mass action 2019-09-11 03:10:38 +05:30
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
jitendra 128dde536e Fixed issues of bundle, downloadable products 2019-09-10 19:22:11 +05:30
Jitendra Singh 60a24016e9
Merge pull request #1431 from rahulshukla-webkul/development
route check added for product flat update
2019-09-10 13:27:22 +05:30
rahul shukla 14773bbfa8 route check added for product flat update 2019-09-10 13:25:26 +05:30
Jitendra Singh 182c33305c
Merge pull request #1430 from rahulshukla-webkul/development
Development
2019-09-10 13:13:05 +05:30
Jitendra Singh 843fbb1922
Merge pull request #1422 from MattApril/master
Change 'self' references inside models to 'static'. This fixes issues…
2019-09-10 12:45:51 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 98bd644e3e Created command for updated min_price and max_price based on special_price 2019-09-10 12:18:01 +05:30
rahul shukla f49e25ea1f Issue #1259 2019-09-09 18:34:02 +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 49ca240675 Duplicate product in cart issue fixed 2019-09-07 15:38:49 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra d8403bf162 Fixed exchange rate exception 2019-09-06 15:48:59 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
jitendra aae2872085 Fixed typo error in Grouped type class 2019-09-05 19:30:17 +05:30
jitendra 7da7c93a79 Search products issue fixed 2019-09-05 16:58:55 +05:30
jitendra 27d3d3f93e Configuration product creation issue fixed 2019-09-05 16:50:16 +05:30
jitendra 1977ddd6ad Bundle product radio and checkbox added in product edit form for is default selection 2019-09-05 13:56:10 +05:30
jitendra 94290e6742 Option mission message added for configurable, group and bundle products during add cart 2019-09-04 17:33:55 +05:30
jitendra 55f888c1df Shop tranlation case fixed 2019-09-04 17:23:53 +05:30
jitendra 136c03ee3a Layered navigation price filter changed based on min_price and max_price 2019-09-04 16:52:38 +05:30
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
jitendra 29ba0c28de Implemented bundle product price html 2019-09-04 14:58:39 +05:30
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
Prashant Singh 5ad8e46a86 Catalog rule frontend implementation started 2019-08-31 20:37:28 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
Prashant Singh a7d7bc80fa Added some blade render events in settings 2019-08-23 10:38:59 +05:30
Prashant Singh fb52c4bffc WIP: Frontend resolution of catalog rule pricing 2019-08-22 18:57:35 +05:30
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +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
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
rahul shukla 9ba2357d7c reverting changes, delete for product_attribute in product flat 2019-08-01 10:22:23 +05:30
rahul shukla 561803cd3c filterable attribute for category, tax price update on cart and issue #1234 2019-07-31 17:44:29 +05:30
rahul shukla 270bdfa553 delete in product flat 2019-07-30 20:09:40 +05:30
rahul shukla 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +05:30
rahul shukla d83396d437 issue #1217, #1220 and #1218 2019-07-29 14:38:17 +05:30
rahul shukla 9d9b0b5176 use in product flat column added in attributes 2019-07-29 14:33:33 +05:30
rahul shukla fca1d6d15c filter code updated 2019-07-25 11:11:18 +05:30
rahul shukla f4eb973ba6 reduces number of loop for filter attribute #1192 2019-07-23 15:57:49 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh 7f3ed81554 Removed a bug from convertXToProductId from cart rule edit form causing it to exception when no criteria for products to be applied is done emtpy after having a previous criteria 2019-07-22 12:18:59 +05:30
rahul shukla 27d6e8894c checkbox type attribute 2019-07-15 18:00:56 +05:30
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +05:30
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
jitendra 1592c9e37f Fixed downloadable issues with locale change 2019-07-05 11:52:14 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
jitendra f3d3dcd733 Now product types can have additional form validations 2019-07-02 16:59:47 +05:30
jitendra 1fb5d9b1fc Removed unnecessary classed from product types 2019-07-02 14:44:07 +05:30
jitendra 318857b785 Now images will be deleted too if the model gets deleted 2019-07-01 19:42:12 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30
jitendra ad6e422fdb Added downloadable and virtual products 2019-06-29 15:23:34 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +05:30
rahul shukla a9090e991c download for image & file type 2019-06-27 14:38:24 +05:30
Prashant Singh 8c9fb32ab1 Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days 2019-06-21 04:15:45 +05:30
rahul shukla d76d8bd129 flash message for discount & error 2019-06-19 21:18:16 +05:30
Prashant Singh de445279d2 Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules 2019-06-19 16:27:32 +05:30
Prashant Singh 9e80687960 Fixed customer group bug in cart rule and fixed a bug in coupon apply rule 2019-06-18 19:00:24 +05:30
rahul shukla 0bdd03b331 ticket 201 error & admin css for back icon 2019-06-14 14:22:22 +05:30
rahul shukla 1a36cd32c7 change query for min price of variant 2019-06-13 20:22:16 +05:30
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964)
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30
Jitendra Singh d399811206
Merge pull request #978 from jitendra-webkul/jitendra
totalQuantity function added to product and product flat model
2019-06-06 16:44:31 +05:30
jitendra 2d00679901 totalQuantity function added to product and product flat model 2019-06-06 16:43:36 +05:30
rahul shukla 40e8c85813 issue #945 product image of variant 2019-06-04 10:17:00 +05:30
rahul shukla 93324e021e issue #896 product special price 2019-06-03 17:11:11 +05:30
jitendra 8202f58284 Issue #932 fixed 2019-05-31 17:52:52 +05:30
Jitendra Singh eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
Development
2019-05-28 17:06:25 +05:30
rahul shukla 7281cfeb78 issue #922 2019-05-28 13:32:13 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
jitendra 37ba923e9e Backorder implemented 2019-05-24 18:45:47 +05:30
rahul shukla b8561d4d5e schema condition in product flat table 2019-05-24 12:15:30 +05:30
rahul shukla 308b3be1d8 installer file deletion after install 2019-05-24 11:53:11 +05:30
rahul shukla 7efcdefc6a changes in prouduct flat new migration 2019-05-23 18:49:29 +05:30
rahul shukla 8678a865f0 column added in product flat table 2019-05-23 12:10:02 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30