Changeset 23360 for branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php

Timestamp:

2014/04/01 09:39:27 (10 years ago)

Author:

shutta

Message:

#2521 (受注メールの配送情報の税込単価が受注時の税率で計算されない)
受注メールの配送情報の単価を受注情報の税率で計算するよう修正。

File:

• branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php (modified) (2 diffs)

branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php

@@ -137 +137 @@
         $arrTplVar->arrOrderDetail = $objQuery->select('*', 'dtb_order_detail', $where, array($order_id));
 
-        $objProduct = new SC_Product_Ex();
-        $objQuery->setOrder('shipping_id');
-        $arrRet = $objQuery->select('*', 'dtb_shipping', 'order_id = ?', array($order_id));
-        foreach ($arrRet as $key => $value) {
-            $objQuery->setOrder('shipping_id');
-            $arrItems = $objQuery->select('*', 'dtb_shipment_item', 'order_id = ? AND shipping_id = ?',
-                                          array($order_id, $arrRet[$key]['shipping_id']));
-            foreach ($arrItems as $arrDetail) {
-                foreach ($arrDetail as $detailKey => $detailVal) {
-                    $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']][$detailKey] = $detailVal;
-                }
-
-                $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']]['productsClass'] =& $objProduct->getDetailAndProductsClass($arrDetail['product_class_id']);
-            }
-        }
-        $arrTplVar->arrShipping = $arrRet;
+        // 配送情報の取得
+        $arrTplVar->arrShipping = $this->sfGetShippingData($order_id);
 
         $arrTplVar->Message_tmp = $arrOrder['message'];
@@ -215 +201 @@
 
         return $objSendMail;
+    }
+
+    /**
+     * 配送情報の取得
+     *
+     * @param integer $order_id 受注ID
+     * @return array 配送情報を格納した配列
+     */
+    function sfGetShippingData($order_id)
+    {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+        $objQuery->setOrder('shipping_id');
+        $arrRet = $objQuery->select('*', 'dtb_shipping', 'order_id = ?', array($order_id));
+        foreach ($arrRet as $key => $value) {
+            $col = 's_i.*, tax_rate, tax_rule';
+            $from = 'dtb_shipment_item AS s_i JOIN dtb_order_detail AS o_d
+                USING(order_id, product_class_id)';
+            $where = 'order_id = ? AND shipping_id = ?';
+            $arrWhereVal = array($order_id, $arrRet[$key]['shipping_id']);
+            $arrItems = $objQuery->select($col, $from, $where, $arrWhereVal);
+            $arrRet[$key]['shipment_item'] = $arrItems;
+        }
+
+        return $arrRet;
     }