Commit Graph

1886 Commits

Author SHA1 Message Date
Prashant Singh c0dfae9af4 daily sync 2019-05-14 19:06:10 +05:30
Prashant Singh 2ef2aa1abf part of conditions on the cart rule form added 2019-05-14 16:19:32 +05:30
Prashant Singh 7508efb51d currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel 2019-05-14 09:32:05 +05:30
Prashant Singh a2fc08d0fe working on conditions for cart rule form 2019-05-13 18:56:29 +05:30
Prashant Singh b5899b7d24 Added more fields for cart rules 2019-05-13 15:52:47 +05:30
Prashant Singh f912fc7cd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-13 11:42:10 +05:30
Prashant Singh 22b4e201a7 making cart attributes for cart rules 2019-05-13 11:42:02 +05:30
Prashant Singh 0ce6348de6 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-05-13 10:25:33 +05:30
Prashant Singh 592b3a0c1d Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them. 2019-05-13 03:16:24 +05:30
Prashant Singh c1e5dee96b Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-05-13 01:08:55 +05:30
Prashant Singh daf78b7425 catalog rule translations added 2019-05-13 01:08:41 +05:30
Prashant Singh d2a5768ba6 fixed product card image not found issue 2019-05-11 17:30:27 +05:30
Jitendra Singh efcd3ce269
Merge pull request #915 from prateek-webkul/development
admin Navigation bar menu scroll issue fixed
2019-05-10 11:59:20 +05:30
Prashant Singh adbc5c9999 fixed customer registration bug due to last fix 2019-05-10 11:34:47 +05:30
prateek srivastava 39ae415148 admin Navigation bar menu scroll issue fixed 2019-05-10 11:34:25 +05:30
Prashant Singh 8829522be6 fixed customer group bug in customer registration controller 2019-05-10 10:40:27 +05:30
Prashant Singh 87be64f30b catalog rule models added with contracts and proxies 2019-05-09 20:00:50 +05:30
Prashant Singh 80bb31800b base sync with master and catalog rule channel and customer groups migrations added 2019-05-09 16:59:31 +05:30
Jitendra Singh 4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra
Refactored ProductController
2019-05-09 16:50:45 +05:30
jitendra 165e6aef5b Refactored ProductController 2019-05-09 16:49:52 +05:30
Prashant Singh f891bf5bc8 catalog rules migrations added 2019-05-09 14:31:08 +05:30
Jitendra Singh 05d3870b06
Merge pull request #911 from jitendra-webkul/jitendra
Added url_key to product api
2019-05-09 13:25:50 +05:30
jitendra 845a6c7f18 Added url_key to product api 2019-05-09 13:24:52 +05:30
Jitendra Singh 6e3769a95e
Merge pull request #910 from rahulshukla-webkul/development
icon issue in layred navigation #issue 903
2019-05-09 12:32:55 +05:30
rahul shukla ce99a4d9bb icon issue in layred navigation #issue 903 2019-05-09 12:28:48 +05:30
Jitendra Singh 2a4e6a619b
Merge pull request #909 from jitendra-webkul/jitendra
Api add to cart error message issue fixed
2019-05-09 12:05:18 +05:30
jitendra a9a069f366 Api add to cart error message issue fixed 2019-05-09 12:04:41 +05:30
Jitendra Singh 221628d84b
Merge pull request #908 from rahulshukla-webkul/development
Development
2019-05-09 11:40:53 +05:30
rahul shukla d31179edaa removal of space 2019-05-09 11:38:34 +05:30
rahul shukla ae8a4dae61 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-09 11:36:51 +05:30
rahul shukla 4c2a895b08 Issue #897 & change in valdation message for category image 2019-05-09 11:36:21 +05:30
Jitendra Singh 55c083ae1e
Merge pull request #907 from jitendra-webkul/jitendra
Added api for forgot password
2019-05-08 18:57:25 +05:30
jitendra 16220c656f Added api for forgot password 2019-05-08 18:56:28 +05:30
Prashant Singh a2a629637f catalog and cart rule designs stable, now moving towards validations on client side and backend 2019-05-08 18:45:34 +05:30
Jitendra Singh 00e5494611
Merge pull request #906 from rahulshukla-webkul/development
Development
2019-05-08 18:00:24 +05:30
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
Prashant Singh 19f4de9489 new icons added for promotion and customer note. new action for customer added to take notes on the customers 2019-05-08 16:11:43 +05:30
Prashant Singh 3115722fc8 catalog rule form changed to muliti attribute set for single condition 2019-05-08 05:46:00 +05:30
rahul shukla 6f494cc04b IE changes 2019-05-07 21:09:27 +05:30
Prashant Singh a36776732b removed discounts table 2019-05-07 20:47:23 +05:30
rahul shukla e2120ea276 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-07 18:57:55 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30
Jitendra Singh 2e57a12ac5
Merge pull request #905 from jitendra-webkul/jitendra
Fixed product repository search index issue
2019-05-07 17:57:53 +05:30
jitendra 0ff492ae80 Fixed product repository search index issue 2019-05-07 17:54:43 +05:30
Jitendra Singh 55752d21e3
Merge pull request #904 from jitendra-webkul/jitendra
Added api for front shop
2019-05-07 17:07:00 +05:30
jitendra a72d054cb5 Added api for front shop 2019-05-07 17:06:21 +05:30
Prashant Singh 8a7a142414 need another revisit on discount rules tables and then prepare for actions 2019-05-07 01:42:15 +05:30
rahul shukla b4a95b8d0c cart pages changes 2019-05-06 21:15:26 +05:30
rahul shukla 1b3653348d front end changes for IE 2019-05-06 20:52:43 +05:30
Prashant Singh 01acd092a4 working on prepopulating the values fields in conditions 2019-05-06 20:02:12 +05:30