Ignore:
Timestamp:
2011/01/19 17:57:11 (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

    r19897 r19978  
    102102        $arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id)); 
    103103        $arrOrder = $arrRet[0]; 
    104         $arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id)); 
     104        $arrTplVar->arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id)); 
     105 
     106        $objProduct = new SC_Product(); 
     107        $objQuery->setOrder('shipping_id'); 
     108        $arrRet = $objQuery->select("*", "dtb_shipping", "order_id = ?", array($order_id)); 
     109        foreach (array_keys($arrRet) as $key) { 
     110            $objQuery->setOrder('shipping_id'); 
     111            $arrItems = $objQuery->select("*", "dtb_shipment_item", "order_id = ? AND shipping_id = ?", 
     112                                          array($order_id, $arrRet[$key]['shipping_id'])); 
     113            foreach ($arrItems as $itemKey => $arrDetail) { 
     114                foreach ($arrDetail as $detailKey => $detailVal) { 
     115                    $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']][$detailKey] = $detailVal; 
     116                } 
     117 
     118                $arrRet[$key]['shipment_item'][$arrDetail['product_class_id']]['productsClass'] =& $objProduct->getDetailAndProductsClass($arrDetail['product_class_id']); 
     119            } 
     120        } 
     121        $arrTplVar->arrShipping = $arrRet; 
    105122 
    106123        $arrTplVar->Message_tmp = $arrOrder['message']; 
     
    108125        // 顧客情報の取得 
    109126        $customer_id = $arrOrder['customer_id']; 
     127        $objQuery->setOrder('customer_id'); 
    110128        $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id)); 
    111129        $arrCustomer = isset($arrRet[0]) ? $arrRet[0] : ""; 
     
    128146 
    129147        // 都道府県変換 
    130         $arrTplVar->arrOrder['deliv_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['deliv_pref']]; 
    131         $arrTplVar->arrOrder['order_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['order_pref']]; 
    132  
    133         $arrTplVar->arrOrderDetail = $arrOrderDetail; 
     148        $arrTplVar->arrPref = $this->arrPref; 
    134149 
    135150        $objCustomer = new SC_Customer(); 
Note: See TracChangeset for help on using the changeset viewer.