Index: branches/dev/data/Smarty/templates/mobile/mypage/set1.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/set1.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/mypage/set1.tpl	(revision 11903)
@@ -41,5 +41,6 @@
 	<input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrForm.zip02|escape}--><!--{else}--><!--{$arrForm.zip02|escape}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
 
-	<input type="submit" name="confirm" value="¼¡¤Ø">
+	<input type="submit" name="confirm" value="¼¡¤Ø"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/mypage/set2.tpl	(revision 11903)
@@ -49,5 +49,6 @@
 	<input type="hidden" name="job" value="<!--{$arrForm.job|escape}-->">
 
-	<input type="submit" name="confirm" value="¼¡¤Ø">
+	<input type="submit" name="confirm" value="¼¡¤Ø"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl	(revision 11903)
@@ -41,5 +41,6 @@
 	<br>
 
-	<input type="submit" name="submit" value="Êѹ¹">
+	<input type="submit" name="submit" value="Êѹ¹"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 11903)
@@ -52,4 +52,8 @@
 
 	<input type="submit" name="confirm" value="¼¡¤Ø">
+
+	<!--{foreach from=$list_data key=key item=item}-->
+		<input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->">
+	<!--{/foreach}-->
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl	(revision 11903)
@@ -1,2 +1,3 @@
+<<<<<<< .working
 <!--{*
 /*
@@ -59,2 +60,58 @@
 <center>LOCKON CO.,LTD.</center>
 <!-- ¢¥¥Õ¥Ã¥¿¡¼ ¤³¤³¤Þ¤Ç -->
+=======
+<center>ÇÛãÆü»þ»ØÄê</center>
+
+<hr>
+
+<form method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+<input type="hidden" name="mode" value="confirm">
+<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+<input type="hidden" name="payment_id" value="<!--{$arrForm.payment_id.value}-->">
+<!--<input type="hidden" name="message" value="">-->
+<!--{if $tpl_login == 1}-->
+<!--<input type="hidden" name="point_check" value="2">-->
+<!--{/if}-->
+
+¢£ÇÛÁ÷Æü»ØÄê<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>
+
+¢£»þ´ÖÂÓ»ØÄê<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>
+
+<center><input type="submit" value="¼¡¤Ø"></center>
+<center><input type="submit" name="return" value="Ìá¤ë"></center>
+</form>
+
+<br>
+<hr>
+
+<a href="<!--{$smarty.const.URL_CART_TOP}-->" accesskey="9"><!--{9|numeric_emoji}-->¤«¤´¤ò¸«¤ë</a><br>
+<a href="<!--{$smarty.const.URL_SITE_TOP}-->" accesskey="0"><!--{0|numeric_emoji}-->TOP¥Ú¡¼¥¸¤Ø</a><br>
+
+<br>
+
+<!-- ¢§¥Õ¥Ã¥¿¡¼ ¤³¤³¤«¤é -->
+<center>LOCKON CO.,LTD.</center>
+<!-- ¢¥¥Õ¥Ã¥¿¡¼ ¤³¤³¤Þ¤Ç -->
+>>>>>>> .merge-right.r11901
Index: branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/shopping/set1.tpl	(revision 11903)
@@ -41,4 +41,5 @@
 
 	<div align="center"><input type="submit" name="submit" value="¼¡¤Ø"></div>
+	<div align="center"><input type="submit" name="return" value="Ìá¤ë"></div>
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 11903)
@@ -60,4 +60,12 @@
 <center><input type="submit" value="Ãíʸ"></center>
 </form>
+<form action="<!--{$smarty.const.URL_SHOP_PAYMENT}-->" method="post">
+<input type="hidden" name="mode" value="deliv_date">
+<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+<input type="hidden" name="payment_id" value="<!--{$arrData.payment_id}-->">
+<input type="hidden" name="deliv_date" value="<!--{$arrData.deliv_date}-->">
+<input type="hidden" name="deliv_time_id" value="<!--{$arrData.deliv_time_id}-->">
+<center><input type="submit" value="Ìá¤ë"></center>
+</form>
 
 <br>
Index: branches/dev/data/Smarty/templates/mobile/shopping/deliv_addr.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/deliv_addr.tpl	(revision 11891)
+++ branches/dev/data/Smarty/templates/mobile/shopping/deliv_addr.tpl	(revision 11903)
@@ -43,6 +43,10 @@
 	<br>
 
-	<div align="center"><input type="submit" name="confirm" value="¼¡¤Ø"></div>
+	<div align="center"><input type="submit" name="submit" value="¼¡¤Ø"></div>
+	<div align="center"><input type="submit" name="return" value="Ìá¤ë"></div>
 
+	<!--{foreach from=$list_data key=key item=item}-->
+		<input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->">
+	<!--{/foreach}-->
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 11903)
@@ -13,4 +13,6 @@
 <input type="hidden" name="mode" value="deliv_date">
 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+<input type="hidden" name="deliv_date" value="<!--{$arrForm.deliv_date.value}-->">
+<input type="hidden" name="deliv_time_id" value="<!--{$arrForm.deliv_time_id.value}-->">
 <!--<input type="hidden" name="message" value="">-->
 <!--{if $tpl_login == 1}-->
@@ -29,4 +31,5 @@
 
 <center><input type="submit" value="¼¡¤Ø"></center>
+<center><input type="submit" name="return" value="Ìá¤ë"></center>
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/shopping/set2.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/set2.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/shopping/set2.tpl	(revision 11903)
@@ -19,4 +19,5 @@
 
 	<div align="center"><input type="submit" name="submit" value="¼¡¤Ø"></div>
+	<div align="center"><input type="submit" name="return" value="Ìá¤ë"></div>
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 11903)
@@ -55,5 +55,9 @@
 	<input type="text" name="kana02" value="<!--{$kana02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
 
-	<input type="submit" name="confirm" value="¼¡¤Ø">
+	<input type="submit" name="submit" value="¼¡¤Ø">
+
+	<!--{foreach from=$list_data key=key item=item}-->
+		<input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->">
+	<!--{/foreach}-->
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/entry/set1.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/set1.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/entry/set1.tpl	(revision 11903)
@@ -40,5 +40,6 @@
 	<input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $zip02 == ""}--><!--{$arrOtherDeliv.zip02|escape}--><!--{else}--><!--{$zip02|escape}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
 
-	<input type="submit" name="confirm" value="¼¡¤Ø">
+	<input type="submit" name="submit" value="¼¡¤Ø"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/Smarty/templates/mobile/entry/confirm.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/confirm.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/entry/confirm.tpl	(revision 11903)
@@ -37,5 +37,10 @@
 	<br>
 
-	<input type="submit" name="submit" value="ÅÐÏ¿">
+	<input type="submit" name="submit" value="ÅÐÏ¿"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
+
+	<!--{foreach from=$list_data key=key item=item}-->
+		<input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->">
+	<!--{/foreach}-->
 </form>
 
Index: branches/dev/data/Smarty/templates/mobile/entry/set2.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/entry/set2.tpl	(revision 11853)
+++ branches/dev/data/Smarty/templates/mobile/entry/set2.tpl	(revision 11903)
@@ -44,5 +44,6 @@
 	<br>
 
-	<input type="submit" name="confirm" value="¼¡¤Ø">
+	<input type="submit" name="submit" value="¼¡¤Ø"><br>
+	<input type="submit" name="return" value="Ìá¤ë">
 
 	<!--{foreach from=$list_data key=key item=item}-->
Index: branches/dev/data/conf/mobile_conf.php
===================================================================
--- branches/dev/data/conf/mobile_conf.php	(revision 11892)
+++ branches/dev/data/conf/mobile_conf.php	(revision 11903)