[Svn-src-all:846] [version-2_5-dev 19733] #581(price02 の入力必須を徹底) 実装

Seasoft admin @ mail.ec-cube.net
2010年 12月 16日 (木) 23:51:05 JST


Subversion committed to /home/svn/open 19733
http://svn.ec-cube.net/open_trac/changeset/19733
┌────────────────────────────┐
│更新者 :  Seasoft                                      │
│更新日時:  2010-12-16 23:51:05 +0900 (木, 16 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#581(price02 の入力必須を徹底) 実装

Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
U   branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U   branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

変更: branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	2010-12-16 14:51:05 UTC (rev 19733)
@@ -112,11 +112,7 @@
                             <!--{/if}-->
                         </td>
                         <td class="pricetd">
-                        <!--{if $item.productsClass.price02 != ""}-->
                             <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                        <!--{else}-->
-                            <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                        <!--{/if}-->
                         </td>
                         <td id="quantity"><!--{$item.quantity}-->
                             <ul id="quantity_level">

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	2010-12-16 14:51:05 UTC (rev 19733)
@@ -94,11 +94,7 @@
                         </ul>
                  </td>
                  <td class="pricetd">
-                 <!--{if $item.productsClass.price02 != ""}-->
                      <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                 <!--{else}-->
-                     <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                 <!--{/if}-->
                  </td>
                  <td><!--{$item.quantity|number_format}--></td>
                  <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	2010-12-16 14:51:05 UTC (rev 19733)
@@ -112,11 +112,7 @@
                             <!--{/if}-->
                         </td>
                         <td class="pricetd">
-                        <!--{if $item.productsClass.price02 != ""}-->
                             <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                        <!--{else}-->
-                            <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                        <!--{/if}-->
                         </td>
                         <td id="quantity"><!--{$item.quantity}-->
                             <ul id="quantity_level">

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2010-12-16 14:51:05 UTC (rev 19733)
@@ -94,11 +94,7 @@
                         </ul>
                  </td>
                  <td class="pricetd">
-                 <!--{if $item.productsClass.price02 != ""}-->
                      <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                 <!--{else}-->
-                     <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                 <!--{/if}-->
                  </td>
                  <td><!--{$item.quantity|number_format}--></td>
                  <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td>

変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	2010-12-16 14:51:05 UTC (rev 19733)
@@ -320,7 +320,7 @@
     stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
     price01 numeric,
-    price02 numeric,
+    price02 numeric NOT NULL,
     deliv_fee numeric,
     point_rate numeric,
     creator_id int NOT NULL,

変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	2010-12-16 14:29:12 UTC (rev 19732)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	2010-12-16 14:51:05 UTC (rev 19733)
@@ -320,7 +320,7 @@
     stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
     price01 numeric,
-    price02 numeric,
+    price02 numeric NOT NULL,
     deliv_fee numeric,
     point_rate numeric,
     creator_id int NOT NULL,




Svn-src-all メーリングリストの案内