Changeset 23205
- Timestamp:
- 2013/09/10 15:51:45 (13 years ago)
- Location:
- branches/version-2_13_0/data
- Files:
-
- 7 edited
-
Smarty/templates/admin/customer/edit.tpl (modified) (2 diffs)
-
Smarty/templates/admin/order/disp.tpl (modified) (2 diffs)
-
Smarty/templates/mobile/entry/index.tpl (modified) (2 diffs)
-
Smarty/templates/mobile/mypage/change.tpl (modified) (2 diffs)
-
Smarty/templates/sphone/frontparts/form_personal_input.tpl (modified) (2 diffs)
-
Smarty/templates/sphone/shopping/nonmember_input.tpl (modified) (4 diffs)
-
class/pages/admin/order/LC_Page_Admin_Order_Disp.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13_0/data/Smarty/templates/admin/customer/edit.tpl
r23140 r23205 93 93 </tr> 94 94 <tr> 95 <th>お名前(フリガナ)< span class="attention"> *</span></th>95 <th>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention"> *</span><!--{/if}--></th> 96 96 <td> 97 97 <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span> … … 127 127 <!--{/if}--> 128 128 <tr> 129 <th>郵便番号< span class="attention"> *</span></th>129 <th>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention"> *</span><!--{/if}--></th> 130 130 <td> 131 131 <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span> -
branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl
r22218 r23205 84 84 <td><!--{$arrForm.order_tel01.value|h}--> - <!--{$arrForm.order_tel02.value|h}--> - <!--{$arrForm.order_tel03.value|h}--></td> 85 85 </tr> 86 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 87 <tr> 88 <th>国</th> 89 <td> 90 <!--{$arrCountry[$arrForm.order_country_id.value]|h}--> 91 </td> 92 </tr> 93 <tr> 94 <th>ZIP CODE</th> 95 <td> 96 <!--{$arrForm.order_zipcode.value|h}--> 97 </td> 98 </tr> 99 <!--{/if}--> 86 100 <tr> 87 101 <th>住所</th> … … 261 275 </td> 262 276 </tr> 277 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 278 <tr> 279 <th>国</th> 280 <td> 281 <!--{assign var=key1 value="shipping_country_id"}--> 282 <!--{assign var=key2 value=$arrShipping[$key1]}--> 283 <!--{$arrCountry[$key2]|h}--> 284 </td> 285 </tr> 286 <tr> 287 <th>ZIP CODE</th> 288 <td> 289 <!--{assign var=key1 value="shipping_zipcode"}--> 290 <!--{$arrShipping[$key1]|h}--> 291 </td> 292 </tr> 293 <!--{/if}--> 263 294 <tr> 264 295 <th>住所</th> -
branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl
r23168 r23205 38 38 <input type="text" name="name02" value="<!--{$arrForm.name02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br> 39 39 40 ●お名前(フリガナ)< font color="#FF0000"> *</font><br>40 ●お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000"> *</font><!--{/if}--><br> 41 41 <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font> 42 42 フリガナ/姓(例:シブヤ)<br> … … 70 70 </select>日<br> 71 71 72 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 73 ●国<font color="#FF0000">※</font><br> 74 <font color="#FF0000"><!--{$arrErr.country_id}--></font> 75 <select name="job"> 76 <option value="">選択してください</option> 77 <!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}--> 78 </select><br> 79 80 ●ZIP CODE<br> 81 <font color="#FF0000"><!--{$arrErr.zipcode}--></font> 82 <input type="text" name="zipcode" value="<!--{$arrForm.zipcode.value|h}-->"><br> 83 <!--{else}--> 84 <input type="hidden" name="country_id" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" /> 85 <!--{/if}--> 86 72 87 <!--{assign var=key1 value="zip01"}--> 73 88 <!--{assign var=key2 value="zip02"}--> 74 ●郵便番号< font color="#FF0000"> *</font><br>89 ●郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000"> *</font><!--{/if}--><br> 75 90 <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font> 76 91 <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}--> -
branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl
r23168 r23205 38 38 <input type="text" name="name02" value="<!--{$arrForm.name02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br> 39 39 40 フリガナ/姓(例:シブヤ)< font color="#FF0000">※</font><br>40 フリガナ/姓(例:シブヤ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br> 41 41 <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font> 42 42 <input type="text" name="kana01" value="<!--{$arrForm.kana01.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br> 43 43 44 フリガナ/名(例:ハナコ)< font color="#FF0000">※</font><br>44 フリガナ/名(例:ハナコ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br> 45 45 <input type="text" name="kana02" value="<!--{$arrForm.kana02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br> 46 46 … … 68 68 <!--{html_options options=$arrDay selected=$arrForm.day.value}--> 69 69 </select>日<br> 70 71 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 72 【国】<font color="#FF0000">※</font><br> 73 <font color="#FF0000"><!--{$arrErr.country_id}--></font> 74 <select name="job"> 75 <option value="">選択してください</option> 76 <!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h}--> 77 </select><br> 78 79 【ZIP CODE】<br> 80 <font color="#FF0000"><!--{$arrErr.zipcode}--></font> 81 <input type="text" name="zipcode" value="<!--{$arrForm.zipcode.value|h}-->"><br> 82 <!--{/if}--> 70 83 71 84 <!--{assign var=key1 value="zip01"}--> 72 85 <!--{assign var=key2 value="zip02"}--> 73 【郵便番号】< font color="#FF0000">※</font><br>86 【郵便番号】<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br> 74 87 <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font> 75 88 <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}--> -
branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
r23203 r23205 34 34 </dd> 35 35 36 <dt>お名前(フリガナ) <span class="attention">※</span></dt>36 <dt>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 37 37 <dd> 38 38 <!--{assign var=key1 value="`$prefix`kana01"}--> … … 44 44 </dd> 45 45 46 <dt>郵便番号 <span class="attention">※</span></dt> 46 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 47 <dt>国 <span class="attention">※</span></dt> 48 <dd> 49 <!--{assign var=key1 value="`$prefix`country_id"}--> 50 <!--{if $arrErr[$key1]}--> 51 <div class="attention"><!--{$arrErr[$key1]}--></div> 52 <!--{/if}--> 53 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 54 <option value="" selected="selected">国を選択</option> 55 <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}--> 56 </select> 57 </dd> 58 59 <dt>ZIP CODE</dt> 60 <dd> 61 <!--{assign var=key1 value="`$prefix`zipcode"}--> 62 <!--{if $arrErr[$key1]}--> 63 <div class="attention"><!--{$arrErr[$key1]}--></div> 64 <!--{/if}--> 65 <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" /> 66 </dd> 67 68 <!--{else}--> 69 <!--{assign var=key1 value="`$prefix`country_id"}--> 70 <input type="hidden" name="<!--{$key1}-->" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" /> 71 <!--{/if}--> 72 73 <dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 47 74 <dd> 48 75 <!--{assign var=key1 value="`$prefix`zip01"}--> -
branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
r23103 r23205 70 70 </dd> 71 71 72 <dt>お名前(フリガナ) <span class="attention">※</span></dt>72 <dt>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 73 73 <dd> 74 74 <!--{assign var=key1 value="order_kana01"}--> … … 86 86 class="boxHarf text data-role-none" placeholder="メイ"/> 87 87 </dd> 88 89 <dt>郵便番号 <span class="attention">※</span></dt> 88 89 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 90 <dt>国 <span class="attention">※</span></dt> 91 <dd> 92 <!--{assign var=key1 value="order_country_id"}--> 93 <div class="attention"><!--{$arrErr[$key1]}--></div> 94 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 95 <option value="" selected="selected">国を選択</option> 96 <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}--> 97 </select> 98 </dd> 99 100 <dt>ZIP CODE</dt> 101 <dd> 102 <!--{assign var=key1 value="order_zipcode"}--> 103 <div class="attention"><!--{$arrErr[$key1]}--></div> 104 <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" /> 105 </dd> 106 <!--{/if}--> 107 108 <dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 90 109 <dd> 91 110 <!--{assign var=key1 value="order_zip01"}--> … … 256 275 </dd> 257 276 258 <dt>フリガナ <span class="attention">※</span></dt>277 <dt>フリガナ<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 259 278 <dd> 260 279 <!--{assign var=key1 value="shipping_kana01"}--> … … 272 291 class="boxHarf text data-role-none" placeholder="メイ"/> 273 292 </dd> 274 275 <dt>郵便番号 <span class="attention">※</span></dt> 293 294 <!--{if $smarty.const.FORM_COUNTRY_ENABLE}--> 295 <dt>国 <span class="attention">※</span></dt> 296 <dd> 297 <!--{assign var=key1 value="shipping_country_id"}--> 298 <div class="attention"><!--{$arrErr[$key1]}--></div> 299 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"> 300 <option value="" selected="selected">国を選択</option> 301 <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}--> 302 </select> 303 </dd> 304 305 <dt>ZIP CODE</dt> 306 <dd> 307 <!--{assign var=key1 value="shipping_zipcode"}--> 308 <div class="attention"><!--{$arrErr[$key1]}--></div> 309 <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" /> 310 </dd> 311 <!--{/if}--> 312 313 <dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt> 276 314 <dd> 277 315 <!--{assign var=key1 value="shipping_zip01"}--> -
branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
r23126 r23205 45 45 'shipping_fax02', 46 46 'shipping_fax03', 47 'shipping_country_id', 48 'shipping_zipcode', 47 49 'shipping_pref', 48 50 'shipping_zip01', … … 84 86 $this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status'); 85 87 $this->arrDeviceType = $masterData->getMasterData('mtb_device_type'); 88 $this->arrCountry = $masterData->getMasterData('mtb_country'); 86 89 87 90 // 支払い方法の取得 … … 147 150 $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 148 151 $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); 152 if (FORM_COUNTRY_ENABLE) { 153 $objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); 154 $objFormParam->addParam('ZIPCODE', 'order_zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK')); 155 } 149 156 $objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); 150 157 $objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); … … 213 220 $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 214 221 $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 222 if (FORM_COUNTRY_ENABLE) { 223 $objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK')); 224 $objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK')); 225 } 215 226 $objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK')); 216 227 $objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
Note: See TracChangeset
for help on using the changeset viewer.
