fjbender / magento-2

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/Invoice.php

Spacing +29 added lines, -29 removed lines

@@ -100,14 +100,14 @@ 
      */
     protected function addInvoicePosition($sId, $dPrice, $sItemType, $iAmount, $sDesc, $dVat)
     {
-        $this->oRequest->addParameter('id['.$this->iIndex.']', $sId);// add invoice item id
-        $this->oRequest->addParameter('pr['.$this->iIndex.']', $this->toolkitHelper->formatNumber($dPrice) * 100);// expected in smallest unit of currency
-        $this->oRequest->addParameter('it['.$this->iIndex.']', $sItemType);// add invoice item type
-        $this->oRequest->addParameter('no['.$this->iIndex.']', $iAmount);// add invoice item amount
-        $this->oRequest->addParameter('de['.$this->iIndex.']', $sDesc);// add invoice item description
-        $this->oRequest->addParameter('va['.$this->iIndex.']', $this->toolkitHelper->formatNumber($dVat * 100, 0));// expected * 100 to also handle vats with decimals
-        $this->dAmount += $dPrice * $iAmount;// needed for return of the main method
-        $this->iIndex++;// increase index for next item
+        $this->oRequest->addParameter('id['.$this->iIndex.']', $sId); // add invoice item id
+        $this->oRequest->addParameter('pr['.$this->iIndex.']', $this->toolkitHelper->formatNumber($dPrice) * 100); // expected in smallest unit of currency
+        $this->oRequest->addParameter('it['.$this->iIndex.']', $sItemType); // add invoice item type
+        $this->oRequest->addParameter('no['.$this->iIndex.']', $iAmount); // add invoice item amount
+        $this->oRequest->addParameter('de['.$this->iIndex.']', $sDesc); // add invoice item description
+        $this->oRequest->addParameter('va['.$this->iIndex.']', $this->toolkitHelper->formatNumber($dVat * 100, 0)); // expected * 100 to also handle vats with decimals
+        $this->dAmount += $dPrice * $iAmount; // needed for return of the main method
+        $this->iIndex++; // increase index for next item
     }
 
     /**
@@ -121,22 +121,22 @@ 
      */
     public function addProductInfo(Base $oRequest, Order $oOrder, $aPositions = false, $blDebit = false)
     {
-        $this->oRequest = $oRequest;// write request to property for manipulation of the object
-        $sInvoiceAppendix = $this->toolkitHelper->getInvoiceAppendix($oOrder);// get invoice appendix
+        $this->oRequest = $oRequest; // write request to property for manipulation of the object
+        $sInvoiceAppendix = $this->toolkitHelper->getInvoiceAppendix($oOrder); // get invoice appendix
         if (!empty($sInvoiceAppendix)) {// invoice appendix existing?
-            $this->oRequest->addParameter('invoiceappendix', $sInvoiceAppendix);// add appendix to request
+            $this->oRequest->addParameter('invoiceappendix', $sInvoiceAppendix); // add appendix to request
         }
 
         foreach ($oOrder->getAllItems() as $oItem) {// add invoice items for all order items
             if ($oItem->isDummy() === false) {// prevent variant-products of adding 2 items
-                $this->addProductItem($oItem, $aPositions);// add product invoice params to request
+                $this->addProductItem($oItem, $aPositions); // add product invoice params to request
             }
         }
 
-        $blFirstCapture = true;// Is first capture?
+        $blFirstCapture = true; // Is first capture?
         if ($aPositions === false || $blFirstCapture === true || $blDebit === true) {
-            $this->addShippingItem($oOrder, $aPositions, $blDebit);// add shipping invoice params to request
-            $this->addDiscountItem($oOrder, $aPositions, $blDebit);// add discount invoice params to request
+            $this->addShippingItem($oOrder, $aPositions, $blDebit); // add shipping invoice params to request
+            $this->addDiscountItem($oOrder, $aPositions, $blDebit); // add discount invoice params to request
         }
         return $this->dAmount;
     }
