Commit Graph

455 Commits

Author SHA1 Message Date
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