Commit Graph

51 Commits

Author SHA1 Message Date
rahul shukla 38f1251568 Issue #2468 2020-02-20 12:30:00 +05:30
Jitendra Singh 4f71d4727b Issue #2142 fixed 2020-02-06 17:18:51 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2446f56413 Issue #1746, #1271, #1735 fixed 2019-11-12 13:52:38 +05:30
Jitendra Singh 8ccb72f1d3
Merge pull request #1727 from prashant-webkul/bugs_patch_1
Fixed issue undefined variable  at checkout
2019-11-01 16:04:40 +05:30
Prashant Singh be34e104a4 Fixed issue undefined variable at checkout 2019-11-01 16:00:11 +05:30
Jitendra Singh 4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
[Bug Fixed #1219 ] & [Enhancement #1182]  Fixed
2019-10-24 10:36:53 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
shivam kumar 101785cbf7 minor chanegs 2019-10-23 13:06:34 +05:30
shivam kumar fd8a1fb851 #1182 fixed 2019-10-18 18:43:38 +05:30
rahul shukla 4761c64c6f update cart method name change for API 2019-10-15 19:05:46 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Prashant Singh bb12e07212 Cart rules refactored 2019-08-08 05:53:28 +05:30
Prashant Singh c751c16e6a Cart rule refactorization 2019-08-05 19:38:17 +05:30
Prashant Singh e4a5e84fb6 Refactoring cart rules 2019-08-03 19:54:02 +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
Prashant Singh e8dd4219a7 Apply on shipping working on cart rule 2019-06-28 12:57:19 +05:30
Prashant Singh 4339475e70 CheckOnShipping method added to check where rule applies on shipping or not 2019-06-27 19:55:36 +05:30
Prashant Singh 25007824eb Shipping now getting applied according to selected shipping method 2019-06-27 19:51:17 +05:30
Prashant Singh 3e4d2603c4 Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount 2019-06-27 04:35:26 +05:30
rahul shukla b0efd192e2 removed undefined variable rule from checkout/save payment 2019-06-24 18:03:31 +05:30
Prashant Singh de445279d2 Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules 2019-06-19 16:27:32 +05:30
Prashant Singh 68e0ba1ac1 Fixed issue #1054 2019-06-19 10:58:02 +05:30
Prashant Singh 82d916c646 cart rule action percent of product changed to base price of item 2019-06-17 16:20:53 +05:30
Prashant Singh 4b99f5acf9 Summary template now re rendering on applying and removal of coupon 2019-06-17 14:16:51 +05:30
Prashant Singh c2c0836b85 Couponable rule getting over ride by previously applied non-couponable rule 2019-06-17 13:09:21 +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
Prashant Singh c52238e45e Cart rule frontend normalization 2019-06-14 13:21:17 +05:30
Prashant Singh 7f9409bd8e Checkout and cart page now coupled with cart rules 2019-06-14 12:10:03 +05:30
Prashant Singh e9a0588185 discount rule fixes 2019-06-13 22:19:44 +05:30
Prashant Singh abf46c8a99 Added discount amount in cart item table 2019-06-13 19:30:00 +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 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Prashant Singh 550cabcbcb Translation strings for datagrid and removal of dead code and pretty syntax 2019-02-14 19:24:44 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
prashant-webkul 2514d748b5 Slider Content Bug Fixed 2018-10-28 18:53:20 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
jitendra f87a47d798 Order creation completed 2018-10-05 17:29:43 +05:30
jitendra a9106e0486 Order create 2018-10-05 11:48:58 +05:30
jitendra c235c22e79 Order creation 2018-10-04 12:12:06 +05:30
prashant-webkul 34833ff995 Path Errors Fixed 2018-09-28 18:58:54 +05:30