[Svn-src-all:3278] [version-2_12-multilang 22179] #1998 都道府県関連を削除
h_yoshimoto
admin ＠ mail.ec-cube.net
2012年 12月 28日 (金) 21:08:26 JST
Subversion committed to /home/svn/open 22179
http://svn.ec-cube.net/open_trac/changeset/22179
┌────────────────────────────┐
│更新者 : h_yoshimoto │
│更新日時: 2012-12-28 21:08:25 +0900 (金, 28 12月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1998 都道府県関連を削除
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/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/abouts/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/mail_templates/contact_mail.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/delivery.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/deliv.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/abouts/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/entry/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/frontparts/form_personal_input.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/change_confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/delivery.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone_en/shopping/deliv.tpl
U branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php
U branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
U branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
U branches/version-2_12-multilang/html/install/sql/insert_data.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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/adminparts/form_customer_search.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -1,18 +1,10 @@
<tr>
<th><!--{t string="tpl_207"}--></th>
- <td>
+ <td colspan="3">
<!--{assign var=key value="search_customer_id"}-->
<!--{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>
- <th><!--{t string="tpl_258"}--></th>
- <td>
- <!--{assign var=key value="search_pref"}-->
- <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><br /><!--{/if}-->
- <select class="top" name="<!--{$key}-->">
- <option value="" selected="selected" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{t string="tpl_036"}--></option>
- <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
- </select>
- </td>
+ <input type="text" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" <!--{if $arrErr[$key]}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
+
</tr>
<tr>
<th><!--{t string="tpl_208"}--></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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -153,13 +153,6 @@
<th><!--{t string="tpl_035"}--></th>
<td>
<p>
- <span class="attention"><!--{$arrErr.pref}--></span>
- <select class="top" name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" >
- <option value="" selected="selected"><!--{t string="tpl_036"}--></option>
- <!--{html_options options=$arrPref selected=$arrForm.pref}-->
- </select>
- </p>
- <p>
<span class="attention"><!--{$arrErr.addr01}--></span>
<input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.addr01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="addr01" /><span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.STEXT_LEN}--></span><br />
<!--{$smarty.const.SAMPLE_ADDRESS1}-->
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -102,11 +102,7 @@
<tr>
<th><!--{t string="tpl_212_1"}--></th>
<td>
- <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
- <select class="top" name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
- <option class="top" value="" selected="selected"><!--{t string="tpl_036"}--></option>
- <!--{html_options options=$arrPref selected=$arrForm.pref}-->
- </select><br />
+ <span class="attention"><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
<input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" size="60" class="box60" <!--{if $arrErr.addr01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
<!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
<input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" size="60" class="box60" <!--{if $arrErr.addr02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -124,7 +124,7 @@
<col width="7%" />
<tr>
<th rowspan="2"><!--{t string="tpl_256"}--></th>
- <th><!--{t string="tpl_207"}--></th>
+ <th rowspan="2"><!--{t string="tpl_207"}--></th>
<th rowspan="2"><!--{t string="tpl_208"}--></th>
<th rowspan="2"><!--{t string="tpl_215"}--></th>
<th><!--{t string="tpl_037"}--></th>
@@ -132,13 +132,12 @@
<th rowspan="2"><!--{t string="tpl_004"}--></th>
</tr>
<tr>
- <th><!--{t string="tpl_258"}--></th>
<th><!--{t string="tpl_108"}--></th>
</tr>
<!--{foreach from=$arrData item=row}-->
<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.customer_id|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>
@@ -146,7 +145,6 @@
<td class="center" rowspan="2"><span class="icon_delete"><a href="#" onclick="return fnDelete('<!--{$row.customer_id|h}-->');"><!--{t string="tpl_004"}--></a></span></td>
</tr>
<tr>
- <td><!--{assign var=pref value=$row.pref}--><!--{$arrPref[$pref]}--></td>
<td><!--{mailto address=$row.email encode="javascript"}--></a><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');"><!--{t string="tpl_259"}--></a><!--{/if}--></td>
</tr>
<!--{/foreach}-->
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -44,7 +44,6 @@
df['shipping_fax01[0]'].value = df.order_fax01.value;
df['shipping_fax02[0]'].value = df.order_fax02.value;
df['shipping_fax03[0]'].value = df.order_fax03.value;
- df['shipping_pref[0]'].value = df.order_pref.value;
df['shipping_addr01[0]'].value = df.order_addr01.value;
df['shipping_addr02[0]'].value = df.order_addr02.value;
}
@@ -210,12 +209,7 @@
-
<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
<a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;"><!--{t string="tpl_211"}--></a><br />
- <!--{assign var=key value="order_pref"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select class="top" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
- <option value="" selected=""><!--{t string="tpl_036"}--></option>
- <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
- </select><br />
+
<!--{assign var=key value="order_addr01"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60 top" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
@@ -504,12 +498,6 @@
-
<input type="text" name="<!--{$key2}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key2]|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2][$shipping_index]|sfGetErrorColor}-->" size="6" class="box6" />
<a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'shipping_zip01[<!--{$shipping_index}-->]', 'shipping_zip02[<!--{$shipping_index}-->]', 'shipping_pref[<!--{$shipping_index}-->]', 'shipping_addr01[<!--{$shipping_index}-->]'); return false;"><!--{t string="tpl_211"}--></a><br />
- <!--{assign var=key value="shipping_pref"}-->
- <span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>
- <select class="top" name="<!--{$key}-->[<!--{$shipping_index}-->]" style="<!--{$arrErr[$key][$shipping_index]|sfGetErrorColor}-->">
- <option value="" selected=""><!--{t string="tpl_036"}--></option>
- <!--{html_options options=$arrPref selected=$arrShipping[$key]}-->
- </select><br />
<!--{assign var=key value="shipping_addr01"}-->
<span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>
<input type="text" name="<!--{$key}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key]|h}-->" size="60" class="box60 top" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$shipping_index]|sfGetErrorColor}-->" /><br />
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/abouts/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/abouts/index.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/abouts/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -74,7 +74,7 @@
<!--{if strlen($objSiteInfo->data.zip01)}-->
<tr>
<th>Location</th>
- <td><!--{$objSiteInfo->data.zip01|h}-->-<!--{$objSiteInfo->data.zip02|h}--><br /><!--{$objSiteInfo->data.pref|h}--><!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></td>
+ <td><!--{$objSiteInfo->data.zip01|h}-->-<!--{$objSiteInfo->data.zip02|h}--><br /><!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></td>
</tr>
<!--{/if}-->
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/confirm.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -50,7 +50,7 @@
</tr>
<tr>
<th>Address</th>
- <td><!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--></td>
+ <td><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--></td>
</tr>
<tr>
<th>Telephone number</th>
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/contact/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -60,11 +60,8 @@
<tr>
<th>Address</th>
<td>
- <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
+ <span class="attention"><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
- <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->">
- <option value="">Select a prefecture</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}--></select>
-
<p>
<input type="text" class="box380" name="addr01" value="<!--{$arrForm.addr01.value|default:$arrData.addr01|h}-->" style="<!--{$arrErr.addr01|sfGetErrorColor}-->; ime-mode: active;" /><br />
<!--{$smarty.const.SAMPLE_ADDRESS1}-->
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/entry/confirm.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -51,7 +51,7 @@
<tr>
<th>Address</th>
<td>
- <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
+ <!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
</td>
</tr>
<tr>
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/frontparts/form_personal_input.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -41,7 +41,6 @@
<td>
<!--{assign var=key1 value="`$prefix`zip01"}-->
<!--{assign var=key2 value="`$prefix`zip02"}-->
- <!--{assign var=key3 value="`$prefix`pref"}-->
<!--{assign var=key4 value="`$prefix`addr01"}-->
<!--{assign var=key5 value="`$prefix`addr02"}-->
<!--{if $arrErr[$key1] || $arrErr[$key2]}-->
@@ -59,13 +58,9 @@
<tr>
<th>Address<span class="attention">*</span></th>
<td>
- <!--{if $arrErr[$key3] || $arrErr[$key4] || $arrErr[$key5]}-->
- <div class="attention"><!--{$arrErr[$key3]}--><!--{$arrErr[$key4]}--><!--{$arrErr[$key5]}--></div>
+ <!--{if $arrErr[$key4] || $arrErr[$key5]}-->
+ <div class="attention"><!--{$arrErr[$key4]}--><!--{$arrErr[$key5]}--></div>
<!--{/if}-->
- <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
- <option value="" selected="selected">Select a prefecture</option>
- <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
- </select>
<p class="top"><input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4]|h}-->" class="box300" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->; ime-mode: active;" /><br />
<!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
<p class="top"><input type="text" name="<!--{$key5}-->" value="<!--{$arrForm[$key5]|h}-->" class="box300" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->; ime-mode: active;" /><br />
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/mail_templates/contact_mail.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/mail_templates/contact_mail.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/mail_templates/contact_mail.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -40,7 +40,7 @@
■Name :<!--{$arrForm.name01.value}--> <!--{$arrForm.name02.value}--> (<!--{$arrForm.kana01.value}--> <!--{$arrForm.kana02.value}-->)
■Postal code:<!--{if $arrForm.zip01.value && $arrForm.zip02.value}--><!--{$arrForm.zip01.value}-->-<!--{$arrForm.zip02.value}--><!--{/if}-->
-■Address :<!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value}--><!--{$arrForm.addr02.value}-->
+■Address :<!--{$arrForm.addr01.value}--><!--{$arrForm.addr02.value}-->
■Telephone number:<!--{$arrForm.tel01.value}-->-<!--{$arrForm.tel02.value}-->-<!--{$arrForm.tel03.value}-->
■E-mail address:<!--{$arrForm.email.value}-->
■Details of inquiry
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/delivery.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/delivery.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/mypage/delivery.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -56,13 +56,12 @@
<th colspan="5">Delivery destination</th>
</tr>
<!--{section name=cnt loop=$arrOtherDeliv}-->
- <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
<tr>
<td class="alignC"><!--{$smarty.section.cnt.iteration}--></td>
<td><label for="add<!--{$smarty.section.cnt.iteration}-->">Delivery address</label></td>
<td>
<!--{$arrOtherDeliv[cnt].zip01}-->-<!--{$arrOtherDeliv[cnt].zip02}--><br />
- <!--{$arrPref[$OtherPref]|h}--><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--><br />
+ <!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--><br />
<!--{$arrOtherDeliv[cnt].name01|h}--> <!--{$arrOtherDeliv[cnt].name02|h}-->
</td>
<td class="alignC">
変更: branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/deliv.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/deliv.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/default_en/shopping/deliv.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -91,8 +91,7 @@
</label>
</td>
<td>
- <!--{assign var=key value=$arrAddr[cnt].pref}-->
- <!--{$arrPref[$key]}--><!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
+ <!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
<!--{$arrAddr[cnt].name01|h}--> <!--{$arrAddr[cnt].name02|h}-->
</td>
<td class="alignC">
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/abouts/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/abouts/index.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/abouts/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -67,7 +67,7 @@
<!--{if strlen($objSiteInfo->data.zip01)}-->
<dt>Location</dt>
<dd><!--{$objSiteInfo->data.zip01|h}-->-<!--{$objSiteInfo->data.zip02|h}--><br />
- <!--{$objSiteInfo->data.pref|h}--><!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></dd>
+ <!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></dd>
<!--{/if}-->
<!--{if strlen($objSiteInfo->data.tel01)}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/confirm.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/confirm.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -49,7 +49,7 @@
<!--{if strlen($arrForm.zip01.value) > 0 && strlen($arrForm.zip02.value) > 0}-->
<!--{$arrForm.zip01.value|h}-->-<!--{$arrForm.zip02.value|h}-->
<!--{/if}--><br />
- <!--{$arrPref[$arrForm.pref.value]}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}-->
+ <!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}-->
</dd>
<dt>Telephone number</dt>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/index.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/contact/index.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -72,7 +72,6 @@
<dd>
<!--{assign var=key1 value="`$prefix`zip01"}-->
<!--{assign var=key2 value="`$prefix`zip02"}-->
- <!--{assign var=key3 value="`$prefix`pref"}-->
<!--{assign var=key4 value="`$prefix`addr01"}-->
<span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
<p>
@@ -90,11 +89,7 @@
<dt>Address</dt>
<dd>
- <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
- <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
- <option value="" selected="selected">Prefecture</option>
- <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
- </select>
+ <span class="attention"><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
<input type="text" name="addr01"
value="<!--{$arrForm.addr01.value|default:$arrData.addr01|h}-->"
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/entry/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/entry/confirm.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/entry/confirm.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -46,7 +46,7 @@
<dt>Address</dt>
<dd>
<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--><br />
- <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
+ <!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
</dd>
<dt>Telephone number</dt>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/frontparts/form_personal_input.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/frontparts/form_personal_input.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -47,7 +47,6 @@
<dd>
<!--{assign var=key1 value="`$prefix`zip01"}-->
<!--{assign var=key2 value="`$prefix`zip02"}-->
- <!--{assign var=key3 value="`$prefix`pref"}-->
<!--{assign var=key4 value="`$prefix`addr01"}-->
<!--{assign var=key5 value="`$prefix`addr02"}-->
<!--{if $arrErr[$key1] || $arrErr[$key2]}-->
@@ -60,13 +59,9 @@
<dt>Address <span class="attention">*</span></dt>
<dd>
- <!--{if $arrErr[$key3] || $arrErr[$key4] || $arrErr[$key5]}-->
- <div class="attention"><!--{$arrErr[$key3]}--><!--{$arrErr[$key4]}--><!--{$arrErr[$key5]}--></div>
+ <!--{if $arrErr[$key4] || $arrErr[$key5]}-->
+ <div class="attention"><!--{$arrErr[$key4]}--><!--{$arrErr[$key5]}--></div>
<!--{/if}-->
- <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" class="boxHarf top data-role-none">
- <option value="" selected="selected">Prefecture</option>
- <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
- </select>
<input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4]|h}-->" class="boxLong text top data-role-none" placeholder="Municipality name" />
<input type="text" name="<!--{$key5}-->" value="<!--{$arrForm[$key5]|h}-->" class="boxLong text data-role-none" placeholder="House number/building name" />
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/change_confirm.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/change_confirm.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -53,7 +53,7 @@
<dt>Address</dt>
<dd>
<!--{$arrForm.zip01}-->-<!--{$arrForm.zip02}--><br />
- <!--{$arrPref[$arrForm.pref]}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
+ <!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}-->
</dd>
<dt>Telephone number</dt>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/delivery.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/delivery.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/mypage/delivery.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -56,10 +56,9 @@
<!--{section name=cnt loop=$arrOtherDeliv max=$dispNumber}-->
<!--▼お届け先 -->
<div class="delivBox">
- <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
<p><em><span class="zip_title">Delivery address<!--{$smarty.section.cnt.iteration}--></span></em>:<br />
<span class="zip01"><!--{$arrOtherDeliv[cnt].zip01}--></span>-<span class="zip02"><!--{$arrOtherDeliv[cnt].zip02}--></span><br />
- <span class="address"><!--{$arrPref[$OtherPref]|h}--><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--></span><br />
+ <span class="address"><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--></span><br />
<span class="name01"><!--{$arrOtherDeliv[cnt].name01|h}--></span> <span class="name02"><!--{$arrOtherDeliv[cnt].name02|h}--></span></p>
<ul class="edit">
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone_en/shopping/deliv.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone_en/shopping/deliv.tpl 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone_en/shopping/deliv.tpl 2012-12-28 12:08:25 UTC (rev 22179)
@@ -75,8 +75,7 @@
</dt>
<!--{/if}-->
<dd <!--{if $smarty.section.cnt.last && !($tpl_addrmax < $smarty.const.DELIV_ADDR_MAX)}-->class="end"<!--{/if}-->>
- <!--{assign var=key value=$arrAddr[cnt].pref}-->
- <!--{$arrPref[$key]}--><!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
+ <!--{$arrAddr[cnt].addr01|h}--><!--{$arrAddr[cnt].addr02|h}--><br />
<!--{$arrAddr[cnt].name01|h}--> <!--{$arrAddr[cnt].name02|h}-->
</dd>
</dl>
変更: 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 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/class/helper/SC_Helper_Customer.php 2012-12-28 12:08:25 UTC (rev 22179)
@@ -361,7 +361,7 @@
$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'));
+ $objFormParam->addParam(t('PARAM_LABEL_PREF'), 'pref', INT_LEN, 'n', array('NUM_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ADDR1'), 'addr01', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ADDR2'), 'addr02', MTEXT_LEN, 'aKV', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_TEL1'), 'tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis.php 2012-12-28 12:08:25 UTC (rev 22179)
@@ -222,7 +222,7 @@
$objFormParam->addParam(t('PARAM_LABEL_ZIP01'), 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ZIP02'), 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK'));
// 所在地チェック
- $objFormParam->addParam(t('PARAM_LABEL_PREF'), 'pref', '', 'n', array('EXIST_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_PREF'), 'pref', '', 'n');
$objFormParam->addParam(t('PARAM_LABEL_ADDR01'), 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_ADDR02'), 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
// メールチェック
変更: branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php 2012-12-28 12:08:25 UTC (rev 22179)
@@ -128,7 +128,7 @@
if (INPUT_DELIV_FEE) {
for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
- $objFormParam->addParam(t('LC_Page_Admin_Basis_DeliveryInput_005', array('T_FIELD' => $cnt)), "fee$cnt", PRICE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam(t('LC_Page_Admin_Basis_DeliveryInput_005', array('T_FIELD' => $cnt)), "fee$cnt", PRICE_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
}
}
break;
@@ -231,17 +231,17 @@
if (INPUT_DELIV_FEE) {
$sqlval = array();
// 配送料金の設定
- for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
- $keyname = "fee$cnt";
- if ($arrRet[$keyname] != '') {
- $sqlval['deliv_id'] = $deliv_id;
- $sqlval['fee'] = $arrRet[$keyname];
- $sqlval['pref'] = $cnt;
- // INSERTの実行
- $sqlval['fee_id'] = $cnt;
- $objQuery->insert('dtb_delivfee', $sqlval);
- }
- }
+// for ($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+// $keyname = "fee$cnt";
+// if ($arrRet[$keyname] != '') {
+// $sqlval['deliv_id'] = $deliv_id;
+// $sqlval['fee'] = $arrRet[$keyname];
+// $sqlval['pref'] = $cnt;
+// // INSERTの実行
+// $sqlval['fee_id'] = $cnt;
+// $objQuery->insert('dtb_delivfee', $sqlval);
+// }
+// }
}
}
変更: branches/version-2_12-multilang/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_12-multilang/html/install/sql/insert_data.sql 2012-12-28 05:27:03 UTC (rev 22178)
+++ branches/version-2_12-multilang/html/install/sql/insert_data.sql 2012-12-28 12:08:25 UTC (rev 22179)
@@ -312,7 +312,6 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (76, 2, 'kana02', 'お名前(フリガナ・名)', 5, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (77, 2, 'zip01', '郵便番号1', 6, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (78, 2, 'zip02', '郵便番号2', 7, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (79, 2, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_customer.pref) as pref', '都道府県', 8, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (80, 2, 'addr01', '住所1', 9, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (81, 2, 'addr02', '住所2', 10, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (82, 2, 'email', 'E-MAIL', 11, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -348,7 +347,6 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (112, 3, 'order_fax03', 'FAX3', 14, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (113, 3, 'order_zip01', '郵便番号1', 15, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP01_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (114, 3, 'order_zip02', '郵便番号2', 16, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP02_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (115, 3, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_order.order_pref) as pref', '都道府県', 17, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (116, 3, 'order_addr01', '住所1', 18, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (117, 3, 'order_addr02', '住所2', 19, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (118, 3, 'order_sex', '性別', 20, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
Svn-src-all メーリングリストの案内