refactor: refreshing of all stuff

ajax/frontend/basket.php

+<?php
+
+/**
+ * This file contains package_quiqqer_order-simple-checkout_ajax_frontend_basket
+ */
+
+QUI::$Ajax->registerFunction(
+    'package_quiqqer_order-simple-checkout_ajax_frontend_basket',
+    function ($orderHash) {
+        $Checkout = new QUI\ERP\Order\SimpleCheckout\Checkout([
+            'orderHash' => $orderHash
+        ]);
+
+        return $Checkout->getBasket();
+    },
+    ['orderHash']
+);

ajax/frontend/payments.php

@@ -7,6 +7,11 @@
 QUI::$Ajax->registerFunction(
     'package_quiqqer_order-simple-checkout_ajax_frontend_payments',
     function ($orderHash) {
+        $Checkout = new QUI\ERP\Order\SimpleCheckout\Checkout([
+            'orderHash' => $orderHash
+        ]);
+
+        return $Checkout->getPayments();
     },
     ['orderHash']
 );

ajax/frontend/update.php

@@ -29,7 +29,15 @@ function ($orderHash, $orderData) {
             $Order->removeShipping();
         }
 
+        if (!empty($orderData['payment'])) {
+            $Order->setPayment($orderData['payment']);
+        } else {
+            $Order->clearPayment();
+        }
+
         $Order->save();
+
+        return $Checkout->isValid();
     },
     ['orderHash', 'orderData']
 );

bin/frontend/controls/SimpleCheckout.js

@@ -2,10 +2,11 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
 
     'qui/QUI',
     'qui/controls/Control',
+    'qui/controls/loader/Loader',
     'qui/utils/Form',
     'Ajax'
 
