Merge pull request #435 from OXID-eSales/PSPAYPAL-803

move functionality to model

Author: mariolorenz

metadata.php

@@ -7,7 +7,6 @@
 
 use OxidEsales\Eshop\Application\Component\BasketComponent;
 use OxidEsales\Eshop\Application\Component\UserComponent;
-use OxidEsales\Eshop\Application\Controller\Admin\PaymentMain;
 use OxidEsales\Eshop\Application\Controller\OrderController;
 use OxidEsales\Eshop\Application\Controller\PaymentController;
 use OxidEsales\Eshop\Application\Controller\Admin\OrderMain;
@@ -27,7 +26,6 @@
 use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalConfigController;
 use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalOrderController;
 use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderMain as PayPalOrderMainController;
-use OxidSolutionCatalysts\PayPal\Controller\Admin\PaymentMain as PayPalPaymentMainController;
 use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderOverview as PayPalOrderOverviewController;
 use OxidSolutionCatalysts\PayPal\Controller\OrderController as PayPalFrontEndOrderController;
 use OxidSolutionCatalysts\PayPal\Controller\PaymentController as PayPalPaymentController;
@@ -82,7 +80,6 @@
         UserComponent::class => PayPalUserComponent::class,
         BasketComponent::class => PayPalBasketComponent::class,
         OrderMain::class => PayPalOrderMainController::class,
-        PaymentMain::class => PayPalPaymentMainController::class,
         OrderOverview::class => PayPalOrderOverviewController::class,
         State::class => PayPalState::class
     ],

src/Controller/Admin/PaymentMain.php

@@ -7,6 +7,7 @@
 
 namespace OxidSolutionCatalysts\PayPal\Model;
 
+use OxidEsales\Eshop\Core\Field;
 use OxidSolutionCatalysts\PayPal\Core\PayPalDefinitions;
 
 class Payment extends Payment_parent
@@ -40,4 +41,18 @@ public function isDeprecatedPayment(): bool
     {
         return PayPalDefinitions::isDeprecatedPayment($this->getId());
     }
+
+    /**
+     * @inheritDoc
+     *
+     * @return string|bool
+     */
+    public function save()
+    {
+        // PayPalExpress could not be a default Payment
+        if ($this->getId() === PayPalDefinitions::EXPRESS_PAYPAL_PAYMENT_ID) {
+            $this->oxpayments__oxchecked = new Field(0);
+        }
+        return parent::save();
+    }
 }

src/Model/Payment.php

@@ -296,5 +296,4 @@
 
     'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE'           => 'PayPal Inhalte des benutzerdefinierten ID-Feldes',
     'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC'            => 'Das benutzerdefinierte PayPal-ID-Feld kann entweder nur den Bestellnummernwert oder ein JSON mit zusätzlichen Daten enthalten.',
-    'OSC_PAYPAL_PAYMENT_METHOD_CANNOT_BE_DEFAULT'   => 'Dieses Zahlungsart kann nicht als Standart-Zahlungsart verwendet werden.',
 ];

views/admin/de/admin_lang.php

@@ -295,6 +295,4 @@
 
     'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE'           => 'PayPal custom id field contents',
     'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC'            => 'PayPal custom id field will be JSON encoded string with order number, shop version and the PayPal module version.',
-
-    'OSC_PAYPAL_PAYMENT_METHOD_CANNOT_BE_DEFAULT'   => 'This payment method cannot be set as default',
 ];