diff --git a/app/code/community/Svea/Checkout/Block/Adminhtml/Queue.php b/app/code/community/Svea/Checkout/Block/Adminhtml/Queue.php index 003d48d..02e3fee 100644 --- a/app/code/community/Svea/Checkout/Block/Adminhtml/Queue.php +++ b/app/code/community/Svea/Checkout/Block/Adminhtml/Queue.php @@ -282,7 +282,7 @@ protected function _processItem($item, $prefix = '') 'ArticleNumber' => $prefix . $item->getSku(), 'Name' => (string)mb_substr($item->getName(), 0, 40), 'Quantity' => (float)round($item->getQty(), 2), - 'UnitPrice' => (float)$item->getPriceInclTax(), + 'UnitPrice' => (float)round($item->getPriceInclTax(), 2), 'VatPercent' => (int)round($item->getTaxPercent()), 'DiscountPercent' => (int)0, 'Unit' => (null), @@ -293,7 +293,7 @@ protected function _processItem($item, $prefix = '') 'ArticleNumber' => (sprintf('discount-%s', $prefix . $item->getId())), 'Name' => (string)mb_substr($item->getName(), 0, 40), 'Quantity' => 1, - 'UnitPrice' => $item->getDiscountAmount() * -1, + 'UnitPrice' => round($item->getDiscountAmount() * -1,2), 'VatPercent' => (int)round($item->getTaxPercent()), 'DiscountPercent' => (int)0, 'Unit' => (null), @@ -388,7 +388,7 @@ protected function _addShipping($quote) 'ArticleNumber' => '', 'Name' => (string)$shippingTitle, 'Quantity' => 1, - 'UnitPrice' => (float)$shipping->getShippingInclTax(), + 'UnitPrice' => (float)round($shipping->getShippingInclTax(), 2), 'VatPercent' => $vatPercent, 'DiscountPercent' => '', ]); diff --git a/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php b/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php index 534e2cd..6334d88 100644 --- a/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php +++ b/app/code/community/Svea/Checkout/Model/Checkout/Api/BuildOrder.php @@ -350,7 +350,7 @@ protected function _processItem($item, $prefix = '', $multiply = 1) $qty = $item->getQty() * $multiply; $orderRowItem = WebPayItem::orderRow() - ->setAmountIncVat((float)$item->getPriceInclTax()) + ->setAmountIncVat((float)round($item->getPriceInclTax(),2)) ->setVatPercent((int)round($item->getTaxPercent())) ->setQuantity((float)round($qty, 2)) ->setArticleNumber($prefix . $item->getSku()) @@ -362,7 +362,7 @@ protected function _processItem($item, $prefix = '', $multiply = 1) $itemRowDiscount = WebPayItem::fixedDiscount() ->setName(mb_substr(sprintf('discount-%s', $prefix . $item->getId()), 0, 40)) ->setVatPercent((int)round($item->getTaxPercent())) - ->setAmountIncVat((float)$item->getDiscountAmount()); + ->setAmountIncVat((float)round($item->getDiscountAmount(),2)); $sveaOrder->addDiscount($itemRowDiscount); } @@ -482,7 +482,7 @@ protected function _addShipping($quote, $sveaOrder, $noSave) $shippingFee = WebPayItem::shippingFee() ->setName((string)$shippingTitle) ->setVatPercent((int)$vatPercent) - ->setAmountIncVat((float)$shippingPrice); + ->setAmountIncVat((float)round($shippingPrice,2)); $sveaOrder->addFee($shippingFee); diff --git a/app/code/community/Svea/Checkout/Model/Payment/Api/Invoice.php b/app/code/community/Svea/Checkout/Model/Payment/Api/Invoice.php index 104b28b..98da322 100644 --- a/app/code/community/Svea/Checkout/Model/Payment/Api/Invoice.php +++ b/app/code/community/Svea/Checkout/Model/Payment/Api/Invoice.php @@ -166,14 +166,14 @@ protected function _adjustQty( $partialActionRow = WebPayItem::numberedOrderRow() ->setRowNumber($key) ->setArticleNumber($referenceNumber . '-' . $item['Name']) - ->setAmountIncVat((float)$item['newDiscount']*-1) + ->setAmountIncVat((float)round($item['newDiscount']*-1, 2)) ->setVatPercent((int)$item['VatPercent']) ->setQuantity($item['Quantity']); $restOfRowQty = WebPayItem::orderRow() ->setArticleNumber($item['ArticleNumber']) ->setName($item['Name']) - ->setAmountIncVat((float)$rest) + ->setAmountIncVat((float)round($rest, 2)) ->setVatPercent((int)$item['VatPercent']) ->setQuantity((int)$item['Quantity']); @@ -215,14 +215,14 @@ protected function _adjustQty( $partialActionRow = WebPayItem::numberedOrderRow() ->setRowNumber($key) ->setArticleNumber($referenceNumber .'-'. $item['ArticleNumber']) - ->setAmountIncVat((float) $item['UnitPrice']) + ->setAmountIncVat((float)round($item['UnitPrice'], 2)) ->setVatPercent((int) $item['VatPercent']) ->setQuantity($adjustQty); $restOfRowQty = WebPayItem::orderRow() ->setArticleNumber($item['ArticleNumber']) ->setName($item['Name']) - ->setAmountIncVat((float)$item['UnitPrice']) + ->setAmountIncVat((float)round($item['UnitPrice'],2)) ->setVatPercent((int)$item['VatPercent']) ->setQuantity((int)$rest); @@ -299,7 +299,7 @@ public function refund($creditMemo) WebPayAdmin::creditAmount($sveaConfig) ->setCheckoutOrderId($sveaOrderId) ->setDeliveryId($deliveryKey) - ->setAmountIncVat((float)$refundAmount) + ->setAmountIncVat((float)round($refundAmount,2)) ->creditCheckoutAmount() ->doRequest(); $sveaOrder = $this->_getCheckoutOrder($order); @@ -318,7 +318,7 @@ public function refund($creditMemo) WebPayAdmin::creditAmount($sveaConfig) ->setCheckoutOrderId($sveaOrderId) ->setDeliveryId($deliveryKey) - ->setAmountIncVat((float)$refundAmount) + ->setAmountIncVat((float)round($refundAmount,2)) ->creditCheckoutAmount() ->doRequest(); @@ -585,7 +585,7 @@ protected function _getActionRows( $chosenItems[$key] = $row; $qty = $items[$itemKey]['qty']; $chosenItems[$key]['action_qty'] = (float)$qty; - $chosenItems[$key]['newDiscount'] = (float)$items[$itemKey]['newDiscount']; + $chosenItems[$key]['newDiscount'] = (float)round($items[$itemKey]['newDiscount'],2); } } else { $itemKey = array_search($row['Name'], array_column($items, 'sku')); @@ -593,7 +593,7 @@ protected function _getActionRows( $chosenItems[$key] = $row; $qty = $items[$itemKey]['qty']; $chosenItems[$key]['action_qty'] = (float)$qty; - $chosenItems[$key]['newDiscount'] = (float)$items[$itemKey]['newDiscount']; + $chosenItems[$key]['newDiscount'] = (float)round($items[$itemKey]['newDiscount'],2); } } diff --git a/app/code/community/Svea/Checkout/Model/Payment/Invoice.php b/app/code/community/Svea/Checkout/Model/Payment/Invoice.php index b0f2a41..fab57cd 100644 --- a/app/code/community/Svea/Checkout/Model/Payment/Invoice.php +++ b/app/code/community/Svea/Checkout/Model/Payment/Invoice.php @@ -268,7 +268,7 @@ protected function _processItem($item, $prefix = '') } $orderRowItem = WebPayItem::orderRow() - ->setAmountIncVat((float)$item->getPriceInclTax()) + ->setAmountIncVat((float)round($item->getPriceInclTax()),2) ->setVatPercent((int)round($item->getTaxPercent())) ->setQuantity((float)round($item->getQty(), 2)) ->setArticleNumber($prefix . $item->getSku()) @@ -280,7 +280,7 @@ protected function _processItem($item, $prefix = '') $itemRowDiscount = WebPayItem::fixedDiscount() ->setName(mb_substr(sprintf('discount-%s', $prefix . $item->getId()), 0, 40)) ->setVatPercent((int)round($item->getTaxPercent())) - ->setAmountExVat((float)$item->getDiscountAmount()); + ->setAmountExVat((float)round($item->getDiscountAmount(),2)); $sveaOrder->addDiscount($itemRowDiscount); }