Changeset 23323

Timestamp:

2014/01/13 17:31:57 (10 years ago)

Author:

undertree

Message:

#2411 非会員購入時に生年月日が登録されない。受注編集画面のエラー処理を修正.

Location:

branches/version-2_13-dev/data

Files:

• Smarty/templates/admin/order/edit.tpl (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (1 diff)

branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl

@@ -278 +278 @@
                     <!--{assign var=key2 value="order_birth_month"}-->
                     <!--{assign var=key3 value="order_birth_day"}-->
-                    <span class="attention"><!--{$arrErr[$key1]}--></span>
-                    <span class="attention"><!--{$arrErr[$key2]}--></span>
-                    <span class="attention"><!--{$arrErr[$key3]}--></span>
-                    <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+                    <!--{assign var=errBirth value="`$arrErr.$key1``$arrErr.$key2``$arrErr.$key3`"}-->
+                    <!--{if $errBirth}-->
+                        <div class="attention"><!--{$errBirth}--></div>
+                    <!--{/if}-->
+                    <select name="<!--{$key1}-->" style="<!--{$errBirth|sfGetErrorColor}-->">
                         <!--{html_options options=$arrBirthYear selected=$arrForm[$key1].value|default:""}-->
                     </select>年
-                    <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->">
+                    <select name="<!--{$key2}-->" style="<!--{$errBirth|sfGetErrorColor}-->">
                         <!--{html_options options=$arrBirthMonth selected=$arrForm[$key2].value|default:""}-->
                     </select>月
-                    <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
+                    <select name="<!--{$key3}-->" style="<!--{$errBirth|sfGetErrorColor}-->">
                         <!--{html_options options=$arrBirthDay selected=$arrForm[$key3].value|default:""}-->
                     </select>日

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

@@ -643 +643 @@
         $arrErrTemp = array_merge($arrErrTemp, $arrErrDate);
 
+        // 複数項目チェック
+        $year = $arrValues['order_birth_year'];
+        $month = $arrValues['order_birth_month'];
+        $day = $arrValues['order_birth_day'];
+        $objError = new SC_CheckError_Ex(array('order_birth_year' => $year,
+                                               'order_birth_month' => $month,
+                                               'order_birth_day' => $day));
+        $objError->doFunc(array('生年月日', 'order_birth_year', 'order_birth_month', 'order_birth_day'),
+                          array('CHECK_BIRTHDAY'));
+        $arrErrTemp['order_birth_year'] = $objError->arrErr['order_birth_year'];
+
         // 商品の種類数
         $max = count($arrValues['quantity']);