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

Fixed an exception in getmaxDiscountAmount().

Browse source 
This should fixes an 500 error code, that showed up on some pages. Also added a test method to test this function.
This commit is contained in:
Jan Böhmer 2019-11-05 17:05:04 +01:00
parent da6b74dfdd
commit a516879258
2 changed files with 112 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Services/PricedetailHelper.php
View file

@ -25,6 +25,8 @@ namespace App\Services;
use App\Entity\Parts\Part;
use App\Entity\PriceInformations\Currency;
use App\Entity\PriceInformations\Pricedetail;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\PersistentCollection;
use Locale;
class PricedetailHelper
@ -53,20 +55,32 @@ class PricedetailHelper
foreach ($orderdetails as $orderdetail) {
$pricedetails = $orderdetail->getPricedetails();
//The orderdetail must have pricedetails, otherwise this will not work!
if (empty($pricedetails)) {
if (count($pricedetails) === 0) {
continue;
}
/* Pricedetails in orderdetails are ordered by min discount quantity,
so our first object is our min order amount for the current orderdetail */
$max_amount = $pricedetails->last()->getMinDiscountQuantity();
if ($pricedetails instanceof PersistentCollection) {
/* Pricedetails in orderdetails are ordered by min discount quantity,
so our first object is our min order amount for the current orderdetail */
$max_amount = $pricedetails->last()->getMinDiscountQuantity();
} else {
// We have to sort the pricedetails manually
$array = $pricedetails->map(
function (Pricedetail $pricedetail) {
return $pricedetail->getMinDiscountQuantity();
}
)->toArray();
sort($array);
$max_amount = end($array);
}
if ($max_amount > $max) {
$max = $max_amount;
}
}
if ($max > 0) {
if ($max > 0.0) {
return $max;
}