Changeset 11691

Timestamp:

2007/03/09 19:46:27 (16 years ago)

Author:

uehara

Message:

 

Location:

branches/dev

Files:

• data/Smarty/templates/mobile/entry/set1.tpl (modified) (1 diff)
• data/Smarty/templates/mobile/mypage/set1.tpl (modified) (1 diff)
• data/Smarty/templates/mobile/shopping/deliv_date.tpl (copied) (copied from branches/mobile/data/Smarty/templates/mobile/shopping/deliv_date.tpl) (1 diff)
• data/Smarty/templates/mobile/shopping/payment.tpl (modified) (2 diffs)
• html/mobile/mypage/change.php (modified) (3 diffs)
• html/mobile/shopping/payment.php (modified) (3 diffs)

branches/dev/data/Smarty/templates/mobile/entry/set1.tpl

@@ -20 +20 @@
     ¡ÚÀ¸Ç¯·îÆü¡Û<font color="#FF0000">*</font><br>
     <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
-    <select name="year">
-        <!--{html_options options=$arrYear selected=$year}-->
-    </select>ǯ<br>
+    <input type="text" name="year" value="<!--{$year|escape}-->" size="4" maxlength="4" istyle="4">ǯ<br>
     <select name="month">
         <option value="">--</option>
         <!--{html_options options=$arrMonth selected=$month}-->
     </select>·î<br>
-    <select value="" name="day">
+    <select name="day">
         <option value="">--</option>
         <!--{html_options options=$arrDay selected=$day}-->

branches/dev/data/Smarty/templates/mobile/mypage/set1.tpl

@@ -21 +21 @@
     ¡ÚÀ¸Ç¯·îÆü¡Û<font color="#FF0000">*</font><br>
     <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
-    <select name="year">
-        <!--{html_options options=$arrYear selected=$arrForm.year}-->
-    </select>ǯ<br>
+    <input type="text" name="year" value="<!--{$arrForm.year|escape}-->" size="4" maxlength="4" istyle="4">ǯ<br>
     <select name="month">
         <option value="">--</option>
         <!--{html_options options=$arrMonth selected=$arrForm.month}-->
     </select>·î<br>
-    <select value="" name="day">
+    <select name="day">
         <option value="">--</option>
         <!--{html_options options=$arrDay selected=$arrForm.day}-->

branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl

@@ +1 @@
+<!--{*
+/*
+ * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ */
+*}-->
 <center>ÇÛãÆü»þ»ØÄê</center>
 

branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl

@@ -6 +6 @@
  */
 *}-->
-<center>ÇÛãÆü¡¦»Ùʧ¤¤»ØÄê</center>
+<center>»Ùʧ¤¤ÊýË¡»ØÄê</center>
 
 <hr>
 
 <form method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
-<input type="hidden" name="mode" value="confirm">
+<input type="hidden" name="mode" value="deliv_date">
 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
 <!--<input type="hidden" name="message" value="">-->
@@ -17 +17 @@
 <!--<input type="hidden" name="point_check" value="2">-->
 <!--{/if}-->
-
-¢£ÇÛãÆü»þ»ØÄê<br>
-ÇÛÁ÷Æü»ØÄê<br>
-<!--{assign var=key value="deliv_date"}-->
-<!--{if $arrErr[$key] != ""}-->
-<font color="red"><!--{$arrErr[$key]}--></font>
-<!--{/if}-->
-<!--{if $arrDelivDate}-->
-<select name="<!--{$key}-->">
-<option value="">»ØÄê¤Ê¤·</option>
-<!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
-</select>
-<!--{else}-->
-¤´»ØÄê失¤Þ¤»¤ó¡£
-<!--{/if}-->
-<br>
-
-»þ´ÖÂÓ»ØÄê<br>
-<!--{assign var=key value="deliv_time_id"}-->
-<!--{if $arrErr[$key] != ""}-->
-<font color="red"><!--{$arrErr[$key]}--></font>
-<!--{/if}-->
-<select name="<!--{$key}-->">
-<option value="">»ØÄê¤Ê¤·</option>
-<!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
-</select>
-<br>
-
-<br>
-
-<center>»Ùʧ¤¤ÊýË¡»ØÄê</center>
-
-<hr>
 
 <!--{assign var=key value="payment_id"}-->

