Index: /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage.php	(revision 22504)
+++ /branches/version-2_12-multilang/data/class/pages/mypage/LC_Page_Mypage.php	(revision 22740)
@@ -127,5 +127,5 @@
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
-        $col        = 'order_id, create_date, payment_id, payment_total, status';
+        $col        = 'order_id, create_date, payment_id, payment_method, payment_total, status';
         $from       = 'dtb_order';
         $where      = 'del_flg = 0 AND customer_id = ?';
Index: /branches/version-2_12-multilang/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- /branches/version-2_12-multilang/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 22489)
+++ /branches/version-2_12-multilang/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 22740)
@@ -262,11 +262,5 @@
                 LIMIT 1
                 ) AS product_name,
-                (SELECT
-                    pay.payment_method
-                FROM
-                    dtb_payment AS pay
-                WHERE
-                    ord.payment_id = pay.payment_id
-                ) AS payment_method
+                ord.payment_method
             FROM (
                 SELECT
@@ -277,5 +271,5 @@
                     total,
                     create_date,
-                    payment_id
+                    payment_method
                 FROM
                     dtb_order AS ord
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/history.tpl	(revision 22205)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/history.tpl	(revision 22740)
@@ -32,5 +32,5 @@
                 <span class="st">購入日時：&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
-                <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <span class="st">お支払い方法：&nbsp;</span><!--{$tpl_arrOrderData.payment_method|h}-->
             </p>
             <form action="order.php" method="post">
Index: /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/index.tpl	(revision 21944)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default/mypage/index.tpl	(revision 22740)
@@ -61,6 +61,5 @@
                         <td class="alignC"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></td>
                         <td><!--{$arrOrder[cnt].order_id}--></td>
-                        <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
-                        <td class="alignC"><!--{$arrPayment[$payment_id]|h}--></td>
+                        <td class="alignC"><!--{$arrOrder[cnt].payment_method|h}--></td>
                         <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
                         
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	(revision 22456)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl	(revision 22740)
@@ -340,6 +340,5 @@
                         <td class="center"><!--{t string="tpl_&#36; T_ARG1_01" escape="none" T_ARG1=$arrPurchaseHistory[cnt].payment_total|number_format}--></td>
                         <td class="center"><!--{if $arrPurchaseHistory[cnt].status eq 5}--><!--{$arrPurchaseHistory[cnt].commit_date|sfDispDBDate}--><!--{else}--><!--{t string="tpl_Not shipped_01"}--><!--{/if}--></td>
-                        <!--{assign var=payment_id value="`$arrPurchaseHistory[cnt].payment_id`"}-->
-                        <td class="center"><!--{$arrPayment[$payment_id]|h}--></td>
+                        <td class="center"><!--{$arrPurchaseHistory[cnt].payment_method|h}--></td>
                     </tr>
                 <!--{/section}-->
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl	(revision 22453)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl	(revision 22740)
@@ -307,5 +307,5 @@
                 <th><!--{t string="tpl_Payment method_01"}--></th>
                 <td>
-                    <!--{$arrPayment[$arrForm.payment_id.value]|h}-->
+                    <!--{$arrForm.payment_method.value|h}-->
                 </td>
             </tr>
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl	(revision 22453)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl	(revision 22740)
@@ -95,5 +95,5 @@
                 <td><!--{$arrStatus[cnt].order_name01|h}--><!--{$arrStatus[cnt].order_name02|h}--></td>
                 <!--{assign var=payment_id value=`$arrStatus[cnt].payment_id`}-->
-                <td><!--{$arrPayment[$payment_id]|h}--></td>
+                <td><!--{$arrStatus[cnt].payment_method|h}--></td>
                 <td class="right"><!--{$arrStatus[cnt].total|number_format}--></td>
                 <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}--><!--{t string="tpl_Not deposited_01"}--><!--{/if}--></td>
Index: /branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl	(revision 22516)
+++ /branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl	(revision 22740)
@@ -805,5 +805,5 @@
             <td><!--{$arrResults[cnt].order_name01|h}--> <!--{$arrResults[cnt].order_name02|h}--></td>
             <!--{assign var=payment_id value="`$arrResults[cnt].payment_id`"}-->
-            <td class="center"><!--{$arrPayments[$payment_id]}--></td>
+            <td class="center"><!--{$arrResults[cnt].payment_method}--></td>
             <td class="right"><!--{$arrResults[cnt].total|number_format}--></td>
             <td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default_t:"tpl_Not shipped_01"}--></td>
