fix(CouponCodeInput): mobile buttons adjusted

Related: quiqqer/template-cologne#103

src/QUI/ERP/Coupons/Events.php

@@ -13,10 +13,9 @@ use QUI\ERP\Coupons\Products\PhysicalCouponProductType;
 use QUI\ERP\Discount\EventHandling as DiscountEvents;
 use QUI\ERP\Order\AbstractOrder;
 use QUI\ERP\Order\Basket\Basket;
-use QUI\ERP\Order\Basket\BasketGuest;
 use QUI\ERP\Products\Handler\Fields;
 use QUI\ERP\Products\Interfaces\ProductInterface;
-use Quiqqer\Engine\Collector;
+use QUI\Smarty\Collector;
 
 use function array_merge;
 use function array_search;
@@ -40,7 +39,7 @@ class Events
      * @param QUI\Package\Package $Package
      * @return void
      */
-    public static function onPackageSetup(QUI\Package\Package $Package)
+    public static function onPackageSetup(QUI\Package\Package $Package): void
     {
         try {
             self::createProductFields();
@@ -52,7 +51,7 @@ class Events
     /**
      * event : on admin load footer
      */
-    public static function onAdminLoadFooter()
+    public static function onAdminLoadFooter(): void
     {
         echo '<script src="' . URL_OPT_DIR . 'quiqqer/coupons/bin/backend/load.js"></script>';
     }
@@ -61,11 +60,14 @@ class Events
      * Template event quiqqer/order: onQuiqqer::order::orderProcessBasketEnd
      *
      * @param Collector $Collector
-     * @param BasketGuest $Basket
-     * @param $Order
+     * @param mixed $Basket
+     * @param AbstractOrder|null $Order
      */
-    public static function templateOrderProcessBasketEnd(Collector $Collector, $Basket, $Order)
-    {
+    public static function templateOrderProcessBasketEnd(
+        Collector $Collector,
+        mixed $Basket,
+        AbstractOrder $Order = null
+    ): void {
         if (
             !($Basket instanceof Basket)
             && !($Basket instanceof QUI\ERP\Order\Basket\BasketOrder)
@@ -79,8 +81,11 @@ class Events
 
                 $CouponCode = Handler::getCouponCodeByCode($code);
                 $CouponCode->checkRedemption(QUI::getUserBySession());
-                $CouponCode->addToOrder($Order);
-            } catch (Exception $Exception) {
+
+                if ($Order instanceof QUI\ERP\Order\OrderInProcess) {
+                    $CouponCode->addToOrder($Order);
+                }
+            } catch (Exception) {
             }
         }
 
@@ -94,7 +99,7 @@ class Events
      * @throws QUI\ERP\Order\Exception
      * @throws QUI\Exception
      */
-    public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess)
+    public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess): void
     {
         $CurrentStep = $OrderProcess->getCurrentStep();
         $currentStep = $CurrentStep->getType();
@@ -137,17 +142,17 @@ class Events
     public static function onQuiqqerOrderBasketRemovePos(
         QUI\ERP\Order\Basket\Basket $Basket,
         $pos
-    ) {
+    ): void {
         $Order = null;
 
         try {
             $Order = $Basket->getOrder();
-        } catch (QUI\Exception $Exception) {
+        } catch (QUI\Exception) {
             $Orders = QUI\ERP\Order\Handler::getInstance();
 
             try {
                 $Order = $Orders->getLastOrderInProcessFromUser(QUI::getUserBySession());
-            } catch (QUI\Exception $Exception) {
+            } catch (QUI\Exception) {
             }
         }
 
@@ -159,6 +164,11 @@ class Events
 
 
         $Article = $Order->getArticles()->getArticle($pos);
+
+        if (!$Article) {
+            return;
+        }
+
         $customData = $Article->getCustomData();
         $orderCoupons = $Order->getDataEntry('quiqqer-coupons');
 
@@ -172,7 +182,7 @@ class Events
             return;
         }
 
-        // custom data has code params, so article is an coupon code
+        // custom data has code params, so article is a coupon code
         // we need to delete it
         if (in_array($articleCouponCode, $orderCoupons)) {
             $pos = array_search($articleCouponCode, $orderCoupons);
@@ -182,7 +192,7 @@ class Events
 
             try {
                 $Order->save();
-            } catch (QUI\Exception $Exception) {
+            } catch (QUI\Exception) {
             }
         }
 
@@ -222,15 +232,16 @@ class Events
     /**
      * event - on price factor init
      *
-     * @param $Basket
+     * @param mixed $Basket
      * @param QUI\ERP\Order\AbstractOrder $Order
      * @param QUI\ERP\Products\Product\ProductList $Products
+     * @throws QUI\Exception
      */
     public static function onQuiqqerOrderBasketToOrder(
-        $Basket,
+        mixed $Basket,
         QUI\ERP\Order\AbstractOrder $Order,
         QUI\ERP\Products\Product\ProductList $Products
-    ) {
+    ): void {
         $coupons = $Order->getDataEntry('quiqqer-coupons');
         $sessionCoupons = QUI::getSession()->get('quiqqer-coupons');
 
@@ -259,7 +270,7 @@ class Events
         $productCount = $Products->count();
         $subSum = $products['calculations']['subSum'];
 
-        $checkRedeemable = !$Order->isSuccessful(); // if order is successful we dont need a check
+        $checkRedeemable = !$Order->isSuccessful(); // if order is successful we don't need a check
         $OrderInProcess = $Order->getAttribute('OrderInProcess');
         $added = false;
 
@@ -278,7 +289,7 @@ class Events
             /* @var $Coupon CouponCode */
             try {
                 $Coupon = Handler::getCouponCodeByCode($coupon);
-            } catch (Exception $Exception) {
+            } catch (Exception) {
                 continue;
             }
 
@@ -297,7 +308,7 @@ class Events
 
                 if ($Discount->getAttribute('scope') === QUI\ERP\Discount\Handler::DISCOUNT_SCOPE_GRAND_TOTAL) {
                     // do nothing for this scope
-                    // since this scope requires all price factors etc, this cannot be calculated here
+                    // since this scope requires all price factors etc., this cannot be calculated here
                 } elseif (!DiscountEvents::isDiscountUsableWithPurchaseValue($Discount, $subSum)) {
                     continue;
                 }
@@ -356,10 +367,10 @@ class Events
      *
      * Redeem coupons used in (completed) orders
      *
-     * @param QUI\ERP\Order\Order|QUI\ERP\Order\OrderInProcess $Order
+     * @param AbstractOrder $Order
      * @return void
      */
-    public static function onQuiqqerOrderSuccessful($Order)
+    public static function onQuiqqerOrderSuccessful(AbstractOrder $Order): void
     {
         $coupons = $Order->getDataEntry('quiqqer-coupons');
 
@@ -381,7 +392,7 @@ class Events
      * @param $Order
      * @param $coupons
      */
-    protected static function addSessionCouponsToOrder($Order, $coupons)
+    protected static function addSessionCouponsToOrder($Order, $coupons): void
     {
         if (!is_array($coupons)) {
             return;
@@ -412,7 +423,7 @@ class Events
      * @param $Order
      * @param $coupon
      */
-    protected static function addCouponToOrder($Order, $coupon)
+    protected static function addCouponToOrder($Order, $coupon): void
     {
         if (!($Order instanceof QUI\ERP\Order\OrderInProcess)) {
             return;
@@ -434,7 +445,7 @@ class Events
             $Order->update();
 
             $CouponCode->addToOrder($Order);
-        } catch (Exception $Exception) {
+        } catch (Exception) {
         }
     }
 
@@ -443,7 +454,7 @@ class Events
      *
      * @return void
      */
-    public static function removeCouponsFromSession()
+    public static function removeCouponsFromSession(): void
     {
         QUI::getSession()->remove('quiqqer-coupons');
     }
@@ -454,7 +465,7 @@ class Events
      * @return void
      * @throws QUI\Exception
      */
-    protected static function createProductFields()
+    protected static function createProductFields(): void
     {
         $fields = [
             CouponProductsHandler::PRODUCT_FIELD_ID_TRANSFERABLE => [
@@ -622,7 +633,7 @@ class Events
             try {
                 Fields::getField($fieldId);
                 continue;
-            } catch (Exception $Exception) {
+            } catch (Exception) {
                 // Field does not exist -> create it
             }
 
@@ -660,7 +671,7 @@ class Events
      *
      * @throws QUI\Exception
      */
-    public static function onQuiqqerProductsProductCreate(ProductInterface $Product)
+    public static function onQuiqqerProductsProductCreate(ProductInterface $Product): void
     {
         if (!($Product instanceof DigitalCouponProductType) && !($Product instanceof PhysicalCouponProductType)) {
             return;
@@ -720,7 +731,7 @@ class Events
      * @throws CouponProductException
      * @throws QUI\Exception
      */
-    public static function onQuiqqerProductsProductActivate(ProductInterface $Product)
+    public static function onQuiqqerProductsProductActivate(ProductInterface $Product): void
     {
         if (!($Product instanceof DigitalCouponProductType) && !($Product instanceof PhysicalCouponProductType)) {
             return;
@@ -761,7 +772,7 @@ class Events
      * @param AbstractOrder $Order
      * @return void
      */
-    public static function onQuiqqerOrderCreated(AbstractOrder $Order)
+    public static function onQuiqqerOrderCreated(AbstractOrder $Order): void
     {
         QUI\ERP\Coupons\Products\Handler::createCouponCodesFromOrder($Order);
     }