浏览代码

Merge branch 'dev'

prodstable
Guillaume 3 年前
父节点
当前提交
48e85fc396
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. +3
    -3
      backend/controllers/DistributionController.php

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

@@ -591,10 +591,10 @@ class DistributionController extends BackendController
$optionCsvExportByPiece = Producer::getConfig('option_csv_export_by_piece') ;

// produits en colonne
$productsNameArray = [''];
$productsNameArray = ['', 'Commentaire'];
$productsIndexArray = [];
$productsHasQuantity = [];
$cpt = 1;
$cpt = 2;
foreach ($productsArray as $product) {
$productsHasQuantity[$product->id] = 0;
foreach (Product::$unitsArray as $unit => $dataUnit) {
@@ -627,7 +627,7 @@ class DistributionController extends BackendController
// listing commandes
$datas[] = ['> ' . $pointSale->name];
foreach ($pointSale->orders as $order) {
$orderLine = [$order->getStrUser()];
$orderLine = [$order->getStrUser(), $order->getCommentReport()];

if($optionCsvExportByPiece) {
foreach ($order->productOrder as $productOrder) {

正在加载...
取消
保存