Index: branches/dev/html/shopping/complete.php
===================================================================
--- branches/dev/html/shopping/complete.php	(revision 17)
+++ branches/dev/html/shopping/complete.php	(revision 20)
@@ -337,5 +337,5 @@
 	
 	// Ê̤ΤªÆϤ±Àè¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÇÛÁ÷Àè¤ËÅÐÏ¿½»½ê¤ò¥³¥Ô¡¼¤¹¤ë¡£
-	if($arrData["deliv_check"] != "1") {
+	if($arrData["deliv_check"] == "-1") {
 		$sqlval['deliv_name01'] = $arrData['order_name01'];
 		$sqlval['deliv_name02'] = $arrData['order_name02'];
Index: branches/dev/html/shopping/deliv.php
===================================================================
--- branches/dev/html/shopping/deliv.php	(revision 17)
+++ branches/dev/html/shopping/deliv.php	(revision 20)
@@ -101,6 +101,6 @@
 // ²ñ°÷ÅÐÏ¿½»½ê¤ËÁ÷¤ë
 case 'customer_addr':
-	// ¤ªÆϤ±À褬¥Á¥§¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¹¹¿·½èÍý¤ò¹Ô¤¦
-	if ($_POST['deli'] != "") {
+	// ²ñ°÷ÅÐÏ¿½»½ê¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¾ì¹ç
+	if ($_POST['deliv_check'] == '-1') {
 		// ²ñ°÷¾ðÊó¤Î½»½ê¤ò¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Ë½ñ¤­¹þ¤à
 		lfRegistDelivData($uniqid, $objCustomer);
@@ -110,17 +110,9 @@
 		header("Location: " . URL_SHOP_PAYMENT);
 		exit;
-	}else{
-		// ¥¨¥é¡¼¤òÊÖ¤¹
-		$arrErr['deli'] = '¢¨ ¤ªÆϤ±Àè¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£';
-	}
-	break;
-	
-// ÅÐÏ¿ºÑ¤ß¤ÎÊ̤ΤªÆϤ±Àè¤ËÁ÷¤ë
-case 'other_addr':
-	// ¤ªÆϤ±À褬¥Á¥§¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¹¹¿·½èÍý¤ò¹Ô¤¦
-	if ($_POST['deli'] != "") {
-		if (sfIsInt($_POST['other_deliv_id'])) {
+	// Ê̤ΤªÆϤ±À褬¥Á¥§¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¾ì¹ç
+	} elseif($_POST['deliv_check'] >= 1) {
+		if (sfIsInt($_POST['deliv_check'])) {
 			// ÅÐÏ¿ºÑ¤ß¤ÎÊ̤ΤªÆϤ±Àè¤ò¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Ë½ñ¤­¹þ¤à
-			lfRegistOtherDelivData($uniqid, $objCustomer, $_POST['other_deliv_id']);
+			lfRegistOtherDelivData($uniqid, $objCustomer, $_POST['deliv_check']);
 			// Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
 			$objSiteSess->setRegistFlag();
@@ -132,26 +124,6 @@
 		// ¥¨¥é¡¼¤òÊÖ¤¹
 		$arrErr['deli'] = '¢¨ ¤ªÆϤ±Àè¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£';
-	}
-	break;
-
-/*
-// Ê̤ΤªÆϤ±Àè¤ò»ØÄê
-case 'new_addr':
-	// ÆþÎÏÃͤÎÊÑ´¹
-	$objFormParam->convParam();
-	$objPage->arrErr = lfCheckError($arrRet);
-	// ÆþÎÏ¥¨¥é¡¼¤Ê¤·
-	if(count($objPage->arrErr) == 0) {
-		// DB¤Ø¤ªÆϤ±Àè¤òÅÐÏ¿
-		lfRegistNewAddrData($uniqid, $objCustomer);
-		// Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
-		$objSiteSess->setRegistFlag();
-		// ¤ª»Ùʧ¤¤ÊýË¡ÁªÂò¥Ú¡¼¥¸¤Ø°ÜÆ°
-		header("Location: " . URL_SHOP_PAYMENT);
-		exit;		
-	}
-	break;
-*/
-
+	}	
+	break;
 // Á°¤Î¥Ú¡¼¥¸¤ËÌá¤ë
 case 'return':
@@ -189,4 +161,5 @@
 $objPage->arrForm = $objFormParam->getFormParamList();
 $objPage->arrErr = $arrErr;
+
 $objView->assignobj($objPage);
 // ¥Õ¥ì¡¼¥à¤òÁªÂò(¥­¥ã¥ó¥Ú¡¼¥ó¥Ú¡¼¥¸¤«¤éÁ«°Ü¤Ê¤éÊѹ¹)
@@ -208,4 +181,5 @@
 	$objFormParam->addParam("ÅÅÏÃÈÖ¹æ2", "deliv_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
 	$objFormParam->addParam("ÅÅÏÃÈÖ¹æ3", "deliv_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+	$objFormParam->addParam("", "deliv_check");	
 }
 
@@ -238,5 +212,5 @@
 	$sqlval['update_date'] = 'Now()';
 	$sqlval['customer_id'] = $objCustomer->getValue('customer_id');
-    $sqlval['deliv_check'] = '1';
+    $sqlval['deliv_check'] = '-1';
 	$sqlval['deliv_name01'] = $objCustomer->getValue('name01');
     $sqlval['deliv_name02'] = $objCustomer->getValue('name02');
@@ -271,5 +245,5 @@
 	$arrRet = $objQuery->select("*", "dtb_other_deliv", $where, array($other_deliv_id));
 	
-	$sqlval['deliv_check'] = '1';
+	$sqlval['deliv_check'] = $other_deliv_id;
     $sqlval['deliv_name01'] = $arrRet[0]['name01'];
     $sqlval['deliv_name02'] = $arrRet[0]['name02'];