Skip to content

Commit e4333bf

Browse files
author
Vincent Boulanger
committed
OX6-168: Alte Giropay entfernt
1 parent 5657f99 commit e4333bf

File tree

14 files changed

+3
-201
lines changed

14 files changed

+3
-201
lines changed

‎application/models/fcpoconfigexport.php

-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ protected function _getPaymentAbbreviation($sPaymentId)
507507
'fcpopl_secdebitnote' => 'fnc',
508508
'fcpopaydirekt_express' => 'wlt',
509509
'fcpo_sofort' => 'sb',
510-
'fcpo_giropay' => 'sb',
511510
'fcpo_eps' => 'sb',
512511
'fcpo_pf_finance' => 'sb',
513512
'fcpo_pf_card' => 'sb',
@@ -566,7 +565,6 @@ protected function _getPaymentSubtype($sPaymentId) {
566565
'fcpopl_secinstallment' => 'PIN',
567566
'fcpopl_secdebitnote' => 'PDD',
568567
'fcpo_sofort' => 'PNT',
569-
'fcpo_giropay' => 'GPY',
570568
'fcpo_eps' => 'EPS',
571569
'fcpo_pf_finance' => 'PFF',
572570
'fcpo_pf_card' => 'PFC',

‎application/translations/de/fcPayOne_lang.php

-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@
246246
'PAYONE Gesicherter Rechnungskauf (neu)' => 'PAYONE Gesicherter Rechnungskauf',
247247
'PAYONE Gesicherter Ratenkauf' => 'PAYONE Gesicherter Ratenkauf',
248248
'PAYONE Gesicherte Lastschrift' => 'PAYONE Gesicherte Lastschrift',
249-
'PAYONE Giropay' => 'PAYONE Giropay',
250249
'PAYONE iDEAL' => 'PAYONE iDEAL',
251250
'PAYONE Klarna Ratenkauf' => 'PAYONE Klarna Ratenkauf',
252251
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',

‎application/translations/en/fcPayOne_lang.php

-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@
257257
'PAYONE Gesicherter Rechnungskauf (neu)' => 'PAYONE Secured Invoice',
258258
'PAYONE Gesicherter Ratenkauf' => 'PAYONE Secured Installment',
259259
'PAYONE Gesicherte Lastschrift' => 'PAYONE Secured Direct Debit',
260-
'PAYONE Giropay' => 'PAYONE Giropay',
261260
'PAYONE iDEAL' => 'PAYONE iDEAL',
262261
'PAYONE Klarna Ratenkauf' => 'PAYONE Klarna Ratenkauf',
263262
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',

‎application/views/admin/de/fcPayOne_lang.php

-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@
477477
'PAYONE Gesicherter Rechnungskauf (neu)' => 'PAYONE Gesicherter Rechnungskauf (neu)',
478478
'PAYONE Gesicherter Ratenkauf' => 'PAYONE Gesicherter Ratenkauf',
479479
'PAYONE Gesicherte Lastschrift' => 'PAYONE Gesicherte Lastschrift',
480-
'PAYONE Giropay' => 'PAYONE Giropay',
481480
'PAYONE iDEAL' => 'PAYONE iDEAL',
482481
'PAYONE Klarna Ratenkauf' => 'PAYONE Klarna Ratenkauf',
483482
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',

‎application/views/admin/en/fcPayOne_lang.php

-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,6 @@
486486
'PAYONE Gesicherter Rechnungskauf (neu)' => 'PAYONE Secured Invoice (new)',
487487
'PAYONE Gesicherter Ratenkauf' => 'PAYONE Secured Installment',
488488
'PAYONE Gesicherte Lastschrift' => 'PAYONE Secured Direct Debit',
489-
'PAYONE Giropay' => 'PAYONE Giropay',
490489
'PAYONE iDEAL' => 'PAYONE iDEAL',
491490
'PAYONE Klarna Ratenkauf' => 'PAYONE Klarna Ratenkauf',
492491
'PAYONE Klarna Rechnung' => 'PAYONE Klarna Rechnung',

‎application/views/frontend/tpl/azure/fcpo_payment_giropay.tpl

-44
This file was deleted.

‎application/views/frontend/tpl/flow/fcpo_payment_giropay.tpl

-44
This file was deleted.

‎application/views/frontend/tpl/wave/fcpo_payment_giropay.tpl

-46
This file was deleted.

‎core/fcpayone_events.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ class fcpayone_events
4848
'fcpoonlineueberweisung',
4949
'fcpoklarna',
5050
'fcpopaydirekt_express',
51-
'fcpo_giropay'
51+
'fcpo_giropay',
52+
'fcpo_trustly',
53+
'fcpobarzahlen',
5254
);
5355

