add additional elegibility-test

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### NEW
 
 - All PayPal payment methods have "PayPal" as a prefix in a fresh installation to better identify them in the admin panel. When setting up payment methods, the merchant can decide which name best fits their needs.
+- Additional check of eligibility for unbranded payments
 - Move PayPal-Config to Config-Section in Admin > Module-List > Module > Options
 
 ### FIX

metadata.php

@@ -494,6 +494,42 @@
             'value' => false,
             'group' => null
         ],
+        [
+            'name' => 'oscPayPalEpsEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalPrzelewy24Eligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSepaEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalBlikEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalBanContactEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalIDealEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
         [
             'name' => 'oscPayPalSandboxAcdcEligibility',
             'type' => 'bool',
@@ -524,6 +560,42 @@
             'value' => false,
             'group' => null
         ],
+        [
+            'name' => 'oscPayPalSandboxEpsEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSandboxPrzelewy24Eligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSandboxSepaEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSandboxBlikEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSandboxBanContactEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalSandboxIDealEligibility',
+            'type' => 'bool',
+            'value' => false,
+            'group' => null
+        ],
         [
             'name' => 'oscPayPalSCAContingency',
             'type' => 'select',
@@ -570,7 +642,35 @@
         [
             'name' => 'oscPayPalUseStructuralCustomIdSchema',
             'type' => 'bool',
-            'value' => false,
+            'value' => true,
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalButtonStyleLayout',
+            'type' => 'select',
+            'constraints' => 'vertical|horizontal',
+            'value' => 'vertical',
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalButtonStyleColor',
+            'type' => 'select',
+            'constraints' => 'gold|blue|silver|white|black',
+            'value' => 'gold',
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalButtonStyleShape',
+            'type' => 'select',
+            'constraints' => 'rect|pill|sharp',
+            'value' => 'rect',
+            'group' => null
+        ],
+        [
+            'name' => 'oscPayPalButtonStyleLabel',
+            'type' => 'select',
+            'constraints' => 'paypal|checkout|buynow|pay|installment',
+            'value' => 'paypal',
             'group' => null
         ],
     ],

src/Controller/PaymentController.php

@@ -43,7 +43,7 @@
 
         $user = $this->getUser();
 
         if ($user) {
             $isVaultingPossible = false;
             $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
             if ($moduleSettings->getIsVaultingActive() && $user->getFieldData('oxpassword')) {
@@ -57,7 +57,7 @@
                 ($paypalCustomerId = $user->getFieldData("oscpaypalcustomerid"))
             ) {
                 $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
                 $vaultedPaymentTokens = $vaultingService->getVaultPaymentTokens($paypalCustomerId)["payment_tokens"];
                 if ($vaultedPaymentTokens) {
                     $vaultedPaymentSources = [];
                     $uniquePaypalVaultedPaymentSources = [];
@@ -65,7 +65,7 @@
                         foreach ($vaultedPaymentToken["payment_source"] as $paymentType => $paymentSource) {
                             if ($paymentType === "card" && $moduleSettings->isVaultingAllowedForACDC()) {
                                 $string = $lang->translateString("OSC_PAYPAL_CARD_ENDING_IN");
                                 $vaultedPaymentSources[$paymentType][] = $paymentSource["brand"] . " " .
                                     $string . $paymentSource["last_digits"];
                             } elseif ($paymentType === "paypal" && $moduleSettings->isVaultingAllowedForPayPal()) {
                                 $string = $lang->translateString("OSC_PAYPAL_CARD_PAYPAL_PAYMENT");
@@ -83,7 +83,7 @@
 
                                 $uniquePaypalVaultedPaymentSources[$email][] = $payer_id;
                                 $vaultedPaymentSources[$paymentType][] =
                                     $string . " " . $email;
                             }
                         }
                     }
@@ -126,7 +126,7 @@
         $paymentList = [];
         $payPalHealth = $this->getServiceFromContainer(ModuleSettings::class)->checkHealth();
         $basket = Registry::getSession()->getBasket();
         $isCalculationModeNetto = $basket ? $basket->isCalculationModeNetto() : false;
 
         /*
          * check:
@@ -138,7 +138,7 @@
          * - netto-mode
          */
 
         foreach ($paymentListRaw as $key => $payment) {
             if (
                 !isset($payPalDefinitions[$key]) ||
                 (
@@ -161,7 +161,10 @@
                     )
                 )
             ) {
-                if ($key !== PayPalDefinitions::EXPRESS_PAYPAL_PAYMENT_ID || PayPalSession::isPayPalExpressOrderActive()) {
+                if (
+                    $key !== PayPalDefinitions::EXPRESS_PAYPAL_PAYMENT_ID
+                    || PayPalSession::isPayPalExpressOrderActive()
+                ) {
                     $paymentList[$key] = $payment;
                 }
             }
@@ -176,6 +179,34 @@
         if (!$this->getServiceFromContainer(ModuleSettings::class)->isPuiEligibility()) {
             unset($paymentList[PayPalDefinitions::PUI_PAYPAL_PAYMENT_ID]);
         }
+        // check GooglePay Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isGooglePayEligibility()) {
+            unset($paymentList[PayPalDefinitions::GOOGLEPAY_PAYPAL_PAYMENT_ID]);
+        }
+        // check ApplePay Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isApplePayEligibility()) {
+            unset($paymentList[PayPalDefinitions::APPLEPAY_PAYPAL_PAYMENT_ID]);
+        }
+        // check Eps Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isEpsEligibility()) {
+            unset($paymentList[PayPalDefinitions::EPS_PAYPAL_PAYMENT_ID]);
+        }
+        // check Przelewy24 Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isPrzelewy24Eligibility()) {
+            unset($paymentList[PayPalDefinitions::PRZELEWY24_PAYPAL_PAYMENT_ID]);
+        }
+        // check Blik Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isBlikEligibility()) {
+            unset($paymentList[PayPalDefinitions::BLIK_PAYPAL_PAYMENT_ID]);
+        }
+        // check BanContact Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isBanContactEligibility()) {
+            unset($paymentList[PayPalDefinitions::BANCONTACT_PAYPAL_PAYMENT_ID]);
+        }
+        // check iDeal Eligibility
+        if (!$this->getServiceFromContainer(ModuleSettings::class)->isIDealEligibility()) {
+            unset($paymentList[PayPalDefinitions::IDEAL_PAYPAL_PAYMENT_ID]);
+        }
 
         return $paymentList;
     }