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

Use bcmath to calculate correct prices.

Browse source
This commit is contained in:
Jan Böhmer 2019-09-01 13:56:14 +02:00
parent 43c439bc9e
commit 4391be448d
9 changed files with 82 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class Orderdetail extends DBElement
/**
* Get all pricedetails.
*
* @return Pricedetail[] all pricedetails as a one-dimensional array of Pricedetails objects,
* @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
@ -250,22 +250,21 @@ class Orderdetail extends DBElement
/**
* Get the price for a specific quantity.
* @param int $quantity this is the quantity to choose the correct pricedetails
* @param int|null $multiplier * This is the multiplier which will be applied to every single price
* @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 float float: the price as a float number (if "$as_money_string == false")
* @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
*/
public function getPrice(int $quantity = 1, $multiplier = null) : ?float
public function getPrice(float $quantity = 1, $multiplier = 1) : ?string
{
if (($quantity === 0) && ($multiplier === null)) {
return 0.0;
return "0.0";
}
$all_pricedetails = $this->getPricedetails();

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

@ -79,6 +79,8 @@ use Symfony\Component\Validator\Constraints as Assert;
class Pricedetail extends DBElement
{
public const PRICE_PRECISION = 5;
use TimestampTrait;
/**
@ -125,6 +127,10 @@ class Pricedetail extends DBElement
*/
protected $manual_input = true;
public function __construct()
{
bcscale(static::PRICE_PRECISION);
}
/********************************************************************************
*
@ -162,21 +168,34 @@ class Pricedetail extends DBElement
return $this->price;
}
/**
* Returns the price associated with this pricedetail as integer.
* It is given in current currency and for the price related quantity, in parts of 0.00001 (5 digits)
* @return int
*/
public function getPriceInt() : int
{
return (int) str_replace('.', '', $this->price);
}
/**
* Get the price for a single unit in the currency associated with this price detail.
*
* @param int $multiplier The returned price (float or string) will be multiplied
* @param float $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
* in the database, you have to pass the "price_related_quantity" count as $multiplier.
*
* @return float the price as a float number
* @return string the price as a bcmath string
*/
public function getPricePerUnit(int $multiplier = 1) : float
public function getPricePerUnit($multiplier = 1) : string
{
return ($this->price * $multiplier) / $this->price_related_quantity;
$multiplier = (string) $multiplier;
$tmp = bcmul($this->price, $multiplier, static::PRICE_PRECISION);
return bcdiv($tmp, (string) $this->price_related_quantity, static::PRICE_PRECISION);
//return ($this->price * $multiplier) / $this->price_related_quantity;
}
/**
@ -266,7 +285,7 @@ class Pricedetail extends DBElement
/**
* Set the price.
*
* @param float $new_price the new price as a float number
* @param string $new_price the new price as a float number
*
* * This is the price for "price_related_quantity" parts!!
* * Example: if "price_related_quantity" is '10',
@ -274,7 +293,7 @@ class Pricedetail extends DBElement
*
* @return self
*/
public function setPrice(float $new_price): Pricedetail
public function setPrice(string $new_price): Pricedetail
{
//Assert::natural($new_price, 'The new price must be positive! Got %s!');