Browse Source

Merge branch 'hotfix/hotfix_959'

master
Guillaume Bourgeois 1 year ago
parent
commit
3cf62fc909
3 changed files with 9 additions and 4 deletions
  1. +3
    -3
      backend/controllers/ProductController.php
  2. +5
    -0
      common/helpers/CSV.php
  3. +1
    -1
      common/logic/PointSale/PointSale/Repository/PointSaleRepository.php

+ 3
- 3
backend/controllers/ProductController.php View File

@@ -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 View File

@@ -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);
}
}

+ 1
- 1
common/logic/PointSale/PointSale/Repository/PointSaleRepository.php View File

@@ -47,7 +47,7 @@ class PointSaleRepository extends AbstractRepository
return $this->createDefaultQuery()
->filterIsOnline()
->filterByName($name)
->fineOne();
->findOne();
}

public function findPointSalesByDistribution(Distribution $distribution)

Loading…
Cancel
Save