Bläddra i källkod

Merge tag 'hotfix_959' into develop

hotfix_959
feature/souke
Guillaume Bourgeois 1 år sedan
förälder
incheckning
ee59e2df56
2 ändrade filer med 8 tillägg och 3 borttagningar
  1. +3
    -3
      backend/controllers/ProductController.php
  2. +5
    -0
      common/helpers/CSV.php

+ 3
- 3
backend/controllers/ProductController.php Visa fil

@@ -399,7 +399,7 @@ class ProductController extends BackendController
$userGroupName = $productPriceCsv[2];
$pointSaleName = $productPriceCsv[3];
$quantityFrom = (float)$productPriceCsv[4];
$price = (float)$productPriceCsv[5];
$price = (float) str_replace(',', '.', $productPriceCsv[5]);

$product = $productName ? $productManager->findOneProductByName($productName) : null;
$user = (count($userArray) > 1) ? $userManager->findOneUserById((int)$userArray[1]) : null;
@@ -493,7 +493,7 @@ class ProductController extends BackendController
'',
'',
'',
$product->price
CSV::formatPrice($product->price)
];

// prix spécifiques
@@ -507,7 +507,7 @@ class ProductController extends BackendController
$productPrice->userGroup ? $productPrice->userGroup->name : '',
$productPrice->pointSale ? $productPrice->pointSale->name : '',
$productPrice->from_quantity ?? '',
$productPrice->price
CSV::formatPrice($productPrice->price)
];
}
}

+ 5
- 0
common/helpers/CSV.php Visa fil

@@ -85,4 +85,9 @@ class CSV
header("Content-Disposition: attachment;filename={$filename}");
header("Content-Transfer-Encoding: binary");
}

public static function formatPrice($price)
{
return str_replace('.', ',', $price);
}
}

Laddar…
Avbryt
Spara