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/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 @@
Order number:
Date/time of purchase:
- Payment method:
+ Payment method:
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 @@
- Order number:
+ Order number:
Date and time of purchase:
- Payment method:
+ Payment method:
Total amount:$
Order status:
@@ -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/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 @@