Index: /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/history.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/history.tpl	(revision 22367)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/history.tpl	(revision 22740)
@@ -32,5 +32,5 @@
                 <span class="st">Date and time of purchase:&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <span class="st">Order number:&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
-                <span class="st">Payment method:&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <span class="st">Payment method:&nbsp;</span><!--{$tpl_arrOrderData.payment_method|h}-->
             </p>
             <form action="order.php" method="post">
Index: /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/index.tpl	(revision 22210)
+++ /branches/version-2_12-multilang/data/Smarty/templates/default_en-US/mypage/index.tpl	(revision 22740)
@@ -61,6 +61,5 @@
                         <td class="alignC"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></td>
                         <td><!--{$arrOrder[cnt].order_id}--></td>
-                        <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
-                        <td class="alignC"><!--{$arrPayment[$payment_id]|h}--></td>
+                        <td class="alignC"><!--{$arrOrder[cnt].payment_method|h}--></td>
                         <td class="alignR">&#036; <!--{$arrOrder[cnt].payment_total|number_format}--></td>
                         
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/history.tpl	(revision 21867)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/history.tpl	(revision 22740)
@@ -34,5 +34,5 @@
                 <em>注文番号</em>：&nbsp;<!--{$tpl_arrOrderData.order_id}--><br />
                 <em>購入日時</em>：&nbsp;<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
-                <em>お支払い方法</em>：&nbsp;<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <em>お支払い方法</em>：&nbsp;<!--{$tpl_arrOrderData.payment_method|h}-->
                 <!--{if $tpl_arrOrderData.deliv_time_id != ""}-->
                     <br />
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22058)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22740)
@@ -53,7 +53,7 @@
                             <div class="arrowBox">
                                 <p>
-                                    <em>注文番号：</em><span class="order_id"><!--{$arrOrder[cnt].order_id}--><!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}--></span><br />
+                                    <em>注文番号：</em><span class="order_id"><!--{$arrOrder[cnt].order_id}--></span><br />
                                     <em>購入日時：</em><span class="create_date"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></span><br />
-                                    <em>お支払い方法：</em><span class="payment_id"><!--{$arrPayment[$payment_id]|h}--></span><br />
+                                    <em>お支払い方法：</em><span class="payment_id"><!--{$arrOrder[cnt].payment_method|h}--></span><br />
                                     <em>合計金額：</em><span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span>円<br />
                                     <em>ご注文状況：</em>
@@ -140,5 +140,5 @@
                         $($(".arrowBox span.create_date").get(maxCnt)).text(history.create_date);
                         //支払い方法をセット
-                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_id);
+                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_method);
                         //合計金額をセット
                         $($(".arrowBox span.payment_total").get(maxCnt)).text(history.payment_total);
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/history.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/history.tpl	(revision 22365)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/history.tpl	(revision 22740)
@@ -34,5 +34,5 @@
                 <em>Order number</em>:&nbsp;<!--{$tpl_arrOrderData.order_id}--><br />
                 <em>Date/time of purchase</em>:&nbsp;<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
-                <em>Payment method</em>:&nbsp;<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <em>Payment method</em>:&nbsp;<!--{$tpl_arrOrderData.payment_method|h}-->
                 <!--{if $tpl_arrOrderData.deliv_time_id != ""}-->
                     <br />
Index: /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/index.tpl
===================================================================
--- /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/index.tpl	(revision 22346)
+++ /branches/version-2_12-multilang/data/Smarty/templates/sphone_en-US/mypage/index.tpl	(revision 22740)
@@ -53,7 +53,7 @@
                             <div class="arrowBox">
                                 <p>
-                                    <em>Order number:</em><span class="order_id"><!--{$arrOrder[cnt].order_id}--><!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}--></span><br />
+                                    <em>Order number:</em><span class="order_id"><!--{$arrOrder[cnt].order_id}--></span><br />
                                     <em>Date and time of purchase:</em><span class="create_date"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></span><br />
-                                    <em>Payment method:</em><span class="payment_id"><!--{$arrPayment[$payment_id]|h}--></span><br />
+                                    <em>Payment method:</em><span class="payment_id"><!--{$arrOrder[cnt].payment_method|h}--></span><br />
                                     <em>Total amount:</em>&#036; <span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span><br />
                                     <em>Order status:</em>
@@ -140,5 +140,5 @@
                         $($(".arrowBox span.create_date").get(maxCnt)).text(history.create_date);
                         //支払い方法をセット
-                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_id);
+                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_method);
                         //合計金額をセット
                         $($(".arrowBox span.payment_total").get(maxCnt)).text(history.payment_total);