[Svn-src-all:4293] [version-2_13_0 23207] #2324 会社名項目を追加。
m_uehara
admin ＠ mail.ec-cube.net
2013年 9月 10日 (火) 17:35:25 JST
Subversion committed to /home/svn/open 23207
http://svn.ec-cube.net/open_trac/changeset/23207
┌────────────────────────────┐
│更新者 : m_uehara │
│更新日時: 2013-09-10 17:35:24 +0900 (火, 10 9月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2324 会社名項目を追加。
#2378 モバイルの会員登録・編集確認画面に国・ZIPCODE項目を追加。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl
U branches/version-2_13_0/data/Smarty/templates/mobile/entry/confirm.tpl
U branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl
U branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl
U branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change_confirm.tpl
U branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
U branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
U branches/version-2_13_0/data/class/helper/SC_Helper_Customer.php
U branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
U branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
変更: branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -76,6 +76,10 @@
<td><!--{$arrForm.order_kana01.value|h}--> <!--{$arrForm.order_kana02.value|h}--></td>
</tr>
<tr>
+ <th>会社名</th>
+ <td><!--{$arrForm.order_company_name.value|h}--></td>
+ </tr>
+ <tr>
<th>メールアドレス</th>
<td><!--{$arrForm.order_email.value|h}--></td>
</tr>
@@ -264,6 +268,11 @@
</td>
</tr>
<tr>
+ <th>会社名</th>
+ <!--{assign var=key1 value="shipping_company_name"}-->
+ <td><!--{$arrShipping[$key1]|h}--></td>
+ </tr>
+ <tr>
<th>TEL</th>
<td>
<!--{assign var=key1 value="shipping_tel01"}-->
変更: branches/version-2_13_0/data/Smarty/templates/mobile/entry/confirm.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/mobile/entry/confirm.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/mobile/entry/confirm.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -38,6 +38,9 @@
●お名前(フリガナ)<br>
<!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--><br>
+ ●会社名<br>
+ <!--{$arrForm.company_name.value|h}--><br>
+
●性別<br>
<!--{assign var=key1 value="sex"}-->
<!--{assign var="sex_id" value=$arrForm[$key1].value}-->
@@ -49,6 +52,15 @@
●生年月日<br>
<!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}--><!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日生まれ<!--{else}-->未登録<!--{/if}--><br>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ ●国<br>
+ <!--{assign var="country_id" value=$arrForm.country_id.value}-->
+ <!--{$arrCountry[$country_id]|h}--><br>
+
+ ●ZIP CODE<br>
+ <!--{$arrForm.zipcode.value|h}--><br>
+ <!--{/if}-->
+
●住所<br>
〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}--><br>
<!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--><br>
変更: branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -45,6 +45,10 @@
フリガナ/名（例：ハナコ）<br>
<input type="text" name="kana02" value="<!--{$arrForm.kana02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ ●会社名<br>
+ <font color="#FF0000"><!--{$arrErr.company_name}--></font>
+ <input type="text" name="company_name" value="<!--{$arrForm.company_name.value|h}-->" istyle="1"><br>
+
●性別<font color="#FF0000"> *</font><br>
<!--{assign var=key1 value="sex"}-->
<!--{if $arrErr[$key1]}-->
@@ -72,7 +76,7 @@
<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
●国<font color="#FF0000">※</font><br>
<font color="#FF0000"><!--{$arrErr.country_id}--></font>
- <select name="job">
+ <select name="country_id">
<option value="">選択してください</option>
<!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
</select><br>
変更: branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -43,6 +43,10 @@
フリガナ/名（例：ハナコ）<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br>
<input type="text" name="kana02" value="<!--{$arrForm.kana02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+
+ 【会社名】<br>
+ <font color="#FF0000"><!--{$arrErr.company_name}--></font>
+ <input type="text" name="company_name" value="<!--{$arrForm.company_name.value|h}-->" istyle="1"><br>
【性別】<font color="#FF0000">※</font><br>
<!--{assign var=key1 value="sex"}-->
@@ -71,7 +75,7 @@
<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
【国】<font color="#FF0000">※</font><br>
<font color="#FF0000"><!--{$arrErr.country_id}--></font>
- <select name="job">
+ <select name="country_id">
<option value="">選択してください</option>
<!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h}-->
</select><br>
変更: branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -35,11 +35,17 @@
【個人情報】<br>
<!--{$arrForm.name01.value|h}--> <!--{$arrForm.name02.value|h}--><br>
<!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--><br>
+ <!--{$arrForm.company_name.value|h}--><br>
<!--{assign var=key1 value="sex"}-->
<!--{assign var="sex_id" value=$arrForm[$key1].value}-->
<!--{$arrSex[$sex_id]|h}--><br>
<!--{$arrJob[$arrForm.job.value]|h}--><br>
<!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}--><!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日生まれ<!--{else}-->生年月日 未登録<!--{/if}--><br>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ <!--{assign var="country_id" value=$arrForm.country_id.value}-->
+ <!--{$arrCountry[$country_id]|h}--><br>
+ <!--{$arrForm.zipcode.value|h}--><br>
+ <!--{/if}-->
〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}--><br>
<!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--><br>
<!--{$arrForm.tel01.value|h}-->-<!--{$arrForm.tel02.value|h}-->-<!--{$arrForm.tel03.value|h}--><br>
変更: branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -43,6 +43,15 @@
<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="セイ"/> <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
+<dt>会社名</dt>
+<dd>
+ <!--{assign var=key1 value="`$prefix`company_name"}-->
+ <!--{if $arrErr[$key1]}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <!--{/if}-->
+ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxLong text data-role-none" />
+</dd>
+
<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
<dt>国 <span class="attention">※</span></dt>
<dd>
変更: branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl 2013-09-10 08:35:24 UTC (rev 23207)
@@ -85,7 +85,14 @@
style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"
class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
-
+
+ <dt>会社名</dt>
+ <dd>
+ <!--{assign var=key value="order_company_name"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+ </dd>
+
<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
<dt>国 <span class="attention">※</span></dt>
<dd>
@@ -290,7 +297,14 @@
style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"
class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
-
+
+ <dt>会社名</dt>
+ <dd>
+ <!--{assign var=key value="shipping_company_name"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+ </dd>
+
<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
<dt>国 <span class="attention">※</span></dt>
<dd>
変更: branches/version-2_13_0/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_13_0/data/class/helper/SC_Helper_Customer.php 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/class/helper/SC_Helper_Customer.php 2013-09-10 08:35:24 UTC (rev 23207)
@@ -387,7 +387,7 @@
{
$objFormParam->addParam('お名前(姓)', $prefix . 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', $prefix . 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam('会社名', $prefix . 'company_name', STEXT_LEN, 'aKV', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('会社名', $prefix . 'company_name', STEXT_LEN, 'aKV', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
if (FORM_COUNTRY_ENABLE === false) {
$objFormParam->addParam('お名前(フリガナ・姓)', $prefix . 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
$objFormParam->addParam('お名前(フリガナ・名)', $prefix . 'kana02', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
変更: branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-09-10 08:35:24 UTC (rev 23207)
@@ -38,6 +38,7 @@
'shipping_name02',
'shipping_kana01',
'shipping_kana02',
+ 'shipping_company_name',
'shipping_tel01',
'shipping_tel02',
'shipping_tel03',
@@ -148,6 +149,7 @@
$objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
if (FORM_COUNTRY_ENABLE) {
$objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
@@ -219,6 +221,7 @@
$objFormParam->addParam('お名前2', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
if (FORM_COUNTRY_ENABLE) {
$objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
変更: branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-09-10 08:00:26 UTC (rev 23206)
+++ branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-09-10 08:35:24 UTC (rev 23207)
@@ -324,7 +324,7 @@
$objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
$objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ZIPCODE', 'order_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -399,7 +399,7 @@
$objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
Svn-src-all メーリングリストの案内