-], function(QUI, QUIControl, QUIFormUtils, QUIAjax) {
+], function(QUI, QUIControl, QUILoader, QUIFormUtils, QUIAjax) {
     'use strict';
 
     return new Class({
@@ -30,13 +31,13 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
         },
 
         $onImport: function() {
+            this.BasketLoader = new QUILoader().inject(this.getElm().getElement('.quiqqer-simple-checkout-basket'));
+
             Promise.all([
                 this.$getControl(this.getElm().getElement('.quiqqer-simple-checkout-delivery')),
                 this.$getControl(this.getElm().getElement('.quiqqer-simple-checkout-shipping')),
                 this.$getControl(this.getElm().getElement('.quiqqer-simple-checkout-payment'))
             ]).then((instances) => {
-                console.log(instances);
-
                 this.$Delivery = instances[0];
                 this.$Shipping = instances[1];
                 this.$Payment = instances[2];
@@ -86,13 +87,34 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
             });
         },
 
+        $refreshBasket: function() {
+            console.log('$refreshBasket');
+
+            this.BasketLoader.show();
+
+            return new Promise((resolve) => {
+                QUIAjax.get('package_quiqqer_order-simple-checkout_ajax_frontend_basket', (basket) => {
+                    this.getElm().getElement('.quiqqer-simple-checkout-basket--sticky').set('html', basket);
+                    this.BasketLoader.hide();
+                    resolve();
+                }, {
+                    'package': 'quiqqer/order-simple-checkout'
+                });
+            });
+        },
+
         update: function() {
             console.log('update');
 
+            const PayButton = this.getElm().getElement('[name="pay"]');
+
             return new Promise((resolve) => {
                 const orderData = QUIFormUtils.getFormData(this.getElm().getElement('form'));
 
-                QUIAjax.post('package_quiqqer_order-simple-checkout_ajax_frontend_update', resolve, {
+                QUIAjax.post('package_quiqqer_order-simple-checkout_ajax_frontend_update', (isValid) => {
+                    PayButton.disabled = !isValid;
+                    this.$refreshBasket().then(resolve);
+                }, {
                     'package': 'quiqqer/order-simple-checkout',
                     orderData: JSON.encode(orderData)
                 });

bin/frontend/controls/SimpleCheckoutPayment.js

 define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleCheckoutPayment', [
 
     'qui/QUI',
-    'qui/controls/Control'
+    'qui/controls/Control',
+    'Ajax'
 
-], function(QUI, QUIControl) {
+], function(QUI, QUIControl, QUIAjax) {
     'use strict';
 
     return new Class({
@@ -11,6 +12,10 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
         Extends: QUIControl,
         Type: 'package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleCheckoutPayment',
 
+        Binds: [
+            '$onChange'
+        ],
+
         initialize: function(options) {
             this.parent(options);
 
@@ -20,11 +25,48 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
         },
 
         $onImport: function() {
+            this.$registerEvents();
+        },
+
+        $registerEvents: function() {
+            this.getElm().getElements('[type="radio"]').addEvent('change', this.$onChange);
+            this.getElm().getElements('[type="radio"]').forEach((Node) => {
+                Node.getParent('.quiqqer-order-step-payments-list-entry').addEvent('click', (e) => {
+                    let Target = e.target;
 
+                    if (!Target.hasClass('quiqqer-order-step-payments-list-entry')) {
+                        Target = Target.getParent('.quiqqer-order-step-payments-list-entry');
+                    }
+
+                    Target.getElement('input').set('checked', true);
+                    this.$onChange();
+                });
+            });
+        },
+
+        $onChange: function(e) {
+            if (typeOf(e) === 'domevent') {
+                e.stop();
+            }
+
+            this.fireEvent('change');
         },
 
         refresh: function() {
-            
+            return new Promise(() => {
+                QUIAjax.get('package_quiqqer_order-simple-checkout_ajax_frontend_payments', (html) => {
+                    const Ghost = new Element('div', {
+                        html: html
+                    });
+
+                    this.getElm().set('html', Ghost.getFirst('div').get('html'));
+                    Ghost.getElements('style').inject(this.getElm());
+
+                    this.$registerEvents();
+                }, {
+                    'package': 'quiqqer/order-simple-checkout'
+                });
+            });
         }
     });
 });

locale.xml

@@ -10,6 +10,10 @@
             <de><![CDATA[ ]]></de>
             <en><![CDATA[ ]]></en>
         </locale>
+        <locale name="title.contact">
+            <de><![CDATA[Konto / Kontakt]]></de>
+            <en><![CDATA[Account / Contact]]></en>
+        </locale>
     </groups>
 
 </locales>
\ No newline at end of file

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

+

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

+{template_event name="quiqqer::order::simple::basket::begin"}
+{$UniqueArticles->toHTML()}
+{template_event name="quiqqer::order::simple::basket::beforeCheckoutButton"}

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

+<?php
+
+namespace QUI\ERP\Order\SimpleCheckout;
+
+use QUI;
+use QUI\ERP\Order\Basket\Exception;
+use QUI\ERP\Order\Basket\ExceptionBasketNotFound;
+
+use function dirname;
+
+class Basket extends QUI\Control
+{
+    protected Checkout $Checkout;
+
+    /**
+     * @throws ExceptionBasketNotFound
+     * @throws Exception
+     * @throws QUI\Database\Exception
+     */
+    public function __construct(Checkout $Checkout, $attributes = [])
+    {
+        $this->Checkout = $Checkout;
+
+        parent::__construct($attributes);
+
+        $this->addCSSFile(dirname(__FILE__) . '/Basket.css');
+    }
+
+    /**
+     * @return string
+     * @throws QUI\Exception
+     */
+    public function getBody(): string
+    {
+        $Engine = QUI::getTemplateManager()->getEngine();
+        $Order = $this->Checkout->getOrder();
+        $Articles = $Order->getArticles();
+
+        if (!$Articles->count()) {
+            return '';
+        }
+
+        $Articles->setCurrency($Order->getCurrency());
+        $UniqueArticles = $Articles->toUniqueList();
+        $UniqueArticles->hideHeader();
+
+        $Engine->assign([
+            'UniqueArticles' => $UniqueArticles
+        ]);
+
+        return $Engine->fetch(dirname(__FILE__) . '/Basket.html');
+    }
+
+}

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

 <div class="quiqqer-simple-checkout-container">
     <form class="quiqqer-simple-checkout-data" method="post" action="">
+
+
+        {template_event name="quiqqer::order::orderProcessBasketEnd" Basket=$Basket Order=$Order assign=expressButtons}
+        {if !empty($expressButtons)}
         <div class="quiqqer-simple-checkout-data-express">
             <p>Express checkout</p>
-            <div></div>
+            <div>
+                {$expressButtons}
+            </div>
         </div>
 
         <div class="quiqqer-simple-checkout-data-or" role="separator">
             <div>OR</div>
         </div>
+        {/if}
 
         <div class="quiqqer-simple-checkout-data-contact">
-            <h1>Contact</h1>
+            <h1>
+                {locale group="quiqqer/order-simple-checkout" var="title.contact"}
+            </h1>
 
             {if $User}
             <div>Eingeloggt als: {$User->getName()}</div>
@@ -22,28 +31,30 @@
         </div>
 
         <div class="quiqqer-simple-checkout-data-delivery">
-            <h1>Delivery</h1>
+            <h1>{locale group="quiqqer/order" var="ordering.step.title.CustomerData"}</h1>
             {$Delivery->create()}
         </div>
 
         <div class="quiqqer-simple-checkout-data-shipping">
-            <h1>Shipping</h1>
+            <h1>{locale group="quiqqer/shipping" var="ordering.step.title.Shipping"}</h1>
             {$Shipping->create()}
         </div>
 
         <div class="quiqqer-simple-checkout-data-payment">
-            <h1>Payment</h1>
+            <h1>{locale group="quiqqer/order" var="ordering.step.title.Payment"}</h1>
             {$Payment->create()}
         </div>
 
         <div class="quiqqer-simple-checkout-data-pay">
-            <button name="pay" disabled>Pay now</button>
+            <button name="pay" disabled>
+                {locale group="quiqqer/order" var="ordering.btn.pay.to.order"}
+            </button>
         </div>
     </form>
 
     <section class="quiqqer-simple-checkout-basket">
         <div class="quiqqer-simple-checkout-basket--sticky">
-            {$Basket->create()}
+            {$BasketDisplay->create()}
         </div>
     </section>
 </div>
\ No newline at end of file

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

@@ -42,13 +42,14 @@ public function getBody(): string
             $template = $this->getAttribute('template');
         }
 
-        $Control = new QUI\ERP\Order\Controls\Basket\Small();
-        $Control->setBasket(
-            QUI\ERP\Order\Handler::getInstance()->getBasketFromUser($this->getUser())
-        );
+        // put the basket articles to the order in process
+        $Basket = QUI\ERP\Order\Handler::getInstance()->getBasketFromUser($this->getUser());
+        $Basket->toOrder($this->getOrder());
 
         $Engine->assign([
-            'Basket' => $Control,
+            'Order' => $this->getOrder(),
+            'Basket' => $Basket,
+            'BasketDisplay' => new Basket($this),
             'User' => $this->getUser(),
             'Delivery' => new CheckoutDelivery($this),
             'Shipping' => new CheckoutShipping($this),
@@ -58,22 +59,41 @@ public function getBody(): string
         return $Engine->fetch($template);
     }
 
-    public function send()
+    /**
+     * Check if the order is valid and the order can be executed
+     *
+     * @return bool Returns true if the order is valid, false otherwise.
+     */
+    public function isValid(): bool
     {
-        $Order = $this->getOrder();
+        // check address
+        try {
+            $Order = $this->getOrder();
 
-        // set all stuff to the order
-        $Order->setInvoiceAddress();
-        $Order->setShipping();
-        $Order->setPayment();
+            QUI\ERP\Order\Controls\OrderProcess\CustomerData::validateAddress(
+                $Order->getInvoiceAddress()
+            );
+        } catch (QUI\Exception $exception) {
+            return false;
+        }
+
+        // check payment
+        $Payment = $Order->getPayment();
 
+        if (!$Payment) {
+            return false;
+        }
 
-        // all runs fine
-        if ($Order instanceof OrderInProcess) {
-            $OrderInProcess = $Order;
-            $Order = $Order->createOrder();
-            $OrderInProcess->delete();
+        // check shipping
+        if (QUI::getPackageManager()->isInstalled('quiqqer/shipping') && !$Order->getShipping()) {
+            return false;
         }
+
+        return true;
+    }
+
+    public function send()
+    {
     }
 
     // region getter
@@ -134,7 +154,47 @@ public function getShipping(): string
         $result = $Shipping->create();
         $css = QUI\Control\Manager::getCSS();
 
-        return $Output->parse($css . $result);
+        try {
+            return $Output->parse($css . $result);
+        } catch (QUI\Exception $exception) {
+            QUI\System\Log::writeException($exception);
+            return '';
+        }
+    }
+
+    /**
+     * Get the payment html for the current order.
+     *
+     * @return string The shipping information
+     */
+    public function getPayments(): string
+    {
+        $Payments = new CheckoutPayment($this);
+        $Output = new QUI\Output();
+        $result = $Payments->create();
+        $css = QUI\Control\Manager::getCSS();
+
+        try {
+            return $Output->parse($css . $result);
+        } catch (QUI\Exception $exception) {
+            QUI\System\Log::writeException($exception);
+            return '';
+        }
+    }
+
+    public function getBasket(): string
+    {
+        $Basket = new Basket($this);
+        $Output = new QUI\Output();
+        $result = $Basket->create();
+        $css = QUI\Control\Manager::getCSS();
+
+        try {
+            return $Output->parse($css . $result);
+        } catch (QUI\Exception $exception) {
+            QUI\System\Log::writeException($exception);
+            return '';
+        }
     }
 
     //endregion

src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutPayment.html

+{if !isset($Payment)}
 <div class="order-simple-checkout-payment--info">
     Enter your delivery address to view available payment methods.
-</div>
\ No newline at end of file
+</div>
+{else}
+{$Payment->create()}
+{/if}
\ No newline at end of file

src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutPayment.php

@@ -3,6 +3,7 @@
 namespace QUI\ERP\Order\SimpleCheckout\Steps;
 
 use QUI;
+use QUI\ERP\Accounting\Payments\Order\Payment;
 use QUI\ERP\Order\SimpleCheckout\Checkout;
 use QUI\ERP\Order\SimpleCheckout\CheckoutStepInterface;
 
@@ -28,6 +29,20 @@ public function __construct(Checkout $Checkout, $attributes = [])
     public function getBody(): string
     {
         $Engine = QUI::getTemplateManager()->getEngine();
+        $Delivery = new CheckoutDelivery($this->Checkout);
+
+        try {
+            $Delivery->validate();
+        } catch (QUI\Exception $exception) {
+            return $Engine->fetch(dirname(__FILE__) . '/CheckoutPayment.html');
+        }
+
+
+        $Payment = new Payment([
+            'Order' => $this->Checkout->getOrder()
+        ]);
+
+        $Engine->assign('Payment', $Payment);
 
         return $Engine->fetch(dirname(__FILE__) . '/CheckoutPayment.html');
     }

src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutShipping.css

@@ -2,3 +2,7 @@
     background: #f5f5f5;
     padding: 1.7rem;
 }
+
+.quiqqer-simple-checkout-payment .quiqqer-order-step-payments header {
+    display: none;
+}