Browse Source

[Backend] Récap commandes > texte en noir + nombre de pièces en début de ligne

refactoring
Guillaume 2 years ago
parent
commit
fa244178cb
2 changed files with 5 additions and 4 deletions
  1. +1
    -0
      backend/controllers/DistributionController.php
  2. +4
    -4
      backend/views/distribution/report.php

+ 1
- 0
backend/controllers/DistributionController.php View File

padding: 3px 8px ; padding: 3px 8px ;
vertical-align : top; vertical-align : top;
page-break-inside: avoid !important; page-break-inside: avoid !important;
color: black;
} }


table tr th { table tr th {

+ 4
- 4
backend/views/distribution/report.php View File

foreach ($order->productOrder as $productOrder) { 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) ; $unit = (Product::strUnit($productOrder->unit, 'wording_short', true) == 'p.') ? '' : ' '.Product::strUnit($productOrder->unit, 'wording_short', true) ;
$strProducts .= $product->getNameExport() . ' (' .$productOrder->quantity .$unit.')<br />';
$strProducts .= '('.$productOrder->quantity .$unit.') '.$product->getNameExport() . '<br />';
$add = true; $add = true;
} }
} }
$quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit); $quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
if ($quantity) { if ($quantity) {
$theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ; $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
$strProducts .= $product->getNameExport() . ' (' .$quantity .$theUnit.')<br />';
$strProducts .= '(' .$quantity .$theUnit.') '.$product->getNameExport() . '<br />';
} }
} }


$quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit); $quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
if ($quantity) { if ($quantity) {
$theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ; $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
$html .= $product->getNameExport() . ' (' .$quantity .$theUnit.')<br />';
$html .= '(' .$quantity .$theUnit.') '.$product->getNameExport() . '<br />';
} }
} }


$quantity = Order::getProductQuantity($product->id, $ordersArray, false, $unit); $quantity = Order::getProductQuantity($product->id, $ordersArray, false, $unit);
if ($quantity) { if ($quantity) {
$theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ; $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
$html .= $product->name . ' (' .$quantity .$theUnit.')<br />';
$html .= '(' .$quantity .$theUnit.') '.$product->name . '<br />';
} }
} }
if($isBig && $cpt == $limit) { if($isBig && $cpt == $limit) {

Loading…
Cancel
Save