Merged in VIPPS-196-to-2.3 (pull request #75)

VIPPS-196: Order amount in Vipps is not the same as in Magento Approved-by: Volodymyr Klymenko <[email protected]> Approved-by: Serhiy Shkolyarenko <[email protected]>
vippsas · Feb 25, 2019 · 7ff0e49 · 7ff0e49
2 parents 5220d97 + 50c5aec
commit 7ff0e49
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Gateway/Command/CaptureCommand.php b/Gateway/Command/CaptureCommand.php
@@ -183,7 +183,7 @@ public function __construct(
     public function execute(array $commandSubject)
     {
         $amount = $this->subjectReader->readAmount($commandSubject);
-        $amount = (int)($this->formatPrice($amount) * 100);
+        $amount = (int)round($this->formatPrice($amount) * 100);
 
         $response = $this->paymentDetailsProvider->get($commandSubject);
         $transaction = $this->transactionBuilder->setData($response)->build();
@@ -219,14 +219,14 @@ private function captureBasedOnPaymentDetails($commandSubject, Transaction $tran
     {
         $payment = $this->subjectReader->readPayment($commandSubject);
         $amount = $this->subjectReader->readAmount($commandSubject);
-        $amount = (int)($this->formatPrice($amount) * 100);
+        $amount = (int)round($this->formatPrice($amount) * 100);
 
         $orderAdapter = $payment->getOrder();
         $orderIncrementId = $orderAdapter->getOrderIncrementId();
 
         $order = $this->orderRepository->get($orderAdapter->getId());
 
-        $magentoTotalDue = (int)($this->formatPrice($order->getTotalDue()) * 100);
+        $magentoTotalDue = (int)round($this->formatPrice($order->getTotalDue()) * 100);
         $vippsTotalDue = $transaction->getTransactionSummary()->getRemainingAmountToCapture();
 
         $deltaTotalDue = $magentoTotalDue - $vippsTotalDue;

diff --git a/Gateway/Command/RefundCommand.php b/Gateway/Command/RefundCommand.php
@@ -184,7 +184,7 @@ public function __construct(
     public function execute(array $commandSubject)
     {
         $amount = $this->subjectReader->readAmount($commandSubject);
-        $amount = (int)($this->formatPrice($amount) * 100);
+        $amount = (int)round($this->formatPrice($amount) * 100);
 
         $response = $this->paymentDetailsProvider->get($commandSubject);
         $transaction = $this->transactionBuilder->setData($response)->build();
@@ -220,14 +220,14 @@ private function refundBasedOnPaymentDetails($commandSubject, Transaction $trans
     {
         $payment = $this->subjectReader->readPayment($commandSubject);
         $amount = $this->subjectReader->readAmount($commandSubject);
-        $amount = (int)($this->formatPrice($amount) * 100);
+        $amount = (int)round($this->formatPrice($amount) * 100);
 
         $orderAdapter = $payment->getOrder();
         $orderIncrementId = $orderAdapter->getOrderIncrementId();
 
         $order = $this->orderRepository->get($orderAdapter->getId());
 
-        $magentoTotalRefunded = (int)($this->formatPrice($order->getTotalRefunded()) * 100);
+        $magentoTotalRefunded = (int)round($this->formatPrice($order->getTotalRefunded()) * 100);
         $vippsTotalRefunded = $transaction->getTransactionSummary()->getRefundedAmount();
 
         $deltaTotalRefunded = $vippsTotalRefunded - $magentoTotalRefunded;

diff --git a/Gateway/Request/Initiate/TransactionDataBuilder.php b/Gateway/Request/Initiate/TransactionDataBuilder.php
@@ -79,14 +79,14 @@ public function build(array $buildSubject)
         $quote = $payment->getQuote();
 
         $amount = $this->subjectReader->readAmount($buildSubject);
-        $amount = (int)($this->formatPrice($amount) * 100);
+        $amount = (int)round($this->formatPrice($amount) * 100);
 
         if ($buildSubject[self::PAYMENT_TYPE_KEY] == self::PAYMENT_TYPE_EXPRESS_CHECKOUT) {
             $shippingAddress = $quote->getShippingAddress();
             $shippingAddress->setShippingMethod(null);
             $quote->collectTotals();
 
-            $amount = (int)($this->formatPrice($quote->getGrandTotal()) * 100);
+            $amount = (int)round($this->formatPrice($quote->getGrandTotal()) * 100);
         }
 
         return [

diff --git a/Gateway/Request/TransactionDataBuilder.php b/Gateway/Request/TransactionDataBuilder.php
@@ -76,7 +76,7 @@ public function build(array $buildSubject)
 
         $amount = $this->subjectReader->readAmount($buildSubject);
         if ($amount) {
-            $transactionData[self::$transaction][self::$amount] = (int)($this->formatPrice($amount) * 100);
+            $transactionData[self::$transaction][self::$amount] = (int)round($this->formatPrice($amount) * 100);
         }
 
         return $transactionData;

diff --git a/Model/OrderPlace.php b/Model/OrderPlace.php
@@ -303,7 +303,7 @@ private function prepareQuote($quote)
      */
     private function validateAmount(CartInterface $quote, Transaction $transaction)
     {
-        $quoteAmount = (int)($this->formatPrice($quote->getGrandTotal()) * 100);
+        $quoteAmount = (int)round($this->formatPrice($quote->getGrandTotal()) * 100);
         $vippsAmount = (int)$transaction->getTransactionInfo()->getAmount();
 
         if ($quoteAmount != $vippsAmount) {