Commit Graph

39 Commits

Author SHA1 Message Date
Florian Bosdorff 5188b1b7f9 Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-28 08:15:11 +01:00
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
David Große 9524c78ad5 various code style improvements 2020-01-14 10:49:22 +01:00
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +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
rahul shukla 763a380870 new customer notification, isssue #1247 2019-08-05 20:23:48 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +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 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
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
Iman 759782c735 fix doc blocks (#787) 2019-04-03 12:34:35 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +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
Prashant Singh 6e966384e5 Disabled customer email verfication and removed the phone field from the customer model 2019-01-15 13:03:41 +05:30
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +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
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
rahul shukla b78cc23797 shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable 2018-12-07 10:55:33 +05:30
rahul shukla 27f5e1d93d export 2018-12-04 09:53:52 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
rahul shukla 41aae38b14 view all & customer name 2018-11-29 12:12:44 +05:30
rahul shukla 5dc60d0fe1 customer group 2018-10-22 11:17:42 +05:30
jitendra 9756480f42 Theme issue fixed 2018-10-17 16:17:03 +05:30
rahul shukla 8009b5c647 error & loader 2018-10-17 13:10:08 +05:30