Changeset 23207

Timestamp:

2013/09/10 17:35:24 (9 years ago)

Author:

m_uehara

Message:

#2324 会社名項目を追加。
#2378 モバイルの会員登録・編集確認画面に国・ZIPCODE項目を追加。

Location:

branches/version-2_13_0/data

Files:

• Smarty/templates/admin/order/disp.tpl (modified) (2 diffs)
• Smarty/templates/mobile/entry/confirm.tpl (modified) (2 diffs)
• Smarty/templates/mobile/entry/index.tpl (modified) (2 diffs)
• Smarty/templates/mobile/mypage/change.tpl (modified) (2 diffs)
• Smarty/templates/mobile/mypage/change_confirm.tpl (modified) (2 diffs)
• Smarty/templates/sphone/frontparts/form_personal_input.tpl (modified) (1 diff)
• Smarty/templates/sphone/shopping/nonmember_input.tpl (modified) (2 diffs)
• class/helper/SC_Helper_Customer.php (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Disp.php (modified) (3 diffs)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (2 diffs)

branches/version-2_13_0/data/Smarty/templates/admin/order/disp.tpl

@@ -75 +75 @@
             <th>お名前(カナ)</th>
             <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>
@@ -265 +269 @@
             </tr>
             <tr>
+                <th>会社名</th>
+                <!--{assign var=key1 value="shipping_company_name"}-->
+                <td><!--{$arrShipping[$key1]|h}--></td>
+            </tr>
+            <tr>
                 <th>TEL</th>
                 <td>

branches/version-2_13_0/data/Smarty/templates/mobile/entry/confirm.tpl

@@ -39 +39 @@
         <!--{$arrForm.kana01.value|h}-->　<!--{$arrForm.kana02.value|h}--><br>
 
+        ●会社名<br>
+        <!--{$arrForm.company_name.value|h}--><br>
+
         ●性別<br>
         <!--{assign var=key1 value="sex"}-->
@@ -49 +52 @@
         ●生年月日<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>

branches/version-2_13_0/data/Smarty/templates/mobile/entry/index.tpl

@@ -46 +46 @@
         <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"}-->
@@ -73 +77 @@
         ●国<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}-->

branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change.tpl

@@ -44 +44 @@
         フリガナ/名（例：ハナコ）<!--{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>
@@ -72 +76 @@
         【国】<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}-->

branches/version-2_13_0/data/Smarty/templates/mobile/mypage/change_confirm.tpl

@@ -36 +36 @@
         <!--{$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}-->
@@ -41 +42 @@
         <!--{$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>

branches/version-2_13_0/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl

@@ -42 +42 @@
     <!--{/if}-->
     <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="セイ"/>&nbsp;&nbsp;<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>
 

branches/version-2_13_0/data/Smarty/templates/sphone/shopping/nonmember_input.tpl

@@ -86 +86 @@
                     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>国&nbsp;<span class="attention">※</span></dt>
@@ -291 +298 @@
                         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>国&nbsp;<span class="attention">※</span></dt>

branches/version-2_13_0/data/class/helper/SC_Helper_Customer.php

@@ -388 +388 @@
         $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'));

branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php

@@ -39 +39 @@
         'shipping_kana01',
         'shipping_kana02',
+        'shipping_company_name',
         'shipping_tel01',
         'shipping_tel02',
@@ -149 +150 @@
         $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) {
@@ -220 +222 @@
         $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'));

branches/version-2_13_0/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -325 +325 @@
         $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'));
@@ -400 +400 @@
         $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'));