Changeset 15120 for branches/beta/html/mobile

Timestamp:

2007/07/24 21:57:44 (19 years ago)

Author:

adati

Message:

1.4.2betaのマージ

Location:

branches/beta/html/mobile

Files:

• nonmember/complete.php (modified) (1 diff)
• nonmember/deliv.php (modified) (6 diffs)
• nonmember/deliv_addr.php (modified) (4 diffs)
• nonmember/index.php (modified) (12 diffs)
• nonmember/payment.php (modified) (1 diff)
• shopping/nonmember.php (deleted)
• shopping/nonmember_index.php (deleted)
• shopping/nonmember_payment.php (deleted)

branches/beta/html/mobile/nonmember/complete.php

@@ -62 +62 @@
     //ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¥¢¥É¥ì¥¹¤¬·ÈÂÓ¤«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, '1',"","");
         }else{
-              sfSendOrderMail($order_id, '0');
+              sfSendOrderMail($order_id, '0',"","");
         }
     }

branches/beta/html/mobile/nonmember/deliv.php

@@ -43 +43 @@
 $objPage->tpl_uniqid = $uniqid;
 
-if(!empty($_POST["mode2"]) ){
-    if ($_POST["mode2"] == "deliv") {
-            
+
+//Á°¤Î¥Ú¡¼¥¸¤«¤é¤ÎÁ«°Ü¤Ë¤è¤Ã¤Æʬ´ô
+if(!empty($_POST["mode2"]) || $_SESSION['user_info'] ){
+    if ($_POST["mode2"] == "deliv" || $_SESSION['user_info']["mode2"] == "deliv") {
+            
+           
             $objFormParam = new SC_FormParam();
             // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
            
             // POSTÃͤμèÆÀ
-            $objFormParam->setParam($_POST);
+            $objFormParam->setParam($_SESSION['user_info']);
             $arrRet = $objFormParam->getHashArray();
             $sqlval = $objFormParam->getDbArray();
@@ -58 +61 @@
             $objPage->arrErr = $arrErr;
             
-           foreach($_POST as $key => $value){
+           foreach($_SESSION['user_info'] as $key => $value){
                $objPage->arrAddr[0][$key] = $value;
            }
@@ -65 +68 @@
             lfRegistDataTemp($objPage->arrAddr[0]['uniqid'],$objPage->arrAddr[0]); 
             
-            lfCopyDeliv($objPage->tpl_uniqid, $_POST);
+            lfCopyDeliv($objPage->tpl_uniqid, $_SESSION['user_info']);
            
             $objPage->tpl_mainpage = 'nonmember/nonmember_deliv.tpl';
@@ -75 +78 @@
         
         if ($_POST["mode2"] == "customer_addr") {
-            //print_r($_POST);
+
             if ($_POST['deli'] != "") {
                 header("Location:" . gfAddSessionId("./payment.php"));
@@ -83 +86 @@
                 $arrErr['deli'] = '¢¨ ¤ªÆϤ±Àè¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£';
             }
-        }
-//Ìá¤ë¥Ü¥¿¥óÍѽèÍý        
-}elseif(!empty($_POST["mode"]) && $_POST["mode"]=="deliv_date"){  
+        }     
+//Ìá¤ë¥Ü¥¿¥óÍѽèÍý   
+}elseif($_POST["mode"]!="nonmember"){  
     //uniqid¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ç¡¼¥¿¤òÆɤ߹þ¤ßɽ¼¨¤¹¤ë
     $objQuery = new SC_Query();
@@ -101 +104 @@
     $objView->display(SITE_FRAME);
 }
+
 
 /**

branches/beta/html/mobile/nonmember/deliv_addr.php

@@ -24 +24 @@
 $objSiteSess = new SC_SiteSession();
 $objCartSess = new SC_CartSession();
-
-////¥í¥°¥¤¥óȽÄê
-//if (!$objCustomer->isLoginSuccess()){
-//  sfDispSiteError(CUSTOMER_ERROR, "", false, "", true);
-//}
 
 $objPage->arrForm = $_POST;
@@ -60 +55 @@
 
                       
- //-- ÆþÎϥǡ¼¥¿¤ÎÊÑ´¹
+    //-- ÆþÎϥǡ¼¥¿¤ÎÊÑ´¹
     $objPage->arrForm = lfConvertParam($objPage->arrForm, $arrRegistColumn);                        
+
+
+if($_SESSION['deliv_info']){
+    
+    foreach($_SESSION['deliv_info'] as $key => $val){
+        $objPage->arrForm[$key] = $val;
+    }
+    
+}
 
 // Ìá¤ë¥Ü¥¿¥óÍѽèÍý
@@ -73 +77 @@
         break;
     default:
-        
-        header("Location: " . gfAddSessionId('index.php'));
-        exit;
+        header("Location: " . gfAddSessionId('deliv.php'));
+        exit;
+
     }
 }
@@ -107 +111 @@
         $objPage->arrErr = lfErrorCheck2($objPage->arrForm);
         if (count($objPage->arrErr) == 0 && empty($_POST["return"])) {
-            $objPage->tpl_mainpage = 'nonmember/set2.tpl';
+             // ÅÐÏ¿
+            $other_deliv_id = lfRegistData($_POST,$arrRegistColumn,$uniqid);
+
+            // ÅÐÏ¿ºÑ¤ß¤ÎÊ̤ΤªÆϤ±Àè¤ò¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Ë½ñ¤­¹þ¤à
+            lfRegistOtherDelivData($uniqid, $objCustomer, $other_deliv_id);
+           
+            $_SESSION['deliv_info'] = $_POST;
+            // Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
+            $objSiteSess->setRegistFlag();
+            // ¤ª»Ùʧ¤¤ÊýË¡ÁªÂò¥Ú¡¼¥¸¤Ø°ÜÆ°
+            header("Location: " . gfAddSessionId('./payment.php'));
+            exit;
+
+//          $objPage->tpl_mainpage = 'nonmember/set2.tpl';
         } else {
             $objPage->tpl_mainpage = 'nonmember/set1.tpl';

branches/beta/html/mobile/nonmember/index.php

@@ -73 +73 @@
 
 switch($_POST['mode']) {
-case 'nonmember_confirm':
-    $objPage = lfSetNonMember($objPage);
-    // ¢¨break¤Ê¤·
-case 'confirm':
-    // ÆþÎÏÃͤÎÊÑ´¹
-    $objFormParam->convParam();
-    $objFormParam->toLower('order_mail');
-    $objFormParam->toLower('order_mail_check');
-    $objPage->arrErr = lfCheckError();
-    // ÆþÎÏ¥¨¥é¡¼¤Ê¤·
-    if(count($objPage->arrErr) == 0) {
-        // DB¤Ø¤Î¥Ç¡¼¥¿ÅÐÏ¿
-        lfRegistData($uniqid);
-        // Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
-        $objSiteSess->setRegistFlag();
-        // ¤ª»Ùʧ¤¤ÊýË¡ÁªÂò¥Ú¡¼¥¸¤Ø°ÜÆ°
-        header("Location: " . gfAddSessionId(MOBILE_URL_SHOP_PAYMENT));
-        exit;       
-    }
-    
-    break;
 // Á°¤Î¥Ú¡¼¥¸¤ËÌá¤ë
 case 'return':
@@ -109 +88 @@
     // ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ
     $uniqid = $objSiteSess->getUniqId();
-    $objQuery = new SC_Query();
-    $where = "order_temp_id = ?";
-    $arrRet = $objQuery->select("*", "dtb_order_temp", $where, array($uniqid));
-    // DBÃͤμèÆÀ
-    $objFormParam->setParam($arrRet[0]);
-    $objFormParam->setValue('order_email_check', $arrRet[0]['order_email']);
-    $objFormParam->setDBDate($arrRet[0]['order_birth']);
+//    $objQuery = new SC_Query();
+//    $where = "order_temp_id = ?";
+//    $arrRet = $objQuery->select("*", "dtb_order_temp", $where, array($uniqid));
+//    sfprintr($arrRet);
+//    // DBÃͤμèÆÀ
+//    $objFormParam->setParam($arrRet[0]);
+//    $objFormParam->setValue('order_email_check', $arrRet[0]['order_email']);
+//    $objFormParam->setDBDate($arrRet[0]['order_birth']);
     break;
 }
@@ -133 +113 @@
 // ÆþÎÏÃͤμèÆÀ
 $objPage->arrForm = $objFormParam->getFormParamList();
-
+sfprintr($_SESSION);
 //objPage¤Î¾ðÊó¤òobjView¤Ë³ÊǼ
 $objView->assignobj($objPage);
@@ -173 +153 @@
 
 //---- ÅÐÏ¿½ü³°ÍÑ¥«¥é¥àÇÛÎó
-//$arrRejectRegistColumn = array("year", "month", "day", "email02", "email_mobile02","password","password02","reminder","reminder_answer");
 $arrRejectRegistColumn = array("year", "month", "day", "email02", "email_mobile02", "password02");
         
@@ -187 +166 @@
     }
     
-    //$objPage->arrForm['email'] = strtolower($objPage->arrForm['email']);        // email¤Ï¤¹¤Ù¤Æ¾®Ê¸»ú¤Ç½èÍý
+    $objPage->arrForm['email'] = strtolower($objPage->arrForm['email']);        // email¤Ï¤¹¤Ù¤Æ¾®Ê¸»ú¤Ç½èÍý
     
     //-- ÆþÎϥǡ¼¥¿¤ÎÊÑ´¹
@@ -197 +176 @@
         switch ($_POST["mode2"]) {
         case "deliv_date":  
-        
             break;
         case "deliv":
@@ -213 +191 @@
     //--¡¡ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
     if (!empty($_POST["mode2"])) {
-            if ($_POST["mode2"] == "set2") {
+        if ($_POST["mode2"] == "set2") {
             $objPage->arrErr = lfErrorCheck1($objPage->arrForm);
             $objPage->tpl_mainpage = 'nonmember/nonmember_set1.tpl';
             $objPage->tpl_title = '¤ªµÒÍ;ðÊóÆþÎÏ(1/3)';
         } elseif ($_POST["mode2"] == "set3") {
-            
             $objPage->arrErr = lfErrorCheck2($objPage->arrForm);
             $objPage->tpl_mainpage = 'nonmember/nonmember_set2.tpl';
@@ -230 +207 @@
     //¥Õ¥©¡¼¥à¤ÎÃͤò$objPage¤Î¥­¡¼¤È¤·¤ÆÂåÆþ¤·¤Æ¤¤¤¯
    foreach($objPage->arrForm as $key => $val) {
-        $objPage->$key = $val;
+            $objPage->$key = $val;
         }
     }
@@ -255 +232 @@
         //--¡¡¥Æ¥ó¥×¥ì¡¼¥ÈÀßÄê
         if ($_POST["mode2"] == "set2") {
-            
             $objPage->tpl_mainpage = 'nonmember/nonmember_set2.tpl';
             $objPage->tpl_title = '¤ªµÒÍ;ðÊóÆþÎÏ(2/3)';
@@ -283 +259 @@
             if ($key != "mode2" && $key != "submit" && $key != "confirm" && $key != "return" && $key != session_name() && !in_array($key, $checkVal)) {
                 $objPage->list_data[ $key ] = $val;
+                $_SESSION['user_info'][$key] = $val;
             }
         }
-        
-        //header("Location:" . gfAddSessionId("./deliv.php"));
-        
+//        sfprintr($_SESSION['user_info']);
+       if($_POST["mode2"] == "deliv"){
+            $_SESSION['user_info']['mode2'] = "deliv"; 
+            header("Location:" . gfAddSessionId("./deliv.php"));
+       }
     }
     return $objPage;
@@ -325 +304 @@
     }
 }
-
 
 /* ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½ */
@@ -368 +346 @@
 }
 
-/* DB¤Ø¥Ç¡¼¥¿¤ÎÅÐÏ¿ */
-
 /* ÆþÎÏÆâÍƤΥÁ¥§¥Ã¥¯ */
 function lfCheckError() {

branches/beta/html/mobile/nonmember/payment.php

@@ -69 +69 @@
         $objSiteSess->setRegistFlag();
         //header("Location: " . gfAddSessionId(MOBILE_URL_SHOP_TOP));
-        header("Location: " . gfAddSessionId('../shopping/index.php'));
+        header("Location: " . gfAddSessionId('../nonmember/deliv.php'));
         exit;
-    }
-}
+//        $_POST['mode'] = "deliv_date";
+    }
+}
+
 switch($_POST['mode']) {
 // »Ùʧ¤¤ÊýË¡»ØÄê ¢ª ÇÛãÆü»þ»ØÄê