Commit Graph

197 Commits

Author SHA1 Message Date
jitendra b72b79032a Issue #1711 fixed 2019-10-31 17:48:37 +05:30
jitendra bd804ddb4a Assets compiled for production 2019-10-11 12:12:34 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 5d63416e95 localization message improvement 2019-09-27 19:46:14 +05:30
rahul shukla 62b2a3f9c3 locale based error message 2019-09-16 13:51:47 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
rahul shukla 403a9dda4c wishlist icon is active when item is already in wishlist 2019-09-10 13:10:58 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
jitendra 7952e57e41 Cart page css updated 2019-09-05 17:39:10 +05:30
jitendra 75e294e1c5 Cart page quantity changer updated 2019-09-05 17:31:09 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
Prashant Singh 8744c84eb9 product card hover padding removed 2019-08-20 10:48:17 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh f8a4f1ba1c product card hover transition applied and reduced hover padding by 33% 2019-07-14 12:38:15 +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
rahul shukla 78d44a8be0 rtl css for slider 2019-07-11 19:53:18 +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 7d2b751479 issue #1015 pagination responsive 2019-06-21 16:17:37 +05:30
rahul shukla a35c997a56 issue #1014 2019-06-21 15:01:51 +05:30
jitendra aa1a5451bd Fixed checkout summary refresh issue 2019-06-19 15:15:27 +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 96e8556b54 Fixed mini cart layout 2019-05-31 18:30:09 +05:30
jitendra 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
rahul shukla 3663391bf6 UI fixes for project 2019-05-30 11:52:06 +05:30
rahul shukla d1199a6f26 issue #956 2019-05-29 11:35:17 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 2674fbb9ca issue #850 2019-04-26 15:31:01 +05:30
rahul shukla 9903d23dfe change in category menu 2019-04-23 15:38:11 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
rahul shukla 1caa3eb4f6 image zoom in rtl 2019-04-12 14:11:05 +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 5c94a8a21f changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui 2019-04-04 14:50:59 +05:30
rahulshukla-webkul 23bb48e759 Development (#790)
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop

* issue #785 product name display

* merge with master & assests compile
2019-04-03 12:17:47 +05:30
rahul shukla 39acb0de43 merge with master 2019-04-02 13:26:39 +05:30
Prashant Singh 9c55f5037d Fixed issue #775 2019-04-02 09:39:43 +05:30
rahul shukla 56142bf3d8 issue #759 2019-04-01 20:00:54 +05:30
Prashant Singh 06aa4dd6bf Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:45:56 +05:30
Prashant Singh ea99fc8c68 fixed issue 764 2019-03-31 22:41:14 +05:30
rahul shukla 257dfc8b1e rtl css for product list & currency capital 2019-03-29 16:48:00 +05:30
rahul shukla 8897a27499 issue #730 2019-03-29 13:11:49 +05:30
rahul shukla c2f24d47cb merge with master 2019-03-27 14:26:52 +05:30
rahul shukla 2a57530184 issue #735 & minor config changes for select 2019-03-22 14:54:46 +05:30
rahul shukla e41445e802 issues #729 and #731 2019-03-22 12:54:38 +05:30
jitendra 41217e525f Assets compiled for production 2019-03-15 19:31:23 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +05:30
Prashant Singh 31eab00df7 added disbaled state to the new radio button used on checkout pages 2019-03-14 10:59:35 +05:30
jitendra a7eec79fbd Editor added on category description textarea 2019-03-12 16:45:08 +05:30
jitendra 99e866d055 Fixed slider controller namespace issue 2019-03-12 16:03:57 +05:30
jitendra 12a4c6dc09 Fixed conflict and Assets compiled for prodcution 2019-03-12 12:04:55 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
rahul shukla c2ae22a262 merge with master 2019-03-05 18:35:44 +05:30
Prashant Singh aac1c583f5 assets compiled for production 2019-03-05 16:32:12 +05:30
Prashant Singh 7ae4be56b8 fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed 2019-03-05 16:28:55 +05:30
jitendra 1079331358 Conflict fixed 2019-03-05 13:17:58 +05:30
jitendra 4c28aceab5 Product gallery selected thumbnail border color changed to brand color 2019-03-05 13:15:21 +05:30
Prashant Singh e2facbc329 All the color values have been converted into variables for shop package 2019-02-28 10:37:21 +05:30
jitendra e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +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
rahul shukla be1de2d1ab assests compile 2019-02-20 14:46:44 +05:30
jitendra e2b411547d Issue #581 fixed 2019-02-20 14:30:54 +05:30
jitendra 5e4ab5dd8f Webpack mix files updated and assets compiled for production 2019-02-20 12:38:09 +05:30
rahul shukla 22b19ec277 product image 2019-02-19 09:59:50 +05:30
rahul shukla 1a9c3d56c2 issue #587 & css changes 2019-02-18 17:01:53 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
jitendra 15fe87d72c Assets compiled for production 2019-02-15 11:31:19 +05:30
Prashant Singh 718a5eaa20 Resolved the issue #517 and removed the intented url from admin as admin don't require 2019-02-14 17:54:46 +05:30
Prashant Singh 616d1bf160 merged with master 2019-02-13 11:40:56 +05:30
jitendra 98f3edc199 Assets compiled for production 2019-02-12 20:11:44 +05:30
rahul shukla e824f4741b assests compile 2019-02-11 18:12:06 +05:30
jitendra f2f3592376 Assets compiled for production 2019-02-04 15:41:43 +05:30
rahul shukla 08fe30ac61 #523 and #519 2019-02-04 12:02:59 +05:30
rahul shukla 7985c4c225 header resposive issue 2019-02-01 19:12:51 +05:30
rahul shukla 745d6c1b48 responsive header menu 2019-02-01 17:06:32 +05:30
jitendra 29065eeba7 Currency switcher dropdown issue fixed 2019-01-31 12:29:35 +05:30
jitendra bb635f1673 Fixed front header layout 2019-01-30 20:11:07 +05:30
jitendra 70c114d3a6 Channel homepage content updated in seeder 2019-01-29 18:32:10 +05:30
jitendra e1bd021e19 Assets compliled for prodcution 2019-01-25 20:19:13 +05:30
jitendra 45c8bba4f5 Complied assets for production 2019-01-25 17:30:46 +05:30
jitendra 6fff4701a6 Flat rate implemented 2019-01-25 17:24:48 +05:30
rahul shukla 54377fd966 installer command differentilate according OS 2019-01-25 17:22:59 +05:30
rahul shukla 363efffaaa merge with master 2019-01-25 10:58:47 +05:30
rahul shukla a269dc614f composer for installer 2019-01-22 16:13:56 +05:30
Prashant Singh f553dcdc71 assets compiled for production 2019-01-21 15:52:56 +05:30
jitendra 42eb46e78c Asset compiled for production 2019-01-21 15:26:00 +05:30
jitendra 575373cd75 Coding standard updated 2019-01-15 17:32:43 +05:30
jitendra b388dc9aa6 Assets compiled for production 2019-01-04 19:24:03 +05:30
rahul shukla b430d4d4b5 merge with master 2019-01-02 20:15:05 +05:30
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30