Commit Graph

774 Commits

Author SHA1 Message Date
Jitendra Singh 8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
Fixed checkout issue
2019-06-14 15:00:15 +05:30
jitendra 5b81968bae Fixed checkout issue 2019-06-14 14:59:29 +05:30
Prashant Singh 4bfefd3a07 base sync 2019-06-14 13:22:37 +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
rahul shukla 5afef79ac2 merge with master 2019-06-13 20:24:52 +05:30
jitendra 6e8c0da054 Fixed conflicts 2019-06-13 19:48:30 +05:30
jitendra 806f8f71f6 Added discount amount to cart item 2019-06-13 19:34:13 +05:30
Prashant Singh abf46c8a99 Added discount amount in cart item table 2019-06-13 19:30:00 +05:30
Prashant Singh a27bae1c2d All assets compiled for production 2019-06-13 19:08:42 +05:30
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 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +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
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 5585b503cf Car controller updated 2019-06-07 16:36:50 +05:30
jitendra ca4d9ef9ba Fixed js issue buy now button not exist 2019-06-07 15:42:58 +05:30
rahul shukla af67516c36 object added with event 2019-06-06 15:16:16 +05:30
rahul shukla 255664c4c0 back button implemented on checkout page 2019-06-04 16:36:42 +05:30
rahul shukla fc456c785f issue #850 2019-06-03 16:29:00 +05:30
jitendra 96e8556b54 Fixed mini cart layout 2019-05-31 18:30:09 +05:30
jitendra 8202f58284 Issue #932 fixed 2019-05-31 17:52:52 +05:30
jitendra 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
Jitendra Singh 49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
UI fixes for project
2019-05-30 13:25:59 +05:30
rahul shukla 3663391bf6 UI fixes for project 2019-05-30 11:52:06 +05:30
Jitendra Singh 3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
Development
2019-05-29 11:48:55 +05:30
rahul shukla d1199a6f26 issue #956 2019-05-29 11:35:17 +05:30
Jitendra Singh eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
Development
2019-05-28 17:06:25 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
jitendra fb394d974c Discount calculation added to the cart and discount added to the sales views 2019-05-23 18:44:16 +05:30
rahul shukla 27812ccd15 shipping title & footer text 2019-05-22 18:45:47 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 30942b3d25 product page changes 2019-05-21 19:36:20 +05:30
rahul shukla 898214e81e issue #925 2019-05-21 12:00:43 +05:30
rahul shukla ce99a4d9bb icon issue in layred navigation #issue 903 2019-05-09 12:28:48 +05:30
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
rahul shukla 6f494cc04b IE changes 2019-05-07 21:09:27 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30
rahul shukla b4a95b8d0c cart pages changes 2019-05-06 21:15:26 +05:30
rahul shukla 1b3653348d front end changes for IE 2019-05-06 20:52:43 +05:30
rahul shukla 87b732898d add & remove at cart page 2019-05-06 13:06:16 +05:30
Jiayu Shen 2816dd01e5
Merge branch 'master' into development 2019-05-01 22:38:42 +10:00
Jitendra Singh 52bc554e31
Merge pull request #895 from prateek-webkul/development
admin mail notification, review price
2019-05-01 17:58:12 +05:30
shenjiayu 8eea13db2d utilise Mail::queue to send emails 2019-05-01 21:31:03 +10:00
rahul shukla ca08b9a133 rtl css chages for category 2019-04-30 14:48:43 +05:30
prateek srivastava 4c101aa646 admin mail notification, review price 2019-04-30 12:55:11 +05:30
rahul shukla 507a41546d issue #890 2019-04-30 12:40:35 +05:30
rahul shukla 2674fbb9ca issue #850 2019-04-26 15:31:01 +05:30
Jitendra Singh 723ecc88d9
Merge pull request #871 from jitendra-webkul/jitendra
Update Cart in order make compatible for api and session guard
2019-04-24 15:57:07 +05:30
jitendra ee056ee917 Update Cart in order make compatible for api and session guard 2019-04-24 15:55:49 +05:30
Jitendra Singh 1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra
Configurable product add to cart issue fixed
2019-04-24 15:10:30 +05:30
jitendra ac03710f07 Configurable product add to cart issue fixed 2019-04-24 15:09:55 +05:30
rahul shukla 8b0787ad53 issue #835 2019-04-24 14:45:57 +05:30
rahul shukla e52c426600 dashboard & issue #841 2019-04-23 16:20:33 +05:30
rahul shukla 9903d23dfe change in category menu 2019-04-23 15:38:11 +05:30
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
jitendra b5c762b528 Created new route for 404 page 2019-04-23 12:43:42 +05:30
jitendra c585186a88 Issue #840 fixed 2019-04-23 10:33:10 +05:30
jitendra 7e826bef00 Issue #840 fixed 2019-04-18 15:50:03 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
rahul shukla 13ac4a9571 issue #824 2019-04-17 15:21:48 +05:30
rahul shukla 58ddc68520 issues 2019-04-17 12:56:33 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
jitendra dd90e63ade Fixed add to cart issue 2019-04-16 16:32:30 +05:30
jitendra 1dd23a5a39 Changed varaible name productFlat to product in product card page 2019-04-16 16:02:04 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +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
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
rahul shukla ee889cc259 upgrade code of zoom 2019-04-12 16:40:45 +05:30
rahul shukla 1caa3eb4f6 image zoom in rtl 2019-04-12 14:11:05 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development
Development
2019-04-10 13:25:43 +05:30
rahul shukla d1e38fe83b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 12:12:15 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 4f999ee34a changed shipment table content 2019-04-09 19:40:43 +05:30
naresh verma ab4c054292 changed shipment table 2019-04-09 18:52:44 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
Development
2019-04-09 15:52:46 +05:30
rahul shukla 6a7f247d7a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 15:30:52 +05:30
jitendra 6b247993e4 Theme finder issue fixed (Shop changes was reflecting in admin) 2019-04-09 15:22:45 +05:30
rahul shukla a3999d7a23 merge with master 2019-04-09 15:13:26 +05:30
rahul shukla 9d89ec816d comment, variable name changes 2019-04-09 14:17:18 +05:30
rahul shukla 09aa34b36a issue #749 fixed again & reduce query 2019-04-09 14:05:57 +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 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
Prashant Singh 09d6afc72a Implemented customer configuration based features:
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30