branches/dev/html/mobile/mypage/change.php

@@ -195 +195 @@
 }
 
-if($objPage->year == '') {
-    $objPage->year = '----';
-}
-
 //----¡¡¥Ú¡¼¥¸É½¼¨
 $objView->assignobj($objPage);
@@ -351 +347 @@
 function lfErrorCheck2($array) {
 
-    global $objConn;
+    global $objConn, $objDate;
     $objErr = new SC_CheckError($array);
     
@@ -359 +355 @@
 
     $objErr->doFunc(array("À­ÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK")); 
-    $objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("SELECT_CHECK", "CHECK_DATE"));
+    $objErr->doFunc(array("À¸Ç¯·îÆü (ǯ)", "year", 4), array("EXIST_CHECK", "SPTAB_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
+    if (!isset($objErr->arrErr['year'])) {
+        $objErr->doFunc(array("À¸Ç¯·îÆü (ǯ)", "year", $objDate->getStartYear()), array("MIN_CHECK"));
+        $objErr->doFunc(array("À¸Ç¯·îÆü (ǯ)", "year", $objDate->getEndYear()), array("MAX_CHECK"));
+    }
+    $objErr->doFunc(array("À¸Ç¯·îÆü (·îÆü)", "month", "day"), array("SELECT_CHECK"));
+    if (!isset($objErr->arrErr['year']) && !isset($objErr->arrErr['month']) && !isset($objErr->arrErr['day'])) {
+        $objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("CHECK_DATE"));
+    }
     
     return $objErr->arrErr;

branches/dev/html/mobile/shopping/payment.php

@@ -17 +17 @@
         $this->tpl_mainpage = 'shopping/payment.tpl';
         $this->tpl_onload = 'fnCheckInputPoint();';
-        $this->tpl_title = "¤ª»ÙʧÊýË¡¡¦¤ªÆϤ±»þ´ÖÅù¤Î»ØÄê";
+        $this->tpl_title = "¤ª»ÙʧÊýË¡¤Î»ØÄê";
         /*
          session_start»þ¤Îno-cache¥Ø¥Ã¥À¡¼¤òÍÞÀ©¤¹¤ë¤³¤È¤Ç
@@ -61 +61 @@
 
 switch($_POST['mode']) {
+// »Ùʧ¤¤ÊýË¡»ØÄê ¢ª ÇÛãÆü»þ»ØÄê
+case 'deliv_date':
+    // ÆþÎÏÃͤÎÊÑ´¹
+    $objFormParam->convParam();
+    $objPage->arrErr = lfCheckError($objPage->arrData);
+    if (!isset($objPage->arrErr['payment_id'])) {
+        // »Ùʧ¤¤ÊýË¡¤ÎÆþÎÏ¥¨¥é¡¼¤Ê¤·
+        $objPage->tpl_mainpage = 'shopping/deliv_date.tpl';
+        $objPage->tpl_title = "ÇÛãÆü»þ»ØÄê";
+        break;
+    } else {
+        // ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ
+        $uniqid = $objSiteSess->getUniqId();
+        // ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤«¤é¤Î¾ðÊó¤ò³ÊǼ
+        lfSetOrderTempData($uniqid);
+    }
+    break;
 case 'confirm':
     // ÆþÎÏÃͤÎÊÑ´¹
@@ -79 +96 @@
         // ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤«¤é¤Î¾ðÊó¤ò³ÊǼ
         lfSetOrderTempData($uniqid);
+        if (!isset($objPage->arrErr['payment_id'])) {
+            // »Ùʧ¤¤ÊýË¡¤ÎÆþÎÏ¥¨¥é¡¼¤Ê¤·
+            $objPage->tpl_mainpage = 'shopping/deliv_date.tpl';
+            $objPage->tpl_title = "ÇÛãÆü»þ»ØÄê";
+        }
     }
     break;