Changeset 18712 for branches/version-2_4/data/Smarty

Timestamp:

2010/06/21 11:37:04 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/default/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/SC_Date.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Date.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

1920

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/Smarty/templates/default/admin/order/edit.tpl [email protected]
data/class/SC_Date.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16741
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php [email protected]

bzr:timestamp:

2010-06-21 11:37:00.411999941 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-21T02:37:00.412000Z

Message:

merged r18670, r18678

• お届け日指定が正常に表示/更新されない不具合を修正(#602)
  • tokyop 様からのご指摘  http://xoops.ec-cube.net/modules/newbb/viewtopic.php?forum=11&post_id=29401&topic_id=5417#forumpost29401
• コミュニティ版の SC_Date をマージ(merged r17795)

File:

• branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl (modified) (2 diffs)

branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl

@@ -573 +573 @@
                                 </td>
                             </tr>
-                            <!--{assign var=key value="deliv_date"}-->
                             <tr class="fs12n">
                                 <td bgcolor="#f2f1ec" colspan="6">▼お届け日指定</td>
@@ -579 +578 @@
                             <tr class="fs12n">
                                 <td bgcolor="#ffffff" colspan="6">
-                                  <span class="attention"><!--{$arrErr.deliv_date_year}--></span> 
-                                  <select name="deliv_date_year" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrYearDelivDate selected=$arrForm.deliv_date_year.value|default:""}--> 
-                                  </select>年 
-                                  <select name="deliv_date_month" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrMonthDelivDate selected=$arrForm.deliv_date_month.value|default:""}--> 
-                                  </select>月 
-                                  <select name="deliv_date_day" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
-                                    <!--{html_options options=$arrDayDelivDate selected=$arrForm.deliv_date_day.value|default:""}--> 
+                                                                    <!--{assign var=key value="deliv_date_year"}-->
+                                  <select name="deliv_date_year" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                                    <!--{html_options options=$arrYearDelivDate selected=$arrForm.deliv_date_year.value|default:""}-->
+                                  </select>年
+                                  <select name="deliv_date_month" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                                    <!--{html_options options=$arrMonthDelivDate selected=$arrForm.deliv_date_month.value|default:""}-->
+                                  </select>月
+                                  <select name="deliv_date_day" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                                    <!--{html_options options=$arrDayDelivDate selected=$arrForm.deliv_date_day.value|default:""}-->
                                   </select>日
+                                                                    <span class="red12"><!--{$arrErr[$key]}--></span>
                                 </td>
                             </tr>