浏览代码

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

refactoring
Guillaume 2 年前
父节点
当前提交
fa244178cb
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. +1
    -0
      backend/controllers/DistributionController.php
  2. +4
    -4
      backend/views/distribution/report.php

+ 1
- 0
backend/controllers/DistributionController.php 查看文件

@@ -562,6 +562,7 @@ class DistributionController extends BackendController
padding: 3px 8px ;
vertical-align : top;
page-break-inside: avoid !important;
color: black;
}

table tr th {

+ 4
- 4
backend/views/distribution/report.php 查看文件

@@ -99,7 +99,7 @@ foreach ($pointsSaleArray as $pointSale) {
foreach ($order->productOrder as $productOrder) {
if($product->id == $productOrder->id_product) {
$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;
}
}
@@ -157,7 +157,7 @@ foreach ($pointsSaleArray as $pointSale) {
$quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
if ($quantity) {
$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 />';
}
}

@@ -206,7 +206,7 @@ foreach ($pointsSaleArray as $pointSale)
$quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
if ($quantity) {
$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 />';
}
}

@@ -233,7 +233,7 @@ foreach ($productsArray as $product) {
$quantity = Order::getProductQuantity($product->id, $ordersArray, false, $unit);
if ($quantity) {
$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) {

正在加载...
取消
保存