@@ -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) { |
@@ -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 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | public function getPayDataArray($aResponse) |
190 | 190 | { |
191 | 191 | $aPayData = array(); |
192 | - foreach($aResponse as $sKey => $sValue) { |
|
192 | + foreach ($aResponse as $sKey => $sValue) { |
|
193 | 193 | $sCorrectedKey = str_ireplace('add_paydata[', '', $sKey); |
194 | 194 | $sCorrectedKey = rtrim($sCorrectedKey, ']'); |
195 | 195 | $sCorrectedKey = strtolower($sCorrectedKey); |
@@ -214,18 +214,18 @@ discard block |
||
214 | 214 | $aPayData = $this->getPayDataArray($aResponse); |
215 | 215 | foreach ($aPayData as $sKey => $sValue) { |
216 | 216 | $aSplit = explode('_', $sKey); |
217 | - for($i = count($aSplit); $i > 0; $i--) { |
|
218 | - if($i == count($aSplit)) { |
|
219 | - $aTmp = array($aSplit[$i-1] => $sValue); |
|
217 | + for ($i = count($aSplit); $i > 0; $i--) { |
|
218 | + if ($i == count($aSplit)) { |
|
219 | + $aTmp = array($aSplit[$i - 1] => $sValue); |
|
220 | 220 | } else { |
221 | - $aTmp = array($aSplit[$i-1] => $aTmp); |
|
221 | + $aTmp = array($aSplit[$i - 1] => $aTmp); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | 225 | $aInstallmentData = array_replace_recursive($aInstallmentData, $aTmp); |
226 | 226 | } |
227 | 227 | |
228 | - if(isset($aInstallmentData['paymentdetails']) && count($aInstallmentData['paymentdetails']) > 0) { |
|
228 | + if (isset($aInstallmentData['paymentdetails']) && count($aInstallmentData['paymentdetails']) > 0) { |
|
229 | 229 | return $aInstallmentData['paymentdetails']; |
230 | 230 | } |
231 | 231 |
@@ -268,7 +268,6 @@ |
||
268 | 268 | |
269 | 269 | /** |
270 | 270 | * Send the previously prepared request, log request and response into the database and return the response |
271 | - |
|
272 | 271 | * @param PayoneMethod $oPayment |
273 | 272 | * @return array |
274 | 273 | */ |
@@ -61,7 +61,7 @@ |
||
61 | 61 | * |
62 | 62 | * @var \Payone\Core\Helper\Toolkit |
63 | 63 | */ |
64 | - protected $toolkitHelper; |
|
64 | + protected $toolkitHelper; |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Constructor |
@@ -77,7 +77,7 @@ |
||
77 | 77 | ) { |
78 | 78 | try { |
79 | 79 | $return = $proceed($creditmemo, $offlineRequested); |
80 | - } catch(\Exception $ex) { |
|
80 | + } catch (\Exception $ex) { |
|
81 | 81 | $aRequest = $this->checkoutSession->getPayoneDebitRequest(); |
82 | 82 | if (is_array($aRequest) && !empty($aRequest)) { |
83 | 83 | $aResponse = $this->checkoutSession->getPayoneDebitResponse(); |
@@ -115,14 +115,14 @@ |
||
115 | 115 | $this->addParameter('language', $this->shopHelper->getLocale()); |
116 | 116 | |
117 | 117 | $this->addAddress($oAddress); |
118 | - if ($this->addressesChecked->wasAddressCheckedBefore($oAddress, $sType,true) === false) { |
|
118 | + if ($this->addressesChecked->wasAddressCheckedBefore($oAddress, $sType, true) === false) { |
|
119 | 119 | $aResponse = $this->send(); |
120 | 120 | if (isset($aResponse['score']) && $aResponse['score'] === 'U') { |
121 | 121 | $unknownDefault = $this->shopHelper->getConfigParam('unknown_value', 'creditrating', 'payone_protect'); |
122 | 122 | $aResponse['score'] = empty($unknownDefault) ? 'G' : $unknownDefault; |
123 | 123 | } |
124 | 124 | if ($aResponse['status'] == 'VALID') { |
125 | - $this->addressesChecked->addCheckedAddress($oAddress, $aResponse, $sType,true); |
|
125 | + $this->addressesChecked->addCheckedAddress($oAddress, $aResponse, $sType, true); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | return $aResponse; |
@@ -109,7 +109,7 @@ |
||
109 | 109 | try { |
110 | 110 | $this->curl->post($sUrl, $aPostArray); |
111 | 111 | $this->log($sUrl.' Response: '.$this->curl->getBody(), $aPostArray); |
112 | - } catch(\Exception $exc) { |
|
112 | + } catch (\Exception $exc) { |
|
113 | 113 | $this->log($sUrl.' Exception: '.$exc->getMessage(), $aPostArray); |
114 | 114 | } |
115 | 115 | } |
@@ -123,8 +123,8 @@ |
||
123 | 123 | */ |
124 | 124 | public function forwardAsyncRequest($aPostArray, $sUrl) |
125 | 125 | { |
126 | - // Increased timeout to 5500ms |
|
127 | - // See payone-gmbh/magento-2 issue #316 |
|
126 | + // Increased timeout to 5500ms |
|
127 | + // See payone-gmbh/magento-2 issue #316 |
|
128 | 128 | $this->curl->setOption(CURLOPT_TIMEOUT_MS, 5500); |
129 | 129 | $this->curl->setOption(CURLOPT_SSL_VERIFYPEER, false); |
130 | 130 | $this->curl->setOption(CURLOPT_SSL_VERIFYHOST, false); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | parent::__construct($context); |
47 | 47 | |
48 | 48 | // Fix for Magento 2.3 CsrfValidator and backwards-compatibility to prior Magento 2 versions |
49 | - if(interface_exists("\Magento\Framework\App\CsrfAwareActionInterface")) { |
|
49 | + if (interface_exists("\Magento\Framework\App\CsrfAwareActionInterface")) { |
|
50 | 50 | $request = $this->getRequest(); |
51 | 51 | if ($request instanceof Http && $request->isPost()) { |
52 | 52 | $request->setParam('ajax', true); |
@@ -83,7 +83,7 @@ |
||
83 | 83 | $aParams['add_paydata[terminal_address_country]'] = $this->shopHelper->getConfigParam('country_id', 'store_information', 'general'); // CHECKEN! |
84 | 84 | $aParams['add_paydata[terminal_address_name]'] = $this->shopHelper->getConfigParam('name', 'store_information', 'general'); |
85 | 85 | $aParams['add_paydata[terminal_address_streetname]'] = $this->shopHelper->getConfigParam('street_line1', 'store_information', 'general'); |
86 | - $aParams['add_paydata[terminal_address_streetnumber]'] = '';// IS THIS NECESSARY? |
|
86 | + $aParams['add_paydata[terminal_address_streetnumber]'] = ''; // IS THIS NECESSARY? |
|
87 | 87 | $aParams['add_paydata[terminal_address_zip]'] = $this->shopHelper->getConfigParam('postcode', 'store_information', 'general'); |
88 | 88 | $aParams['add_paydata[terminal_id]'] = $this->shopHelper->getConfigParam('name', 'store_information', 'general'); |
89 | 89 |