Changeset 19978


Ignore:
Timestamp:
2011/01/19 17:57:11 (15 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19977
bzr:committer:
Kentaro Ohkouchi <[email protected]>
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:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
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 [email protected]
data/Smarty/templates/mobile/mail_templates/order_mail.tpl [email protected]
data/class/helper/SC_Helper_Mail.php [email protected]
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(複数配送先の指定)

  • 受注完了メールの対応
Location:
branches/version-2_5-dev/data
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl

    r19764 r19978  
    2525 
    2626****************************************************************** 
    27 　配送情報とご請求金額 
     27　ご請求金額 
    2828****************************************************************** 
    2929 
    … …  
    3131お支払合計：￥ <!--{$arrOrder.payment_total|number_format|default:0}--> 
    3232ご決済方法：<!--{$arrOrder.payment_method}--> 
    33 　お届け日：<!--{$arrOrder.deliv_date|default:"指定なし"}--> 
    34 お届け時間：<!--{$arrOrder.deliv_time|default:"指定なし"}--> 
    3533メッセージ：<!--{$Message_tmp}--> 
    36 ◎お届け先 
    37 　お名前　：<!--{$arrOrder.deliv_name01}--> <!--{$arrOrder.deliv_name02}-->　様 
    38 　郵便番号：〒<!--{$arrOrder.deliv_zip01}-->-<!--{$arrOrder.deliv_zip02}--> 
    39 　住所　　：<!--{$arrOrder.deliv_pref_name}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}--> 
    40 　電話番号：<!--{$arrOrder.deliv_tel01}-->-<!--{$arrOrder.deliv_tel02}-->-<!--{$arrOrder.deliv_tel03}--> 
    4134 
    4235<!--{if $arrOther.title.value }--> 
    … …  
    7063=============================================================== 
    7164合　計 ￥ <!--{$arrOrder.payment_total|number_format|default:0}--> 
     65 
     66 
     67****************************************************************** 
     68　配送情報 
     69****************************************************************** 
     70 
     71<!--{foreach item=shipping name=shipping from=$arrShipping}--> 
     72◎お届け先<!--{if count($arrShipping) > 1}--><!--{$smarty.foreach.shipping.iteration}--><!--{/if}--> 
     73 
     74　お名前　：<!--{$shipping.shipping_name01}--> <!--{$shipping.shipping_name02}-->　様 
     75　郵便番号：〒<!--{$shipping.shipping_zip01}-->-<!--{$shipping.shipping_zip02}--> 
     76　住所　　：<!--{$arrPref[$shipping.shipping_pref]}--><!--{$shipping.shipping_addr01}--><!--{$shipping.shipping_addr02}--> 
     77　電話番号：<!--{$shipping.shipping_tel01}-->-<!--{$shipping.shipping_tel02}-->-<!--{$shipping.shipping_tel03}--> 
     78　お届け日：<!--{$shipping.shipping_date|date_format:"%Y/%m/%d"|default:"指定なし"}--> 
     79お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}--> 
     80 
     81<!--{foreach item=item name=item from=$shipping.shipment_item}--> 
     82商品コード: <!--{$item.product_code}--> 
     83商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}--> 
     84単価：￥ <!--{$item.price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 
     85数量：<!--{$item.quantity}--> 
     86 
     87<!--{/foreach}--> 
     88<!--{/foreach}--> 
    7289<!--{if $arrOrder.customer_id && $smarty.const.USE_POINT !== false}--> 
    7390=============================================================== 

  • branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl

    r19915 r19978  
    2424<!--{$arrOrder.order_name01}--> <!--{$arrOrder.order_name02}--> 様 
    2525 
    26 ■配送情報とご請求金額 
     26■ご請求金額 
    2727ご注文番号：<!--{$arrOrder.order_id}--> 
    2828お支払合計：￥ <!--{$arrOrder.payment_total|number_format|default:0}--> 
    2929ご決済方法：<!--{$arrOrder.payment_method}--> 
    30 お届け日：<!--{$arrOrder.deliv_date|default:"指定なし"}--> 
    31 お届け時間：<!--{$arrOrder.deliv_time|default:"指定なし"}--> 
    32  
    33 ◎お届け先 
    34 お名前　：<!--{$arrOrder.deliv_name01}--> <!--{$arrOrder.deliv_name02}-->　様 
    35 郵便番号：〒<!--{$arrOrder.deliv_zip01}-->-<!--{$arrOrder.deliv_zip02}--> 
    36 住所　　：<!--{$arrOrder.deliv_pref_name}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}--> 
    37 電話番号：<!--{$arrOrder.deliv_tel01}-->-<!--{$arrOrder.deliv_tel02}-->-<!--{$arrOrder.deliv_tel03}--> 
     30メッセージ：<!--{$Message_tmp}--> 
    3831 
    3932<!--{if $arrOther.title.value }--> 
    … …  
    4841■ご注文商品明細 
    4942<!--{section name=cnt loop=$arrOrderDetail}--> 
     43商品コード: <!--{$arrOrderDetail[cnt].product_code}--> 
    5044商品名: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}--> 
     45単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 
    5146数量：<!--{$arrOrderDetail[cnt].quantity}--> 
    52 金額：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 
    5347 
    5448<!--{/section}--> 
     49 
     50小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->） 
     51値引き ￥ <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}--> 
     52送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}--> 
     53手数料 ￥ <!--{$arrOrder.charge|number_format|default:0}--> 
     54=============================================================== 
     55合　計 ￥ <!--{$arrOrder.payment_total|number_format|default:0}--> 
     56 
     57■配送情報 
     58 
     59<!--{foreach item=shipping name=shipping from=$arrShipping}--> 
     60◎お届け先<!--{if count($arrShipping) > 1}--><!--{$smarty.foreach.shipping.iteration}--><!--{/if}--> 
     61 
     62　お名前　：<!--{$shipping.shipping_name01}--> <!--{$shipping.shipping_name02}-->　様 
     63　郵便番号：〒<!--{$shipping.shipping_zip01}-->-<!--{$shipping.shipping_zip02}--> 
     64　住所　　：<!--{$arrPref[$shipping.shipping_pref]}--><!--{$shipping.shipping_addr01}--><!--{$shipping.shipping_addr02}--> 
     65　電話番号：<!--{$shipping.shipping_tel01}-->-<!--{$shipping.shipping_tel02}-->-<!--{$shipping.shipping_tel03}--> 
     66　お届け日：<!--{$shipping.shipping_date|date_format:"%Y/%m/%d"|default:"指定なし"}--> 
     67お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}--> 
     68 
     69<!--{foreach item=item name=item from=$shipping.shipment_item}--> 
     70商品コード: <!--{$item.product_code}--> 
     71商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}--> 
     72単価：￥ <!--{$item.price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 
     73数量：<!--{$item.quantity}--> 
     74 
     75<!--{/foreach}--> 
     76<!--{/foreach}--> 
    5577<!--{if $arrOrder.customer_id && $smarty.const.USE_POINT !== false}--> 
    5678■ポイント情報 

  • 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.