@@ -151,14 +151,14 @@ 
     protected function addProductItem($oItem, $aPositions)
     {
         if ($aPositions === false || array_key_exists($oItem->getProductId(), $aPositions) !== false) {// full or single-invoice?
-            $dItemAmount = $oItem->getQtyOrdered();// get ordered item amount
+            $dItemAmount = $oItem->getQtyOrdered(); // get ordered item amount
             if ($aPositions !== false && array_key_exists($oItem->getProductId(), $aPositions) !== false) {// product existing in single-invoice?
-                $dItemAmount = $aPositions[$oItem->getProductId()]['amount'];// use amount from single-invoice
+                $dItemAmount = $aPositions[$oItem->getProductId()]['amount']; // use amount from single-invoice
             }
-            $dBrutPrice = $oItem->getBasePrice() + ($oItem->getBaseTaxAmount() / $oItem->getQtyOrdered());// cals single item price
+            $dBrutPrice = $oItem->getBasePrice() + ($oItem->getBaseTaxAmount() / $oItem->getQtyOrdered()); // cals single item price
             $this->addInvoicePosition($oItem->getSku(), $dBrutPrice, 'goods', $dItemAmount, $oItem->getName(), $oItem->getTaxPercent());
             if ($this->dTax === false) {// is dTax not set yet?
-                $this->dTax = $oItem->getTaxPercent();// set the tax for following entities which dont have the vat attached to it
+                $this->dTax = $oItem->getTaxPercent(); // set the tax for following entities which dont have the vat attached to it
             }
         }
     }
@@ -175,11 +175,11 @@ 
     {
         // shipping costs existing or given for partial captures/debits?
         if ($oOrder->getBaseShippingInclTax() != 0 && ($aPositions === false || ($blDebit === false || array_key_exists('oxdelcost', $aPositions) !== false))) {
-            $sDelDesc = __('Surcharge').' '.__('Shipping Costs');// default description
+            $sDelDesc = __('Surcharge').' '.__('Shipping Costs'); // default description
             if ($oOrder->getBaseShippingInclTax() < 0) {// negative shipping cost
-                $sDelDesc = __('Deduction').' '.__('Shipping Costs');// change item description to deduction
+                $sDelDesc = __('Deduction').' '.__('Shipping Costs'); // change item description to deduction
             }
-            $sShippingSku = $this->toolkitHelper->getConfigParam('sku', 'costs', 'payone_misc');// get configured shipping SKU
+            $sShippingSku = $this->toolkitHelper->getConfigParam('sku', 'costs', 'payone_misc'); // get configured shipping SKU
             $this->addInvoicePosition($sShippingSku, $oOrder->getBaseShippingInclTax(), 'shipment', 1, $sDelDesc, $this->dTax);
         }
     }
@@ -200,16 +200,16 @@ 
             if ($aPositions === false) {// full invoice?
                 // The calculations broken down to single items of Magento2 are unprecise and the Payone API will send an error if
                 // the calculated positions don't match, so we compensate for rounding-problems here
-                $dDiff = ($this->dAmount + $oOrder->getBaseDiscountAmount()) - $oOrder->getGrandTotal();// calc rounding discrepancy
-                $dDiscount -= $dDiff;// subtract difference from discount
+                $dDiff = ($this->dAmount + $oOrder->getBaseDiscountAmount()) - $oOrder->getGrandTotal(); // calc rounding discrepancy
+                $dDiscount -= $dDiff; // subtract difference from discount
             }
-            $sDiscountSku = $this->toolkitHelper->getConfigParam('sku', 'discount', 'payone_misc');// get configured discount SKU
-            $sDesc = (string)__('Discount');// default description
+            $sDiscountSku = $this->toolkitHelper->getConfigParam('sku', 'discount', 'payone_misc'); // get configured discount SKU
+            $sDesc = (string)__('Discount'); // default description
             if ($oOrder->getCouponCode()) {// was a coupon code used?
-                $sDiscountSku = $this->toolkitHelper->getConfigParam('sku', 'voucher', 'payone_misc');// get configured voucher SKU
-                $sDesc = (string)__('Coupon').' - '.$oOrder->getCouponCode();// add counpon code to description
+                $sDiscountSku = $this->toolkitHelper->getConfigParam('sku', 'voucher', 'payone_misc'); // get configured voucher SKU
+                $sDesc = (string)__('Coupon').' - '.$oOrder->getCouponCode(); // add counpon code to description
             }
-            $this->addInvoicePosition($sDiscountSku, $dDiscount, 'voucher', 1, $sDesc, $this->dTax);// add invoice params to request
+            $this->addInvoicePosition($sDiscountSku, $dDiscount, 'voucher', 1, $sDesc, $this->dTax); // add invoice params to request
         }
     }
 }