Merge branch 'main' into 'next-3.x'

Update 'next-3.x' with latest changes from 'main'

See merge request !148

locale.xml

@@ -250,8 +250,8 @@
             <en><![CDATA[Copy from order #[orderId]]]></en>
         </locale>
         <locale name="message.basket.is.empty">
-            <de><![CDATA[Ihr Warenkorb enthält keine Produkte.]]></de>
-            <en><![CDATA[There are no products in your shopping cart.]]></en>
+            <de><![CDATA[Ihr Warenkorb enthält keine Produkte]]></de>
+            <en><![CDATA[There are no products in your shopping cart]]></en>
         </locale>
 
         <locale name="control.basket.buttonAdd.text">

src/QUI/ERP/Order/AbstractOrder.php

@@ -474,8 +474,10 @@ protected function setDataBaseData(array $data): void
      * @param QUI\Interfaces\Users\User|null $PermissionUser
      * @return ErpEntityInterface|null
      */
-    public function reversal(string $reason = '', null | QUI\Interfaces\Users\User $PermissionUser = null): ?ErpEntityInterface
-    {
+    public function reversal(
+        string $reason = '',
+        null | QUI\Interfaces\Users\User $PermissionUser = null
+    ): ?ErpEntityInterface {
         $this->delete($PermissionUser);
         return null;
     }
@@ -1167,7 +1169,6 @@ public function setCurrency(QUI\ERP\Currency\Currency $Currency): void
      * Set a customer to the order
      *
      * @param array|User|QUI\Interfaces\Users\User $User
-     * @throws Exception
      * @throws QUI\Exception
      * @throws ExceptionStack
      */
@@ -1264,6 +1265,7 @@ public function setCustomer(QUI\Interfaces\Users\User | array | User $User): voi
                 QUI::getEvents()->fireEvent('onQuiqqerOrderCustomerChange', [$this]);
             }
 
+            $this->Articles?->setUser($this->Customer);
             return;
         }
 
@@ -1277,6 +1279,7 @@ public function setCustomer(QUI\Interfaces\Users\User | array | User $User): voi
                 QUI::getEvents()->fireEvent('onQuiqqerOrderCustomerChange', [$this]);
             }
 
+            $this->Articles?->setUser($this->Customer);
             return;
         }
 
@@ -1293,6 +1296,8 @@ public function setCustomer(QUI\Interfaces\Users\User | array | User $User): voi
             if ($this->customerId !== $oldCustomerId) {
                 QUI::getEvents()->fireEvent('onQuiqqerOrderCustomerChange', [$this]);
             }
+
+            $this->Articles?->setUser($this->Customer);
         }
     }
 
