Changeset 18726 for branches/version-2_4/html

Timestamp:

2010/06/22 15:01:42 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100622054328-gb3ouyz7heons1ht

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-20100622060138-0bnti85taez6jdsx

bzr:revno:

1933

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20100621024307-zlsnjvavwufdgeep
data/class/pages/contact/LC_Page_Contact.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18555
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20100616043149-lhr1rbqldxfqlakc

bzr:timestamp:

2010-06-22 15:01:38.634000063 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-22T06:01:38.634000Z

Message:

merged r18671

• 携帯での受注メールが受注キャンセルメールになるのを修正(#355)

File:

• branches/version-2_4/html/install/sql/insert_data.sql (modified) (2 diffs)

branches/version-2_4/html/install/sql/insert_data.sql

@@ -252 +252 @@
 
 ',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 +655 @@
 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);