Commit Graph

207 Commits

Author SHA1 Message Date
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
rahul shukla f1c263805c issues #815 2019-04-10 16:45:52 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
rahul shukla 8e7c3c7f22 restore migration 2019-04-09 12:12:35 +05:30
rahul shukla dbde05e0cd change in delete query 2019-04-09 12:05:52 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
rahul shukla 28c45c9bfa issue #802 2019-04-05 19:29:04 +05:30
rahul shukla 91477e50c0 issue #802 sqllite 2019-04-05 19:19:10 +05:30
rahul shukla 7be61550a4 change in query for muliselect attribute & layered navigation 2019-04-04 19:11:32 +05:30
rahul shukla 9c8f4f9522 issue #799 multiselect attribute & layered navigation 2019-04-04 15:43:33 +05:30
rahulshukla-webkul 9314d9159c Development (#789)
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop
2019-04-03 11:37:48 +05:30
Prashant Singh f9cdc21066 fixed issue #765 2019-04-02 13:06:13 +05:30
rahul shukla 179ac647d8 variable name change 2019-03-28 10:14:36 +05:30
rahul shukla 23fe05e192 issue #742 2019-03-28 10:10:26 +05:30
rahul shukla 281567456b product linking completed 2019-03-13 10:33:43 +05:30
rahul shukla 3bb197c75a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 09:38:36 +05:30
rahul shukla 9b82321d4f change in related products 2019-03-12 21:05:10 +05:30
jitendra ff1154c422 'getAll' function of ProductRepository modified 2019-03-12 18:32:23 +05:30
jitendra 961e00227f Update get all product function 2019-03-12 18:23:11 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
rahul shukla ca39b84d0b upsell product 2019-03-04 10:11:24 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +05:30
JItendra Singh 242b64afbf
Merge pull request #614 from prashant-webkul/development
Development
2019-02-26 11:56:43 +05:30
JItendra Singh c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
Option swatches feature added
2019-02-26 11:55:42 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla 7cfc0d3710 issue #618 & #619 & rtl css changes 2019-02-25 18:06:18 +05:30
Prashant Singh 3d94bfcd6e migration name changed according to current conventions 2019-02-22 16:25:49 +05:30
rahul shukla 3aacfc6acf admin name for attribute 2019-02-22 15:55:29 +05:30
rahul shukla 19101afc18 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-21 16:36:45 +05:30
rahul shukla 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
JItendra Singh 491504a844
Merge pull request #609 from jitendra-webkul/jitendra
Issue #608 fixed
2019-02-21 15:02:49 +05:30
jitendra fd07499407 Issue #608 fixed 2019-02-21 15:01:44 +05:30
rahul shukla 2d62465d60 issues #596 and #597 2019-02-20 17:14:14 +05:30