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

Timestamp:

2011/02/02 16:56:53 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110201123345-uz52fiu8968h2sci

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/basis/delivery_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fdelivery_input.tpl
data/Smarty/templates/admin/products/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fconfirm.tpl
data/Smarty/templates/admin/products/product.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct.tpl
data/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/Smarty/templates/admin/products/product_class_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_confirm.tpl
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/LC_Page_Index.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_Index.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 15297@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery_Input.php
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Product.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
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
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110202075647-gfbrip1v1xbkqxr0

bzr:revno:

2797

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/basis/delivery_input.tpl ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/Smarty/templates/admin/products/confirm.tpl ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/Smarty/templates/admin/products/product.tpl ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/Smarty/templates/admin/products/product_class.tpl ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/Smarty/templates/admin/products/product_class_confirm.tpl ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/class/SC_Product.php ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/class/SC_View.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1
data/class/pages/LC_Page_Index.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php ohkouchi@loop-az.jp-20110201131938-umefp6v1j47h3ovk
data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1
data/class/pages/shopping/LC_Page_Shopping_Deliv.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110202070434-w3zdwmvof412f3s1

bzr:timestamp:

2011-02-02 16:56:47.275000095 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-02T07:56:47.275000Z

Message:

#990(配送設定・支払方法設定の仕様変更)

• 管理画面 -> 基本情報管理, 商品管理のみ対応

Location:

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

Files:

• basis/delivery_input.tpl (modified) (1 diff)
• products/confirm.tpl (modified) (2 diffs)
• products/product.tpl (modified) (1 diff)
• products/product_class.tpl (modified) (2 diffs)
• products/product_class_confirm.tpl (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl

@@ -85 +85 @@
     <tr>
       <th>商品種別</th>
-      <td><span class="attention"><!--{$arrErr[$key]}--></span><!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value}--></td>
+      <td><span class="attention"><!--{$arrErr[$key]}--></span><!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value separator='&nbsp;&nbsp;'}--></td>
+    </tr>
+  </table>
+
+  <h2>取扱支払方法</h2>
+  <!--{assign var=key value="payment_ids"}-->
+  <table>
+    <tr>
+      <th>支払方法</th>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key].value separator='&nbsp;&nbsp;'}-->
+      </td>
     </tr>
   </table>

branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl

@@ -24 +24 @@
 <form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
   <!--{foreach key=key item=item from=$arrForm}-->
-    <!--{if $key == 'product_status' || $key == 'payment_ids'}-->
+    <!--{if $key == 'product_status'}-->
       <!--{foreach item=statusVal from=$item}-->
       <input type="hidden" name="<!--{$key}-->[]" value="<!--{$statusVal|h}-->" />
@@ -112 +112 @@
         <!--{$arrForm.stock|h}-->
       <!--{/if}-->
-      </td>
-    </tr>
-    <tr>
-      <th>支払方法</th>
-      <td>
-      <!--{foreach from=$arrForm.payment_ids item=payment_id}-->
-        <!--{$arrPayments[$payment_id]|h}-->&nbsp;
-      <!--{/foreach}-->
       </td>
     </tr>

branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl

@@ -183 +183 @@
       </td>
     </tr>
-    <tr>
-      <th>支払方法<span class="attention"> *</span></th>
-       <td>
-         <span class="attention"><!--{$arrErr.payment_ids}--></span>
-         <!--{html_checkboxes name="payment_ids" options=$arrPayments selected=$arrForm.payment_ids separator='&nbsp;&nbsp;'}-->
-       </td>
-    </tr>
     <!--{/if}-->
 

branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl

@@ -114 +114 @@
       <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
       <th>商品種別<span class="attention">*</span></th>
-      <th><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" id="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /><label for="allPaymentIds">支払方法</label></th>
       <th>ダウンロード<br>ファイル名<span class="red"><br>上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
       <th>ダウンロード商品用<br>ファイル</th>
@@ -155 +154 @@
         <!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key] separator='<br />'}-->
       </td>
-      <td class="class-payment center">
-        <!--{assign var=key value="payment_ids:`$smarty.section.cnt.iteration`"}-->
-        <!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key] separator='<br />'}-->
-      </td>
       <td class="center">
         <!--{assign var=key value="down_filename:`$smarty.section.cnt.iteration`"}-->

branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl

@@ -25 +25 @@
 <form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
 <!--{foreach key=key item=item from=$arrForm}-->
-  <!--{if '/payment_ids:/'|preg_match:$key}-->
-    <!--{foreach item=paymentsVal from=$item}-->
-      <input type="hidden" name="<!--{$key}-->[]" value="<!--{$paymentsVal|h}-->" />
-    <!--{/foreach}-->
-  <!--{else}-->
     <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
-  <!--{/if}-->
 <!--{/foreach}-->
 
@@ -51 +45 @@
       <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)</th>
       <th>商品種別</th>
-      <th>支払方法</th>
       <th>ダウンロードファイル名</th>
       <th>ダウンロード商品用ファイルアップロード</th>
@@ -84 +77 @@
       <!--{/foreach}-->
       </td>
-      <!--{assign var=key value="payment_ids:`$smarty.section.cnt.iteration`"}-->
-      <td>
-      <!--{foreach from=$arrForm[$key] item=payment_id}-->
-        <!--{$arrPayments[$payment_id]|h}-->&nbsp;
-      <!--{/foreach}-->
-      </td>
       <!--{assign var=key value="down_filename:`$smarty.section.cnt.iteration`"}-->
       <td class="right"><!--{$arrForm[$key]}--></td>