mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-10 10:24:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Respect the currency of the prices when calculating average part price.

Browse source
This commit is contained in:
Jan Böhmer 2019-09-01 18:52:22 +02:00
parent a479dc81c4
commit af3dfafe22
5 changed files with 148 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/Entity/PriceInformations/Orderdetail.php
View file

@ -217,8 +217,6 @@ class Orderdetail extends DBElement
*
* @return Pricedetail[]|Collection all pricedetails as a one-dimensional array of Pricedetails objects,
* sorted by minimum discount quantity
*
* @throws Exception if there was an error
*/
public function getPricedetails(): Collection
{
@ -249,50 +247,30 @@ class Orderdetail extends DBElement
}
/**
* Get the price for a specific quantity.
* Get the pricedetail for a specific quantity.
* @param float $quantity this is the quantity to choose the correct pricedetails
* @param string|float|int $multiplier * This is the multiplier which will be applied to every single price
* * If you pass NULL, the number from $quantity will be used
*
* @return string|null: the price as a bcmath string. Null if there are no orderdetails for the given quantity
*
* @throws Exception if there are no pricedetails for the choosed quantity
* (for example, there are only one pricedetails with the minimum discount quantity '10',
* but the choosed quantity is '5' --> the price for 5 parts is not defined!)
* @throws Exception if there was an error
* @return Pricedetail|null: the price as a bcmath string. Null if there are no orderdetails for the given quantity
*/
public function getPrice(float $quantity = 1, $multiplier = 1) : ?string
public function getPrice(float $quantity = 1) : ?Pricedetail
{
if (($quantity === 0) && ($multiplier === null)) {
return "0.0";
if ($quantity <= 0) {
return null;
}
$all_pricedetails = $this->getPricedetails();
if (count($all_pricedetails) == 0) {
return null;
}
$correct_pricedetails = null;
foreach ($all_pricedetails as $pricedetails) {
$correct_pricedetail = null;
foreach ($all_pricedetails as $pricedetail) {
// choose the correct pricedetails for the choosed quantity ($quantity)
if ($quantity < $pricedetails->getMinDiscountQuantity()) {
if ($quantity < $pricedetail->getMinDiscountQuantity()) {
break;
}
$correct_pricedetails = $pricedetails;
$correct_pricedetail = $pricedetail;
}
if ($correct_pricedetails === null) {
return null;
}
if ($multiplier === null) {
$multiplier = $quantity;
}
return $correct_pricedetails->getPricePerUnit($multiplier);
return $correct_pricedetail;
}
/********************************************************************************

4
src/Entity/PriceInformations/Pricedetail.php
View file

@ -181,7 +181,7 @@ class Pricedetail extends DBElement
/**
* Get the price for a single unit in the currency associated with this price detail.
*
* @param float $multiplier The returned price (float or string) will be multiplied
* @param float|string $multiplier The returned price (float or string) will be multiplied
* with this multiplier.
*
* You will get the price for $multiplier parts. If you want the price which is stored
@ -190,7 +190,7 @@ class Pricedetail extends DBElement
* @return string the price as a bcmath string
*/
public function getPricePerUnit($multiplier = 1) : string
public function getPricePerUnit($multiplier = 1.0) : string
{
$multiplier = (string) $multiplier;
$tmp = bcmul($this->price, $multiplier, static::PRICE_PRECISION);