浏览代码

Merge tag 'hotfix_659' into dev

hotfix_659
refactoring
Guillaume Bourgeois 2 年前
父节点
当前提交
ea05e1e870
共有 1 个文件被更改,包括 10 次插入8 次删除
  1. +10
    -8
      backend/controllers/DistributionController.php

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

@@ -482,15 +482,17 @@ class DistributionController extends BackendController

$quantity = 0;
$invoicePrice = null;
foreach ($order->productOrder as $productOrder) {
if ($productOrder->id_product == $product['id']) {
if ($productOrder->invoice_price) {
$invoicePrice = number_format($productOrder->invoice_price, 2);
} else {
$invoicePrice = number_format($productOrder->price, 3);
}

$quantity = $productOrder->quantity;
if(isset($order->productOrder)) {
foreach ($order->productOrder as $productOrder) {
if ($productOrder->id_product == $product['id']) {
if ($productOrder->invoice_price) {
$invoicePrice = number_format($productOrder->invoice_price, 2);
} else {
$invoicePrice = number_format($productOrder->price, 3);
}
$quantity = $productOrder->quantity;
}
}
}


正在加载...
取消
保存