Skip to content

Commit 5657f99

Browse files
author
Vincent Boulanger
committed
OX6-168: Maestro entfernt
1 parent 447b1ed commit 5657f99

File tree

7 files changed

+3
-119
lines changed

7 files changed

+3
-119
lines changed

‎application/models/fcpotransactionstatus.php

-2
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ public function getCardtype()
123123
'A' => 'Amex',
124124
'D' => 'Diners',
125125
'J' => 'JCB',
126-
'O' => 'Maestro International',
127-
'U' => 'Maestro UK',
128126
'B' => 'Carte Bleue',
129127
);
130128

‎application/views/admin/tpl/fcpayone_main.tpl

-24
Original file line numberDiff line numberDiff line change
@@ -201,30 +201,6 @@
201201
</dd>
202202
<div class="spacer"></div>
203203
</dl>
204-
<dl>
205-
<dt>Maestro International</dt>
206-
<dd style="margin-top: 4px; margin-left: 150px;">
207-
<input type="hidden" name="confbools[blFCPOMaestroIntActivated]" value="false">
208-
<input type="checkbox" name="confbools[blFCPOMaestroIntActivated]" value="true" [{if ($confbools.blFCPOMaestroIntActivated)}]checked[{/if}]>
209-
<input type="button" onclick="JavaScript:showDialog('[{$oView->fcGetAdminSeperator()}]cl=fcpayone_main&amp;aoc=1&amp;oxid=O&amp;type=cc');" class="" value="[{oxmultilang ident="GENERAL_ASSIGNCOUNTRIES"}]">
210-
[{oxinputhelp ident="FCPO_HELP_ASSIGNCOUNTRIES"}]
211-
<input type="radio" name="confbools[blFCPOCCOLive]" value="1" [{if $confbools.blFCPOCCOLive == '1'}]checked[{/if}]> <strong>Live</strong>
212-
<input type="radio" name="confbools[blFCPOCCOLive]" value="0" [{if $confbools.blFCPOCCOLive == '0' || !$confbools.blFCPOCCOLive}]checked[{/if}]> Test
213-
</dd>
214-
<div class="spacer"></div>
215-
</dl>
216-
<dl>
217-
<dt>Maestro UK</dt>
218-
<dd style="margin-top: 4px; margin-left: 150px;">
219-
<input type="hidden" name="confbools[blFCPOMaestroUKActivated]" value="false">
220-
<input type="checkbox" name="confbools[blFCPOMaestroUKActivated]" value="true" [{if ($confbools.blFCPOMaestroUKActivated)}]checked[{/if}]>
221-
<input type="button" onclick="JavaScript:showDialog('[{$oView->fcGetAdminSeperator()}]cl=fcpayone_main&amp;aoc=1&amp;oxid=U&amp;type=cc');" class="" value="[{oxmultilang ident="GENERAL_ASSIGNCOUNTRIES"}]">
222-
[{oxinputhelp ident="FCPO_HELP_ASSIGNCOUNTRIES"}]
223-
<input type="radio" name="confbools[blFCPOCCULive]" value="1" [{if $confbools.blFCPOCCULive == '1'}]checked[{/if}]> <strong>Live</strong>
224-
<input type="radio" name="confbools[blFCPOCCULive]" value="0" [{if $confbools.blFCPOCCULive == '0' || !$confbools.blFCPOCCULive}]checked[{/if}]> Test
225-
</dd>
226-
<div class="spacer"></div>
227-
</dl>
228204
<dl>
229205
<dt>Carte Bleue</dt>
230206
<dd style="margin-top: 4px; margin-left: 150px;">

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</li>
2121
<li>
2222
<label>[{oxmultilang ident="FCPO_CREDITCARD"}]:</label>
23-
<select name="dynvalue[fcpo_kktype]" [{if $oView->getMaestroUK()}]onchange="fcCheckType(this); return false;"[{/if}]>
23+
<select name="dynvalue[fcpo_kktype]">
2424
[{foreach from=$aFcPoCCPaymentMetaData item="oFcPoCCPaymentMetaData"}]
2525
<option value="[{$oFcPoCCPaymentMetaData->sPaymentTag}]" [{if $oFcPoCCPaymentMetaData->blSelected}]selected[{/if}]>[{$oFcPoCCPaymentMetaData->sPaymentName}]</option>
2626
[{/foreach}]
@@ -91,12 +91,6 @@
9191
<div class="clear"></div>
9292
<div class="note">[{oxmultilang ident="FCPO_CARD_SECURITY_CODE_DESCRIPTION"}]</div>
9393
</li>
94-
[{if $oView->getMaestroUK()}]
95-
<li id="fcpo_kkcsn_row" style="display: none;">
96-
<label>[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]:</label>
97-
<input placeholder="[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]" autocomplete="off" type="text" class="payment_text" size="20" maxlength="64" name="dynvalue[fcpo_kkcsn]" value="[{$dynvalue.fcpo_kkcsn}]">
98-
</li>
99-
[{/if}]
10094
</ul>
10195
[{block name="checkout_payment_longdesc"}]
10296
[{if $paymentmethod->oxpayments__oxlongdesc->value}]

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="form-group fcpo_kktype">
2525
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_CREDITCARD"}]:</label>
2626
<div class="col-lg-9">
27-
<select name="dynvalue[fcpo_kktype]" [{if $oView->getMaestroUK()}]onchange="fcCheckType(this); return false;"[{/if}] class="form-control selectpicker" required="required">
27+
<select name="dynvalue[fcpo_kktype]" class="form-control selectpicker" required="required">
2828
[{foreach from=$aFcPoCCPaymentMetaData item="oFcPoCCPaymentMetaData"}]
2929
<option value="[{$oFcPoCCPaymentMetaData->sPaymentTag}]" [{if $oFcPoCCPaymentMetaData->blSelected}]selected[{/if}]>[{$oFcPoCCPaymentMetaData->sPaymentName}]</option>
3030
[{/foreach}]
@@ -116,14 +116,6 @@
116116
<span class="help-block">[{oxmultilang ident="FCPO_CARD_SECURITY_CODE_DESCRIPTION"}]</span>
117117
</div>
118118
</div>
119-
[{if $oView->getMaestroUK()}]
120-
<div class="form-group" id="fcpo_kkcsn_row" style="display: none;">
121-
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]</label>
122-
<div class="col-lg-9">
123-
<input placeholder="[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]" autocomplete="off" type="text" class="payment_text" size="20" maxlength="64" name="dynvalue[fcpo_kkcsn]" value="[{$dynvalue.fcpo_kkcsn}]">
124-
</div>
125-
</div>
126-
[{/if}]
127119
<div class="clearfix"></div>
128120
[{block name="checkout_payment_longdesc"}]
129121
[{if $paymentmethod->oxpayments__oxlongdesc->value}]

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="form-group fcpo_kktype">
2525
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_CREDITCARD"}]:</label>
2626
<div class="col-lg-9">
27-
<select name="dynvalue[fcpo_kktype]" [{if $oView->getMaestroUK()}]onchange="fcCheckType(this); return false;"[{/if}] class="form-control" required="required">
27+
<select name="dynvalue[fcpo_kktype]" class="form-control" required="required">
2828
[{foreach from=$aFcPoCCPaymentMetaData item="oFcPoCCPaymentMetaData"}]
2929
<option value="[{$oFcPoCCPaymentMetaData->sPaymentTag}]" [{if $oFcPoCCPaymentMetaData->blSelected}]selected[{/if}]>[{$oFcPoCCPaymentMetaData->sPaymentName}]</option>
3030
[{/foreach}]
@@ -116,14 +116,6 @@
116116
<span class="help-block">[{oxmultilang ident="FCPO_CARD_SECURITY_CODE_DESCRIPTION"}]</span>
117117
</div>
118118
</div>
119-
[{if $oView->getMaestroUK()}]
120-
<div class="form-group" id="fcpo_kkcsn_row" style="display: none;">
121-
<label class="req control-label col-lg-3">[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]:</label>
122-
<div class="col-lg-9">
123-
<input placeholder="[{oxmultilang ident="FCPO_CARDSEQUENCENUMBER"}]" autocomplete="off" type="text" class="payment_text" size="20" maxlength="64" name="dynvalue[fcpo_kkcsn]" value="[{$dynvalue.fcpo_kkcsn}]">
124-
</div>
125-
</div>
126-
[{/if}]
127119
<div class="clearfix"></div>
128120
[{block name="checkout_payment_longdesc"}]
129121
[{if $paymentmethod->oxpayments__oxlongdesc->value}]

