Merge pull request #19 in DEV-MO/shopware5-module from feature/SHPWR-…

…347_fix-rounded-price-discrepancies to release/5.2.4 * commit 'c6ca0d7ba7ae8f2ed1004d824810fcc5acb9b8c7': [SHPWR-347] round item prices for b2b shops [SHPWR-347] fix rounded price discrepancies
ratepay · Sep 11, 2018 · 6852107 · 6852107
2 parents c7730f2 + c6ca0d7
commit 6852107
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/Component/Library/src/Model/Request/SubModel/Content/ShoppingBasket.php b/Component/Library/src/Model/Request/SubModel/Content/ShoppingBasket.php
@@ -96,7 +96,7 @@ public function toArray()
                 $amount += floatval($unitPrice);
             }
 
-            $this->admittedFields['Amount']['value'] = $amount;
+            $this->admittedFields['Amount']['value'] = round($amount, 2);
         }
 
         return parent::toArray();

diff --git a/Component/Library/src/Service/Math.php b/Component/Library/src/Service/Math.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace RatePAY\Service;
+use RpayRatePay\Component\Service\Logger;
 
 
 /**
@@ -13,20 +14,15 @@ class Math
     /**
      * @param float $netPrice
      * @param float|int $taxPercentage
-     * @param bool $round
+     * @param bool $roundToTwoDecimals
      * @return float
      */
-    public static function netToGross($netPrice, $taxPercentage, $round = false)
+    public static function netToGross($netPrice, $taxPercentage, $roundToTwoDecimals = false)
     {
-        $withTax = $netPrice + $netPrice * $taxPercentage / 100;
+        $withTax = $netPrice + ($netPrice * $taxPercentage / 100);
+        $precision = $roundToTwoDecimals ? 2 : 3;
 
-        if (!$round) {
-            return $withTax;
-        }
-
-        $rounded = round($withTax, 2);
-
-        return $rounded;
+        return round($withTax, $precision);
     }
 
     /**

diff --git a/Component/Mapper/ModelFactory.php b/Component/Mapper/ModelFactory.php
@@ -830,7 +830,7 @@ private function getShippingItemData(PaymentRequestData $shippingData, $useFallb
             Math::netToGross($shippingData->getShippingCost(), $shippingData->getShippingTax()) :
             $shippingData->getShippingCost();
 
-        $priceGross = round($priceGross, 2);
+        $priceGross = round($priceGross, 3);
 
         $item = [
             'Description' => 'Shipping costs',

diff --git a/Component/Service/PaymentProcessor.php b/Component/Service/PaymentProcessor.php
@@ -99,6 +99,8 @@ public function setPaymentStatusPaid($order)
     /**
      * @param $transactionId
      * @param \Shopware\Models\Order\Order $order
+     * @param bool $backend
+     * @throws \Exception
      */
     public function sendPaymentConfirm($transactionId, $order, $backend = false)
     {

diff --git a/Controller/frontend/RpayRatepay.php b/Controller/frontend/RpayRatepay.php
@@ -124,7 +124,7 @@ public function saveUserDataAction()
 
         /** @var Shopware\Models\Customer\Customer $userModel */
         $userModel = $customerModel->findOneBy(['id' => Shopware()->Session()->sUserId]);
-        $userWrapped = new ShopwareCustomerWrapper($userModel);
+        $userWrapped = new ShopwareCustomerWrapper($userModel, Shopware()->Models());
 
         if (isset($Parameter['checkoutBillingAddressId']) && !is_null($Parameter['checkoutBillingAddressId'])) { // From Shopware 5.2 current billing address is sent by parameter
             $addressModel = Shopware()->Models()->getRepository('Shopware\Models\Customer\Address');

diff --git a/Views/responsive/frontend/installment/php/PiRatepayRateCalc.php b/Views/responsive/frontend/installment/php/PiRatepayRateCalc.php
@@ -111,8 +111,7 @@ public function createFormattedResult()
                 $currency = '&euro;';
                 $decimalSeperator = ',';
                 $thousandSepeartor = '.';
-            }
-            else {
+            } else {
                 $currency = '&euro;';
                 $decimalSeperator = '.';
                 $thousandSepeartor = ',';