Changeset 16756

Timestamp:

2007/11/08 18:56:48 (16 years ago)

Author:

satou

Message:

【ペイジェント決済モジュールの修正】-------------------------------
・カード決済でエラーを出した後に完了すると、管理画面でカード電文送信が出来ない。
・ローソン，ファミマの注文完了画面に、支払いに必要な情報が表示されていない。

---

以上2点を修正しました。

Location:

branches/beta

Files:

• data/downloads/module/mdl_paygent/mdl_paygent.inc (modified) (11 diffs)
• html/admin/order/edit.php (modified) (1 diff)

branches/beta/data/downloads/module/mdl_paygent/mdl_paygent.inc

@@ -78 +78 @@
 define ("TELEGRAM_VERSION", '1.0');
 
+// ¥³¥ó¥Ó¥Ë¥³¡¼¥É
+define ("CODE_SEVENELEVEN", "00C001");  // ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó
+define ("CODE_LOWSON", "00C002");       // ¥í¡¼¥½¥ó
+define ("CODE_MINISTOP", "00C004");     // ¥ß¥Ë¥¹¥È¥Ã¥×
+define ("CODE_FAMILYMART", "00C005");   // ¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È
+define ("CODE_SUNKUS", "00C006");       // ¥µ¥ó¥¯¥¹
+define ("CODE_CIRCLEK", "00C007");      // ¥µ¡¼¥¯¥ëK
+define ("CODE_YAMAZAKI", "00C014");     // ¥Ç¥¤¥ê¡¼¥ä¥Þ¥¶¥­
+define ("CODE_SEICOMART", "00C016");    // ¥»¥¤¥³¡¼¥Þ¡¼¥È
+
 //¥³¥ó¥Ó¥Ë¤Î¼ïÎà
 $arrConvenience = array(
-    '00C016' => '¥»¥¤¥³¡¼¥Þ¡¼¥È',
-    '00C002' => '¥í¡¼¥½¥ó',
-    '00C004' => '¥ß¥Ë¥¹¥È¥Ã¥×',
-    '00C005' => '¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È',
-    '00C006' => '¥µ¥ó¥¯¥¹',
-    '00C007' => '¥µ¡¼¥¯¥ëK',
-    '00C014' => '¥Ç¥¤¥ê¡¼¥ä¥Þ¥¶¥­',
-    '00C001' => '¥»¥Ö¥ó¥¤¥ì¥Ö¥ó'
+    CODE_SEICOMART => '¥»¥¤¥³¡¼¥Þ¡¼¥È',
+    CODE_LOWSON => '¥í¡¼¥½¥ó',
+    CODE_MINISTOP => '¥ß¥Ë¥¹¥È¥Ã¥×',
+    CODE_FAMILYMART => '¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È',
+    CODE_SUNKUS => '¥µ¥ó¥¯¥¹',
+    CODE_CIRCLEK => '¥µ¡¼¥¯¥ëK',
+    CODE_YAMAZAKI => '¥Ç¥¤¥ê¡¼¥ä¥Þ¥¶¥­',
+    CODE_SEVENELEVEN => '¥»¥Ö¥ó¥¤¥ì¥Ö¥ó'
 );
     
@@ -119 +129 @@
  * Ìá¤êÃÍ   ¡§¼èÆÀ·ë²Ì
  **************************************************************************************************************/
