Skip to content

Commit

Permalink
Merge pull request #10 from escapeboy/develop
Browse files Browse the repository at this point in the history
fix number format
  • Loading branch information
escapeboy committed Oct 11, 2022
2 parents 34a3f6b + 43632d0 commit 6b1e2fc
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/XmlConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ public static function convert(Shop $shop): self
$xml->startElement('artenum');
$xml->writeElement('art_name', $item->getName());
$xml->writeElement('art_quant', (string)$item->getQuantity());
$xml->writeElement('art_price', number_format($item->getPrice(), 2));
$xml->writeElement('art_price', number_format($item->getPrice(), 2, '.', ''));
$xml->writeElement('art_vat_rate', (string)$item->getVatRate());
$xml->writeElement('art_vat', number_format($item->getVat(), 2));
$xml->writeElement('art_sum', number_format($item->getFinalPrice(), 2));
$xml->writeElement('art_vat', number_format($item->getVat(), 2, '.', ''));
$xml->writeElement('art_sum', number_format($item->getFinalPrice(), 2, '.', ''));
$xml->endElement();
}
$xml->endElement();

$xml->writeElement('ord_total1', number_format($order->getTotalWithoutVat(), 2));
$xml->writeElement('ord_disc', number_format($order->getTotalDiscount(), 2));
$xml->writeElement('ord_vat', number_format($order->getOrderTotalVat(), 2));
$xml->writeElement('ord_total2', number_format($order->getOrderTotal(), 2));
$xml->writeElement('ord_total1', number_format($order->getTotalWithoutVat(), 2, '.', ''));
$xml->writeElement('ord_disc', number_format($order->getTotalDiscount(), 2, '.', ''));
$xml->writeElement('ord_vat', number_format($order->getOrderTotalVat(), 2, '.', ''));
$xml->writeElement('ord_total2', number_format($order->getOrderTotal(), 2, '.', ''));
$xml->writeElement('paym', (string)$order->getPaymentType()::CODE);
if ($order->getVirtualPosNumber()) {
$xml->writeElement('pos_n', $order->getVirtualPosNumber());
Expand All @@ -67,14 +67,14 @@ public static function convert(Shop $shop): self
$xml->endElement();

$xml->writeElement('r_ord', (string)count($shop->getReturnedOrders()));
$xml->writeElement('r_total', number_format($shop->getTotalAmountReturnedOrders(), 2));
$xml->writeElement('r_total', number_format($shop->getTotalAmountReturnedOrders(), 2, '.', ''));

if (count($shop->getReturnedOrders())) {
$xml->startElement('rorder');
foreach ($shop->getReturnedOrders() as $returnedOrder) {
$xml->startElement('rorderenum');
$xml->writeElement('r_ord_n', $returnedOrder->getOrderNumber());
$xml->writeElement('r_amount', number_format($returnedOrder->getOrderAmount(), 2));
$xml->writeElement('r_amount', number_format($returnedOrder->getOrderAmount(), 2, '.', ''));
$xml->writeElement('r_date', $returnedOrder->getOrderDate()->format('Y-m-d'));
$xml->writeElement('r_paym', (string)$returnedOrder->getReturnMethod()::CODE);
$xml->endElement();
Expand Down

0 comments on commit 6b1e2fc

Please sign in to comment.