‎extend/application/controllers/fcPayOnePaymentView.php

-26
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,6 @@ public function hasPaymentMethodAvailableSubTypes($sType)
575575
$this->getAmex(),
576576
$this->getDiners(),
577577
$this->getJCB(),
578-
$this->getMaestroInternational(),
579-
$this->getMaestroUK(),
580578
$this->getCarteBleue(),
581579
),
582580
'sb' => array(
@@ -645,26 +643,6 @@ public function getJCB()
645643
return ($this->getConfigParam('blFCPOJCBActivated') && $this->isPaymentMethodAvailableToUser('J', 'cc'));
646644
}
647645

648-
/**
649-
* Check if sub payment method MaestroInternational is available to the user
650-
*
651-
* @return bool
652-
*/
653-
public function getMaestroInternational()
654-
{
655-
return ($this->getConfigParam('blFCPOMaestroIntActivated') && $this->isPaymentMethodAvailableToUser('O', 'cc'));
656-
}
657-
658-
/**
659-
* Check if sub payment method MaestroUK is available to the user
660-
*
661-
* @return bool
662-
*/
663-
public function getMaestroUK()
664-
{
665-
return ($this->getConfigParam('blFCPOMaestroUKActivated') && $this->isPaymentMethodAvailableToUser('U', 'cc'));
666-
}
667-
668646
/**
669647
* Check if sub payment method CarteBleue is available to the user
670648
*
@@ -851,8 +829,6 @@ public function fcpoGetCCPaymentMetaData()
851829
$this->_fcpoSetCCMetaData($oPayment, 'A', 'American Express');
852830
$this->_fcpoSetCCMetaData($oPayment, 'D', 'Diners Club');
853831
$this->_fcpoSetCCMetaData($oPayment, 'J', 'JCB');
854-
$this->_fcpoSetCCMetaData($oPayment, 'O', 'Maestro International');
855-
$this->_fcpoSetCCMetaData($oPayment, 'U', 'Maestro UK');
856832
$this->_fcpoSetCCMetaData($oPayment, 'B', 'Carte Bleue');
857833

858834
return $this->_aPaymentCCMetaData;
@@ -1395,8 +1371,6 @@ protected function _fcpoSetCCMetaData($oPayment, $sBrandShortcut, $sBrandName)
13951371
'A' => $this->getAmex(),
13961372
'D' => $this->getDiners(),
13971373
'J' => $this->getJCB(),
1398-
'O' => $this->getMaestroInternational(),
1399-
'U' => $this->getMaestroUK(),
14001374
'B' => $this->getCarteBleue(),
14011375
);
14021376

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

-42
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,6 @@ public function test_hasPaymentMethodAvailableSubTypes_CC()
455455
'getAmex',
456456
'getDiners',
457457
'getJCB',
458-
'getMaestroInternational',
459-
'getMaestroUK',
460458
'getCarteBleue',
461459
'getSofortUeberweisung',
462460
'getGiropay',
@@ -473,8 +471,6 @@ public function test_hasPaymentMethodAvailableSubTypes_CC()
473471
$oTestObject->expects($this->any())->method('getAmex')->will($this->returnValue(false));
474472
$oTestObject->expects($this->any())->method('getDiners')->will($this->returnValue(false));
475473
$oTestObject->expects($this->any())->method('getJCB')->will($this->returnValue(false));
476-
$oTestObject->expects($this->any())->method('getMaestroInternational')->will($this->returnValue(false));
477-
$oTestObject->expects($this->any())->method('getMaestroUK')->will($this->returnValue(false));
478474
$oTestObject->expects($this->any())->method('getCarteBleue')->will($this->returnValue(false));
479475
$oTestObject->expects($this->any())->method('getSofortUeberweisung')->will($this->returnValue(false));
480476
$oTestObject->expects($this->any())->method('getGiropay')->will($this->returnValue(false));
@@ -500,8 +496,6 @@ public function test_hasPaymentMethodAvailableSubTypes_SB()
500496
'getAmex',
501497
'getDiners',
502498
'getJCB',
503-
'getMaestroInternational',
504-
'getMaestroUK',
505499
'getCarteBleue',
506500
'getSofortUeberweisung',
507501
'getGiropay',
@@ -518,8 +512,6 @@ public function test_hasPaymentMethodAvailableSubTypes_SB()
518512
$oTestObject->expects($this->any())->method('getAmex')->will($this->returnValue(false));
519513
$oTestObject->expects($this->any())->method('getDiners')->will($this->returnValue(false));
520514
$oTestObject->expects($this->any())->method('getJCB')->will($this->returnValue(false));
521-
$oTestObject->expects($this->any())->method('getMaestroInternational')->will($this->returnValue(false));
522-
$oTestObject->expects($this->any())->method('getMaestroUK')->will($this->returnValue(false));
523515
$oTestObject->expects($this->any())->method('getCarteBleue')->will($this->returnValue(false));
524516
$oTestObject->expects($this->any())->method('getSofortUeberweisung')->will($this->returnValue(false));
525517
$oTestObject->expects($this->any())->method('getGiropay')->will($this->returnValue(false));
@@ -600,34 +592,6 @@ public function test_getJCB_Coverage()
600592
$this->assertEquals(true, $oTestObject->getJCB());
601593
}
602594

603-
/**
604-
* Testing getMaestroInternational vor Coverage
605-
*
606-
* @param void
607-
* @return void
608-
*/
609-
public function test_getMaestroInternational_Coverage()
610-
{
611-
$oTestObject = $this->getMock('fcPayOnePaymentView', array('getConfigParam', 'isPaymentMethodAvailableToUser'));
612-
$oTestObject->expects($this->any())->method('getConfigParam')->will($this->returnValue(true));
613-
$oTestObject->expects($this->any())->method('isPaymentMethodAvailableToUser')->will($this->returnValue(true));
614-
$this->assertEquals(true, $oTestObject->getMaestroInternational());
615-
}
616-
617-
/**
618-
* Testing getMaestroUK vor Coverage
619-
*
620-
* @param void
621-
* @return void
622-
*/
623-
public function test_getMaestroUK_Coverage()
624-
{
625-
$oTestObject = $this->getMock('fcPayOnePaymentView', array('getConfigParam', 'isPaymentMethodAvailableToUser'));
626-
$oTestObject->expects($this->any())->method('getConfigParam')->will($this->returnValue(true));
627-
$oTestObject->expects($this->any())->method('isPaymentMethodAvailableToUser')->will($this->returnValue(true));
628-
$this->assertEquals(true, $oTestObject->getMaestroUK());
629-
}
630-
631595
/**
632596
* Testing getCarteBleue vor Coverage
633597
*
@@ -877,8 +841,6 @@ public function test_fcpoGetCCPaymentMetaData_Coverage()
877841
'getAmex',
878842
'getDiners',
879843
'getJCB',
880-
'getMaestroInternational',
881-
'getMaestroUK',
882844
'getCarteBleue',
883845
'_fcpoGetCCPaymentMetaData',
884846
)
@@ -889,8 +851,6 @@ public function test_fcpoGetCCPaymentMetaData_Coverage()
889851
$oTestObject->expects($this->any())->method('getAmex')->will($this->returnValue(true));
890852
$oTestObject->expects($this->any())->method('getDiners')->will($this->returnValue(true));
891853
$oTestObject->expects($this->any())->method('getJCB')->will($this->returnValue(true));
892-
$oTestObject->expects($this->any())->method('getMaestroInternational')->will($this->returnValue(true));
893-
$oTestObject->expects($this->any())->method('getMaestroUK')->will($this->returnValue(true));
894854
$oTestObject->expects($this->any())->method('getCarteBleue')->will($this->returnValue(true));
895855
$oTestObject->expects($this->any())->method('_fcpoGetCCPaymentMetaData')->will($this->returnValue('someValue'));
896856

@@ -901,8 +861,6 @@ public function test_fcpoGetCCPaymentMetaData_Coverage()
901861
'someValue',
902862
'someValue',
903863
'someValue',
904-
'someValue',
905-
'someValue',
906864
);
907865
$aResponse = $oTestObject->fcpoGetCCPaymentMetaData();
908866

0 commit comments

Comments
 (0)