|
|
@@ -111,7 +111,7 @@ foreach ($pointsSaleArray as $pointSale) { |
|
|
|
$add = false; |
|
|
|
foreach ($order->productOrder as $productOrder) { |
|
|
|
if($product->id == $productOrder->id_product) { |
|
|
|
$unit = ( $productModule->getSolver()->strUnit($productOrder->product, UnitDefinition::WORDING_SHORT, true) == 'p.') ? '' : ' '. $productModule->getSolver()->strUnit($productOrder->unit, UnitDefinition::WORDING_SHORT, true) ; |
|
|
|
$unit = ( $productModule->getSolver()->strUnit($productOrder->product, UnitDefinition::WORDING_SHORT, true) == 'p.') ? '' : ' '. $productModule->getSolver()->strUnit($productOrder->product, UnitDefinition::WORDING_SHORT, true) ; |
|
|
|
$strProducts .= $product->name . ' (' .$productOrder->quantity .$unit.')<br />'; |
|
|
|
$add = true; |
|
|
|
} |
|
|
@@ -136,26 +136,9 @@ foreach ($pointsSaleArray as $pointSale) { |
|
|
|
|
|
|
|
// moyen de paiement |
|
|
|
$html .= '<td>' ; |
|
|
|
if(isset($order->mean_payment) && strlen($order->mean_payment) > 0) |
|
|
|
{ |
|
|
|
if($order->mean_payment == 'cheque') { |
|
|
|
$html .= 'Chèque' ; |
|
|
|
} |
|
|
|
elseif($order->mean_payment == 'money') { |
|
|
|
$html .= 'Espèces' ; |
|
|
|
} |
|
|
|
elseif($order->mean_payment == 'credit') { |
|
|
|
$html .= 'Crédit' ; |
|
|
|
} |
|
|
|
elseif($order->mean_payment == 'credit-card') { |
|
|
|
$html .= 'Carte bancaire' ; |
|
|
|
} |
|
|
|
elseif($order->mean_payment == 'transfer') { |
|
|
|
$html .= 'Virement' ; |
|
|
|
} |
|
|
|
else { |
|
|
|
$html .= $order->mean_payment ; |
|
|
|
} |
|
|
|
$paymentLabelPaid = $orderModule->getRepository()->getPaymentLabelPaid($order); |
|
|
|
if($paymentLabelPaid) { |
|
|
|
$html .= $paymentLabelPaid; |
|
|
|
} |
|
|
|
$html .= '</td>' ; |
|
|
|
|
|
|
@@ -166,7 +149,6 @@ foreach ($pointsSaleArray as $pointSale) { |
|
|
|
$userProducer = UserProducer::searchOne([ |
|
|
|
'id_user' => $order->user->id |
|
|
|
]); |
|
|
|
|
|
|
|
if($userProducer) { |
|
|
|
$credit = number_format($userProducer->credit,2).' €' ; |
|
|
|
} |