@@ -1303,6 +1308,7 @@ public function removeCustomer(): void
     {
         $this->Customer = null;
         $this->customerId = 0;
+        $this->Articles->setUser(null);
 
         try {
             QUI::getEvents()->fireEvent('onQuiqqerOrderCustomerChange', [$this]);

src/QUI/ERP/Order/Controls/Basket/Basket.css

+.quiqqer-order-controls-basket {
+    --_min-Height: var(--min-Height, 30dvh);
+    --_decorative-element-height: var(--decorative-element-height, 1rem);
+    --_decorative-element-width: var(--decorative-element-width, 0.25rem);
+    --_decorative-element-rotation: var(--decorative-element-rotation, 35deg);
+
+    min-height: var(--_min-Height);
+}
+
+:where(.quiqqer-order-basket-articles .offer-original-price) {
+    display: block;
+    font-size: 0.875rem;
+    text-decoration: line-through;
+}
+
+:where(.quiqqer-order-controls-basket .quiqqer-order-basket-isEmpty) {
+    text-align: center;
+    min-height: var(--_min-Height);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+:where(.quiqqer-order-controls-basket .quiqqer-order-basket-isEmpty__iconContainer) {
+    font-size: 5rem;
+    opacity: 0.5;
+}
+
+:where(.quiqqer-order-controls-basket .quiqqer-order-basket-isEmpty__text) {
+    max-width: 40ch;
+    margin-inline: auto;
+    margin-top: 1rem;
+    font-size: 1.25rem;
+
+    opacity: 0;
+    animation-name: fadeIn;
+    animation-duration: 0.3s;
+    animation-delay: 0.25s;
+    animation-fill-mode: forwards;
+    animation-timing-function: ease;
+}
+
+:where(.quiqqer-order-controls-basket .quiqqer-order-basket-isEmpty__icon) {
+    opacity: 0;
+    animation-name: fadeInIcon;
+    animation-duration: 0.3s;
+    animation-fill-mode: forwards;
+    animation-delay: 0.35s;
+    animation-timing-function: ease;
+}
+
+:where(.quiqqer-order-controls-basket .decorative-element) {
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: end;
+    gap: 0.5rem;
+}
+
+:where(.quiqqer-order-controls-basket .decorative-element__line) {
+    display: inline-block;
+    width: var(--_decorative-element-width);
+    height: var(--_decorative-element-height);
+    background: currentColor;
+    flex-shrink: 0;
+    border-radius: 0.25rem;
+    opacity: 0;
+
+    animation-name: fadeInWithSlideDecorationEls;
+    animation-duration: 0.3s;
+    animation-fill-mode: forwards;
+    animation-timing-function: ease;
+}
+
+:where(.quiqqer-order-controls-basket .decorative-element__line--1) {
+    --transform-start: translateY(5px) rotate(calc(var(--_decorative-element-rotation) * -1)) scaleY(0);
+    --transform-end: translateY(0) rotate(calc(var(--_decorative-element-rotation) * -1)) scaleY(1);
+
+    transform-origin: bottom left;
+    transform: var(--transform-start);
+    animation-delay: 0.5s;
+}
+
+:where(.quiqqer-order-controls-basket .decorative-element__line--2) {
+    --transform-start: translateY(5px) scaleY(0);
+    --transform-end: translateY(0) scaleY(1);
+
+    transform-origin: bottom center;
+    height: calc(var(--_decorative-element-height) * 1.35);
+    transform: var(--transform-start);
+    animation-delay: 0.45s;
+}
+
+:where(.quiqqer-order-controls-basket .decorative-element__line--3) {
+    --transform-start: translateY(5px) rotate(var(--_decorative-element-rotation)) scaleY(0);
+    --transform-end: translateY(0) rotate(var(--_decorative-element-rotation)) scaleY(1);
+
+    transform-origin: bottom right;
+    transform: var(--transform-start);
+    animation-delay: 0.55s;
+}
+
+/* state: loading */
+:where(.quiqqer-order-basket-isLoading) {
+    min-height: var(--_min-Height);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 4rem;
+    opacity: 0.5;
+}
+
+/* keyframes */
+@keyframes fadeIn {
+    from {
+        opacity: 0;
+    }
+
+    to {
+        opacity: 1;
+    }
+}
+
+@keyframes fadeInIcon {
+    from {
+        opacity: 0;
+        transform: translateY(10px) scale(0.95);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0) scale(1);
+    }
+}
+
+@keyframes fadeInWithSlideDecorationEls {
+    from {
+        opacity: 0;
+        transform: var(--transform-start);
+    }
+
+    to {
+        opacity: 0.75;
+        transform: var(--transform-end);
+    }
+}
+
+/* disable animation */
+@media (prefers-reduced-motion: reduce) {
+    .animation {
+        animation: none;
+    }
+
+    .decorative-element__line.animation {
+        opacity: 0.75;
+        transform: var(--transform-end)
+    }
+
+    .quiqqer-order-basket-isEmpty__text.animation {
+        opacity: 1;
+    }
+}
\ No newline at end of file

src/QUI/ERP/Order/Controls/Basket/Basket.html

@@ -227,11 +227,23 @@
 
 {elseif $this->isGuest() && $this->isLoading()}
 <div class="quiqqer-order-basket-isLoading">
-    <span class="fa fa-spinner fa-spin"></span>
+    <div class="quiqqer-order-basket-isLoading__inner">
+        <span class="fa fa-circle-notch fa-spin"></span>
+    </div>
 </div>
 {else}
 <div class="quiqqer-order-basket-isEmpty">
-    {locale group="quiqqer/order" var="message.basket.is.empty"}
+    <div class="quiqqer-order-basket-isEmpty__iconContainer">
+        <div class="decorative-element">
+            <div class="decorative-element__line decorative-element__line--1 animation"></div>
+            <div class="decorative-element__line decorative-element__line--2 animation"></div>
+            <div class="decorative-element__line decorative-element__line--3 animation"></div>
+        </div>
+        <i class="fa-solid fa-cart-shopping quiqqer-order-basket-isEmpty__icon animation"></i>
+    </div>
+    <div class="quiqqer-order-basket-isEmpty__text animation">
+        {locale group="quiqqer/order" var="message.basket.is.empty"}
+    </div>
 </div>
 {/if}
 

src/QUI/ERP/Order/Controls/Basket/Basket.php

@@ -49,6 +49,10 @@ public function __construct(array $attributes = [])
 
         parent::__construct($attributes);
 
+        $this->addCSSFile(dirname(__FILE__) . '/Basket.css');
+
+        $this->addCSSClass('quiqqer-order-controls-basket');
+
         $this->setAttributes([
             'data-qui' => 'package/quiqqer/order/bin/frontend/controls/basket/Basket'
         ]);

src/QUI/ERP/Order/Controls/OrderProcess/Basket.css

@@ -17,10 +17,3 @@
 .quiqqer-order-btn-submit:hover {
     background: #538018;
 }
-
-.offer-original-price {
-    clear: both;
-    display: block;
-    font-size: 80%;
-    text-decoration: line-through;
-}