Changeset 15482
- Timestamp:
- 2007/08/30 17:38:25 (13 years ago)
- Location:
- branches/beta
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/beta/data/conf/conf.php
r15284 r15482 190 190 */ 191 191 /* ¥·¥¹¥Æ¥à´ØÏ¢ */ 192 define ('DEBUG_MODE', false); // ¥Ç¥Ð¥Ã¥°¥â¡¼¥É(true¡§sfPrintR¤äDB¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ¹¤ë¡¢false¡§½ÐÎϤ·¤Ê¤¤)192 define ('DEBUG_MODE', true); // ¥Ç¥Ð¥Ã¥°¥â¡¼¥É(true¡§sfPrintR¤äDB¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ¹¤ë¡¢false¡§½ÐÎϤ·¤Ê¤¤) 193 193 define ("ADMIN_ID", "1"); // ´ÉÍý¥æ¡¼¥¶ID(¥á¥ó¥Æ¥Ê¥ó¥¹ÍÑɽ¼¨¤µ¤ì¤Ê¤¤¡£) 194 194 define ("CUSTOMER_CONFIRM_MAIL", false); // ²ñ°÷ÅÐÏ¿»þ¤Ë²¾²ñ°÷³Îǧ¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤«¡Êtrue:²¾²ñ°÷¡¢false:Ëܲñ°÷¡Ë … … 600 600 // ³Æ¥Æ¥ó¥×¥ì¡¼¥È¤Î¥Ñ¥¹ 601 601 $arrMAILTPLPATH = array( 602 0=> "mail_templates/order_mail.tpl",603 1=> "mobile/mail_templates/order_mail.tpl"602 1 => "mail_templates/order_mail.tpl", 603 2 => "mobile/mail_templates/order_mail.tpl" 604 604 ); 605 605 -
branches/beta/data/lib/slib.php
r15120 r15482 540 540 // POST¤Î¥æ¥Ë¡¼¥¯ID¤È¥»¥Ã¥·¥ç¥ó¤Î¥æ¥Ë¡¼¥¯ID¤òÈæ³Ó(¥æ¥Ë¡¼¥¯ID¤¬POST¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¥¹¥ë¡¼) 541 541 $ret = $objSiteSess->checkUniqId(); 542 542 543 if($ret != true) { 543 544 // ¥¨¥é¡¼¥Ú¡¼¥¸¤Îɽ¼¨ … … 1755 1756 $arrOther[$other_key]["value"] = ""; 1756 1757 } 1757 } 1758 1758 } 1759 1759 $objPage->arrOther = $arrOther; 1760 1760 } 1761 1761 1762 1762 // ÅÔÆ»Éܸ©ÊÑ´¹ 1763 1763 global $arrPref; … … 1772 1772 // ¥á¡¼¥ëËÜʸ¤Î¼èÆÀ 1773 1773 $objMailView->assignobj($objPage); 1774 1774 1775 $name = $objPage->arrOrder['order_name01']." ".$objPage->arrOrder['order_name02']; 1775 1776 $objPage->tpl_body = ereg_replace( "(\{name\})", $name , $objPage->tpl_body ); 1776 1777 $tmp_subject = ereg_replace( "(\{name\})", $name , $tmp_subject ); 1777 1778 // $template_id==1¤Ï·ÈÂÓÍÑ 1779 if($template_id == '1'){ 1780 $body = $objMailView->fetch($arrMAILTPLPATH[1]); 1781 $body = ereg_replace( "(\{order\})", $body , $objPage->tpl_body ); 1782 }else{ 1783 $body = $objMailView->fetch($arrMAILTPLPATH[0]); 1784 $body = ereg_replace( "(\{order\})", $body , $objPage->tpl_body ); 1785 } 1786 1778 1779 // ¼õÃíÆ°ÅªÉôʬ¤ò¼èÆÀ 1780 $body = $objMailView->fetch($arrMAILTPLPATH[$template_id]); 1781 $body = ereg_replace( "(\{order\})", $body , $objPage->tpl_body ); 1782 1787 1783 // ¥á¡¼¥ëÁ÷¿®½èÍý 1788 1784 $objSendMail = new GC_SendMail(); … … 1795 1791 $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc); 1796 1792 $objSendMail->setTo($arrOrder["order_email"], $arrOrder["order_name01"] . " ". $arrOrder["order_name02"] ." ÍÍ"); 1797 1798 1793 1799 1794 // Á÷¿®¥Õ¥é¥°:true¤Î¾ì¹ç¤Ï¡¢Á÷¿®¤¹¤ë¡£ -
branches/beta/html/install/sql/insert_data.sql
r15128 r15482 224 224 INSERT INTO dtb_templates (template_code, template_name, create_date, update_date) VALUES('default1','¥Ç¥Õ¥©¥ë¥È1', now(), now()); 225 225 226 insert into dtb_mailtemplate (subject, body, creator_id, update_date, create_date, send_type, template_name) values ( 226 insert into dtb_mailtemplate (template_id, subject, body, creator_id, update_date, create_date, send_type, template_name) values ( 227 '1', 227 228 '¤´Ãíʸ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£', 228 229 '{name}ÍÍ … … 244 245 '¼õÃí´°Î»¥Æ¥ó¥×¥ì¡¼¥È(PCÍÑ)'); 245 246 246 insert into dtb_mailtemplate (subject, body, creator_id, update_date, create_date, send_type, template_name) values ( 247 insert into dtb_mailtemplate (template_id, subject, body, creator_id, update_date, create_date, send_type, template_name) values ( 248 '2', 247 249 '¤´Ãíʸ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£', 248 250 '{name}ÍÍ -
branches/beta/html/shopping/complete.php
r15120 r15482 63 63 //ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬·ÈÂÓ¤«PC¤«¤Ë±þ¤¸¤ÆÃíʸ´°Î»¥á¡¼¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤òÊѤ¨¤ë 64 64 if(ereg("(ezweb.ne.jp$|docomo.ne.jp$|softbank.ne.jp$|vodafone.ne.jp$)",$order_email[0]['order_email'])){ 65 sfSendOrderMail($order_id, '1',"",""); 65 // ¥â¥Ð¥¤¥ëÈÇ 66 sfSendOrderMail($order_id, '2'); 66 67 }else{ 67 sfSendOrderMail($order_id, '0',"",""); 68 // PCÈÇ 69 sfSendOrderMail($order_id, '1'); 68 70 } 69 71 }
Note: See TracChangeset
for help on using the changeset viewer.