Changeset 19923 for branches/version-2_5-dev/data/Smarty

Timestamp:

2011/01/16 01:20:36 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19922

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2652

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl [email protected]
data/Smarty/templates/default/shopping/confirm.tpl [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Multiple.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-01-16 01:20:29.269999981 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-15T16:20:29.270000Z

Message:

#843(複数配送先の指定)

• お届け日/お届け時間が反映されるよう修正

Location:

branches/version-2_5-dev/data/Smarty/templates

Files:

• admin/order/edit.tpl (modified) (4 diffs)
• default/shopping/confirm.tpl (modified) (2 diffs)

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

@@ -80 +80 @@
         <tr>
             <th>注文番号</th>
-            <td><!--{$arrForm.order_id.value}--></td>
+            <td><!--{$tpl_order_id|h}--></td>
         </tr>
         <tr>
@@ -253 +253 @@
                     <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');">削除</a>
                 <!--{/if}-->
+            <input type="hidden" name="product_type_id[<!--{$key}-->]" value="<!--{$arrForm.product_type_id.value[$key]}-->" id="product_type_id_<!--{$key}-->" />
             <input type="hidden" name="product_id[<!--{$key}-->]" value="<!--{$arrForm.product_id.value[$key]}-->" id="product_id_<!--{$key}-->" />
             <input type="hidden" name="product_class_id[<!--{$key}-->]" value="<!--{$arrForm.product_class_id.value[$key]}-->" id="product_class_id_<!--{$key}-->" />
@@ -464 +465 @@
             <th>お届け時間</th>
             <td>
-                <!--{assign var=key value="deliv_time_id_`$shipping_id`"}-->
+                <!--{assign var=key value="time_id_`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
                 <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
@@ -475 +476 @@
             <th>お届け日</th>
             <td>
-                <!--{assign var=key value="deliv_date_`$shipping_id`"}-->
-                <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input
-                    name="<!--{$key|h}-->"
-                    value="<!--{$arrForm[$key].value|h}-->"
-                    style="<!--{$arrErr[$key]|sfGetErrorColor}-->"
-                    size="30"
-                    maxlength="<!--{$arrForm[$key].length}-->"
-                >
+              <!--{assign var=key1 value="shipping_date_year_`$shipping_id`"}-->
+              <!--{assign var=key2 value="shipping_date_month_`$shipping_id`"}-->
+              <!--{assign var=key3 value="shipping_date_day_`$shipping_id`"}-->
+              <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}-->">
+              <!--{html_options options=$arrYearShippingDate selected=$arrForm[$key1].value|default:""}-->
+              </select>年
+              <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->">
+              <!--{html_options options=$arrMonthShippingDate selected=$arrForm[$key2].value|default:""}-->
+              </select>月
+              <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
+              <!--{html_options options=$arrDayShippingDate selected=$arrForm[$key3].value|default:""}-->
+              </select>日
             </td>
         </tr>

branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl

@@ -231 +231 @@
                     <tr>
                         <th>お届け日</th>
-                        <td><!--{$shippingItem.deliv_date|default:"指定なし"|h}--></td>
+                        <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
                     </tr>
                     <tr>
                        <th>お届け時間</th>
-                        <td><!--{$shippingItem.deliv_time|default:"指定なし"|h}--></td>
+                        <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
                     </tr>
                 <!--{/if}-->
@@ -245 +245 @@
 
             <h3>▼お支払方法・その他お問い合わせ</h3>
-            <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
+            <table summary="お支払方法・その他お問い合わせ" class="delivname">
                 <tbody>
                 <tr>