|
|
@@ -92,14 +92,13 @@ foreach ($pointsSaleArray as $pointSale) { |
|
|
|
foreach ($productsArray as $product) { |
|
|
|
$add = false; |
|
|
|
foreach ($order->productOrder as $productOrder) { |
|
|
|
if ($product->id == $productOrder->id_product) { |
|
|
|
if($product->id == $productOrder->id_product) { |
|
|
|
$unit = (Product::strUnit($productOrder->unit, 'wording_short', true) == 'p.') ? '' : ' '.Product::strUnit($productOrder->unit, 'wording_short', true) ; |
|
|
|
$strProducts .= $product->name . ' (' .$productOrder->quantity .$unit.')<br />'; |
|
|
|
$add = true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$html .= '<td>'.substr($strProducts, 0, strlen($strProducts) - 6).'</td>'; |
|
|
|
if($isBig) { |
|
|
@@ -109,9 +108,17 @@ foreach ($pointsSaleArray as $pointSale) { |
|
|
|
|
|
|
|
if($pointSale->credit) { |
|
|
|
$credit = '' ; |
|
|
|
if(isset($order->user) && isset($order->user->userProducer)) { |
|
|
|
$credit = number_format($order->user->userProducer[0]->credit,2).' €' ; |
|
|
|
|
|
|
|
if(isset($order->user) && $order->user->id) { |
|
|
|
$userProducer = UserProducer::searchOne([ |
|
|
|
'id_user' => $order->user->id |
|
|
|
]); |
|
|
|
|
|
|
|
if($userProducer) { |
|
|
|
$credit = number_format($userProducer->credit,2).' €' ; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$html .= '<td>'.$credit.'</td>' ; |
|
|
|
} |
|
|
|
|