Commit Graph

220 Commits

Author SHA1 Message Date
rahul shukla ddf754e2a7 Issue #1384 2019-09-05 16:41:26 +05:30
Prashant Singh 6693a443d3 Removed latest flag check from prettus l5 repository 2019-09-04 14:00:45 +05:30
Prashant Singh 0468a1fdd6 Changes in core repository made 2019-09-04 13:36:34 +05:30
Prashant Singh b570bf229b CMS pages seeder implemented and now seeder generates all prebuilt pages that were listed in footer quicklinks 2019-08-24 15:57:09 +05:30
Prashant Singh c856ef55ea Added entry for CMS in core's concord.php 2019-08-23 16:43:53 +05:30
Prashant Singh 05c5425c96 Added home page SEO under channel edit and create forms and fixed issue #1319 2019-08-21 13:38:07 +05:30
Jitendra Singh fbf5da570e
Merge pull request #1318 from prashant-webkul/development
Development
2019-08-20 12:07:58 +05:30
Prashant Singh 0ea994502d Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules 2019-08-20 11:46:20 +05:30
Jitendra Singh 59cfd13795
Merge pull request #1307 from prashant-webkul/development
Development
2019-08-16 17:50:18 +05:30
Prashant Singh bd6e0c9345 Structural changes in CMS pages. Fixed bugs #1300, #1295 2019-08-16 17:43:58 +05:30
Hossein 33977ffd94
Create Persian language file 2019-08-10 10:27:40 +04:30
Prashant Singh 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
moe2566 e038416f55
Update 2019_07_23_033128_alter_locales_table.php 2019-07-23 19:22:03 -04:00
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Prashant Singh 5f08f2b9f4 Fixed sort order for configuration in admin panel 2019-07-14 00:46:33 +05:30
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30
rahul shukla f9e9dfbae1 slider delete issue 2019-07-08 17:10:42 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Prashant Singh 1a262e0f27 Fixed some bugs in cart rules 2019-06-25 12:27:13 +05:30
Prashant Singh ba31ecd527 Cart rule create and edit forms bug fixes 2019-06-16 22:18:19 +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
rahul shukla b7b42ffc15 translation updated 2019-06-04 18:25:54 +05:30
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 439652699e issue #836 2019-04-17 19:20:07 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +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
Prashant Singh 1aa9bf78aa Removed unforced controller file from attribute package's Repositories directory 2019-04-16 14:41:12 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 1ec1c5d83c fixed some bugs 2019-04-09 13:29:31 +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 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 257dfc8b1e rtl css for product list & currency capital 2019-03-29 16:48:00 +05:30
Prashant Singh 2b17cdb7fd fixed issue #713 2019-03-19 13:24:28 +05:30
Prashant Singh 97da404216 default channel now getting checked with admin 2019-03-19 13:22:06 +05:30
Jitendra Singh c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
jitendra 218ef7a85f Added getCurrentLocale function in Core.php 2019-03-14 18:24:02 +05:30
rahul shukla a887cf8b92 slider controller name issue 2019-03-14 17:05:18 +05:30
Jitendra Singh 45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
Added pt-br translation
2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner 2e2d7d7642 Added pt-br translation 2019-03-12 09:19:27 -03:00
jitendra 99e866d055 Fixed slider controller namespace issue 2019-03-12 16:03:57 +05:30
Jitendra Singh 4dc7ef649c
Merge pull request #673 from prashant-webkul/development
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30