Changeset 15482

Timestamp:

2007/08/30 17:38:25 (13 years ago)

Author:

naka

Message:

受注メールのバグ修正

Location:

branches/beta

Files:

• data/conf/conf.php (modified) (2 diffs)
• data/lib/slib.php (modified) (4 diffs)
• html/install/sql/insert_data.sql (modified) (2 diffs)
• html/shopping/complete.php (modified) (1 diff)

branches/beta/data/conf/conf.php

@@ -190 +190 @@
  */
 /* ¥·¥¹¥Æ¥à´ØÏ¢ */
-define ('DEBUG_MODE', false);                          // ¥Ç¥Ð¥Ã¥°¥â¡¼¥É(true¡§sfPrintR¤äDB¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ¹¤ë¡¢false¡§½ÐÎϤ·¤Ê¤¤)
+define ('DEBUG_MODE', true);                          // ¥Ç¥Ð¥Ã¥°¥â¡¼¥É(true¡§sfPrintR¤äDB¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ¹¤ë¡¢false¡§½ÐÎϤ·¤Ê¤¤)
 define ("ADMIN_ID", "1");                               // ´ÉÍý¥æ¡¼¥¶ID(¥á¥ó¥Æ¥Ê¥ó¥¹ÍÑɽ¼¨¤µ¤ì¤Ê¤¤¡£)
 define ("CUSTOMER_CONFIRM_MAIL", false);                // ²ñ°÷ÅÐÏ¿»þ¤Ë²¾²ñ°÷³Îǧ¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤«¡Êtrue:²¾²ñ°÷¡¢false:Ëܲñ°÷¡Ë
@@ -600 +600 @@
 // ³Æ¥Æ¥ó¥×¥ì¡¼¥È¤Î¥Ñ¥¹
 $arrMAILTPLPATH = array(
-    0 => "mail_templates/order_mail.tpl",
-    1 => "mobile/mail_templates/order_mail.tpl"
+    1 => "mail_templates/order_mail.tpl",
+    2 => "mobile/mail_templates/order_mail.tpl"
 );
 

branches/beta/data/lib/slib.php

@@ -540 +540 @@
     // POST¤Î¥æ¥Ë¡¼¥¯ID¤È¥»¥Ã¥·¥ç¥ó¤Î¥æ¥Ë¡¼¥¯ID¤òÈæ³Ó(¥æ¥Ë¡¼¥¯ID¤¬POST¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¥¹¥ë¡¼)
     $ret = $objSiteSess->checkUniqId();
+    
     if($ret != true) {
         // ¥¨¥é¡¼¥Ú¡¼¥¸¤Îɽ¼¨
@@ -1755 +1756 @@
                 $arrOther[$other_key]["value"] = "";
             }
-        }
-        
+        }       
         $objPage->arrOther = $arrOther;
     }
-
+        
     // ÅÔÆ»Éܸ©ÊÑ´¹
     global $arrPref;
@@ -1772 +1772 @@
     // ¥á¡¼¥ëËÜʸ¤Î¼èÆÀ
     $objMailView->assignobj($objPage);
+    
     $name = $objPage->arrOrder['order_name01']." ".$objPage->arrOrder['order_name02'];
     $objPage->tpl_body = ereg_replace( "(\{name\})", $name ,  $objPage->tpl_body );
     $tmp_subject = ereg_replace( "(\{name\})", $name ,  $tmp_subject );
-    
-    // $template_id==1¤Ï·ÈÂÓÍÑ
-    if($template_id == '1'){
-       $body = $objMailView->fetch($arrMAILTPLPATH[1]);
-       $body = ereg_replace( "(\{order\})", $body ,  $objPage->tpl_body );
-    }else{
-       $body = $objMailView->fetch($arrMAILTPLPATH[0]); 
-       $body = ereg_replace( "(\{order\})", $body ,  $objPage->tpl_body );
-    }
-    
+     
+    // ¼õÃíưŪÉôʬ¤ò¼èÆÀ
+    $body = $objMailView->fetch($arrMAILTPLPATH[$template_id]);
+    $body = ereg_replace( "(\{order\})", $body ,  $objPage->tpl_body );
+        
     // ¥á¡¼¥ëÁ÷¿®½èÍý
     $objSendMail = new GC_SendMail();
@@ -1795 +1791 @@
     $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
     $objSendMail->setTo($arrOrder["order_email"], $arrOrder["order_name01"] . " ". $arrOrder["order_name02"] ." ÍÍ");
-
 
     // Á÷¿®¥Õ¥é¥°:true¤Î¾ì¹ç¤Ï¡¢Á÷¿®¤¹¤ë¡£

branches/beta/html/install/sql/insert_data.sql

@@ -224 +224 @@
 INSERT INTO dtb_templates (template_code, template_name, create_date, update_date) VALUES('default1','¥Ç¥Õ¥©¥ë¥È1', now(), now());
 
-insert into dtb_mailtemplate (subject, body, creator_id, update_date, create_date, send_type, template_name) values (
+insert into dtb_mailtemplate (template_id, subject, body, creator_id, update_date, create_date, send_type, template_name) values (
+'1',
 '¤´Ãíʸ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£',
 '{name}ÍÍ
@@ -244 +245 @@
 '¼õÃí´°Î»¥Æ¥ó¥×¥ì¡¼¥È(PCÍÑ)');
 
-insert into dtb_mailtemplate (subject, body, creator_id, update_date, create_date, send_type, template_name) values (
+insert into dtb_mailtemplate (template_id, subject, body, creator_id, update_date, create_date, send_type, template_name) values (
+'2',
 '¤´Ãíʸ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£',
 '{name}ÍÍ

branches/beta/html/shopping/complete.php

@@ -63 +63 @@
     //ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬·ÈÂÓ¤«PC¤«¤Ë±þ¤¸¤ÆÃíʸ´°Î»¥á¡¼¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤òÊѤ¨¤ë
     if(ereg("(ezweb.ne.jp$|docomo.ne.jp$|softbank.ne.jp$|vodafone.ne.jp$)",$order_email[0]['order_email'])){
-              sfSendOrderMail($order_id, '1',"","");
+            // ¥â¥Ð¥¤¥ëÈÇ
+            sfSendOrderMail($order_id, '2');
         }else{
-              sfSendOrderMail($order_id, '0',"","");
+            // PCÈÇ
+            sfSendOrderMail($order_id, '1');
         }
     }