Merge pull request #524 from fatchip-Stefan/SW-452

SW-452
PAYONE-GmbH · Jul 22, 2024 · 78fb0d9 · 78fb0d9
2 parents 45a2519 + b1c671e
commit 78fb0d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/Frontend/MoptPaymentPayone/Components/Classes/PayoneFormHandler.php b/Frontend/MoptPaymentPayone/Components/Classes/PayoneFormHandler.php
@@ -265,13 +265,8 @@ protected function proccessIdeal($formData)
     {
         $paymentData = array();
 
-        if ($formData['mopt_payone__ideal_bankgrouptype'] == 'not_choosen') {
-            $paymentData['sErrorFlag']['mopt_payone__ideal_bankgrouptype'] = true;
-        } else {
-            $paymentData['formData']['mopt_payone__ideal_bankgrouptype'] = $formData['mopt_payone__ideal_bankgrouptype'];
-            $paymentData['formData']['mopt_payone__onlinebanktransfertype'] = Payone_Api_Enum_OnlinebanktransferType::IDEAL;
-            $paymentData['formData']['mopt_payone__ideal_bankcountry'] = 'NL';
-        }
+        $paymentData['formData']['mopt_payone__onlinebanktransfertype'] = Payone_Api_Enum_OnlinebanktransferType::IDEAL;
+        $paymentData['formData']['mopt_payone__ideal_bankcountry'] = 'NL';
 
         $this->setFormSubmittedFlag();
 

diff --git a/Frontend/MoptPaymentPayone/Components/Classes/PayoneParamBuilder.php b/Frontend/MoptPaymentPayone/Components/Classes/PayoneParamBuilder.php
@@ -1020,7 +1020,6 @@ public function getPaymentInstantBankTransfer($router, $paymentData)
             $session->offsetSet('isIdealredirect', true);
             $params['onlinebanktransfertype'] = 'IDL';
             $params['bankcountry'] = $paymentData['mopt_payone__ideal_bankcountry'];
-            $params['bankgrouptype'] = $paymentData['mopt_payone__ideal_bankgrouptype'];
             $params['successurl'] = $this->payonePaymentHelper->assembleTokenizedUrl($router, array('action' => 'success',
                 'forceSecure' => true, 'appendSession' => false));
             $params['errorurl'] = $router->assemble(array('action' => 'failure',

diff --git a/Frontend/MoptPaymentPayone/Components/Payone/Api/Adapter/Http/Abstract.php b/Frontend/MoptPaymentPayone/Components/Payone/Api/Adapter/Http/Abstract.php
@@ -168,6 +168,10 @@ public function setParams(array $params)
      */
     public function getParams()
     {
+        if (empty($this->params['bankgrouptype'])) {
+            unset($this->params['bankgrouptype']);
+        }
+
         return $this->params;
     }
 

diff --git a/Frontend/MoptPaymentPayone/Views/frontend/plugins/payment/mopt_paymentmean_ideal.tpl b/Frontend/MoptPaymentPayone/Views/frontend/plugins/payment/mopt_paymentmean_ideal.tpl
@@ -1,26 +1,4 @@
 {namespace name='frontend/MoptPaymentPayone/payment'}
 
 <div class="payment--form-group">
-    <div class="select-field">
-        <select name="moptPaymentData[mopt_payone__ideal_bankgrouptype]" 
-                id="mopt_payone__ideal_bankgrouptype" 
-                {if $payment_mean.id == $form_data.payment}required="required" aria-required="true"{/if}
-                class="select--country is--required{if $error_flags.mopt_payone__ideal_bankgrouptype} has--error{/if}">
-            <option disabled="disabled" value="" selected="selected">{s name='bankGroup'}Bankgruppe{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</option>
-            <option value="ABN_AMRO_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'ABN_AMRO_BANK'}selected="selected"{/if}>ABN Amro Bank</option>
-            <option value="ASN_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'ASN_BANK'}selected="selected"{/if}>ASN Bank</option>
-            <option value="BUNQ_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'BUNQ_BANK'}selected="selected"{/if}>Bunq Bank</option>
-            <option value="ING_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'ING_BANK'}selected="selected"{/if}>ING Bank</option>
-            <option value="KNAB_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'KNAB_BANK'}selected="selected"{/if}>Knab Bank</option>
-            <option value="NATIONALE_NEDERLANDEN" {if $form_data.mopt_payone__ideal_bankgrouptype == 'NATIONALE_NEDERLANDEN'}selected="selected"{/if}>Nationale-Nederlanden</option>
-            <option value="N26" {if $form_data.mopt_payone__ideal_bankgrouptype == 'N26'}selected="selected"{/if}>N26</option>
-            <option value="RABOBANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'RABOBANK'}selected="selected"{/if}>Rabobank</option>
-            <option value="REVOLUT" {if $form_data.mopt_payone__ideal_bankgrouptype == 'REVOLUT'}selected="selected"{/if}>Revolut</option>
-            <option value="SNS_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'SNS_BANK'}selected="selected"{/if}>SNS Bank</option>
-            <option value="SNS_REGIO_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'SNS_REGIO_BANK'}selected="selected"{/if}>SNS Regio Bank</option>
-            <option value="TRIODOS_BANK" {if $form_data.mopt_payone__ideal_bankgrouptype == 'TRIODOS_BANK'}selected="selected"{/if}>Triodos Bank</option>
-            <option value="VAN_LANSCHOT_BANKIERS" {if $form_data.mopt_payone__ideal_bankgrouptype == 'VAN_LANSCHOT_BANKIERS'}selected="selected"{/if}>van Lanschot Kempen</option>
-            <option value="YOURSAFE" {if $form_data.mopt_payone__ideal_bankgrouptype == 'YOURSAFE'}selected="selected"{/if}>Yoursafe</option>
-        </select>
-    </div>
 </div>