Changeset 7777

Timestamp:

2006/11/08 14:34:45 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/Smarty/templates/shopping/confirm.tpl (modified) (previous)
• html/admin/order/edit.php (modified) (1 diff)
• html/shopping/confirm.php (modified) (3 diffs)

temp/trunk/html/admin/order/edit.php

@@ -182 +182 @@
         // ¤½¤Î¾»Ùʧ¤¤¾ðÊó¤òɽ¼¨
         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"] = "¤ª»Ùʧ¤¤";
         }
-
     }
 }

temp/trunk/html/shopping/confirm.php

@@ -66 +66 @@
 }
 
+// ·èºÑ¶èʬ¤ò¼èÆÀ¤¹¤ë
+$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 +102 @@
     $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 +113 @@
     break;
 }
+
 
 $objPage->arrData = $arrData;