Commit Graph

111 Commits

Author SHA1 Message Date
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +05:30
Jitendra Singh a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
Development
2019-08-09 19:12:44 +05:30
rahul shukla 763a380870 new customer notification, isssue #1247 2019-08-05 20:23:48 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh 487484f86d Product export now added 2019-06-27 14:55:32 +05:30
Prashant Singh c245eab856 Fixed issue #1086 for customer edit 2019-06-27 14:41:01 +05:30
Prashant Singh d1395ba145 Fixed issue #1086 2019-06-27 14:24:26 +05:30
rahul shukla be8c11aa98 issue #1069 2019-06-19 16:32:38 +05:30
jitendra a2d1e1aa85 Column 'code' added in customer_groups table 2019-06-15 18:50:38 +05:30
jitendra ff64d23319 Guest removed from customer pages 2019-06-15 16:34:56 +05:30
Prashant Singh 6c0ee913ed added mass actions in admin customers grid 2019-06-13 12:47:58 +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 Singh 796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
clean up
2019-06-06 17:47:10 +05:30
imanghafoori 99ccac943d fix bug 2019-06-06 16:25:06 +04:30
imanghafoori 9f039cb9a5 clean up
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
imanghafoori e0dd74c06c clean up 2019-06-04 00:52:37 +04:30
rahul shukla fe8ac5abf1 issue #957 change in event 2019-05-29 09:56:28 +05:30
rahul shukla 75e74dfb7e issue #867 shipment issue 2019-04-24 17:57:16 +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
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
Jitendra Singh d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
Flatten code
2019-04-03 14:49:06 +05:30
Iman 759782c735 fix doc blocks (#787) 2019-04-03 12:34:35 +05:30
imanghafoori 14cd4eb97e flatten code 2019-04-02 21:50:44 +03:30
imanghafoori a84b81f446 flatten code 2019-04-01 18:39:15 +03:30
imanghafoori 1a4c040894 remove unused code 2019-04-01 18:38:18 +03:30
Prashant Singh c9c5208693 Updated the list of exportable grids 2019-03-12 12:19:28 +05:30
Prashant Singh 9578f7609b export functionality refactored 2019-03-12 12:13:48 +05:30
Prashant Singh 9eb1deb3fa Datagrid export functionality refactoring 2019-03-12 11:07:12 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +05:30
jitendra 7bfb216bb0 Dashboard sql issue fixed 2019-02-11 15:13:38 +05:30
JItendra Singh 2d99b565b1
Merge pull request #509 from rahulshukla-webkul/development
configuration changes
2019-02-01 16:48:25 +05:30
jitendra 2d1a816349 Issue #514 fixed 2019-02-01 12:19:30 +05:30
rahul shukla 41d3f74fc1 configuration changes 2019-01-31 17:04:32 +05:30
rahul shukla ee91d69361 configuration changes 2019-01-31 15:18:36 +05:30
rahul shukla 9c934d8e8d issues #401 2019-01-28 15:04:45 +05:30
JItendra Singh 63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra
Issues fixed
2019-01-18 16:41:22 +05:30
jitendra fbbf1fe99f Issues fixed 2019-01-18 16:40:40 +05:30
rahul shukla d50bb3e962 configuration message 2019-01-17 20:22:01 +05:30
rahul shukla e018d6555f export issue 2019-01-17 15:17:44 +05:30
rahul shukla 8c32a21521 export changes 2019-01-16 16:43:36 +05:30
rahul shukla 4747f8fb59 customer design fixex 2019-01-16 14:08:39 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
Prashant Singh 6e966384e5 Disabled customer email verfication and removed the phone field from the customer model 2019-01-15 13:03:41 +05:30
jitendra 9c1612d0ab Assets compiled for production 2019-01-11 15:31:10 +05:30
jitendra f1371fd6a0 Product inventory management updated 2019-01-11 14:51:20 +05:30
Prashant Singh a4485e2191 merged with master 2019-01-10 11:54:17 +05:30
Prashant Singh 926158cc0d datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components 2019-01-07 13:37:35 +05:30