Changeset 14676 for branches/beta/html/shopping/complete.php

Timestamp:

2007/06/14 22:01:13 (19 years ago)

Author:

adati

Message:

1.4.0a-betaのマージ

File:

• branches/beta/html/shopping/complete.php (modified) (2 diffs)

branches/beta/html/shopping/complete.php

@@ -58 +58 @@
     // ´°Î»¥á¡¼¥ëÁ÷¿®
     if($order_id != "") {
-        sfSendOrderMail($order_id, '1');
+        $order_email = $objQuery->select("order_email", "dtb_order", "order_id = ?", array($order_id));
+    
+    //ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬·ÈÂÓ¤«PC¤«¤Ë±þ¤¸¤ÆÃíʸ´°Î»¥á¡¼¥ë¤Î¥Æ¥ó¥×¥ì¡¼¥È¤òÊѤ¨¤ë
+    if(ereg("(ezweb.ne.jp$|docomo.ne.jp$|softbank.ne.jp$|vodafone.ne.jp$)",$order_email[0]['order_email'])){
+              sfSendOrderMail($order_id, '1',"","");
+        }else{
+              sfSendOrderMail($order_id, '0',"","");
+        }
     }
 
@@ -200 +207 @@
     lfDeleteTempOrder($objQuery, $uniqid);
     // ¥­¥ã¥ó¥Ú¡¼¥ó¤«¤é¤ÎÁ«°Ü¤Î¾ì¹çÅÐÏ¿¤¹¤ë¡£
-    if($objCampaignSess->getIsCampaign()) {
+    if($objCampaignSess->getIsCampaign() and $objCartSess->chkCampaign($objCampaignSess->getCampaignId())) {
         lfRegistCampaignOrder($objQuery, $objCampaignSess, $order_id);
     }