Design v2

.gitignore

@@ -7,6 +7,7 @@
 *.exe
 *.o
 *.so
+cache
 
 ######################
 # Packages           #

composer.json

@@ -111,12 +111,12 @@
     "stof/doctrine-extensions-bundle": "^1.6",
     "sylius/theme-bundle": "^2.2",
     "symfony/dotenv": "^6.3",
+    "symfony/form": "^6.3",
     "symfony/http-client": "^6.3",
     "symfony/intl": "^6.3",
     "symfony/notifier": "^6.3",
     "symfony/serializer": "^6.3",
     "symfony/twig-bundle": "^6.3",
-    "symfony/form": "^6.3",
     "webmozart/assert": "^1.10"
   },
   "require-dev": {

features/ui/frontend/cart/adding_product_to_cart.feature

@@ -11,7 +11,7 @@ Feature: Adding a product to the cart
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding a product to the cart as a logged in customer
@@ -23,5 +23,5 @@ Feature: Adding a product to the cart
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "RACING CAR"
+        And this item should have name "Racing Car"
         And I should see "Racing Car" with unit price "€1,000.00" in my cart

features/ui/frontend/cart/adding_product_to_cart_with_maximum_qty.feature

@@ -13,19 +13,19 @@ Feature: Adding a product to the cart with maximum Quantity to Order
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with less than minimum quantity to order
         Given the product "TShirt" has a maximum order quantity of "100"
         When I add 101 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that I can only order a maximum of 100 of TSHIRT
+        And  I should be notified that I can only order a maximum of 100 of TShirt
 
 
     Scenario: Adding product to cart with less than minimum quantity to order with smaller quantities
         Given the product "TShirt" has a maximum order quantity of "2"
         When I add 3 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that I can only order a maximum of 2 of TSHIRT
+        And  I should be notified that I can only order a maximum of 2 of TShirt
 

features/ui/frontend/cart/adding_product_to_cart_with_minimum_qty.feature

@@ -13,19 +13,19 @@ Feature: Adding a product to the cart with minimum Quantity to Order
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with less than minimum quantity to order
         Given the product "TShirt" has a minimum order quantity of "100"
         When I add 99 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that I need to order at least 100 of TSHIRT
+        And I should be notified that I need to order at least 100 of TShirt
 
 
     Scenario: Adding product to cart with less than minimum quantity to order with smaller quantities
         Given the product "TShirt" has a minimum order quantity of "2"
         When I add 1 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that I need to order at least 2 of TSHIRT
+        And I should be notified that I need to order at least 2 of TShirt
 

features/ui/frontend/cart/adding_product_to_cart_with_out_of_stock_product.feature

@@ -15,13 +15,13 @@ Feature: Adding a product to the cart with a Product that is tracked and out-of-
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
 
     Scenario: Adding product to cart with more than stocked quantity
         When I add 3 of this product to the cart
         Then I should be on the cart summary page
-        And  I should be notified that TSHIRT does not have sufficient stock
+        And  I should be notified that TShirt does not have sufficient stock
 
     Scenario: Adding product, with on-hold stock, to cart with more than stocked quantity
         Given the product has 2 on hold
@@ -31,5 +31,5 @@ Feature: Adding a product to the cart with a Product that is tracked and out-of-
         Given the product has 1 on hold
         When I add 2 of this product to the cart
         Then I should be on the cart summary page
-        And I should be notified that TSHIRT does not have sufficient stock
+        And I should be notified that TShirt does not have sufficient stock
 

features/ui/frontend/cart/automatic_cart_price_rule.feature

@@ -15,7 +15,7 @@ Feature: Getting an automatic cart price rule
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
         And my cart's total should be "€80.00"
 
@@ -25,6 +25,6 @@ Feature: Getting an automatic cart price rule
         Then I should be on the cart summary page
         And I should be notified that the product has been successfully added
         And there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
         And I should see "TShirt" with unit price "€100.00" in my cart
         And my cart's total should be "€70.00"

features/ui/frontend/cart/keep_cart_after_login.feature

@@ -13,11 +13,11 @@ Feature: Maintaining cart after login
         When I log in as "[email protected]" with "cybertruck" password
         And I see the summary of my cart
         Then there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"
 
     Scenario: Having cart maintained after registration
         Given I add this product to the cart
         When I register with email "[email protected]" and password "bigbigbooster"
         And I see the summary of my cart
         Then there should be one item in my cart
-        And this item should have name "TSHIRT"
+        And this item should have name "TShirt"

features/ui/frontend/category/view_category.feature

@@ -56,13 +56,13 @@ Feature: Viewing a product details
     When I switch to category "Coats" on main menu
     Then I should see 3 products in the category list
     And I change order to "Name Descending"
-    And I should see products in order "WINTER COAT,RAIN COAT,JACKET" in list
+    And I should see products in order "Winter Coat,Rain Coat,Jacket" in list
     And I change order to "Name Ascending"
-    And I should see products in order "JACKET,RAIN COAT,WINTER COAT" in list
+    And I should see products in order "Jacket,Rain Coat,Winter Coat" in list
     When I switch to category "Shoes" on left menu
     And I change order to "Name Descending"
-    And I should see products in order "SHOE 2,SHOE" in list
+    And I should see products in order "Shoe 2,Shoe" in list
     And I switch to view to "grid"
-    And I should see products in order "SHOE 2,SHOE" in grid
+    And I should see products in order "Shoe 2,Shoe" in grid
     And I change order to "Name Ascending"
-    And I should see products in order "SHOE,SHOE 2" in grid
+    And I should see products in order "Shoe,Shoe 2" in grid

features/ui/frontend/payment/concurrency.feature

@@ -10,6 +10,7 @@ Feature: Create a new order
     And the site has a tax rule group "AT"
     And the tax rule group has a tax rule for country "Austria" with tax rate "AT"
     And the site has a product "T-Shirt" priced at 2000
+    And the product is active and published and available for store "Austria"
     And the product has the tax rule group "AT"
     And the site has a customer "[email protected]"
     And the customer "[email protected]" has an address with country "Austria", "4600", "Wels", "Freiung", "9-11/N3"

src/CoreShop/Behat/Context/Ui/Frontend/CartContext.php

@@ -159,23 +159,23 @@ public function shouldBeOnMyCartSummaryPage(): void
      */
     public function iShouldBeNotifiedThatItHasBeenSuccessfullyAdded(): void
     {
-        $this->notificationChecker->checkNotification('ITEM ADDED', NotificationType::success());
+        $this->notificationChecker->checkNotification('Item added', NotificationType::success());
     }
 
     /**
      * @Then I should be notified that the voucher has been applied
      */
     public function iShouldBeNotifiedThatTheVoucherHasBeenApplied(): void
     {
-        $this->notificationChecker->checkNotification('VOUCHER HAS BEEN SUCCESSFULLY APPLIED', NotificationType::success());
+        $this->notificationChecker->checkNotification('Voucher has been successfully applied', NotificationType::success());
     }
 
     /**
      * @Then I should be notified that the voucher is invalid
      */
     public function iShouldBeNotifiedThatTheVoucherIsInvalid(): void
     {
-        $this->notificationChecker->checkNotification('THIS VOUCHER IS INVALID', NotificationType::error());
+        $this->notificationChecker->checkNotification('This voucher is invalid', NotificationType::error());
     }
 
     /**
@@ -184,7 +184,7 @@ public function iShouldBeNotifiedThatTheVoucherIsInvalid(): void
     public function iShouldBeNotifiedThatItNeedToOrderAtLeastOf(string $quantity, string $productName): void
     {
         $this->notificationChecker->checkNotification(
-            sprintf('YOU NEED TO ORDER AT LEAST %s UNITS OF %s.', $quantity, $productName),
+            sprintf('You need to order at least %s units of %s.', $quantity, $productName),
             NotificationType::error(),
         );
     }
@@ -195,7 +195,7 @@ public function iShouldBeNotifiedThatItNeedToOrderAtLeastOf(string $quantity, st
     public function iShouldBeNotifiedThatICanOnlyOrderAMaximumQuantityOf(string $quantity, string $productName): void
     {
         $this->notificationChecker->checkNotification(
-            sprintf('YOU CAN ORDER A MAXIMUM OF %s UNITS OF %s.', $quantity, $productName),
+            sprintf('You can order a maximum of %s units of %s.', $quantity, $productName),
             NotificationType::error(),
         );
     }
@@ -206,7 +206,7 @@ public function iShouldBeNotifiedThatICanOnlyOrderAMaximumQuantityOf(string $qua
     public function iShouldBeNotifiedThatDoesNotHaveSufficientStock(string $productName): void
     {
         $this->notificationChecker->checkNotification(
-            sprintf('%s DOES NOT HAVE SUFFICIENT STOCK.', $productName),
+            sprintf('%s does not have sufficient stock.', $productName),
             NotificationType::error(),
         );
     }

src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php

@@ -148,7 +148,7 @@ public function specifyAddressPhoneNumber(?string $phoneNumber): void
 
     public function acceptTermsOfService(): void
     {
-        $this->getElement('terms_of_service')->check();
+        $this->getElement('terms_of_service')->click();
     }
 
     protected function getDefinedElements(): array

src/CoreShop/Behat/Page/Frontend/Checkout/CustomerPage.php

@@ -111,7 +111,7 @@ public function specifyGuestAddressCountry(?int $country): void
 
     public function acceptTermsOfService(): void
     {
-        $this->getElement('terms_of_service')->check();
+        $this->getElement('terms_of_service')->click();
     }
 
     public function submitGuestCheckout(): void

src/CoreShop/Behat/Page/Frontend/Checkout/SummaryPage.php

@@ -34,12 +34,12 @@ public function submitOrder(): void
 
     public function acceptTermsOfService(): void
     {
-        $this->getElement('terms_of_service')->check();
+        $this->getElement('terms_of_service')->click();
     }
 
     public function declineTermsOfService(): void
     {
-        $this->getElement('terms_of_service')->uncheck();
+        $this->getElement('terms_of_service')->click();
     }
 
     public function submitQuote(): void

src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php

@@ -62,18 +62,18 @@
 
 class CartController extends FrontendController
 {
-    public function widgetAction(Request $request, ShopperContextInterface $shopperContext): Response
+    public function widgetAction(Request $request): Response
     {
         $multiCartEnabled = $this->getParameter('coreshop.storage_list.multi_list.order');
 
         $params = [
             'cart' => $this->getCart(),
-            'multi_cart_enabled' => $this->getParameter('coreshop.storage_list.multi_list.order')
+            'multi_cart_enabled' => $this->getParameter('coreshop.storage_list.multi_list.order'),
         ];
 
         if ($multiCartEnabled) {
             $form = $this->container->get('form.factory')->createNamed('coreshop', CartListType::class, ['list' => $this->getCart()], [
-                'context' => $shopperContext->getContext(),
+                'context' => $this->container->get(ShopperContextInterface::class)->getContext(),
             ]);
 
             $params['form'] = $form->createView();

src/CoreShop/Bundle/FrontendBundle/Controller/Extend/CartWidgetController.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * CoreShop
+ *
+ * This source file is available under two different licenses:
+ *  - GNU General Public License version 3 (GPLv3)
+ *  - CoreShop Commercial License (CCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ * @copyright  Copyright (c) CoreShop GmbH (https://www.coreshop.org)
+ * @license    https://www.coreshop.org/license     GPLv3 and CCL
+ *
+ */
+
+namespace CoreShop\Bundle\FrontendBundle\Controller\Extend;
+
+use CoreShop\Bundle\FrontendBundle\Controller\FrontendController;
+use CoreShop\Component\Core\Context\ShopperContextInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class CartWidgetController extends FrontendController
+{
+    private ShopperContextInterface $shopperContext;
+
+    public function __construct(
+        ShopperContextInterface $shopperContext,
+        ContainerInterface $container,
+    ) {
+        parent::__construct($container);
+        $this->shopperContext = $shopperContext;
+    }
+
+    public function cartNumberAction(): JsonResponse
+    {
+        $items = $this->shopperContext->getCart()->getItems();
+
+        return new JsonResponse(count($items));
+    }
+}

src/CoreShop/Bundle/FrontendBundle/DependencyInjection/CoreShopFrontendExtension.php

@@ -48,6 +48,8 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('coreshop.frontend.category.default_sort_name', $configs['category']['default_sort_name']);
         $container->setParameter('coreshop.frontend.category.default_sort_direction', $configs['category']['default_sort_direction']);
 
+        $container->setParameter('coreshop.frontend_dir', dirname(__DIR__));
+
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
     }

src/CoreShop/Bundle/FrontendBundle/Resources/assets/js/app.ts

@@ -0,0 +1,22 @@
+/* STYLES  */
+import '../scss/app.scss';
+import 'swiper/css/bundle';
+
+/* JS */
+import 'bootstrap';
+import './scripts/handle-prototypes.js';
+import './plugin/coreshop.plugin.quantity.js';
+import './plugin/coreshop.plugin.variant.js';
+import './scripts/shop.js';
+import './scripts/variant.js';
+import './scripts/map.js';
+import {Carousel} from './scripts/carousel';
+//import {CartInfo} from './scripts/cartInfo';
+
+document.addEventListener('DOMContentLoaded', function () {
+    // const CartWidget = new CartInfo('/coreshop_get_cart_items', '.js-cart-widget');
+    const CarouselProducts = new Carousel();
+
+    //console.log(CartWidget);
+    console.log(CarouselProducts);
+})