Commit Graph

404 Commits

Author SHA1 Message Date
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
Florian Bosdorff d125f9eba0 add reporting for try-catch-sections 2020-01-27 17:06:03 +01:00
Jitendra Singh 8176317a59 Removed commented code 2020-01-27 16:46:58 +05:30
Jitendra Singh 25d94ea944 Issue #2087 fixed 2020-01-27 16:41:25 +05:30
Steffen Mahler a5c49e4b76 button 'update cart' will only be shown if corresponding products are in cart 2020-01-24 07:15:49 +01:00
Jitendra Singh 956259cc32
Merge pull request #2123 from rahulshukla-webkul/development
Issue #2087
2020-01-23 11:51:19 +05:30
rahul shukla 2d8f5f412e Issue #2087 2020-01-23 10:42:09 +05:30
Florian Bosdorff 61d9b59e5f Merge master into issue-1183/guest-checkout-configuration 2020-01-22 08:10:45 +01:00
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Jitendra Singh 7d7e86e85c Issue #2058 fixed 2020-01-17 12:05:28 +05:30
Annika Wolff 91d6586ad8 resolve exception, rename function haveDownloadableItems 2020-01-15 11:53:48 +01:00
Annika Wolff a75f3dab51 resolve conflicts 2020-01-15 11:37:38 +01:00
Jitendra Singh cf36d252a0 Issue #1764 fixed 2020-01-13 12:44:36 +05:30
Jitendra Singh 9fbe756075 Fixed review controller compact undefined variable issue 2020-01-10 15:14:29 +05:30
Jitendra Singh d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
Annika Wolff d47201af75 bugfixed quantity update when showQuantityBox is false 2019-12-27 14:41:32 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
shubhammehrotra.symfony@webkul.com 992d09e8d5 check guest customer configuration 2019-12-19 16:04:55 +05:30
shubhammehrotra.symfony@webkul.com cf837ba290 throw exception when session user is not available on product review page 2019-12-19 15:53:01 +05:30
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla dbf404d13f Issue #1787 2019-12-11 15:25:19 +05:30
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
MonaHartdegen e57cd8e552 added numbers to regex for products and categories route 2019-11-25 14:22:49 +01:00
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
jitendra 2446f56413 Issue #1746, #1271, #1735 fixed 2019-11-12 13:52:38 +05:30
Jitendra Singh 6537f66441
Merge pull request #1739 from jitendra-webkul/jitendra
Issue #1732 fixed
2019-11-05 13:12:33 +05:30
jitendra 803957c894 Issue #1732 fixed 2019-11-05 13:11:11 +05:30
Jitendra Singh ede889703e
Merge pull request #1737 from jitendra-webkul/jitendra
Issue #1347 fixed
2019-11-05 12:45:22 +05:30
jitendra 8347e1770b Issue #1347 fixed 2019-11-05 12:44:26 +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 163ce17e34 Issue #1662 fixed 2019-10-31 13:50:17 +05:30
Jitendra Singh b0b2e26ef2
Merge pull request #1365 from KarimQaderi/patch-5
change route pages to page
2019-10-24 10:37:41 +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 ce6766b305 design changes and fixed minor issue 2019-10-21 15:37:51 +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 a3bb10a8b6 Issue #1568 fixed 2019-10-11 11:46:19 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
jitendra 8545d5ef3c Unlimited download link issue fixed 2019-09-06 19:46:25 +05:30
jitendra 55fa22af6c Virtual product add to cart issue fixed 2019-09-05 15:36:28 +05:30
jitendra 94290e6742 Option mission message added for configurable, group and bundle products during add cart 2019-09-04 17:33:55 +05:30
jitendra 55f888c1df Shop tranlation case fixed 2019-09-04 17:23:53 +05:30
Karim Qaderi c088ee1f45
change route pages to page 2019-08-29 18:43:53 +04: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 bd6e0c9345 Structural changes in CMS pages. Fixed bugs #1300, #1295 2019-08-16 17:43:58 +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 6a8bb7982d Base sync 2019-08-06 14:37:03 +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
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
rahul shukla 9cd9846d65 set locale on session if not available 2019-07-23 17:47:19 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
jitendra b7d346260a Resolve conflicts 2019-07-01 17:12:44 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +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
rahul shukla 79b5e1c4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 14:38:48 +05:30
rahul shukla a9090e991c download for image & file type 2019-06-27 14:38:24 +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 9a92a61724 try & catch added in buynow 2019-06-26 16:40:15 +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 eaa755bbea Fixed discount on frontend 2019-06-15 13:13:07 +05:30
Prashant Singh c36950c609 applied translation string in apply coupon responses 2019-06-14 20:26:54 +05:30
Prashant Singh 0188644fce Prepared standard responses when applying couponable rules 2019-06-14 20:04:32 +05:30
Prashant Singh 1e865986c4 improved conditions check in applying cart rules 2019-06-14 19:24:15 +05:30
Prashant Singh da82f2935c removed some dead code 2019-06-14 17:55:03 +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 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 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
rahul shukla fc456c785f issue #850 2019-06-03 16:29:00 +05:30
jitendra 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
shenjiayu 8eea13db2d utilise Mail::queue to send emails 2019-05-01 21:31:03 +10:00
rahul shukla 507a41546d issue #890 2019-04-30 12:40:35 +05:30
jitendra ee056ee917 Update Cart in order make compatible for api and session guard 2019-04-24 15:55:49 +05:30
jitendra ac03710f07 Configurable product add to cart issue fixed 2019-04-24 15:09:55 +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 58ddc68520 issues 2019-04-17 12:56:33 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
Development
2019-04-09 15:52:46 +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 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 82e56334c2 Fixed modal style issues, localization of routes issue and updated description string of version command 2019-04-07 06:30:55 +05:30
rahulshukla-webkul 9314d9159c Development (#789)
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop
2019-04-03 11:37:48 +05:30
rahul shukla 9e58602262 issue #758 2019-04-02 13:24:11 +05:30
Prashant Singh 06aa4dd6bf Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:45:56 +05:30
Prashant Singh 40ebb3a0c4 Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:43:44 +05:30
Prashant Singh 4a2efc8eee fixed issue #749 2019-04-01 01:32:58 +05:30
rahul shukla 257dfc8b1e rtl css for product list & currency capital 2019-03-29 16:48:00 +05:30
Prashant Singh fef1b2d8da Fixing of 3rd level menu issue for custom roles #705 2019-03-28 18:09:29 +05:30
rahul shukla d4c58724ae issue #728 2019-03-28 15:36:48 +05:30
rahul shukla fb6b4a13f1 issue #738 2019-03-28 14:29:45 +05:30
rahul shukla 23fe05e192 issue #742 2019-03-28 10:10:26 +05:30
Prashant Singh c84e76646e Fixed issue #720 2019-03-20 10:13:27 +05:30
jitendra 12a4c6dc09 Fixed conflict and Assets compiled for prodcution 2019-03-12 12:04:55 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Prashant Singh 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Jay Thanki 727e6a2b89
subscriber_email email changes
change email subscriber_email as footer field assign to this field.
2019-03-08 11:31:31 +05:30
jitendra 570442ad3e Fixed cart controller issue 2019-02-27 13:07:27 +05:30
Prashant Singh 5e704a4979 more testcases for customer authentication 2019-02-23 17:23:46 +05:30
rahul shukla 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
rahul shukla a7f545fcf4 issue #594 2019-02-20 19:11:46 +05:30
jitendra d2f620bb9f Issue fixed (If configurable product added to cart without options) 2019-02-15 19:38:10 +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
Prashant Singh 3a69f76b96 Fixed issue #368 2019-01-29 16:05:30 +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 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 575373cd75 Coding standard updated 2019-01-15 17:32:43 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
jitendra 239d151887 Cart add event code updated 2019-01-07 16:11:11 +05:30
jitendra 16cb592130 Event added to cart 2019-01-07 16:00:28 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30