Skip to content

Commit 867126f

Browse files
committed
MAGETWO-53317: Unable to place order within direct payment method from admin
- Removed redundant usages of deprecated methods - Fixed code style
1 parent 7527a1e commit 867126f

File tree

7 files changed

+19
-29
lines changed

7 files changed

+19
-29
lines changed

app/code/Magento/Payment/Block/Form/Cc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function hasVerification()
108108
/**
109109
* Whether switch/solo card type available
110110
*
111-
* @deprecated
111+
* @deprecated unused
112112
* @return bool
113113
*/
114114
public function hasSsCardType()
@@ -124,7 +124,7 @@ public function hasSsCardType()
124124
/**
125125
* Solo/switch card start year
126126
*
127-
* @deprecated
127+
* @deprecated unused
128128
* @return array
129129
*/
130130
public function getSsStartYears()

app/code/Magento/Payment/Model/CcConfig.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function __construct(
6262
* Solo/switch card start years
6363
*
6464
* @return array
65-
* @deprecated
65+
* @deprecated unused
6666
*/
6767
public function getSsStartYears()
6868
{
@@ -120,7 +120,7 @@ public function hasVerification()
120120
* Whether switch/solo card type available
121121
*
122122
* @return bool
123-
* @deprecated
123+
* @deprecated unused
124124
*/
125125
public function hasSsCardType()
126126
{

app/code/Magento/Payment/Model/CcGenericConfigProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function getConfig()
6464
* Solo/switch card start years
6565
*
6666
* @return array
67-
* @deprecated
67+
* @deprecated unused
6868
*/
6969
protected function getSsStartYears()
7070
{
@@ -143,7 +143,7 @@ protected function hasVerification($methodCode)
143143
*
144144
* @param string $methodCode
145145
* @return bool
146-
* @deprecated
146+
* @deprecated unused
147147
*/
148148
protected function hasSsCardType($methodCode)
149149
{

app/code/Magento/Paypal/Model/Direct.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,8 @@ protected function _placeOrder(Payment $payment, $amount)
437437
$this->_getFormattedCcExpirationDate($payment->getCcExpMonth(), $payment->getCcExpYear())
438438
)->setCreditCardCvv2(
439439
$payment->getCcCid()
440-
)->setMaestroSoloIssueNumber(
441-
$payment->getCcSsIssue()
442440
);
443441

444-
if ($payment->getCcSsStartMonth() && $payment->getCcSsStartYear()) {
445-
$year = sprintf('%02d', substr($payment->getCcSsStartYear(), -2, 2));
446-
$api->setMaestroSoloIssueDate($this->_getFormattedCcExpirationDate($payment->getCcSsStartMonth(), $year));
447-
}
448-
449442
// add shipping and billing addresses
450443
if ($order->getIsVirtual()) {
451444
$api->setAddress($order->getBillingAddress())->setSuppressShipping(true);

app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
114114
/**
115115
* Credit card SS start year.
116116
*
117-
* @deprecated
117+
* @deprecated unused constant
118118
*/
119119
const CC_SS_START_YEAR = 'cc_ss_start_year';
120120
/*
@@ -161,7 +161,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
161161
/**
162162
* Credit card SS start month.
163163
*
164-
* @deprecated
164+
* @deprecated unused constant
165165
*/
166166
const CC_SS_START_MONTH = 'cc_ss_start_month';
167167
/*
@@ -216,7 +216,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
216216
/**
217217
* Credit card SS issue.
218218
*
219-
* @deprecated
219+
* @deprecated unused constant
220220
*/
221221
const CC_SS_ISSUE = 'cc_ss_issue';
222222
/*
@@ -472,23 +472,23 @@ public function getCcSecureVerify();
472472
* Gets the credit card SS issue for the order payment.
473473
*
474474
* @return string|null Credit card SS issue.
475-
* @deprecated
475+
* @deprecated unused
476476
*/
477477
public function getCcSsIssue();
478478

479479
/**
480480
* Gets the credit card SS start month for the order payment.
481481
*
482482
* @return string|null Credit card SS start month.
483-
* @deprecated
483+
* @deprecated unused
484484
*/
485485
public function getCcSsStartMonth();
486486

487487
/**
488488
* Gets the credit card SS start year for the order payment.
489489
*
490490
* @return string|null Credit card SS start year.
491-
* @deprecated
491+
* @deprecated unused
492492
*/
493493
public function getCcSsStartYear();
494494

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function getQuote()
101101
* Whether switch/solo card type available
102102
*
103103
* @return true
104-
* @deprecated
104+
* @deprecated unused
105105
*/
106106
public function hasSsCardType()
107107
{

app/code/Magento/Sales/Model/Order/Payment.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ public function getCcSecureVerify()
17031703
* Returns cc_ss_issue
17041704
*
17051705
* @return string
1706-
* @deprecated
1706+
* @deprecated unused
17071707
*/
17081708
public function getCcSsIssue()
17091709
{
@@ -1714,7 +1714,7 @@ public function getCcSsIssue()
17141714
* Returns cc_ss_start_month
17151715
*
17161716
* @return string
1717-
* @deprecated
1717+
* @deprecated unused
17181718
*/
17191719
public function getCcSsStartMonth()
17201720
{
@@ -1725,7 +1725,7 @@ public function getCcSsStartMonth()
17251725
* Returns cc_ss_start_year
17261726
*
17271727
* @return string
1728-
* @deprecated
1728+
* @deprecated unused
17291729
*/
17301730
public function getCcSsStartYear()
17311731
{
@@ -2090,8 +2090,7 @@ public function setCcExpMonth($ccExpMonth)
20902090

20912091
/**
20922092
* {@inheritdoc}
2093-
*
2094-
* @deprecated
2093+
* @deprecated unused
20952094
*/
20962095
public function setCcSsStartYear($ccSsStartYear)
20972096
{
@@ -2180,8 +2179,7 @@ public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
21802179

21812180
/**
21822181
* {@inheritdoc}
2183-
*
2184-
* @deprecated
2182+
* @deprecated unused
21852183
*/
21862184
public function setCcSsStartMonth($ccSsStartMonth)
21872185
{
@@ -2286,8 +2284,7 @@ public function setCcDebugResponseBody($ccDebugResponseBody)
22862284

22872285
/**
22882286
* {@inheritdoc}
2289-
*
2290-
* @deprecated
2287+
* @deprecated unused
22912288
*/
22922289
public function setCcSsIssue($ccSsIssue)
22932290
{

0 commit comments

Comments
 (0)