Merge branch 'master' into fix-valid-url

data/Smarty/templates/sphone/cart/index.tpl

@@ -82,10 +82,6 @@
 
                 <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="<!--{$smarty.const.CART_URL|h}-->">
                     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-                    <!--{if 'sfGMOCartDisplay'|function_exists}-->
-                        <!--{'sfGMOCartDisplay'|call_user_func}-->
-                    <!--{/if}-->
-
                     <input type="hidden" name="mode" value="confirm" />
                     <input type="hidden" name="cart_no" value="" />
                     <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />

data/Smarty/templates/sphone/mypage/change.tpl

@@ -40,9 +40,6 @@
         <dl class="form_entry">
             <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=true prefix=""}-->
         </dl>
-        <!--{if 'sfGMOMypageDisplay'|function_exists}-->
-            <!--{'sfGMOMypageDisplay'|call_user_func}-->
-        <!--{/if}-->
         <div class="btn_area">
             <p><input type="submit" class="btn data-role-none" value="確認ページへ" name="refusal" id="refusal" /></p>
         </div>

data/class_extends/README.md

@@ -36,3 +36,6 @@ EC-CUBE2.17.2 までは、 [data/class](../class/) 以下すべてのクラス
 - [data/class_extends/page_extends/mypage/LC_Page_AbstractMypage_Ex.php](page_extends/mypage/LC_Page_AbstractMypage_Ex.php)
 - [data/class_extends/page_extends/LC_Page_Ex.php](page_extends/LC_Page_Ex.php)
 - [data/class_extends/page_extends/admin/LC_Page_Admin_Ex.php](page_extends/admin/LC_Page_Admin_Ex.php)
+- [data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php](page_extends/shopping/LC_Page_Shopping_Payment_Ex.php)
+- [data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php](page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php)
+- [data/class_extends/SC_Display_Ex.php](SC_Display_Ex.php)

data/class_extends/SC_Display_Ex.php

@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+require_once CLASS_REALDIR.'SC_Display.php';
+
+/*
+ * 決済モジュールやプラグイン、 user_data 以下の PHP で require されているため削除しないでください
+ */
+
+class SC_Display_Ex extends SC_Display
+{
+}

data/class_extends/page_extends/shopping/LC_Page_Shopping_LoadPaymentModule_Ex.php

@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+require_once CLASS_REALDIR.'pages/shopping/LC_Page_Shopping_LoadPaymentModule.php';
+
+/*
+ * 決済モジュールやプラグイン、 user_data 以下の PHP で require されているため削除しないでください
+ */
+
+class LC_Page_Shopping_LoadPaymentModule_Ex extends LC_Page_Shopping_LoadPaymentModule
+{
+}

data/class_extends/page_extends/shopping/LC_Page_Shopping_Payment_Ex.php

@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+require_once CLASS_REALDIR.'pages/shopping/LC_Page_Shopping_Payment.php';
+
+/*
+ * 決済モジュールやプラグイン、 user_data 以下の PHP で require されているため削除しないでください
+ */
+
+class LC_Page_Shopping_Payment_Ex extends LC_Page_Shopping_Payment
+{
+}