Changeset 19978 for branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

Timestamp:

2011/01/19 17:57:11 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19977

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/mail_templates/order_mail.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmail_templates%2Forder_mail.tpl
data/Smarty/templates/mobile/mail_templates/order_mail.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmail_templates%2Forder_mail.tpl
data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110119085610-w1vq3ey5jqj1jq58

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110119085659-i7r7philodwpao7b

bzr:revno:

2707

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/mail_templates/order_mail.tpl ohkouchi@loop-az.jp-20110119085610-w1vq3ey5jqj1jq58
data/Smarty/templates/mobile/mail_templates/order_mail.tpl ohkouchi@loop-az.jp-20110119085610-w1vq3ey5jqj1jq58
data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20110119085610-w1vq3ey5jqj1jq58

bzr:timestamp:

2011-01-19 17:56:59.447000027 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-19T08:56:59.447000Z

Message:

#843(複数配送先の指定)

• 受注完了メールの対応

File:

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

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

@@ -102 +102 @@
         $arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
         $arrOrder = $arrRet[0];
-        $arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id));
+        $arrTplVar->arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id));
+
+        $objProduct = new SC_Product();
+        $objQuery->setOrder('shipping_id');
+        $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($order_id));
+        foreach (array_keys($arrRet) as $key) {
+            $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 $itemKey => $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->Message_tmp = $arrOrder['message'];
@@ -108 +125 @@
         // 顧客情報の取得
         $customer_id = $arrOrder['customer_id'];
+        $objQuery->setOrder('customer_id');
         $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id));
         $arrCustomer = isset($arrRet[0]) ? $arrRet[0] : "";
@@ -128 +146 @@
 
         // 都道府県変換
-        $arrTplVar->arrOrder['deliv_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['deliv_pref']];
-        $arrTplVar->arrOrder['order_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['order_pref']];
-
-        $arrTplVar->arrOrderDetail = $arrOrderDetail;
+        $arrTplVar->arrPref = $this->arrPref;
 
         $objCustomer = new SC_Customer();