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

Next 2.x

See merge request !45

bin/frontend/controls/SimpleCheckout.js

@@ -219,6 +219,27 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
                 });
             }
 
+            if (!this.getAttribute('products') && !this.getAttribute('orderHash')) {
+                // load from basket
+                return new Promise((resolve) => {
+                    require(['package/quiqqer/order/bin/frontend/Basket'], (Basket) => {
+                        if (!Basket.isLoaded()) {
+                            Basket.addEvent('load', () => {
+                                resolve(Basket);
+                            });
+                        } else {
+                            resolve(Basket);
+                        }
+                    });
+                }).then((Basket) => {
+                    return Basket.toOrder();
+                }).then((orderHash) => {
+                    this.setAttribute('orderHash', orderHash);
+
+                    return this.$loadOrder();
+                });
+            }
+
             return Promise.resolve({
                 order: false
             });

locale.xml

@@ -115,10 +115,6 @@
             <de><![CDATA[Bitte füge Deiner Bestellung / Deinem Warenkorb Artikel hinzu.]]></de>
             <en><![CDATA[Please add items to your order / shopping cart.]]></en>
         </locale>
-        <locale name="ordering.btn.continue.basket">
-            <de><![CDATA[Zurück zum Warenkorb]]></de>
-            <en><![CDATA[Back to shopping cart]]></en>
-        </locale>
         <locale name="orderSimpleCheckout.settings.disableProductLinks">
             <de><![CDATA[Keine Produktlinks]]></de>
             <en><![CDATA[No product links]]></en>

src/QUI/ERP/Order/SimpleCheckout/Basket.ArticleList.html

@@ -68,7 +68,7 @@
                          alt="{$Article->getAttribute('title')|escape:'html'}"
                         class="articleList-entry__img" style="width: var(--_imgWidth);"
                     />
-                {if $disableProductLinks}
+                {if !$disableProductLinks}
                 </a>
                 {/if}
             </div>

src/QUI/ERP/Order/SimpleCheckout/Checkout.html

@@ -118,7 +118,7 @@
 
                 {if $this->getAttribute('showBasketLink') && $BasketSite}
                     <a href="{url Site=$BasketSite}" class="quiqqer-simple-checkout-basket__link">
-                        {locale group="quiqqer/order" var="ordering.btn.continue.basket"}
+                        {locale group="quiqqer/order" var="ordering.btn.backToBasket"}
                     </a>
                 {/if}
             </div>