Index: /temp/trunk/html/shopping/confirm.php
===================================================================
--- /temp/trunk/html/shopping/confirm.php	(revision 7715)
+++ /temp/trunk/html/shopping/confirm.php	(revision 7777)
@@ -66,4 +66,15 @@
 }
 
+// ·èºÑ¶èʬ¤ò¼èÆÀ¤¹¤ë
+$payment_type = "";
+if(sfColumnExists("dtb_payment", "memo01")){
+	// MEMO03¤ËÃͤ¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥â¥¸¥å¡¼¥ëÄɲ䵤줿¤â¤Î¤È¤ß¤Ê¤¹
+	$sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?";
+	$arrPayment = $objQuery->getall($sql, array($arrData['payment_id']));
+	$payment_type = $arrPayment[0]["memo03"];
+}
+$objPage->payment_type = $payment_type;
+
+
 switch($_POST['mode']) {
 // Á°¤Î¥Ú¡¼¥¸¤ËÌá¤ë
@@ -91,27 +102,10 @@
 	$objSiteSess->setRegistFlag();
 	
-	// ·èºÑ¶èʬ¤ò¼èÆÀ¤¹¤ë
-	if(sfColumnExists("dtb_payment", "memo01")){
-		$sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?";
-		$arrPayment = $objQuery->getall($sql, array($arrData['payment_id']));
-	}
-	
 	// ·èºÑÊýË¡¤Ë¤è¤ê²èÌÌÀÚÂØ
-	switch($arrPayment[0]["memo03"]) {
-	case PAYMENT_CREDIT_ID:
-	case PAYMENT_CONVENIENCE_ID:
-		//header("Location: " . URL_SHOP_CREDIT);
-		//header("Location: " . URL_SHOP_CONVENIENCE);
+	if($payment_type != "") {
 		$_SESSION["payment_id"] = $arrData['payment_id'];
 		header("Location: " . URL_SHOP_MODULE);
-		break;
-/*
-	case PAYMENT_LOAN_ID:
-		header("Location: " . URL_SHOP_LOAN);
-		break;
-*/
-	default:
+	}else{
 		header("Location: " . URL_SHOP_COMPLETE);
-		break;
 	}
 	break;
@@ -119,4 +113,5 @@
 	break;
 }
+
 
 $objPage->arrData = $arrData;
Index: /temp/trunk/html/admin/order/edit.php
===================================================================
--- /temp/trunk/html/admin/order/edit.php	(revision 7770)
+++ /temp/trunk/html/admin/order/edit.php	(revision 7777)
@@ -182,12 +182,11 @@
 		// ¤½¤Î¾»Ùʧ¤¤¾ðÊó¤òɽ¼¨
 		if($objPage->arrDisp["memo02"] != "") $objPage->arrDisp["payment_info"] = unserialize($objPage->arrDisp["memo02"]);
-		if($objPage->arrDisp["memo01"] == 1){
+		if($objPage->arrDisp["memo01"] == PAYMENT_CREDIT_ID){
 			$objPage->arrDisp["payment_type"] = "¥¯¥ì¥¸¥Ã¥È·èºÑ";
-		}elseif($objPage->arrDisp["memo01"] == 2){
+		}elseif($objPage->arrDisp["memo01"] == PAYMENT_CONVENIENCE_ID){
 			$objPage->arrDisp["payment_type"] = "¥³¥ó¥Ó¥Ë·èºÑ";
 		}else{
 			$objPage->arrDisp["payment_type"] = "¤ª»Ùʧ¤¤";
 		}
-
 	}
 }