Changeset 17884

Timestamp:

2009/03/07 21:13:14 (15 years ago)

Author:

Seasoft

Message:

merge 17323
・取得元: version-2
・未テスト
【取得元のログメッセージ】
[F-REGI決済モジュール]連携用

Location:

branches/comu-ver2/data

Files:

• Smarty/templates/default/admin/order/edit.tpl (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (3 diffs)

branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl

@@ -96 +96 @@
   </table>
 
+  <!--{* F-REGI決済モジュール用 *}-->
+  <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_fregi/fregi_order.tpl}-->
+  <!--{if file_exists($path)}-->
+    <!--{include file=$path}-->
+  <!--{/if}-->
+
   <!--{foreach key=key item=item from=$arrSearchHidden}-->
   <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -30 +30 @@
 }
 
+/* F-REGI決済モジュール連携用 */
+if (file_exists(MODULE_PATH. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php') === TRUE) {
+    require_once(MODULE_PATH. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php');
+}
+
 /**
  * 受注修正 のページクラス.
@@ -73 +78 @@
         if(function_exists("sfPaygentOrderPage")) {
             $this->arrFormKind = sfPaygentOrderPage();
+        }
+        
+        /* F-REGI決済モジュール連携用 */
+        if (file_exists(MODULE_PATH. 'mdl_fregi/LC_Page_Mdl_Fregi_Config.php') === TRUE) {
+            global $arrFregiPayment;
+            $this->arrFregiPayment = $arrFregiPayment;
+            global $arrFregiDispKind;
+            $this->arrFregiDispKind = $arrFregiDispKind;
         }
     }
@@ -159 +172 @@
         case 'paygent_order':
             $this->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id);
+            break;
+        /* F-REGI決済モジュール連携用 */
+        case 'fregi_status':
+            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
+            $this->fregi_err = $objFregiConfig->getSaleInfo($order_id, $this->arrDisp);
+            $this->lfGetOrderData($order_id);
+            break;
+        case 'fregi_card':
+            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
+            $this->fregi_card_err = $objFregiConfig->setCardInfo($_POST['card_status'], $order_id, $this->arrDisp);
+            $this->lfGetOrderData($order_id);
             break;
         // 商品削除