[Svn-src-all:3276] [version-2_12-multilang 22177] #1997 カナのテキストフィールドを削除
h_yoshimoto
admin ＠ mail.ec-cube.net
2012年 12月 28日 (金) 14:18:33 JST
Subversion committed to /home/svn/open 22177
http://svn.ec-cube.net/open_trac/changeset/22177
┌────────────────────────────┐
│更新者 : h_yoshimoto │
│更新日時: 2012-12-28 14:18:33 +0900 (金, 28 12月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1997 カナのテキストフィールドを削除
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-multilang/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/customer/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/customer/search_customer.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/entry/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/frontparts/form_personal_input.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/change_confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/history.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/nonmember_input.tpl
U branches/version-2_12-multilang/data/class/SC_CartSession.php
U branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php
U branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U branches/version-2_12-multilang/html/install/sql/create_table_mysql.sql
U branches/version-2_12-multilang/html/install/sql/create_table_pgsql.sql
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/adminparts/form_customer_search.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/adminparts/form_customer_search.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -16,17 +16,11 @@
</tr>
<tr>
<th><!--{t string="tpl_208"}--></th>
- <td>
+ <td colspan="3">
<!--{assign var=key value="search_name"}-->
<!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><br /><!--{/if}-->
- <input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="30" class="box30" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+ <input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
</td>
- <th><!--{t string="tpl_210"}--></th>
- <td>
- <!--{assign var=key value="search_kana"}-->
- <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><br /><!--{/if}-->
- <input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="30" class="box30" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
- </td>
</tr>
<tr>
<th><!--{t string="tpl_215"}--></th>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -125,14 +125,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_029"}--></th>
- <td>
- <span class="attention"><!--{$arrErr.company_kana}--></span>
- <input type="text" name="company_kana" value="<!--{$arrForm.company_kana|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.company_kana != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
- <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.STEXT_LEN}--></span>
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_030_1"}--></th>
<td>
<span class="attention"><!--{$arrErr.shop_name}--></span>
@@ -141,14 +133,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_031"}--></th>
- <td>
- <span class="attention"><!--{$arrErr.shop_kana}--></span>
- <input type="text" name="shop_kana" value="<!--{$arrForm.shop_kana|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.shop_kana != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
- <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.STEXT_LEN}--></span>
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_032"}--></th>
<td>
<span class="attention"><!--{$arrErr.shop_name_eng}--></span>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -92,13 +92,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_210_1"}--></th>
- <td>
- <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
- <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_033_1"}--></th>
<td>
<span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit_confirm.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -72,10 +72,6 @@
<td><!--{t string="tpl_240" T_FIELD1=$arrForm.name01|h T_FIELD2=$arrForm.name02|h}--></td>
</tr>
<tr>
- <th><!--{t string="tpl_210"}--></th>
- <td><!--{t string="tpl_240" T_FIELD1=$arrForm.kana01|h T_FIELD2=$arrForm.kana02|h}--></td>
- </tr>
- <tr>
<th><!--{t string="tpl_033"}--></th>
<td><!--{t string="tpl_106"}--> <!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--></td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/index.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/index.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -125,7 +125,7 @@
<tr>
<th rowspan="2"><!--{t string="tpl_256"}--></th>
<th><!--{t string="tpl_207"}--></th>
- <th rowspan="2"><!--{t string="tpl_257"}--></th>
+ <th rowspan="2"><!--{t string="tpl_208"}--></th>
<th rowspan="2"><!--{t string="tpl_215"}--></th>
<th><!--{t string="tpl_037"}--></th>
<th rowspan="2"><!--{t string="tpl_003"}--></th>
@@ -139,7 +139,7 @@
<tr>
<td class="center" rowspan="2"><!--{if $row.status eq 1}--><!--{t string="tpl_260"}--><!--{else}--><!--{t string="tpl_261"}--><!--{/if}--></td>
<td><!--{$row.customer_id|h}--></td>
- <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br>(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
+ <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--></td>
<td class="center" rowspan="2"><!--{$arrSex[$row.sex]|h}--></td>
<td><!--{$row.tel01|h}-->-<!--{$row.tel02|h}-->-<!--{$row.tel03|h}--></td>
<td class="center" rowspan="2"><span class="icon_edit"><a href="#" onclick="return fnEdit('<!--{$row.customer_id|h}-->');"><!--{t string="tpl_003"}--></a></span></td>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/search_customer.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/search_customer.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -56,7 +56,7 @@
<input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="30" class="box30" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
</td>
</tr>
- <tr>
+ <tr class="n">
<th class="colmun"><!--{t string="tpl_208"}--></th>
<td>
<!--{assign var=key value="search_name"}-->
@@ -64,14 +64,6 @@
<input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="30" class="box30" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
</td>
</tr>
- <tr class="n">
- <th class="colmun"><!--{t string="tpl_210"}--></th>
- <td>
- <!--{assign var=key value="search_kana"}-->
- <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><br /><!--{/if}-->
- <input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="30" class="box30" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
- </td>
- </tr>
</table>
<div class="btn-area">
@@ -91,7 +83,7 @@
<table class="list">
<tr>
<th><!--{t string="tpl_207"}--></th>
- <th><!--{t string="tpl_210"}--></th>
+ <th><!--{t string="tpl_208"}--></th>
<th><!--{t string="tpl_037"}--></th>
<th><!--{t string="tpl_196"}--></th>
</tr>
@@ -101,7 +93,7 @@
<td>
<!--{$arrCustomer[cnt].customer_id|h}-->
</td>
- <td><!--{$arrCustomer[cnt].name01|h}--><!--{$arrCustomer[cnt].name02|h}-->(<!--{$arrCustomer[cnt].kana01|h}--><!--{$arrCustomer[cnt].kana02|h}-->)</td>
+ <td><!--{$arrCustomer[cnt].name01|h}--><!--{$arrCustomer[cnt].name02|h}--></td>
<td><!--{$arrCustomer[cnt].tel01|h}-->-<!--{$arrCustomer[cnt].tel02|h}-->-<!--{$arrCustomer[cnt].tel03|h}--></td>
<td align="center"><a href="" onClick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)"><!--{t string="tpl_196"}--></a></td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/disp.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -72,10 +72,6 @@
<td><!--{$arrForm.order_name01.value|h}--> <!--{$arrForm.order_name02.value|h}--></td>
</tr>
<tr>
- <th><!--{t string="tpl_364"}--></th>
- <td><!--{$arrForm.order_kana01.value|h}--> <!--{$arrForm.order_kana02.value|h}--></td>
- </tr>
- <tr>
<th><!--{t string="tpl_108"}--></th>
<td><!--{$arrForm.order_email.value|h}--></td>
</tr>
@@ -241,14 +237,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_364"}--></th>
- <td>
- <!--{assign var=key1 value="shipping_kana01"}-->
- <!--{assign var=key2 value="shipping_kana02"}-->
- <!--{$arrShipping[$key1]|h}--> <!--{$arrShipping[$key2]|h}-->
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_037"}--></th>
<td>
<!--{assign var=key1 value="shipping_tel01"}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -36,8 +36,6 @@
df = document.form1;
df['shipping_name01[0]'].value = df.order_name01.value;
df['shipping_name02[0]'].value = df.order_name02.value;
- df['shipping_kana01[0]'].value = df.order_kana01.value;
- df['shipping_kana02[0]'].value = df.order_kana02.value;
df['shipping_zip01[0]'].value = df.order_zip01.value;
df['shipping_zip02[0]'].value = df.order_zip02.value;
df['shipping_tel01[0]'].value = df.order_tel01.value;
@@ -166,16 +164,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_210"}--></th>
- <td>
- <!--{assign var=key1 value="order_kana01"}-->
- <!--{assign var=key2 value="order_kana02"}-->
- <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
- <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
- <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_108"}--></th>
<td>
<!--{assign var=key1 value="order_email"}-->
@@ -478,16 +466,6 @@
</td>
</tr>
<tr>
- <th><!--{t string="tpl_210"}--></th>
- <td>
- <!--{assign var=key1 value="shipping_kana01"}-->
- <!--{assign var=key2 value="shipping_kana02"}-->
- <span class="attention"><!--{$arrErr[$key1][$shipping_index]}--><!--{$arrErr[$key2][$shipping_index]}--></span>
- <input type="text" name="<!--{$key1}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key1]|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1][$shipping_index]|sfGetErrorColor}-->" size="15" class="box15" />
- <input type="text" name="<!--{$key2}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key2]|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2][$shipping_index]|sfGetErrorColor}-->" size="15" class="box15" />
- </td>
- </tr>
- <tr>
<th><!--{t string="tpl_037"}--></th>
<td>
<!--{assign var=key1 value="shipping_tel01"}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/index.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -142,17 +142,11 @@
</tr>
<tr>
<th><!--{t string="tpl_208"}--></th>
- <td>
+ <td colspan="3">
<!--{assign var=key value="search_order_name"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" />
+ <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
</td>
- <th><!--{t string="tpl_210"}--></th>
- <td>
- <!--{assign var=key value="search_order_kana"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" />
- </td>
</tr>
<tr>
<th><!--{t string="tpl_108"}--></th>
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/confirm.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/confirm.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -41,10 +41,6 @@
<td><!--{$arrForm.name01.value|h}--> <!--{$arrForm.name02.value|h}--></td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention">*</span></th>
- <td><!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--></td>
- </tr>
- <tr>
<th>Postal code</th>
<td>
<!--{if strlen($arrForm.zip01.value) > 0 && strlen($arrForm.zip02.value) > 0}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/index.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/index.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -40,16 +40,8 @@
Last name <input type="text" class="box120" name="name01" value="<!--{$arrForm.name01.value|default:$arrData.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.name01|sfGetErrorColor}-->; ime-mode: active;" />
Name <input type="text" class="box120" name="name02" value="<!--{$arrForm.name02.value|default:$arrData.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.name02|sfGetErrorColor}-->; ime-mode: active;" />
</td>
- </tr>
+ </tr
<tr>
- <th>お名前(フリガナ)<span class="attention">*</span></th>
- <td>
- <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
- セイ <input type="text" class="box120" name="kana01" value="<!--{$arrForm.kana01.value|default:$arrData.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.kana01|sfGetErrorColor}-->; ime-mode: active;" />
- メイ <input type="text" class="box120" name="kana02" value="<!--{$arrForm.kana02.value|default:$arrData.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.kana02|sfGetErrorColor}-->; ime-mode: active;" />
- </td>
- </tr>
- <tr>
<th>Postal code</th>
<td>
<span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/entry/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/entry/confirm.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/entry/confirm.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -43,13 +43,6 @@
</td>
</tr>
<tr>
- <th>お名前(フリガナ)</th>
- <td>
- <!--{$arrForm.kana01|h}-->
- <!--{$arrForm.kana02|h}-->
- </td>
- </tr>
- <tr>
<th>Postal code</th>
<td>
<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/frontparts/form_personal_input.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/frontparts/form_personal_input.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -37,18 +37,6 @@
</td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention">*</span></th>
- <td>
- <!--{assign var=key1 value="`$prefix`kana01"}-->
- <!--{assign var=key2 value="`$prefix`kana02"}-->
- <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
- <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
- <!--{/if}-->
- セイ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- メイ <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- </td>
-</tr>
-<tr>
<th>Postal code<span class="attention">*</span></th>
<td>
<!--{assign var=key1 value="`$prefix`zip01"}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/change_confirm.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/change_confirm.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -47,10 +47,6 @@
<td><!--{$arrForm.name01|h}--> <!--{$arrForm.name02|h}--></td>
</tr>
<tr>
- <th>お名前(フリガナ)</th>
- <td><!--{$arrForm.kana01|h}--> <!--{$arrForm.kana02|h}--></td>
- </tr>
- <tr>
<th>Postal code</th>
<td><!--{$arrForm.zip01}-->-<!--{$arrForm.zip02}--></td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/history.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/history.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/history.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -188,10 +188,6 @@
<td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
</tr>
<tr>
- <th class="alignL">お名前(フリガナ)</th>
- <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
- </tr>
- <tr>
<th class="alignL">Postal code</th>
<td><!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--></td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/confirm.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/confirm.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -228,10 +228,6 @@
<td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
</tr>
<tr>
- <th scope="row">お名前(フリガナ)</th>
- <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
- </tr>
- <tr>
<th scope="row">Postal code</th>
<td><!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/nonmember_input.tpl 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/nonmember_input.tpl 2012-12-28 05:18:33 UTC (rev 22177)
@@ -52,16 +52,6 @@
</td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention">*</span></th>
- <td>
- <!--{assign var=key1 value="order_kana01"}-->
- <!--{assign var=key2 value="order_kana02"}-->
- <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
- セイ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- メイ <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- </td>
- </tr>
- <tr>
<th>Postal code<span class="attention">*</span></th>
<td>
<!--{assign var=key1 value="order_zip01"}-->
@@ -192,16 +182,6 @@
</td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention">*</span></th>
- <td>
- <!--{assign var=key1 value="shipping_kana01"}-->
- <!--{assign var=key2 value="shipping_kana02"}-->
- <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
- セイ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- メイ <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
- </td>
- </tr>
- <tr>
<th>Postal code<span class="attention">*</span></th>
<td>
<!--{assign var=key1 value="shipping_zip01"}-->
変更: branches/version-2_12-multilang/data/class/SC_CartSession.php
===================================================================
--- branches/version-2_12-multilang/data/class/SC_CartSession.php 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/class/SC_CartSession.php 2012-12-28 05:18:33 UTC (rev 22177)
@@ -632,11 +632,11 @@
}
// 配送業者の送料を加算
- if (OPTION_DELIV_FEE == 1
- && !SC_Utils_Ex::isBlank($deliv_pref)
- && !SC_Utils_Ex::isBlank($deliv_id)) {
- $results['deliv_fee'] += $this->sfGetDelivFee($deliv_pref, $deliv_id);
- }
+// if (OPTION_DELIV_FEE == 1
+// && !SC_Utils_Ex::isBlank($deliv_pref)
+// && !SC_Utils_Ex::isBlank($deliv_id)) {
+// $results['deliv_fee'] += $this->sfGetDelivFee($deliv_pref, $deliv_id);
+// }
// 送料無料チェック
if ($this->isDelivFree($productTypeId)) {
変更: branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php 2012-12-28 05:18:33 UTC (rev 22177)
@@ -357,8 +357,8 @@
function sfCustomerCommonParam(&$objFormParam) {
$objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTNAME'), 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTNAME'), 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' , 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'kana02', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_LASTKANA'), 'kana01', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_CUSTOMER_FIRSTKANA'), 'kana02', STEXT_LEN, 'CKV', array('NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ZIP1'), 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ZIP2'), 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK' ,'NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_PREF'), 'pref', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2012-12-28 05:18:33 UTC (rev 22177)
@@ -288,8 +288,8 @@
// お客様情報
$objFormParam->addParam(t('PARAM_LABEL_ORDER_LASTNAME'), 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ORDER_FIRSTNAME'), 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_ORDER_LASTKANA'), 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_ORDER_FIRSTKANA'), 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_ORDER_LASTKANA'), 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_ORDER_FIRSTKANA'), 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_EMAIL'), 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ZIP01'), 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ZIP02'), 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
変更: branches/version-2_12-multilang/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_12-multilang/html/install/sql/create_table_mysql.sql 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/html/install/sql/create_table_mysql.sql 2012-12-28 05:18:33 UTC (rev 22177)
@@ -480,8 +480,8 @@
customer_id int NOT NULL,
name01 text NOT NULL,
name02 text NOT NULL,
- kana01 text NOT NULL,
- kana02 text NOT NULL,
+ kana01 text,
+ kana02 text,
zip01 text,
zip02 text,
pref smallint,
変更: branches/version-2_12-multilang/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_12-multilang/html/install/sql/create_table_pgsql.sql 2012-12-28 02:22:00 UTC (rev 22176)
+++ branches/version-2_12-multilang/html/install/sql/create_table_pgsql.sql 2012-12-28 05:18:33 UTC (rev 22177)
@@ -480,8 +480,8 @@
customer_id int NOT NULL,
name01 text NOT NULL,
name02 text NOT NULL,
- kana01 text NOT NULL,
- kana02 text NOT NULL,
+ kana01 text,
+ kana02 text,
zip01 text,
zip02 text,
pref smallint,
Svn-src-all メーリングリストの案内