Commit Graph

2073 Commits

Author SHA1 Message Date
rahul shukla 0fc78c5d83 Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development 2019-06-13 14:51:24 +05:30
Prashant Singh a0b14391fb
Merge pull request #1019 from prashant-webkul/development
Development
2019-06-13 06:38:41 +05:30
Prashant Singh 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +05:30
Prashant Singh c86a699f69 Added status check in customer auth session creation function 2019-06-13 06:34:46 +05:30
Prashant Singh 86e918b041
Merge pull request #1018 from prashant-webkul/development
Added status and notes in customer model fillables
2019-06-13 06:31:36 +05:30
Prashant Singh 619b8b6c8b Added status and notes in customer model fillables 2019-06-13 06:28:29 +05:30
Prashant Singh 46e32e497e
Merge pull request #1017 from prashant-webkul/development
Development
2019-06-13 01:06:30 +05:30
Prashant Singh ec27ed4c8d added credit max in configuration 2019-06-13 01:05:29 +05:30
Prashant Singh 9a41904364 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-13 01:03:39 +05:30
Prashant Singh 4542c96b17 Fixed issue in core regarding buynow button passing static quantity as 1 is now removed 2019-06-12 15:16:06 +05:30
Prashant Singh 322205e28b
Merge pull request #1016 from prashant-webkul/development
added isset checks on admin dashboard causing some rendering issue wh…
2019-06-12 01:06:40 +05:30
Prashant Singh 76e43dcd58 added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated 2019-06-12 01:05:24 +05:30
rahul shukla 6a8c7a8784 assests compile for production 2019-06-11 16:40:13 +05:30
rahul shukla 5b1f300abf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-11 16:22:15 +05:30
rahul shukla 1a84a016fa bulk add to cart 2019-06-11 16:22:01 +05:30
Prashant Singh d26b4b5a72
Merge pull request #1012 from prashant-webkul/development
Development
2019-06-11 14:56:19 +05:30
Prashant Singh 22a81efdb3 fixed issue #1011 2019-06-11 14:51:28 +05:30
Prashant Singh 6b9be23cb0 fixed issue in cart rule for add condition button and exception while updating cart rule 2019-06-11 14:38:57 +05:30
Prashant Singh 359f5de7c9
Merge pull request #1008 from prashant-webkul/development
Development
2019-06-11 13:30:37 +05:30
Prashant Singh de126e38ed fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation 2019-06-11 12:32:34 +05:30
Prashant Singh a7592b233d Fixed bug #1003 2019-06-11 12:26:54 +05:30
Prashant Singh 64c249983d Fixed 2019-06-10 18:28:17 +05:30
Prashant Singh 5689482fa0
Merge pull request #1002 from prashant-webkul/development
Fixed bugs in creation of cart rule form
2019-06-10 18:26:49 +05:30
Prashant Singh 8b5ac835e0 Fixed bugs in creation of cart rule form 2019-06-10 18:26:12 +05:30
rahul shukla 8e37ebe7d5 conflict resolve 2019-06-10 17:13:30 +05:30
rahul shukla 80ac7bba72 customer document 2019-06-10 17:11:56 +05:30
Prashant Singh 0c67e69bcc
Merge pull request #1000 from prashant-webkul/development
Fixed bug in cart rule form
2019-06-10 16:47:30 +05:30
Prashant Singh e20e29b0bd Fixed bug in cart rule form 2019-06-10 16:44:39 +05:30
Prashant Singh 71ce9e744d
Merge pull request #999 from prashant-webkul/development
disabled customer groups from cart rules
2019-06-10 16:42:18 +05:30
Prashant Singh 451000c0d5 disabled customer groups from cart rules 2019-06-10 16:41:31 +05:30
Prashant Singh 79731c7991
Merge pull request #998 from prashant-webkul/development
fixed validation issues in cart rule #993 & #997
2019-06-10 15:30:21 +05:30
Prashant Singh 0d3539f3c9 fixed validation issues in cart rule #993 & #997 2019-06-10 15:29:19 +05:30
Prashant Singh a9519ec645
Merge pull request #996 from prashant-webkul/development
fixed issue #994
2019-06-10 15:22:31 +05:30
Prashant Singh cfb16da64a fixed issue #994 2019-06-10 15:21:45 +05:30
Prashant Singh cda92782d7
Merge pull request #992 from prashant-webkul/development
Removed php loc from require dev of composer.json
2019-06-10 13:58:01 +05:30
Prashant Singh 3b0ef1bade Removed php loc from require dev of composer.json 2019-06-10 13:57:09 +05:30
Prashant Singh 0161488948
Merge pull request #991 from prashant-webkul/development
Development
2019-06-10 13:41:14 +05:30
Prashant Singh c8f7608c46
Development (#990)
* 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

* removed an extra dependency from composer.json
2019-06-10 13:35:48 +05:30
Prashant Singh e495232c53 removed an extra dependency from composer.json 2019-06-10 13:34:24 +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 5efd8b88ef Altered cart rules to some extent 2019-06-10 13:17:53 +05:30
Prashant Singh a6a114c652 altered some frontend variables on onepage checkout 2019-06-08 21:08:42 +05:30
Prashant Singh 9058124f81 base sync with master 2019-06-08 20:38:21 +05:30
Prashant Singh 194fc51261 Cart rule frontend work done 2019-06-08 20:34:41 +05:30
Prashant Singh 3c16cbba73 provision to remove the couponable and non couponable rule had been added 2019-06-08 16:13:17 +05:30
Prashant Singh c791833425 cart rule bug fixes 2019-06-07 19:51:45 +05:30
Prashant Singh ccba7afbe2 Discount rule implemented. 2019-06-07 19:00:05 +05:30
Jitendra Singh b37ac65e13
Merge pull request #984 from jitendra-webkul/jitendra
Optional index for datagrid action
2019-06-07 18:00:22 +05:30
jitendra 66bd3e7989 Optional index for datagrid action 2019-06-07 17:59:38 +05:30
Jitendra Singh 6cdbcdc2dc
Merge pull request #983 from jitendra-webkul/jitendra
Car controller updated
2019-06-07 16:52:16 +05:30