Index: branches/version-2/data/Smarty/templates/default/admin/order/edit.tpl
===================================================================
--- branches/version-2/data/Smarty/templates/default/admin/order/edit.tpl	(revision 17232)
+++ branches/version-2/data/Smarty/templates/default/admin/order/edit.tpl	(revision 17323)
@@ -120,4 +120,10 @@
 						</table>
 						
+						<!--{* F-REGI決済モジュール用 *}-->
+						<!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_fregi/fregi_order.tpl}-->
+						<!--{if file_exists($path)}-->
+							<!--{include file=$path}-->
+						<!--{/if}-->
+						
 						<table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
 							<!--{foreach key=key item=item from=$arrSearchHidden}-->
Index: branches/version-2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 16987)
+++ branches/version-2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 17323)
@@ -28,4 +28,9 @@
 if (file_exists(MODULE_PATH . 'mdl_paygent/include.php') === TRUE) {
 	require_once(MODULE_PATH . 'mdl_paygent/include.php');
+}
+
+/* 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');
 }
 
@@ -69,4 +74,12 @@
             $this->arrDispKind = 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;
+        }
     }
 
@@ -147,4 +160,15 @@
         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;
         default: