Index: /branches/version-2_4-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_4-dev/html/install/sql/insert_data.sql (revision 18601)
+++ /branches/version-2_4-dev/html/install/sql/insert_data.sql (revision 18671)
@@ -252,4 +252,14 @@
',0,Now(), now());
+insert into dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) values (
+2,
+'ご注文ありがとうございます。',
+'',
+'',0,Now(), now());
+INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, update_date, create_date) VALUES (
+5,
+'お問い合わせを受け付けました',
+'',
+'',0,now(), now());
insert into dtb_news (news_date,rank, news_title, news_comment, creator_id, create_date, update_date)
@@ -645,10 +655,13 @@
INSERT INTO mtb_taxrule VALUES ('3', '切り上げ',2);
INSERT INTO mtb_mail_template VALUES ('1', '注文受付メール',0);
-INSERT INTO mtb_mail_template VALUES ('2', '注文キャンセル受付メール',1);
-INSERT INTO mtb_mail_template VALUES ('3', '取り寄せ確認メール',2);
+INSERT INTO mtb_mail_template VALUES ('2', '注文受付メール(携帯)',1);
+INSERT INTO mtb_mail_template VALUES ('3', '注文キャンセル受付メール',2);
+INSERT INTO mtb_mail_template VALUES ('4', '取り寄せ確認メール',3);
+INSERT INTO mtb_mail_template VALUES ('5', 'お問い合わせ受付メール',4);
INSERT INTO mtb_mail_tpl_path VALUES ('1', 'mail_templates/order_mail.tpl',0);
INSERT INTO mtb_mail_tpl_path VALUES ('2', 'mobile/mail_templates/order_mail.tpl',1);
INSERT INTO mtb_mail_tpl_path VALUES ('3', 'mail_templates/order_mail.tpl',2);
-INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/contact_mail.tpl',3);
+INSERT INTO mtb_mail_tpl_path VALUES ('4', 'mail_templates/order_mail.tpl',3);
+INSERT INTO mtb_mail_tpl_path VALUES ('5', 'mail_templates/contact_mail.tpl',4);
INSERT INTO mtb_job VALUES ('1', '公務員',0);
INSERT INTO mtb_job VALUES ('2', 'コンサルタント',1);
Index: /branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php (revision 18574)
+++ /branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php (revision 18671)
@@ -45,5 +45,5 @@
/* DBに登録されたテンプレートメールの送信 */
- function sfSendTemplateMail($to, $to_name, $template_id, &$objPage) {
+ function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = "", $from_name = "", $reply_to = "") {
$objQuery = new SC_Query();
@@ -66,7 +66,10 @@
$objSendMail = new SC_SendMail_Ex();
$from = $arrInfo['email03'];
+ if ($from_address == "") $from_address = $arrInfo['email03'];
+ if ($from_name == "") $from_name = $arrInfo['shop_name'];
+ if ($reply_to == "") $reply_to = $arrInfo['email03'];
$error = $arrInfo['email04'];
$tosubject = $tmp_subject;
- $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error);
+ $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
$objSendMail->setTo($to, $to_name);
$objSendMail->sendMail(); // メール送信
Index: /branches/version-2_4-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- /branches/version-2_4-dev/data/class/pages/contact/LC_Page_Contact.php (revision 18559)
+++ /branches/version-2_4-dev/data/class/pages/contact/LC_Page_Contact.php (revision 18671)
@@ -242,47 +242,15 @@
$objQuery = new SC_Query();
- $objMailText = new SC_SiteView();
$objSiteInfo = $this->objView->objSiteInfo;
$arrInfo = $objSiteInfo->data;
$objPage->tpl_shopname=$arrInfo['shop_name'];
$objPage->tpl_infoemail = $arrInfo['email02'];
- $objMailText->assignobj($objPage);
- $toCustomerMail = $objMailText->fetch("mail_templates/contact_mail.tpl");
- $objMail = new SC_SendMail();
-
- if ( $objPage->arrForm['email'] ) {
- $fromMail_name = $objPage->arrForm['name01'] ." 様";
- $fromMail_address = $objPage->arrForm['email'];
- } else {
- $fromMail_name = $CONF["shop_name"];
- $fromMail_address = $CONF["email02"];
- }
+
+ $fromMail_name = $objPage->arrForm['name01'] ." 様";
+ $fromMail_address = $objPage->arrForm['email'];
+
$helperMail = new SC_Helper_Mail_Ex();
- $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせがありました。");
- $objMail->setItem(
- $CONF["email02"] // 宛先
- , $subject // サブジェクト
- , $toCustomerMail // 本文
- , $fromMail_address // 配送元アドレス
- , $fromMail_name // 配送元 名前
- , $fromMail_address // reply_to
- , $CONF["email04"] // return_path
- , $CONF["email04"] // Errors_to
- );
- $objMail->sendMail();
-
- $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせを受け付けました。");
- $objMail->setItem(
- '' // 宛先
- , $subject // サブジェクト
- , $toCustomerMail // 本文
- , $CONF["email03"] // 配送元アドレス
- , $CONF["shop_name"] // 配送元 名前
- , $CONF["email02"] // reply_to
- , $CONF["email04"] // return_path
- , $CONF["email04"] // Errors_to
- );
- $objMail->setTo($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様");
- $objMail->sendMail();
+ $helperMail->sfSendTemplateMail($CONF["email02"], $CONF["shop_name"], "5", $objPage, $fromMail_address, $fromMail_name, $fromMail_address);
+ $helperMail->sfSendTemplateMail($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様", "5", $objPage, $CONF["email03"], $CONF["shop_name"], $CONF["email02"]);
}
}