Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 53cd7010 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

refactor: code style

Übergeordneter 8e6d6642
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace QUI\ERP\Coupons; namespace QUI\ERP\Coupons;
use Exception;
use QUI; use QUI;
use QUI\ERP\Accounting\Calc as ErpCalc; use QUI\ERP\Accounting\Calc as ErpCalc;
use QUI\ERP\Coupons\Handler as CouponsHandler; use QUI\ERP\Coupons\Handler as CouponsHandler;
...@@ -17,6 +18,15 @@ ...@@ -17,6 +18,15 @@
use QUI\ERP\Products\Interfaces\ProductInterface; use QUI\ERP\Products\Interfaces\ProductInterface;
use Quiqqer\Engine\Collector; use Quiqqer\Engine\Collector;
use function array_merge;
use function array_search;
use function array_unique;
use function in_array;
use function is_array;
use function is_string;
use function json_decode;
use function json_encode;
/** /**
* Class Events * Class Events
* *
...@@ -34,7 +44,7 @@ public static function onPackageSetup(QUI\Package\Package $Package) ...@@ -34,7 +44,7 @@ public static function onPackageSetup(QUI\Package\Package $Package)
{ {
try { try {
self::createProductFields(); self::createProductFields();
} catch (\Exception $Exception) { } catch (Exception $Exception) {
QUI\System\Log::writeException($Exception); QUI\System\Log::writeException($Exception);
} }
} }
...@@ -69,7 +79,7 @@ public static function templateOrderProcessBasketEnd(Collector $Collector, $Bask ...@@ -69,7 +79,7 @@ public static function templateOrderProcessBasketEnd(Collector $Collector, $Bask
$CouponCode = Handler::getCouponCodeByCode($code); $CouponCode = Handler::getCouponCodeByCode($code);
$CouponCode->checkRedemption(QUI::getUserBySession()); $CouponCode->checkRedemption(QUI::getUserBySession());
$CouponCode->addToOrder($Order); $CouponCode->addToOrder($Order);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
} }
} }
...@@ -94,11 +104,11 @@ public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess) ...@@ -94,11 +104,11 @@ public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess)
$coupons = QUI::getSession()->get('quiqqer-coupons'); $coupons = QUI::getSession()->get('quiqqer-coupons');
if (\is_string($coupons)) { if (is_string($coupons)) {
$coupons = \json_decode($coupons, true); $coupons = json_decode($coupons, true);
} }
if (!\is_array($coupons)) { if (!is_array($coupons)) {
$coupons = []; $coupons = [];
} }
...@@ -106,7 +116,7 @@ public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess) ...@@ -106,7 +116,7 @@ public static function onOrderProcess(QUI\ERP\Order\OrderProcess $OrderProcess)
$coupons[] = $_GET['coupon']; $coupons[] = $_GET['coupon'];
} }
$coupons = \array_unique($coupons); $coupons = array_unique($coupons);
if (empty($coupons)) { if (empty($coupons)) {
return; return;
...@@ -163,8 +173,8 @@ public static function onQuiqqerOrderBasketRemovePos( ...@@ -163,8 +173,8 @@ public static function onQuiqqerOrderBasketRemovePos(
// custom data has code params, so article is an coupon code // custom data has code params, so article is an coupon code
// we need to delete it // we need to delete it
if (\in_array($articleCouponCode, $orderCoupons)) { if (in_array($articleCouponCode, $orderCoupons)) {
$pos = \array_search($articleCouponCode, $orderCoupons); $pos = array_search($articleCouponCode, $orderCoupons);
unset($orderCoupons[$pos]); unset($orderCoupons[$pos]);
$Order->setData('quiqqer-coupons', $orderCoupons); $Order->setData('quiqqer-coupons', $orderCoupons);
...@@ -179,15 +189,15 @@ public static function onQuiqqerOrderBasketRemovePos( ...@@ -179,15 +189,15 @@ public static function onQuiqqerOrderBasketRemovePos(
// we need to delete it // we need to delete it
$coupons = QUI::getSession()->get('quiqqer-coupons'); $coupons = QUI::getSession()->get('quiqqer-coupons');
if (\is_string($coupons)) { if (is_string($coupons)) {
$coupons = \json_decode($coupons, true); $coupons = json_decode($coupons, true);
} }
if (!\is_array($coupons) || empty($coupons)) { if (!is_array($coupons) || empty($coupons)) {
return; return;
} }
if (!\in_array($customData['code'], $coupons)) { if (!in_array($customData['code'], $coupons)) {
return; return;
} }
...@@ -204,7 +214,7 @@ public static function onQuiqqerOrderBasketRemovePos( ...@@ -204,7 +214,7 @@ public static function onQuiqqerOrderBasketRemovePos(
if (empty($newCouponList)) { if (empty($newCouponList)) {
QUI::getSession()->remove('quiqqer-coupons'); QUI::getSession()->remove('quiqqer-coupons');
} else { } else {
QUI::getSession()->set('quiqqer-coupons', \json_encode($newCouponList)); QUI::getSession()->set('quiqqer-coupons', json_encode($newCouponList));
} }
} }
...@@ -223,18 +233,18 @@ public static function onQuiqqerOrderBasketToOrder( ...@@ -223,18 +233,18 @@ public static function onQuiqqerOrderBasketToOrder(
$coupons = $Order->getDataEntry('quiqqer-coupons'); $coupons = $Order->getDataEntry('quiqqer-coupons');
$sessionCoupons = QUI::getSession()->get('quiqqer-coupons'); $sessionCoupons = QUI::getSession()->get('quiqqer-coupons');
if (!\is_array($coupons)) { if (!is_array($coupons)) {
$coupons = []; $coupons = [];
} }
if (\is_string($sessionCoupons)) { if (is_string($sessionCoupons)) {
$sessionCoupons = \json_decode($sessionCoupons, true); $sessionCoupons = json_decode($sessionCoupons, true);
if (\is_array($sessionCoupons)) { if (is_array($sessionCoupons)) {
$coupons = \array_merge($coupons, $sessionCoupons); $coupons = array_merge($coupons, $sessionCoupons);
} }
$coupons = \array_unique($coupons); $coupons = array_unique($coupons);
self::addSessionCouponsToOrder($Order, $sessionCoupons); self::addSessionCouponsToOrder($Order, $sessionCoupons);
} }
...@@ -266,7 +276,7 @@ public static function onQuiqqerOrderBasketToOrder( ...@@ -266,7 +276,7 @@ public static function onQuiqqerOrderBasketToOrder(
/* @var $Coupon CouponCode */ /* @var $Coupon CouponCode */
try { try {
$Coupon = Handler::getCouponCodeByCode($coupon); $Coupon = Handler::getCouponCodeByCode($coupon);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
continue; continue;
} }
...@@ -359,7 +369,7 @@ public static function onQuiqqerOrderSuccessful($Order) ...@@ -359,7 +369,7 @@ public static function onQuiqqerOrderSuccessful($Order)
try { try {
$CouponCode = CouponsHandler::getCouponCodeByCode($couponCode); $CouponCode = CouponsHandler::getCouponCodeByCode($couponCode);
$CouponCode->redeem($Order->getCustomer(), $Order); $CouponCode->redeem($Order->getCustomer(), $Order);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
QUI\System\Log::writeException($Exception); QUI\System\Log::writeException($Exception);
} }
} }
...@@ -371,7 +381,7 @@ public static function onQuiqqerOrderSuccessful($Order) ...@@ -371,7 +381,7 @@ public static function onQuiqqerOrderSuccessful($Order)
*/ */
protected static function addSessionCouponsToOrder($Order, $coupons) protected static function addSessionCouponsToOrder($Order, $coupons)
{ {
if (!\is_array($coupons)) { if (!is_array($coupons)) {
return; return;
} }
...@@ -416,13 +426,13 @@ protected static function addCouponToOrder($Order, $coupon) ...@@ -416,13 +426,13 @@ protected static function addCouponToOrder($Order, $coupon)
$coupons = $Order->getDataEntry('quiqqer-coupons'); $coupons = $Order->getDataEntry('quiqqer-coupons');
$coupons[] = $code; $coupons[] = $code;
$coupons = \array_unique($coupons); $coupons = array_unique($coupons);
$Order->setData('quiqqer-coupons', $coupons); $Order->setData('quiqqer-coupons', $coupons);
$Order->update(); $Order->update();
$CouponCode->addToOrder($Order); $CouponCode->addToOrder($Order);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
} }
} }
...@@ -610,7 +620,7 @@ protected static function createProductFields() ...@@ -610,7 +620,7 @@ protected static function createProductFields()
try { try {
Fields::getField($fieldId); Fields::getField($fieldId);
continue; continue;
} catch (\Exception $Exception) { } catch (Exception $Exception) {
// Field does not exist -> create it // Field does not exist -> create it
} }
...@@ -627,7 +637,7 @@ protected static function createProductFields() ...@@ -627,7 +637,7 @@ protected static function createProductFields()
'options' => !empty($field['options']) ? $field['options'] : null, 'options' => !empty($field['options']) ? $field['options'] : null,
'requiredField' => !empty($field['requiredField']) ? 1 : 0 'requiredField' => !empty($field['requiredField']) ? 1 : 0
]); ]);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
QUI\System\Log::writeException($Exception); QUI\System\Log::writeException($Exception);
continue; continue;
} }
...@@ -679,7 +689,7 @@ public static function onQuiqqerProductsProductCreate(ProductInterface $Product) ...@@ -679,7 +689,7 @@ public static function onQuiqqerProductsProductCreate(ProductInterface $Product)
$Field->setValue($value); $Field->setValue($value);
$Product->addOwnField($Field); $Product->addOwnField($Field);
} catch (\Exception $Exception) { } catch (Exception $Exception) {
QUI\System\Log::writeException($Exception); QUI\System\Log::writeException($Exception);
} }
} }
...@@ -693,7 +703,7 @@ public static function onQuiqqerProductsProductCreate(ProductInterface $Product) ...@@ -693,7 +703,7 @@ public static function onQuiqqerProductsProductCreate(ProductInterface $Product)
try { try {
$Product->update(QUI::getUsers()->getSystemUser()); $Product->update(QUI::getUsers()->getSystemUser());
} catch (\Exception $Exception) { } catch (Exception $Exception) {
QUI\System\Log::writeException($Exception); QUI\System\Log::writeException($Exception);
} }
} }
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren