[Svn-src-all:4339] [version-2_13-dev 23253] #2433 v2.13.0 管理画面：受注変更画面 価格と数量の見栄えが揃っていない。
dkazuto
admin ＠ mail.ec-cube.net
2013年 10月 24日 (木) 23:34:08 JST
Subversion committed to /home/svn/open 23253
http://svn.ec-cube.net/open_trac/changeset/23253
┌────────────────────────────┐
│更新者 : dkazuto │
│更新日時: 2013-10-24 23:34:08 +0900 (木, 24 10月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2433 v2.13.0 管理画面：受注変更画面 価格と数量の見栄えが揃っていない。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl 2013-10-24 14:13:09 UTC (rev 23252)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl 2013-10-24 14:34:08 UTC (rev 23253)
@@ -131,7 +131,7 @@
<!--▼受注商品情報ここから-->
<h2>受注商品情報</h2>
- <table class="list">
+ <table class="list" id="order-edit-products">
<tr>
<th class="id">商品コード</th>
<th class="name">商品名/規格1/規格2</th>
@@ -143,24 +143,24 @@
<!--{section name=cnt loop=$arrForm.quantity.value}-->
<!--{assign var=product_index value="`$smarty.section.cnt.index`"}-->
<tr>
- <td>
+ <td class="center">
<!--{$arrForm.product_code.value[$product_index]|h}-->
</td>
- <td>
+ <td class="center">
<!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default:"(なし)"|h}-->
</td>
- <td align="center">
+ <td class="center">
<!--{$arrForm.price.value[$product_index]|h}-->円
</td>
- <td align="center">
+ <td class="center">
<!--{$arrForm.quantity.value[$product_index]|h}-->
</td>
<!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
<!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
<!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
<!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
- <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
- <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+ <td class="center"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円<br />(税率<!--{$tax_rate|number_format}-->%)</td>
+ <td class="center"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
</tr>
<!--{/section}-->
<tr>
@@ -225,21 +225,21 @@
<!--{section name=item loop=$arrShipping.shipment_product_class_id|@count}-->
<!--{assign var=item_index value="`$smarty.section.item.index`"}-->
<tr>
- <td>
+ <td class="center">
<!--{assign var=key value="shipment_product_code"}-->
<!--{$arrShipping[$key][$item_index]|h}-->
</td>
- <td>
+ <td class="center">
<!--{assign var=key1 value="shipment_product_name"}-->
<!--{assign var=key2 value="shipment_classcategory_name1"}-->
<!--{assign var=key3 value="shipment_classcategory_name2"}-->
<!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}-->
</td>
- <td class="right">
+ <td class="center">
<!--{assign var=key value="shipment_price"}-->
<!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
</td>
- <td class="right">
+ <td class="center">
<!--{assign var=key value="shipment_quantity"}-->
<!--{$arrShipping[$key][$item_index]|h}-->
</td>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl 2013-10-24 14:13:09 UTC (rev 23252)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl 2013-10-24 14:34:08 UTC (rev 23253)
@@ -346,11 +346,11 @@
<!--{section name=cnt loop=$arrForm.quantity.value}-->
<!--{assign var=product_index value="`$smarty.section.cnt.index`"}-->
<tr>
- <td>
+ <td class="center">
<!--{$arrForm.product_code.value[$product_index]|h}-->
<input type="hidden" name="product_code[<!--{$product_index}-->]" value="<!--{$arrForm.product_code.value[$product_index]|h}-->" id="product_code_<!--{$product_index}-->" />
</td>
- <td>
+ <td class="center">
<!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default:"(なし)"|h}-->
<input type="hidden" name="product_name[<!--{$product_index}-->]" value="<!--{$arrForm.product_name.value[$product_index]|h}-->" id="product_name_<!--{$product_index}-->" />
<input type="hidden" name="classcategory_name1[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name1.value[$product_index]|h}-->" id="classcategory_name1_<!--{$product_index}-->" />
@@ -367,12 +367,12 @@
<input type="hidden" name="product_class_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_class_id.value[$product_index]|h}-->" id="product_class_id_<!--{$product_index}-->" />
<input type="hidden" name="point_rate[<!--{$product_index}-->]" value="<!--{$arrForm.point_rate.value[$product_index]|h}-->" id="point_rate_<!--{$product_index}-->" />
</td>
- <td align="center">
+ <td class="center">
<!--{assign var=key value="price"}-->
<span class="attention"><!--{$arrErr[$key][$product_index]}--></span>
<input type="text" name="<!--{$key}-->[<!--{$product_index}-->]" value="<!--{$arrForm[$key].value[$product_index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$product_index]|sfGetErrorColor}-->" id="<!--{$key}-->_<!--{$product_index}-->" /> 円
</td>
- <td align="center">
+ <td class="center">
<!--{assign var=key value="quantity"}-->
<span class="attention"><!--{$arrErr[$key][$product_index]}--></span>
<input type="text" name="<!--{$key}-->[<!--{$product_index}-->]" value="<!--{$arrForm[$key].value[$product_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$product_index]|sfGetErrorColor}-->" id="<!--{$key}-->_<!--{$product_index}-->" onChange="quantityCopyForSingleShipping('<!--{$product_index}-->')" />
@@ -383,13 +383,13 @@
<!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
<input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
- <td class="right">
+ <td class="center">
<!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円<br />
<!--{assign var=key value="tax_rate"}-->
<span class="attention"><!--{$arrErr[$key][$product_index]}--></span>
税率<input type="text" name="<!--{$key}-->[<!--{$product_index}-->]" value="<!--{$arrForm[$key].value[$product_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key][$product_index]|sfGetErrorColor}-->" id="<!--{$key}-->_<!--{$product_index}-->" />%
</td>
- <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+ <td class="center"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
</tr>
<!--{/section}-->
<tr>
@@ -504,14 +504,14 @@
<!--{assign var=item_index value="`$smarty.section.item.index`"}-->
<tr>
- <td>
+ <td class="center">
<!--{assign var=key value="shipment_product_class_id"}-->
<input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
<!--{assign var=key value="shipment_product_code"}-->
<input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
<!--{$arrShipping[$key][$item_index]|h}-->
</td>
- <td>
+ <td class="center">
<!--{assign var=key1 value="shipment_product_name"}-->
<!--{assign var=key2 value="shipment_classcategory_name1"}-->
<!--{assign var=key3 value="shipment_classcategory_name2"}-->
@@ -525,12 +525,12 @@
<a class="btn-normal" href="javascript:;" name="delete" onclick="eccube.setValue('delete_no', <!--{$item_index}-->, 'form1'); eccube.setValue('select_shipping_id', <!--{$shipping_index}-->, 'form1'); eccube.setModeAndSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
<!--{/if}-->
</td>
- <td class="right">
+ <td class="center">
<!--{assign var=key value="shipment_price"}-->
<!--{$arrShipping[$key][$item_index]|number_format}-->円
<input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
</td>
- <td class="right">
+ <td class="center">
<!--{assign var=key value="shipment_quantity"}-->
<span class="attention"><!--{$arrErr[$key][$shipping_index][$item_index]}--></span>
<input type="text" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" />
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl 2013-10-24 14:13:09 UTC (rev 23252)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl 2013-10-24 14:34:08 UTC (rev 23253)
@@ -382,10 +382,10 @@
<tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
<td class="center"><!--{$arrResults[cnt].create_date|sfDispDBDate}--></td>
<td class="center"><!--{$arrResults[cnt].order_id}--></td>
- <td><!--{$arrResults[cnt].order_name01|h}--> <!--{$arrResults[cnt].order_name02|h}--></td>
+ <td class="center"><!--{$arrResults[cnt].order_name01|h}--> <!--{$arrResults[cnt].order_name02|h}--></td>
<!--{assign var=payment_id value="`$arrResults[cnt].payment_id`"}-->
<td class="center"><!--{$arrPayments[$payment_id]}--></td>
- <td class="right"><!--{$arrResults[cnt].total|number_format}--></td>
+ <td class="center"><!--{$arrResults[cnt].total|number_format}--></td>
<td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default:"未発送"}--></td>
<td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
<td class="center">
Svn-src-all メーリングリストの案内