Changeset 11982 for branches/comu/html/shopping/complete.php

Timestamp:

2007/03/28 13:01:38 (19 years ago)

Author:

uehara

Message:

 

File:

• branches/comu/html/shopping/complete.php (modified) (8 diffs)

branches/comu/html/shopping/complete.php

@@ -61 +61 @@
     }
 
-    //¤½¤Î¾¾ðÊó¤Î¼èÆÀ
-    $other_data = $objQuery->get("dtb_order", "memo02", "order_id = ? ", array($order_id));
-    if($other_data != "") {
-        $arrOther = unserialize($other_data);
-        
-        // ¥Ç¡¼¥¿¤òÊÔ½¸
-        foreach($arrOther as $key => $val){
-            // URL¤Î¾ì¹ç¤Ë¤Ï¥ê¥ó¥¯¤Ä¤­¤Çɽ¼¨¤µ¤»¤ë
-            if (preg_match('/^(https?|ftp)(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $val["value"])) {
-                $arrOther[$key]["value"] = "<a href='#' onClick=\"window.open('". $val["value"] . "'); \" >" . $val["value"] ."</a>";
+    // ¤½¤Î¾¾ðÊó¤Î¼èÆÀ
+    $arrResults = $objQuery->getall("SELECT memo02, memo05 FROM dtb_order WHERE order_id = ? ", array($order_id));
+
+    if (count($arrResults) > 0) {   
+        if (isset($arrResults[0]["memo02"]) || isset($arrResults[0]["memo05"])) {
+            // ´°Î»²èÌ̤Çɽ¼¨¤¹¤ë·èºÑÆâÍÆ
+            $arrOther = unserialize($arrResults[0]["memo02"]);
+            // ´°Î»²èÌ̤«¤éÁ÷¿®¤¹¤ë·èºÑÆâÍÆ
+            $arrModuleParam = unserialize($arrResults[0]["memo05"]);
+            
+            // ¥Ç¡¼¥¿¤òÊÔ½¸
+            foreach($arrOther as $key => $val){
+                // URL¤Î¾ì¹ç¤Ë¤Ï¥ê¥ó¥¯¤Ä¤­¤Çɽ¼¨¤µ¤»¤ë
+                if (preg_match('/^(https?|ftp)(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $val["value"])) {
+                    $arrOther[$key]["value"] = "<a href='#' onClick=\"window.open('". $val["value"] . "'); \" >" . $val["value"] ."</a>";
+                }
             }
+                    
+            $objPage->arrOther = $arrOther;
+            $objPage->arrModuleParam = $arrModuleParam;
         }
-                
-        $objPage->arrOther = $arrOther;
-        
     }
     
@@ -229 +235 @@
     $sqlval['reminder'] = $arrData['reminder'];
     $sqlval['reminder_answer'] = $arrData['reminder_answer'];
-    // ²ñ°÷²¾ÅÐÏ¿
-    $sqlval['status'] = 1;
-    // URLȽÄêÍÑ¥­¡¼
-    $sqlval['secret_key'] = sfGetUniqRandomId("t"); 
-    
-    $objQuery = new SC_Query();
-    $sqlval['create_date'] = "now()";
-    $sqlval['update_date'] = "now()";
-    $objQuery->insert("dtb_customer", $sqlval);
-    
-    // ¸ÜµÒID¤Î¼èÆÀ
-    $arrRet = $objQuery->select("customer_id", "dtb_customer", "secret_key = ?", array($sqlval['secret_key']));
-    $customer_id = $arrRet[0]['customer_id'];
     
     // ¥á¥ë¥Þ¥¬ÇÛ¿®Íѥե饰¤ÎȽÄê
@@ -258 +251 @@
         break;
     }
-
+    // ¥á¥ë¥Þ¥¬¥Õ¥é¥°
+    $sqlval['mailmaga_flg'] = $mail_flag;
+        
+    // ²ñ°÷²¾ÅÐÏ¿
+    $sqlval['status'] = 1;
+    // URLȽÄêÍÑ¥­¡¼
+    $sqlval['secret_key'] = sfGetUniqRandomId("t"); 
+    
     $objQuery = new SC_Query();
-    $objQuery->begin(); 
-    // ¥á¥ë¥Þ¥¬ÇÛ¿®Íѥơ¼¥Ö¥ëÅÐÏ¿
-    lfRegistNonCustomer($arrData['order_email'], $mail_flag, $objQuery);
-    $objQuery->commit();
-
+    $sqlval['create_date'] = "now()";
+    $sqlval['update_date'] = "now()";
+    $objQuery->insert("dtb_customer", $sqlval);
+    
+    // ¸ÜµÒID¤Î¼èÆÀ
+    $arrRet = $objQuery->select("customer_id", "dtb_customer", "secret_key = ?", array($sqlval['secret_key']));
+    $customer_id = $arrRet[0]['customer_id'];
+    
     //¡¡²¾ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
     $objMailPage = new LC_Page();
@@ -300 +303 @@
 
     // ¼õÃí¥Æ¡¼¥Ö¥ë¤Ë½ñ¤­¹þ¤Þ¤Ê¤¤Îó¤ò½üµî
-    unset($sqlval['mail_flag']);        // ¥á¥ë¥Þ¥¬¥Á¥§¥Ã¥¯
+    unset($sqlval['mailmaga_flg']);     // ¥á¥ë¥Þ¥¬¥Á¥§¥Ã¥¯
     unset($sqlval['deliv_check']);      // Ê̤ΤªÆϤ±Àè¥Á¥§¥Ã¥¯
     unset($sqlval['point_check']);      // ¥Ý¥¤¥ó¥ÈÍøÍÑ¥Á¥§¥Ã¥¯
@@ -307 +310 @@
     unset($sqlval['reminder']);         // ¥ê¥Þ¥¤¥ó¥À¡¼¼ÁÌä
     unset($sqlval['reminder_answer']);  // ¥ê¥Þ¥¤¥ó¥À¡¼Åú¤¨
-
+    unset($sqlval['mail_flag']);        // ¥á¡¼¥ë¥Õ¥é¥°
+    
     // Ãíʸ¥¹¥Æ¡¼¥¿¥¹:»ØÄ̵꤬¤±¤ì¤Ð¿·µ¬¼õÉÕ¤ËÀßÄê
     if($sqlval["status"] == ""){
@@ -314 +318 @@
     
     // Ê̤ΤªÆϤ±Àè¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÇÛÁ÷Àè¤ËÅÐÏ¿½»½ê¤ò¥³¥Ô¡¼¤¹¤ë¡£
-    if($arrData["deliv_check"] != "1") {
+    if($arrData["deliv_check"] == "-1") {
         $sqlval['deliv_name01'] = $arrData['order_name01'];
         $sqlval['deliv_name02'] = $arrData['order_name02'];
@@ -340 +344 @@
     // INSERT¤Î¼Â¹Ô
     $objQuery->insert("dtb_order", $sqlval);
-    
-    // ¥á¥ë¥Þ¥¬ÇÛ¿®´õ˾¾ðÊó¤ÎÅÐÏ¿
-    lfRegistNonCustomer($arrData['order_email'], $arrData['mail_flag'], $objQuery);
     
     return $order_id;
@@ -495 +496 @@
 }
 
-/* Èó²ñ°÷¤Î¥á¥ë¥Þ¥¬¥Æ¡¼¥Ö¥ë¤Ø¤ÎÅÐÏ¿ */
-function lfRegistNonCustomer($email, $mail_flag, $objQuery) {
-    // ²ñ°÷¤Î¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç
-    if(!sfCheckCustomerMailMaga($email)) {
-        $where = "email = ?";
-        $objQuery->delete("dtb_customer_mail", $where, array($email));
-        $sqlval['email'] = $email;
-        $sqlval['mail_flag'] = $mail_flag;
-        $sqlval['create_date'] = "now()";
-        $sqlval['update_date'] = "now()";
-        $objQuery->insert("dtb_customer_mail", $sqlval);
-    }
-}
-
 // ºß¸Ë¤ò¸º¤é¤¹½èÍý
 function lfReduceStock($objQuery, $arrID, $quantity) {