@@ -28,10 +28,8 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Payone\Core\Controller\Onepage\Redirect as ClassToTest; |
| 30 | 30 | use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; |
| 31 | -use Magento\Sales\Model\Order as OrderCore; |
|
| 32 | 31 | use Magento\Checkout\Model\Session; |
| 33 | 32 | use Magento\Framework\App\Action\Context; |
| 34 | -use Magento\Customer\Model\Session as CustomerSession; |
|
| 35 | 33 | use Magento\Store\App\Response\Redirect as RedirectResponse; |
| 36 | 34 | use Magento\Framework\App\Console\Response; |
| 37 | 35 | use Magento\Framework\UrlInterface; |
@@ -28,10 +28,8 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Payone\Core\Controller\Onepage\Returned as ClassToTest; |
| 30 | 30 | use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; |
| 31 | -use Magento\Sales\Model\Order as OrderCore; |
|
| 32 | 31 | use Magento\Checkout\Model\Session; |
| 33 | 32 | use Magento\Framework\App\Action\Context; |
| 34 | -use Magento\Customer\Model\Session as CustomerSession; |
|
| 35 | 33 | use Magento\Store\App\Response\Redirect as RedirectResponse; |
| 36 | 34 | use Magento\Framework\App\Console\Response; |
| 37 | 35 | use Magento\Framework\App\ResponseInterface; |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Payone\Core\Controller\Paypal\Express as ClassToTest; |
| 30 | 30 | use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; |
| 31 | -use Magento\Sales\Model\Order as OrderCore; |
|
| 32 | 31 | use Magento\Framework\Controller\Result\Redirect; |
| 33 | 32 | use Magento\Checkout\Model\Session; |
| 34 | 33 | use Magento\Framework\Controller\ResultFactory; |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Payone\Core\Controller\Paypal\Returned as ClassToTest; |
| 30 | 30 | use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; |
| 31 | -use Magento\Sales\Model\Order as OrderCore; |
|
| 32 | 31 | use Magento\Framework\Controller\Result\Redirect; |
| 33 | 32 | use Magento\Checkout\Model\Session; |
| 34 | 33 | use Payone\Core\Model\Paypal\ReturnHandler; |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | $sXml = $this->configExport->generateConfigExportXml(); |
| 88 | 88 | if ($sXml !== false) { |
| 89 | 89 | $oResultRaw->setHeader("Content-Type", "text/xml; charset=\"utf8\"", true); |
| 90 | - $oResultRaw->setHeader("Content-Disposition", "attachment; filename=\"payone_config_export" . date('Y-m-d H-i-s') . "_" . md5($sXml) . ".xml\"", true); |
|
| 90 | + $oResultRaw->setHeader("Content-Disposition", "attachment; filename=\"payone_config_export".date('Y-m-d H-i-s')."_".md5($sXml).".xml\"", true); |
|
| 91 | 91 | $oResultRaw->setContents($sXml); |
| 92 | 92 | } |
| 93 | 93 | } catch (\Exception $e) { |
@@ -28,11 +28,10 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Magento\Payment\Model\Method\AbstractMethod; |
| 30 | 30 | use Magento\Sales\Model\Order; |
| 31 | -use Payone\Core\Model\Methods\Paydirekt as ClassToTest; |
|
| 31 | +use Payone\Core\Model\Methods\Paydirekt; |
|
| 32 | 32 | use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; |
| 33 | 33 | use Payone\Core\Helper\Shop; |
| 34 | 34 | use Magento\Framework\App\Config\ScopeConfigInterface; |
| 35 | -use Payone\Core\Model\Methods\Paydirekt; |
|
| 36 | 35 | use Payone\Core\Model\PayoneConfig; |
| 37 | 36 | use Magento\Payment\Model\Info; |
| 38 | 37 | use Payone\Core\Model\Api\Request\Authorization; |
@@ -26,8 +26,6 @@ |
||
| 26 | 26 | |
| 27 | 27 | namespace Payone\Core\Model\Api\Payolution; |
| 28 | 28 | |
| 29 | -use Locale; |
|
| 30 | - |
|
| 31 | 29 | /** |
| 32 | 30 | * Class for requesting the privacy declaration from payolution |
| 33 | 31 | */ |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | |
| 29 | 29 | use Payone\Core\Model\PayoneConfig; |
| 30 | 30 | use Magento\Sales\Model\Order; |
| 31 | -use Magento\Payment\Model\InfoInterface; |
|
| 32 | 31 | use Magento\Framework\Exception\LocalizedException; |
| 33 | 32 | use Payone\Core\Model\Methods\PayoneMethod; |
| 34 | 33 | use Magento\Framework\DataObject; |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | $sErrorMessage = false; |
| 137 | 137 | if (isset($aResponsePreCheck['status']) && $aResponsePreCheck['status'] == 'ERROR') { |
| 138 | - $sErrorMessage = __($aResponsePreCheck['errorcode'] . ' - ' . $aResponsePreCheck['customermessage']); |
|
| 138 | + $sErrorMessage = __($aResponsePreCheck['errorcode'].' - '.$aResponsePreCheck['customermessage']); |
|
| 139 | 139 | } elseif (isset($aResponseCalculation['status']) && $aResponseCalculation['status'] == 'ERROR') { |
| 140 | - $sErrorMessage = __($aResponseCalculation['errorcode'] . ' - ' . $aResponseCalculation['customermessage']); |
|
| 140 | + $sErrorMessage = __($aResponseCalculation['errorcode'].' - '.$aResponseCalculation['customermessage']); |
|
| 141 | 141 | } elseif (!$aResponsePreCheck || (isset($aResponsePreCheck['status']) && $aResponsePreCheck['status'] == 'OK' && !$aResponseCalculation)) { |
| 142 | 142 | $sErrorMessage = __('An unknown error occurred'); |
| 143 | 143 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | public function getPayDataArray($aResponse) |
| 191 | 191 | { |
| 192 | 192 | $aPayData = array(); |
| 193 | - foreach($aResponse as $sKey => $sValue) { |
|
| 193 | + foreach ($aResponse as $sKey => $sValue) { |
|
| 194 | 194 | $sCorrectedKey = str_ireplace('add_paydata[', '', $sKey); |
| 195 | 195 | $sCorrectedKey = rtrim($sCorrectedKey, ']'); |
| 196 | 196 | $sCorrectedKey = strtolower($sCorrectedKey); |
@@ -215,18 +215,18 @@ discard block |
||
| 215 | 215 | $aPayData = $this->getPayDataArray($aResponse); |
| 216 | 216 | foreach ($aPayData as $sKey => $sValue) { |
| 217 | 217 | $aSplit = explode('_', $sKey); |
| 218 | - for($i = count($aSplit); $i > 0; $i--) { |
|
| 219 | - if($i == count($aSplit)) { |
|
| 220 | - $aTmp = array($aSplit[$i-1] => $sValue); |
|
| 218 | + for ($i = count($aSplit); $i > 0; $i--) { |
|
| 219 | + if ($i == count($aSplit)) { |
|
| 220 | + $aTmp = array($aSplit[$i - 1] => $sValue); |
|
| 221 | 221 | } else { |
| 222 | - $aTmp = array($aSplit[$i-1] => $aTmp); |
|
| 222 | + $aTmp = array($aSplit[$i - 1] => $aTmp); |
|
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | $aInstallmentData = array_replace_recursive($aInstallmentData, $aTmp); |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - if(isset($aInstallmentData['paymentdetails']) && count($aInstallmentData['paymentdetails']) > 0) { |
|
| 229 | + if (isset($aInstallmentData['paymentdetails']) && count($aInstallmentData['paymentdetails']) > 0) { |
|
| 230 | 230 | return $aInstallmentData['paymentdetails']; |
| 231 | 231 | } |
| 232 | 232 | |