Commit Graph

401 Commits

Author SHA1 Message Date
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 Singh bfcd52618b
Merge pull request #1659 from vivek-webkul/patch-7
[Enhancement #1232 : Added option for showing records per page in con…
2019-10-18 20:14:57 +05:30
rahul shukla 859cd04660 compile all assest 2019-10-18 18:21:12 +05:30
Vivek 5b6ce4a6ab [Enhancement #1232 : Added option for showing records per page in configuration.] 2019-10-18 17:07:57 +05:30
Vivek f8767adc0d [Enhancement #737: Fields added to the customer DataGrid and customer addresses section added at admin end.] 2019-10-17 18:12:51 +05:30
Jitendra Singh 51c23a87da
Merge pull request #1604 from jitendra-webkul/jitendra
Issue #1552 fixed
2019-10-11 12:38:33 +05:30
jitendra adf10bca30 Issue #1552 fixed 2019-10-11 12:37:26 +05:30
Prashant Singh 744549f8a5 Fixed issue #1595 2019-10-11 12:26:23 +05:30
Webkul 9e2e73d0b3 Datagrid actions enhancement, now action can have a key called condition which must return boolean in order to trigger that action's visibility 2019-10-10 13:53:36 +05:30
jitendra e17c2c5f40 Merged with master 2019-09-11 15:23:57 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Prashant Singh d48fe8d435 Removed setInvoker method and allowed property to get set in Datagrid's constructor. 2019-09-11 12:59:51 +05:30
Prashant Singh b7d604ed31 Datagrid events unleashed 2019-09-11 03:18:32 +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 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
Jitendra Singh dede76a442
Merge pull request #1416 from rahulshukla-webkul/development
changed in webpack
2019-09-07 13:30:02 +05:30
rahul shukla 9e8edfa226 changed in webpack 2019-09-07 13:27:54 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
Prashant Singh 8a6b5d4723 Assets compiled for production 2019-09-05 18:37:58 +05:30
rahul shukla ddf754e2a7 Issue #1384 2019-09-05 16:41:26 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Jitendra Singh 39a195f923
Merge pull request #1296 from prashant-webkul/development
Development
2019-08-14 14:55:44 +05:30
Prashant Singh de24f9a39c Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well 2019-08-14 14:01:49 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Hossein 90639a3d4a
Create Persian language file 2019-08-10 10:28:52 +04:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh 08f606c099 Worked on ConvertXToProductId and the bug in multiselect caused a huge delay but right now we have falled back to old select box 2019-07-16 19:02:40 +05:30
Prashant Singh 9f9e0b6a68 Created a command to activate the usage of catalog rule 2019-07-15 16:02:39 +05:30
Prashant Singh 2a6e43de28 Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel 2019-07-15 14:11:00 +05:30
Prashant Singh d860466dfc mass action index now totally dependent on datagrid's index property 2019-07-14 14:30:44 +05:30
Prashant Singh caf165d06c Fixed issue with image of product card getting cropped due to CSS 2019-07-14 12:25:57 +05:30
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30
jitendra 3d527d6aba Updated 2019-07-11 15:05:07 +05:30
jitendra 31b6e779d6 Fixed image wrapper css issue 2019-07-02 17:55:56 +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 8e9768f947 assets compile for production 2019-06-28 17:08:30 +05:30
Prashant Singh d18667351c Base sync 2019-06-17 12:38:29 +05:30
Prashant Singh ea185aad7b Discount package bug fixes and complete refactor with overriding features for actions 2019-06-17 08:56:30 +05:30
Prashant Singh 15abe379e0 Changed frontend attributes and syntax fixes in checkout 2019-06-16 17:26:06 +05:30
jitendra ba240925a4 Added v-debounce directive 2019-06-15 19:51:10 +05:30
rahul shukla 6a8c7a8784 assests compile for production 2019-06-11 16:40:13 +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 66bd3e7989 Optional index for datagrid action 2019-06-07 17:59:38 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30