5456
/**

‎extend/application/controllers/fcPayOnePaymentView.php

-15
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ public function hasPaymentMethodAvailableSubTypes($sType)
579579
),
580580
'sb' => array(
581581
$this->getSofortUeberweisung(),
582-
$this->getGiropay(),
583582
$this->getPostFinanceEFinance(),
584583
$this->getPostFinanceCard(),
585584
$this->getIdeal(),
@@ -663,16 +662,6 @@ public function getSofortUeberweisung()
663662
return ($this->getConfigParam('blFCPOSofoActivated') && $this->isPaymentMethodAvailableToUser('PNT', 'sb'));
664663
}
665664

666-
/**
667-
* Check if sub payment method Giropay is available to the user
668-
*
669-
* @return bool
670-
*/
671-
public function getGiropay()
672-
{
673-
return ($this->getConfigParam('blFCPOgiroActivated') && $this->isPaymentMethodAvailableToUser('GPY', 'sb'));
674-
}
675-
676665
/**
677666
* Check if sub payment method EPS is available to the user
678667
*
@@ -847,9 +836,6 @@ public function fcpoGetOnlinePaymentMetaData()
847836
if ($this->getSofortUeberweisung()) {
848837
$aPaymentMetaData[] = $this->_fcpoGetOnlinePaymentData('PNT');
849838
}
850-
if ($this->getGiropay()) {
851-
$aPaymentMetaData[] = $this->_fcpoGetOnlinePaymentData('GPY');
852-
}
853839
if ($this->getEPS()) {
854840
$aPaymentMetaData[] = $this->_fcpoGetOnlinePaymentData('EPS');
855841
}
@@ -1392,7 +1378,6 @@ protected function _fcpoGetOnlinePaymentData($sIdent)
13921378

13931379
$aCaptions = array(
13941380
'PNT' => 'SOFORT Überweisung',
1395-
'GPY' => 'giropay',
13961381
'EPS' => 'eps - Online-Überweisung',
13971382
'PFF' => 'PostFinance E-Finance',
13981383
'PFC' => 'PostFinance Card',

‎extend/application/models/fcPayOnePayment.php

-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class fcPayOnePayment extends fcPayOnePayment_parent
6262
'fcpoamazonpay',
6363
'fcpo_secinvoice',
6464
'fcpo_sofort',
65-
'fcpo_giropay',
6665
'fcpo_eps',
6766
'fcpo_pf_finance',
6867
'fcpo_pf_card',
@@ -90,7 +89,6 @@ class fcPayOnePayment extends fcPayOnePayment_parent
9089
'fcpoklarna_directdebit',
9190
'fcpopaydirekt',
9291
'fcpo_sofort',
93-
'fcpo_giropay',
9492
'fcpo_eps',
9593
'fcpo_pf_finance',
9694
'fcpo_pf_card',
@@ -107,7 +105,6 @@ class fcPayOnePayment extends fcPayOnePayment_parent
107105
*/
108106
protected static $_aOnlinePayments = array(
109107
'fcpo_sofort',
110-
'fcpo_giropay',
111108
'fcpo_eps',
112109
'fcpo_pf_finance',
113110
'fcpo_pf_card',

‎lib/fcporequest.php

-19
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,6 @@ protected function setPaymentParameters($oOrder, $aDynvalue, $sRefNr, $blIsPreau
499499
$this->addParametersOnlineSofort($oOrder, $aDynvalue);
500500
$blAddRedirectUrls = true;
501501
break;
502-
case 'fcpo_giropay':
503-
$this->addParametersOnlineGiropay($aDynvalue);
504-
$blAddRedirectUrls = true;
505-
break;
506502
case 'fcpo_eps':
507503
$this->addParametersOnlineEps($aDynvalue);
508504
$blAddRedirectUrls = true;
@@ -814,21 +810,6 @@ protected function addParametersOnlineSofort($oOrder, $aDynvalue)
814810
$this->addParameter('bankcountry', $oBillCountry->oxcountry__oxisoalpha2->value);
815811
}
816812

817-
/**
818-
* Add parameters needed for giropay
819-
*
820-
* @param $aDynvalue
821-
* @return void
822-
*/
823-
protected function addParametersOnlineGiropay($aDynvalue)
824-
{
825-
$this->addParameter('clearingtype', 'sb'); //Payment method
826-
$this->addParameter('onlinebanktransfertype', 'GPY');
827-
$this->addParameter('bankcountry', 'DE');
828-
$this->addParameter('iban', $aDynvalue['fcpo_ou_iban_gpy']);
829-
$this->addParameter('bic', $aDynvalue['fcpo_ou_bic_gpy']);
830-
}
831-
832813
/**
833814
* Add parameters needed for eps
834815
*

‎out/blocks/fcpo_payment_select_override.tpl

-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@
5050
[{elseif $sPaymentID == "fcpo_sofort"}]
5151
[{assign var="sFcPoTemplatePath" value=$sFcPoTemplatePath|cat:'/fcpo_payment_sofort.tpl'}]
5252
[{include file=$oViewConf->fcpoGetAbsModuleTemplateFrontendPath($sFcPoTemplatePath)}]
53-
[{elseif $sPaymentID == "fcpo_giropay"}]
54-
[{assign var="sFcPoTemplatePath" value=$sFcPoTemplatePath|cat:'/fcpo_payment_giropay.tpl'}]
55-
[{include file=$oViewConf->fcpoGetAbsModuleTemplateFrontendPath($sFcPoTemplatePath)}]
5653
[{elseif $sPaymentID == "fcpo_eps"}]
5754
[{assign var="sFcPoTemplatePath" value=$sFcPoTemplatePath|cat:'/fcpo_payment_eps.tpl'}]
5855
[{include file=$oViewConf->fcpoGetAbsModuleTemplateFrontendPath($sFcPoTemplatePath)}]

‎tests/unit/fcPayOne/extend/application/controllers/fcPayonePaymentViewTest.php

-20
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@ public function test_hasPaymentMethodAvailableSubTypes_CC()
457457
'getJCB',
458458
'getCarteBleue',
459459
'getSofortUeberweisung',
460-
'getGiropay',
461460
'getEPS',
462461
'getPostFinanceEFinance',
463462
'getPostFinanceCard',
@@ -473,7 +472,6 @@ public function test_hasPaymentMethodAvailableSubTypes_CC()
473472
$oTestObject->expects($this->any())->method('getJCB')->will($this->returnValue(false));
474473
$oTestObject->expects($this->any())->method('getCarteBleue')->will($this->returnValue(false));
475474
$oTestObject->expects($this->any())->method('getSofortUeberweisung')->will($this->returnValue(false));
476-
$oTestObject->expects($this->any())->method('getGiropay')->will($this->returnValue(false));
477475
$oTestObject->expects($this->any())->method('getEPS')->will($this->returnValue(false));
478476
$oTestObject->expects($this->any())->method('getPostFinanceCard')->will($this->returnValue(false));
479477
$oTestObject->expects($this->any())->method('getIdeal')->will($this->returnValue(false));
@@ -498,7 +496,6 @@ public function test_hasPaymentMethodAvailableSubTypes_SB()
498496
'getJCB',
499497
'getCarteBleue',
500498
'getSofortUeberweisung',
501-
'getGiropay',
502499
'getEPS',
503500
'getPostFinanceEFinance',
504501
'getPostFinanceCard',
@@ -514,7 +511,6 @@ public function test_hasPaymentMethodAvailableSubTypes_SB()
514511
$oTestObject->expects($this->any())->method('getJCB')->will($this->returnValue(false));
515512
$oTestObject->expects($this->any())->method('getCarteBleue')->will($this->returnValue(false));
516513
$oTestObject->expects($this->any())->method('getSofortUeberweisung')->will($this->returnValue(false));
517-
$oTestObject->expects($this->any())->method('getGiropay')->will($this->returnValue(false));
518514
$oTestObject->expects($this->any())->method('getEPS')->will($this->returnValue(false));
519515
$oTestObject->expects($this->any())->method('getPostFinanceCard')->will($this->returnValue(false));
520516
$oTestObject->expects($this->any())->method('getIdeal')->will($this->returnValue(false));
@@ -620,20 +616,6 @@ public function test_getSofortUeberweisung_Coverage()
620616
$this->assertEquals(true, $oTestObject->getSofortUeberweisung());
621617
}
622618

623-
/**
624-
* Testing getGiropay vor Coverage
625-
*
626-
* @param void
627-
* @return void
628-
*/
629-
public function test_getGiropay_Coverage()
630-
{
631-
$oTestObject = $this->getMock('fcPayOnePaymentView', array('getConfigParam', 'isPaymentMethodAvailableToUser'));
632-
$oTestObject->expects($this->any())->method('getConfigParam')->will($this->returnValue(true));
633-
$oTestObject->expects($this->any())->method('isPaymentMethodAvailableToUser')->will($this->returnValue(true));
634-
$this->assertEquals(true, $oTestObject->getGiropay());
635-
}
636-
637619
/**
638620
* Testing getEPS vor Coverage
639621
*
@@ -878,7 +860,6 @@ public function test_fcpoGetOnlinePaymentMetaData_Coverage()
878860
$oTestObject = $this->getMock(
879861
'fcPayOnePaymentView', array(
880862
'getSofortUeberweisung',
881-
'getGiropay',
882863
'getEPS',
883864
'getPostFinanceEFinance',
884865
'getPostFinanceCard',
@@ -890,7 +871,6 @@ public function test_fcpoGetOnlinePaymentMetaData_Coverage()
890871
);
891872

892873
$oTestObject->expects($this->any())->method('getSofortUeberweisung')->will($this->returnValue(true));
893-
$oTestObject->expects($this->any())->method('getGiropay')->will($this->returnValue(true));
894874
$oTestObject->expects($this->any())->method('getEPS')->will($this->returnValue(true));
895875
$oTestObject->expects($this->any())->method('getPostFinanceEFinance')->will($this->returnValue(true));
896876
$oTestObject->expects($this->any())->method('getPostFinanceCard')->will($this->returnValue(true));

0 commit comments

Comments
 (0)