-function sfGetPaygentShare($telegram_kind, $order_id, $arrParam) {
+function sfGetPaygentShare($telegram_kind, $order_id, $arrParam, $payment_id = "") {
     
     /** ¶¦ÄÌÅÅʸ **/    
@@ -134 +144 @@
     // ¥Þ¡¼¥Á¥ã¥ó¥È¼è°úID
     $arrSend['trading_id'] = $order_id;
+    // ·èºÑID
+    if (strlen($payment_id) > 0) $arrSend['payment_id'] = $payment_id;
     // EC-CUBE¤«¤é¤ÎÅÅʸ¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹¡£
     $arrSend['partner'] = 'lockon';
@@ -193 +205 @@
 
     // ±þÅú¤ò½èÍý
-    $arrRet = sfPaygentResponse(PAYGENT_CREDIT, $p, $uniqid);
+    $arrRet = sfPaygentResponse(PAYGENT_CREDIT, $p, $uniqid, $arrInput);
     
     return $arrRet;
@@ -250 +262 @@
 
     // ±þÅú¤ò½èÍý
-    $arrRet = sfPaygentResponse(PAYGENT_CONVENI, $p, $uniqid);
+    $arrRet = sfPaygentResponse(PAYGENT_CONVENI, $p, $uniqid, $arrInput);
         
     return $arrRet;
@@ -307 +319 @@
     
     // ±þÅú¤ò½èÍý
-    $arrRet = sfPaygentResponse(PAYGENT_ATM, $p, $uniqid);
+    $arrRet = sfPaygentResponse(PAYGENT_ATM, $p, $uniqid, $arrInput);
     
     return $arrRet;
@@ -382 +394 @@
     
     // ±þÅú¤ò½èÍý
-    $arrRet = sfPaygentResponse(PAYGENT_BANK, $p, $uniqid);
+    $arrRet = sfPaygentResponse(PAYGENT_BANK, $p, $uniqid, $arrInput);
     
     return $arrRet;
@@ -395 +407 @@
  * Ìá¤êÃÍ   ¡§¼èÆÀ·ë²Ì
  **************************************************************************************************************/
-
-function sfPaygentResponse($telegram_kind, $objPaygent, $uniqid) {
+function sfPaygentResponse($telegram_kind, $objPaygent, $uniqid, $arrInput) {
     global $arrConvenience;
     global $arrInitStatus;
@@ -440 +451 @@
         break;
     // ¥³¥ó¥Ó¥Ë·èºÑ¤Î¾ì¹ç
-    case PAYGENT_CONVENI:       
+    case PAYGENT_CONVENI:
         // ¥¿¥¤¥È¥ë¤òÀßÄꤹ¤ë
-        $arrMemo['title'] = sfSetConvMSG("¥³¥ó¥Ó¥Ë¤ª»Ùʧ¾ðÊó", true);   
-        //ʧ¹þɼÈÖ¹æ
-        $arrMemo['receipt_number'] = sfSetConvMSG("ʧ¹þɼÈÖ¹æ", $arrRes[0]['receipt_number']);
+        $arrMemo['title'] = sfSetConvMSG("¥³¥ó¥Ó¥Ë¤ª»Ùʧ¾ðÊó", true);
+        // ¥³¥ó¥Ó¥Ë¾ðÊó¤Î¼èÆÀ
         $arrCVS = split("-", $arrRes[0]['usable_cvs_company_id']);
         foreach($arrCVS as $val) {
             if($cvsLine != "") {
-                $cvsLine.= ",".$arrConvenience[$val];               
+                $cvsLine.= ",".$arrConvenience[$val];
             } else {
                 $cvsLine = $arrConvenience[$val];
             }
         }
-        //Âоݥ³¥ó¥Ó¥Ë
-        $arrMemo['usable_cvs_company_id'] = sfSetConvMSG("¤ª»Ùʧ²Äǽ¤Ê¥³¥ó¥Ó¥Ë", $cvsLine);         
-        
-        //ʧ¹þɼURL(PC)
-        /*
-         * ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¾ì¹ç¤Î¤ßʧ¹þɼURL¤¬Í­¸ú¤Ê¤Î¤Çɽ¼¨¤¹¤ë¡£
-         */
-        if($arrRes[0]['receipt_print_url'] != "" && $cvsLine == $arrConvenience['00C001']) {
+        // ·èºÑ¥Ù¥ó¥À¼õÉÕÈÖ¹æ¡Ê¥³¥ó¥Ó¥Ë¤Ë¤è¤Ã¤Æ̾¾Î¤¬°Û¤Ê¤ë¡Ë
+        switch ($arrInput['cvs_company_id']) {
+        // ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó
+        case CODE_SEVENELEVEN:
+            $receipt_num_name = "ʧ¹þɼÈÖ¹æ";
+            break;
+        // ¥í¡¼¥½¥ó¡¤¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È
+        case CODE_LOWSON:
+        case CODE_FAMILYMART:
+            $receipt_num_name = "¤ªµÒÍÍÈÖ¹æ";
+            break;
+        // ¥ß¥Ë¥¹¥È¥Ã¥×¡¤¥µ¥ó¥¯¥¹¡¤¥µ¡¼¥¯¥ëK¡¤¥Ç¥¤¥ê¡¼¥ä¥Þ¥¶¥­
+        case CODE_MINISTOP:
+        case CODE_SUNKUS:
+        case CODE_CIRCLEK:
+        case CODE_YAMAZAKI:
+            $receipt_num_name = "¥±¡¼¥¿¥¤¡¿¥ª¥ó¥é¥¤¥ó·èºÑÈÖ¹æ";
+            break;
+        // ¥»¥¤¥³¡¼¥Þ¡¼¥È
+        case CODE_SEICOMART:
+            $receipt_num_name = "¤ªµÒÍͤμõÉÕÈÖ¹æ";
+            break;
+        default:
+            break;
+        }
+        $arrMemo['receipt_number'] = sfSetConvMSG($receipt_num_name, $arrRes[0]['receipt_number']);
+        // ʧ¹þɼURL(PC) ¡§ ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¾ì¹ç¤Î¤ßʧ¹þɼURL¤¬Í­¸ú¤Ê¤Î¤Çɽ¼¨¤¹¤ë¡£
+        if($arrRes[0]['receipt_print_url'] != "" && $arrInput['cvs_company_id'] == CODE_SEVENELEVEN) {
             $arrMemo['receipt_print_url'] = sfSetConvMSG("ʧ¹þɼURL", $arrRes[0]['receipt_print_url']);
-        }           
+        }
+        // ³ÎǧÈÖ¹æ ¡§ ¥í¡¼¥½¥ó¡¤¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È¤Î¤ß³ÎǧÈֹ椬ɬÍפʤΤÇɽ¼¨¤¹¤ë¡£
+        if ($arrInput['cvs_company_id'] == CODE_LOWSON || $arrInput['cvs_company_id'] == CODE_FAMILYMART) {
+            $arrMemo['confirm_number'] = sfSetConvMSG("³ÎǧÈÖ¹æ", "400008");
+        }
+        // Âоݥ³¥ó¥Ó¥Ë
+        $arrMemo['usable_cvs_company_id'] = sfSetConvMSG("¤ª»Ùʧ²Äǽ¤Ê¥³¥ó¥Ó¥Ë", $cvsLine);
         // »Ùʧ´üÆü
         $arrMemo['payment_limit_date'] = sfSetConvMSG("¤ª»Ùʧ´üÆü", date("Yǯm·îdÆü", strtotime($arrRes[0]['payment_limit_date'])));
@@ -748 +784 @@
  * Ìá¤êÃÍ   ¡§¼èÆÀ·ë²Ì
  **************************************************************************************************************/
-function sfPaygentOrder($paygent_type, $order_id) {
+function sfPaygentOrder($paygent_type, $order_id, $payment_id) {
     global $arrDispKind;
     
@@ -769 +805 @@
         break;
     }
-    $arrSend = sfGetPaygentShare($kind, $order_id, $arrPaymentDB[0]);
+    $arrSend = sfGetPaygentShare($kind, $order_id, $arrPaymentDB[0], $payment_id);
     
     // ÅÅʸ¤ÎÁ÷ÉÕ

branches/beta/html/admin/order/edit.php

@@ -98 +98 @@
 // ¥Ú¥¤¥¸¥§¥ó¥ÈÂбþ
 case 'paygent_order':
-    $objPage->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id);
+    $objPage->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id, $objPage->arrDisp['memo06']);
     break;
 default: