|
@@ -707,7 +707,9 @@ class Manage
|
|
$price = ($v['price'] - $c_price);
|
|
$price = ($v['price'] - $c_price);
|
|
$total += $price;
|
|
$total += $price;
|
|
$shop[$v['type_id']] += $price * $per;
|
|
$shop[$v['type_id']] += $price * $per;
|
|
- $shop[$v['type_id']] = round($shop[$v['type_id']], 2);
|
|
|
|
|
|
+ }
|
|
|
|
+ foreach ($shop as $k => $v) {
|
|
|
|
+ $shop[$k] = round($shop[$k], 2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -728,7 +730,9 @@ class Manage
|
|
$price = $v['buy'];
|
|
$price = $v['buy'];
|
|
$total += $price;
|
|
$total += $price;
|
|
$shop[$v['shop_id']] += $price * $per;
|
|
$shop[$v['shop_id']] += $price * $per;
|
|
- $shop[$v['shop_id']] = round($shop[$v['shop_id']], 2);
|
|
|
|
|
|
+ }
|
|
|
|
+ foreach ($shop as $k => $v) {
|
|
|
|
+ $shop[$k] = round($shop[$k], 2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return array(round($total, 2), round($total*$per, 2), $shop);
|
|
return array(round($total, 2), round($total*$per, 2), $shop);
|