Changeset 18671


Ignore:
Timestamp:
2010/06/04 19:52:12 (11 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100603091554-99fe2rfn0lieww1n
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
data/class/pages/contact/LC_Page_Contact.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcontact%2FLC_Page_Contact.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100604105208-ta8jsmbwpoetj564
bzr:revno:
1949
bzr:revprop:branch-nick:
branches/version-2_4-dev
bzr:root:
branches/version-2_4-dev
bzr:text-parents:

data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20100219075201-eviboef8x7yy3us2
data/class/pages/contact/LC_Page_Contact.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18559
html/install/sql/insert_data.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18601
bzr:timestamp:
2010-06-04 19:52:08.944000006 +0900
bzr:user-agent:
bzr2.1.1+bzr-svn1.0.2
svn:original-date:
2010-06-04T10:52:08.944000Z
Message:

merged r17375

  • 携帯での受注メールが受注キャンセルメールになるのを修正(#355)
Location:
branches/version-2_4-dev
Files:
3 edited

Legend:

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

    r18574 r18671  
    4545 
    4646    /* DBに登録されたテンプレートメールの送信 */ 
    47     function sfSendTemplateMail($to, $to_name, $template_id, &$objPage) { 
     47    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = "", $from_name = "", $reply_to = "") { 
    4848 
    4949        $objQuery = new SC_Query(); 
     
    6666        $objSendMail = new SC_SendMail_Ex(); 
    6767        $from = $arrInfo['email03']; 
     68        if ($from_address == "") $from_address = $arrInfo['email03']; 
     69        if ($from_name == "") $from_name = $arrInfo['shop_name']; 
     70        if ($reply_to == "") $reply_to = $arrInfo['email03']; 
    6871        $error = $arrInfo['email04']; 
    6972        $tosubject = $tmp_subject; 
    70         $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error); 
     73        $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error); 
    7174        $objSendMail->setTo($to, $to_name); 
    7275        $objSendMail->sendMail();    // メール送信 
  • branches/version-2_4-dev/data/class/pages/contact/LC_Page_Contact.php

    r18559 r18671  
    242242 
    243243        $objQuery = new SC_Query(); 
    244         $objMailText = new SC_SiteView(); 
    245244        $objSiteInfo = $this->objView->objSiteInfo; 
    246245        $arrInfo = $objSiteInfo->data; 
    247246        $objPage->tpl_shopname=$arrInfo['shop_name']; 
    248247        $objPage->tpl_infoemail = $arrInfo['email02']; 
    249         $objMailText->assignobj($objPage); 
    250         $toCustomerMail = $objMailText->fetch("mail_templates/contact_mail.tpl"); 
    251         $objMail = new SC_SendMail(); 
    252  
    253         if ( $objPage->arrForm['email'] ) { 
    254             $fromMail_name = $objPage->arrForm['name01'] ." 様"; 
    255             $fromMail_address = $objPage->arrForm['email']; 
    256         } else { 
    257             $fromMail_name = $CONF["shop_name"]; 
    258             $fromMail_address = $CONF["email02"]; 
    259         } 
     248 
     249        $fromMail_name = $objPage->arrForm['name01'] ." 様"; 
     250        $fromMail_address = $objPage->arrForm['email']; 
     251 
    260252        $helperMail = new SC_Helper_Mail_Ex(); 
    261         $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせがありました。"); 
    262         $objMail->setItem( 
    263                               $CONF["email02"]                  // 宛先 
    264                             , $subject                          // サブジェクト 
    265                             , $toCustomerMail                   // 本文 
    266                             , $fromMail_address                 // 配送元アドレス 
    267                             , $fromMail_name                    // 配送元 名前 
    268                             , $fromMail_address                 // reply_to 
    269                             , $CONF["email04"]                  // return_path 
    270                             , $CONF["email04"]                  //  Errors_to 
    271                                                             ); 
    272         $objMail->sendMail(); 
    273  
    274         $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせを受け付けました。"); 
    275         $objMail->setItem( 
    276                               ''                                // 宛先 
    277                             , $subject                          // サブジェクト 
    278                             , $toCustomerMail                   // 本文 
    279                             , $CONF["email03"]                  // 配送元アドレス 
    280                             , $CONF["shop_name"]                // 配送元 名前 
    281                             , $CONF["email02"]                  // reply_to 
    282                             , $CONF["email04"]                  // return_path 
    283                             , $CONF["email04"]                  //  Errors_to 
    284                                                             ); 
    285         $objMail->setTo($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様"); 
    286         $objMail->sendMail(); 
     253        $helperMail->sfSendTemplateMail($CONF["email02"], $CONF["shop_name"], "5", $objPage, $fromMail_address, $fromMail_name, $fromMail_address);  
     254        $helperMail->sfSendTemplateMail($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様", "5", $objPage, $CONF["email03"], $CONF["shop_name"], $CONF["email02"]); 
    287255    } 
    288256} 
  • branches/version-2_4-dev/html/install/sql/insert_data.sql

    r18601 r18671  
    252252 
    253253',0,Now(), now()); 
     254insert into dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) values ( 
     2552, 
     256'ご注文ありがとうございます。', 
     257'', 
     258'',0,Now(), now()); 
     259INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) VALUES ( 
     2605, 
     261'お問い合わせを受け付けました', 
     262'', 
     263'',0,now(), now()); 
    254264 
    255265insert into dtb_news (news_date,rank, news_title, news_comment, creator_id, create_date, update_date) 
     
    645655INSERT INTO mtb_taxrule VALUES ('3', '切り上げ',2); 
    646656INSERT INTO mtb_mail_template VALUES ('1', '注文受付メール',0); 
    647 INSERT INTO mtb_mail_template VALUES ('2', '注文キャンセル受付メール',1); 
    648 INSERT INTO mtb_mail_template VALUES ('3', '取り寄せ確認メール',2); 
     657INSERT INTO mtb_mail_template VALUES ('2', '注文受付メール(携帯)',1); 
     658INSERT INTO mtb_mail_template VALUES ('3', '注文キャンセル受付メール',2); 
     659INSERT INTO mtb_mail_template VALUES ('4', '取り寄せ確認メール',3); 
     660INSERT INTO mtb_mail_template VALUES ('5', 'お問い合わせ受付メール',4); 
    649661INSERT INTO mtb_mail_tpl_path VALUES ('1', 'mail_templates/order_mail.tpl',0); 
    650662INSERT INTO mtb_mail_tpl_path VALUES ('2', 'mobile/mail_templates/order_mail.tpl',1); 
    651663INSERT INTO mtb_mail_tpl_path VALUES ('3', 'mail_templates/order_mail.tpl',2); 
    652 INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/contact_mail.tpl',3); 
     664INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/order_mail.tpl',3); 
     665INSERT INTO mtb_mail_tpl_path VALUES ('5', 'mail_templates/contact_mail.tpl',4); 
    653666INSERT INTO mtb_job VALUES ('1', '公務員',0); 
    654667INSERT INTO mtb_job VALUES ('2', 'コンサルタント',1); 
Note: See TracChangeset for help on using the changeset viewer.