From 4d5c88ca7554e25c6faa7461a390b1d9ec04626f Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 17 Sep 2019 09:31:49 +0900 Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E6=B3=A8=E7=AE=A1=E7=90=86=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/admin/order/LC_Page_Admin_Order_Edit.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php index 6848e090da..d0a7b56b7c 100644 --- a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php +++ b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php @@ -689,9 +689,10 @@ public function lfCheckError(&$objFormParam) $totaltax = 0; for ($i = 0; $i < $max; $i++) { // 小計の計算 - $subtotal += SC_Helper_DB_Ex::sfCalcIncTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i]; - // 小計の計算 - $totaltax += SC_Utils_Ex::sfTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]) * $arrValues['quantity'][$i]; + $tax = SC_Helper_TaxRule_Ex::calcTax($arrValues['price'][$i], $arrValues['tax_rate'][$i], $arrValues['tax_rule'][$i]); + $subtotal += ($tax + $arrValues['price'][$i]) * $arrValues['quantity'][$i]; + // 税額の計算 + $totaltax += $tax * $arrValues['quantity'][$i]; // 加算ポイントの計算 $totalpoint += SC_Utils_Ex::sfPrePoint($arrValues['price'][$i], $arrValues['point_rate'][$i]) * $arrValues['quantity'][$i]; @@ -1082,7 +1083,7 @@ public function shipmentEditProduct(&$objFormParam, $edit_product_class_id, $cha $this->changeShipmentProducts($arrShipmentProducts, $arrAddProductInfo, $select_shipping_id, $change_no); //受注商品情報も上書き - $arrTax = SC_Helper_TaxRule_Ex::getTaxRule(0, $edit_product_class_id); + $arrTax = SC_Helper_TaxRule_Ex::getTaxRule($arrAddProductInfo['product_id']); // 実際はedit $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name']) @@ -1260,7 +1261,7 @@ public function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $i { if (!$arrProductClassIds || !in_array($insert_product_class_id, $arrProductClassIds)) { $arrAddProducts = array(); - $arrTax = SC_Helper_TaxRule_Ex::getTaxRule(0, $insert_product_class_id); + $arrTax = SC_Helper_TaxRule_Ex::getTaxRule($arrAddProductInfo['product_id']); $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name']) ? $arrAddProductInfo['product_name']