PAYONE-GmbH / magento-2

Helper/ConfigExport.php

Spacing +1 added lines, -1 removed lines

@@ -177,6 +177,6 @@
         if ($this->getPaymentConfig('allowspecific', $sPaymentCode, $sStoreCode, true) == '1') {
             return $this->getPaymentConfig('specificcountry', $sPaymentCode, $sStoreCode, true);
         }
-        return '';// empty return value if all countries are available
+        return ''; // empty return value if all countries are available
     }
 }

Helper/Database.php

Spacing +1 added lines, -1 removed lines

@@ -188,6 +188,6 @@
         if ($iCount === null) {
             return 0;
         }
-        return $iCount+1;
+        return $iCount + 1;
     }
 }

Helper/HostedIframe.php

Spacing +4 added lines, -4 removed lines

@@ -156,15 +156,15 @@
      */
     public function getHostedFieldConfig()
     {
-        $aHostedParams = $this->getHostedParams();// get hosted params from config
+        $aHostedParams = $this->getHostedParams(); // get hosted params from config
 
         $aFieldConfig = [];
         if (!empty($aHostedParams)) {
-            $aFieldConfig['fields'] = $this->getFieldConfig();// generate config for all field types
+            $aFieldConfig['fields'] = $this->getFieldConfig(); // generate config for all field types
             $aFieldConfig['defaultStyle'] = $this->getDefaultStyles($aHostedParams);
             if ($aHostedParams['Errors_active'] == "true") {
-                $aFieldConfig['error'] = 'errorOutput';// area to display error-messages (optional)
-                $aFieldConfig['language'] = $aHostedParams['Errors_lang'];// has to be defined in javascript
+                $aFieldConfig['error'] = 'errorOutput'; // area to display error-messages (optional)
+                $aFieldConfig['language'] = $aHostedParams['Errors_lang']; // has to be defined in javascript
             }
         }
         return $aFieldConfig;

Model/Methods/BaseMethod.php

Spacing +17 added lines, -17 removed lines

@@ -235,7 +235,7 @@ 
      */
     public function getInstructions()
     {
-        return trim($this->getConfigData('instructions'));// return description text
+        return trim($this->getConfigData('instructions')); // return description text
     }
 
     /**
@@ -247,9 +247,9 @@ 
     {
         $sRequestType = $this->getAuthorizationMode();
         if ($sRequestType == PayoneConfig::REQUEST_TYPE_PREAUTHORIZATION) {
-            return AbstractMethod::ACTION_AUTHORIZE;// only create order
+            return AbstractMethod::ACTION_AUTHORIZE; // only create order
         } elseif ($sRequestType == PayoneConfig::REQUEST_TYPE_AUTHORIZATION) {
-            return AbstractMethod::ACTION_AUTHORIZE_CAPTURE;// create order and capture
+            return AbstractMethod::ACTION_AUTHORIZE_CAPTURE; // create order and capture
         }
     }
 
@@ -262,9 +262,9 @@ 
      */
     public function authorize(InfoInterface $payment, $amount)
     {
-        $oReturn = parent::authorize($payment, $amount);// execute Magento parent authorization
-        $this->sendPayoneAuthorization($payment, $amount);// send auth request to PAYONE
-        return $oReturn;// return magento parent auth value
+        $oReturn = parent::authorize($payment, $amount); // execute Magento parent authorization
+        $this->sendPayoneAuthorization($payment, $amount); // send auth request to PAYONE
+        return $oReturn; // return magento parent auth value
     }
 
     /**
@@ -276,9 +276,9 @@ 
      */
     public function refund(InfoInterface $payment, $amount)
     {
-        $oReturn = parent::refund($payment, $amount);// execute Magento parent refund
-        $this->sendPayoneDebit($payment, $amount);// send debit request to PAYONE
-        return $oReturn;// return magento parent refund value
+        $oReturn = parent::refund($payment, $amount); // execute Magento parent refund
+        $this->sendPayoneDebit($payment, $amount); // send debit request to PAYONE
+        return $oReturn; // return magento parent refund value
     }
 
     /**
@@ -290,13 +290,13 @@ 
      */
     public function capture(InfoInterface $payment, $amount)
     {
-        $oReturn = parent::capture($payment, $amount);// execute Magento parent capture
+        $oReturn = parent::capture($payment, $amount); // execute Magento parent capture
         if ($payment->getParentTransactionId()) {// does the order already have a transaction?
-            $this->sendPayoneCapture($payment, $amount);// is probably admin invoice capture
+            $this->sendPayoneCapture($payment, $amount); // is probably admin invoice capture
         } else {
-            $this->sendPayoneAuthorization($payment, $amount);// is probably frontend checkout capture
+            $this->sendPayoneAuthorization($payment, $amount); // is probably frontend checkout capture
         }
-        return $oReturn;// return magento parent capture value
+        return $oReturn; // return magento parent capture value
     }
 
     /**
@@ -311,12 +311,12 @@ 
         $iAllowSpecific = $this->shopHelper->getConfigParam('allowspecific');
         $aAvailableCountries = explode(',', $this->shopHelper->getConfigParam('specificcountry'));
         if ($this->hasCustomConfig()) {// check for non-global configuration
-            $iAllowSpecific = $this->getCustomConfigParam('allowspecific');// only specific countries allowed?
-            $aAvailableCountries = explode(',', $this->getCustomConfigParam('specificcountry'));// get allowed countries
+            $iAllowSpecific = $this->getCustomConfigParam('allowspecific'); // only specific countries allowed?
+            $aAvailableCountries = explode(',', $this->getCustomConfigParam('specificcountry')); // get allowed countries
         }
         if ($iAllowSpecific == 1 && !in_array($country, $aAvailableCountries)) {// only specific but not included
-            return false;// cant use for given country
+            return false; // cant use for given country
         }
-        return true;// can use for given country
+        return true; // can use for given country
     }
 }

Model/Methods/PayoneMethod.php

Spacing +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
     protected function sendPayoneAuthorization(InfoInterface $payment, $amount)
     {
         $oOrder = $payment->getOrder();
-        $this->checkoutSession->unsPayoneRedirectUrl();// remove redirect url from session
+        $this->checkoutSession->unsPayoneRedirectUrl(); // remove redirect url from session
         $aResponse = $this->authorizationRequest->sendRequest($this, $oOrder, $amount);
         $this->handleResponse($aResponse);
         if ($aResponse['status'] == 'ERROR') {// request returned an error
@@ -154,7 +154,7 @@ 
      */
     public function getPaymentSpecificParameters(Order $oOrder)
     {
-        return [];// filled in child classes
+        return []; // filled in child classes
     }
 
     /**
@@ -272,7 +272,7 @@ 
      */
     public function getSubTypeSpecificParameters(Order $oOrder)
     {
-        return [];// filled in child classes
+        return []; // filled in child classes
     }
 
     /**

Model/Api/Request/Debit.php

Spacing +4 added lines, -4 removed lines

@@ -86,19 +86,19 @@
         $oOrder = $oPaymentInfo->getOrder();
         $iTxid = $oPaymentInfo->getParentTransactionId();
         if (strpos($iTxid, '-') !== false) {
-            $iTxid = substr($iTxid, 0, strpos($iTxid, '-'));// clean the txid from the magento-suffixes
+            $iTxid = substr($iTxid, 0, strpos($iTxid, '-')); // clean the txid from the magento-suffixes
         }
 
         $this->setOrderId($oOrder->getRealOrderId());
 
         $this->addParameter('request', 'debit'); // Request method
-        $this->addParameter('mode', $oPayment->getOperationMode());// PayOne Portal Operation Mode (live or test)
+        $this->addParameter('mode', $oPayment->getOperationMode()); // PayOne Portal Operation Mode (live or test)
         $this->addParameter('txid', $iTxid); // PayOne Transaction ID
         $this->addParameter('sequencenumber', $this->databaseHelper->getSequenceNumber($iTxid));
 
         // Total order sum in smallest currency unit
-        $this->addParameter('amount', number_format((-1 * $dAmount), 2, '.', '')*100);
-        $this->addParameter('currency', $oOrder->getOrderCurrencyCode());// Currency
+        $this->addParameter('amount', number_format((-1 * $dAmount), 2, '.', '') * 100);
+        $this->addParameter('currency', $oOrder->getOrderCurrencyCode()); // Currency
         $this->addParameter('transactiontype', 'GT');
 
         $sRefundAppendix = $this->getRefundAppendix($oOrder, $oPayment);

Model/Api/Request/Authorization.php

Spacing +30 added lines, -30 removed lines

@@ -116,20 +116,20 @@ 
      */
     public function sendRequest(PayoneMethod $oPayment, Order $oOrder, $dAmount)
     {
-        $this->setOrderId($oOrder->getRealOrderId());// save order id to object for later use
+        $this->setOrderId($oOrder->getRealOrderId()); // save order id to object for later use
 
-        $this->addParameter('request', $oPayment->getAuthorizationMode());// add request type
-        $this->addParameter('mode', $oPayment->getOperationMode());// add mode ( live or test )
-        $this->addParameter('customerid', $oOrder->getCustomerId());// add customer id
-        $this->addParameter('aid', $this->shopHelper->getConfigParam('aid'));// add sub account id
-        $this->setAuthorizationParameters($oPayment, $oOrder, $dAmount);// set authorization params
+        $this->addParameter('request', $oPayment->getAuthorizationMode()); // add request type
+        $this->addParameter('mode', $oPayment->getOperationMode()); // add mode ( live or test )
+        $this->addParameter('customerid', $oOrder->getCustomerId()); // add customer id
+        $this->addParameter('aid', $this->shopHelper->getConfigParam('aid')); // add sub account id
+        $this->setAuthorizationParameters($oPayment, $oOrder, $dAmount); // set authorization params
         if ($oPayment->hasCustomConfig()) {// if payment type doesnt use the global settings
-            $this->addCustomParameters($oPayment);// add custom connection settings
+            $this->addCustomParameters($oPayment); // add custom connection settings
         }
 
-        $aResponse = $this->send();// send request to PAYONE Server API
+        $aResponse = $this->send(); // send request to PAYONE Server API
 
-        $this->apiHelper->addPayoneOrderData($oOrder, $this->getParameters(), $aResponse);// add payone data to order
+        $this->apiHelper->addPayoneOrderData($oOrder, $this->getParameters(), $aResponse); // add payone data to order
 
         return $aResponse;
     }
@@ -143,15 +143,15 @@ 
      */
     protected function setUserParameters(PayoneMethod $oPayment, Order $oOrder)
     {
-        $oQuote = $this->checkoutSession->getQuote();// get quote from session
-        $oCustomer = $oQuote->getCustomer();// get customer object from quote
+        $oQuote = $this->checkoutSession->getQuote(); // get quote from session
+        $oCustomer = $oQuote->getCustomer(); // get customer object from quote
         $this->addUserDataParameters($oOrder->getBillingAddress(), $oPayment, $oCustomer->getGender(), $oOrder->getCustomerEmail(), $oCustomer->getDob());
 
         $oShipping = $oOrder->getShippingAddress(); // get shipping address from order
         if ($oShipping) {// shipping address existing?
-            $this->addAddress($oShipping, true);// add regular shipping address
+            $this->addAddress($oShipping, true); // add regular shipping address
         } elseif ($oPayment->getCode() == PayoneConfig::METHOD_PAYPAL && $this->shopHelper->getConfigParam('bill_as_del_address', PayoneConfig::METHOD_PAYPAL, 'payone_payment')) {
-            $this->addAddress($oOrder->getBillingAddress(), true);// add billing address as shipping address
+            $this->addAddress($oOrder->getBillingAddress(), true); // add billing address as shipping address
         }
     }
 
@@ -165,22 +165,22 @@ 
      */
     protected function setAuthorizationParameters(PayoneMethod $oPayment, Order $oOrder, $dAmount)
     {
-        $sRefNr = $this->shopHelper->getConfigParam('ref_prefix').$oOrder->getIncrementId();// ref_prefix to prevent duplicate refnumbers in testing environments
-        $sRefNr = $oPayment->formatReferenceNumber($sRefNr);// some payment methods have refnr regulations
-        $this->addParameter('reference', $sRefNr);// add ref-nr to request
-        $this->addParameter('amount', number_format($dAmount, 2, '.', '')*100);// add price to request
-        $this->addParameter('currency', $oOrder->getOrderCurrencyCode());// add currency to request
+        $sRefNr = $this->shopHelper->getConfigParam('ref_prefix').$oOrder->getIncrementId(); // ref_prefix to prevent duplicate refnumbers in testing environments
+        $sRefNr = $oPayment->formatReferenceNumber($sRefNr); // some payment methods have refnr regulations
+        $this->addParameter('reference', $sRefNr); // add ref-nr to request
+        $this->addParameter('amount', number_format($dAmount, 2, '.', '') * 100); // add price to request
+        $this->addParameter('currency', $oOrder->getOrderCurrencyCode()); // add currency to request
         if ($this->shopHelper->getConfigParam('transmit_ip') == '1') {// is IP transmission needed?
-            $sIp = $this->environmentHelper->getRemoteIp();// get remote IP
+            $sIp = $this->environmentHelper->getRemoteIp(); // get remote IP
             if ($sIp != '') {// is IP not empty
-                $this->addParameter('ip', $sIp);// add IP address to the request
+                $this->addParameter('ip', $sIp); // add IP address to the request
             }
         }
-        $this->setUserParameters($oPayment, $oOrder);// add user data - addresses etc.
-        $this->setPaymentParameters($oPayment, $oOrder);// add payment specific parameters
+        $this->setUserParameters($oPayment, $oOrder); // add user data - addresses etc.
+        $this->setPaymentParameters($oPayment, $oOrder); // add payment specific parameters
 
         if ($this->apiHelper->isInvoiceDataNeeded($oPayment)) {//
-            $this->invoiceGenerator->addProductInfo($this, $oOrder);// add invoice parameters
+            $this->invoiceGenerator->addProductInfo($this, $oOrder); // add invoice parameters
         }
     }
 
@@ -193,15 +193,15 @@ 
      */
     protected function setPaymentParameters(PayoneMethod $oPayment, Order $oOrder)
     {
-        $this->addParameter('clearingtype', $oPayment->getClearingtype());// add payment type to request
+        $this->addParameter('clearingtype', $oPayment->getClearingtype()); // add payment type to request
         $sNarrativeText = $this->toolkitHelper->getNarrativeText($oOrder, $oPayment);
         if (!empty($sNarrativeText)) {// narrative text existing?
-            $this->addParameter('narrative_text', $sNarrativeText);// add narrative text parameter
+            $this->addParameter('narrative_text', $sNarrativeText); // add narrative text parameter
         }
-        $aPaymentParams = $oPayment->getPaymentSpecificParameters($oOrder);// get payment params specific to the payment type
-        $this->aParameters = array_merge($this->aParameters, $aPaymentParams);// merge payment params with other params
+        $aPaymentParams = $oPayment->getPaymentSpecificParameters($oOrder); // get payment params specific to the payment type
+        $this->aParameters = array_merge($this->aParameters, $aPaymentParams); // merge payment params with other params
         if ($oPayment->needsRedirectUrls() === true) {// does the used payment type need redirect urls?
-            $this->addRedirectUrls($oPayment);// add needed redirect urls
+            $this->addRedirectUrls($oPayment); // add needed redirect urls
         }
     }
 
@@ -214,9 +214,9 @@ 
     protected function addCustomParameters(PayoneMethod $oPayment)
     {
         foreach ($this->aCustomParamMap as $sParamName => $sConfigName) {// add all custom parameters
-            $sCustomConfig = $oPayment->getCustomConfigParam($sConfigName);// get custom config param
+            $sCustomConfig = $oPayment->getCustomConfigParam($sConfigName); // get custom config param
             if (!empty($sCustomConfig)) {// only add if the param is configured
-                $this->addParameter($sParamName, $sCustomConfig);// add custom param to request
+                $this->addParameter($sParamName, $sCustomConfig); // add custom param to request
             }
         }
     }

Model/Api/Request/Capture.php

Spacing +3 added lines, -3 removed lines

@@ -79,12 +79,12 @@
         $this->setOrderId($oOrder->getRealOrderId());
 
         $this->addParameter('request', 'capture'); // Request method
-        $this->addParameter('mode', $oPayment->getOperationMode());// PayOne Portal Operation Mode (live or test)
+        $this->addParameter('mode', $oPayment->getOperationMode()); // PayOne Portal Operation Mode (live or test)
         $this->addParameter('language', Locale::getPrimaryLanguage(Locale::getDefault()));
 
         // Total order sum in smallest currency unit
-        $this->addParameter('amount', number_format($dAmount, 2, '.', '')*100);
-        $this->addParameter('currency', $oOrder->getOrderCurrencyCode());// Currency
+        $this->addParameter('amount', number_format($dAmount, 2, '.', '') * 100);
+        $this->addParameter('currency', $oOrder->getOrderCurrencyCode()); // Currency
 
         $this->addParameter('txid', $iTxid); // PayOne Transaction ID
         $this->addParameter('sequencenumber', $this->databaseHelper->getSequenceNumber($iTxid));

Model/Api/Request/Genericpayment/PayPalExpress.php

Spacing +2 added lines, -2 removed lines

@@ -48,10 +48,10 @@
     {
         $this->addParameter('request', 'genericpayment');
         $this->addParameter('mode', $oPayment->getOperationMode());
-        $this->addParameter('aid', $this->shopHelper->getConfigParam('aid'));// ID of PayOne Sub-Account
+        $this->addParameter('aid', $this->shopHelper->getConfigParam('aid')); // ID of PayOne Sub-Account
         $this->addParameter('clearingtype', 'wlt');
         $this->addParameter('wallettype', 'PPE');
-        $this->addParameter('amount', number_format($oQuote->getGrandTotal(), 2, '.', '')*100);
+        $this->addParameter('amount', number_format($oQuote->getGrandTotal(), 2, '.', '') * 100);
         $this->addParameter('currency', $oQuote->getQuoteCurrencyCode());
         $this->addParameter('narrative_text', 'Test');