Changeset 20849

Timestamp:

2011/04/16 10:52:17 (13 years ago)

Author:

Seasoft

Message:

#1267 (「数量」の揺らぎ)
#627 (ソース整形・ソースコメントの改善)

Location:

branches/version-2_11-dev/data

Files:

• Smarty/templates/admin/total/page_products.tpl (modified) (3 diffs)
• Smarty/templates/default/frontparts/bloc/cart.tpl (modified) (1 diff)
• class/SC_CartSession.php (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (4 diffs)
• class/pages/admin/total/LC_Page_Admin_Total.php (modified) (1 diff)
• class/pages/products/LC_Page_Products_Detail.php (modified) (3 diffs)

branches/version-2_11-dev/data/Smarty/templates/admin/total/page_products.tpl

@@ -28 +28 @@
         <th>商品名</th>
         <th>購入件数</th>
-        <th>点数</th>
+        <th>数量</th>
         <th>単価</th>
         <th>金額</th>
@@ -49 +49 @@
             <td class="left"><!--{*商品名*}--><!--{$arrResults[cnt].product_name|sfCutString:40:false|h}--></td>
             <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].order_count}-->件</td>
-            <td class="right"><!--{*点数*}--><!--{$arrResults[cnt].products_count}--></td>
+            <td class="right"><!--{*数量*}--><!--{$arrResults[cnt].products_count}--></td>
             <td class="right"><!--{*単価*}--><!--{$arrResults[cnt].price|number_format}-->円</td>
             <td class="right"><!--{*金額*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
@@ -60 +60 @@
         <th>商品名</th>
         <th>購入件数</th>
-        <th>点数</th>
+        <th>数量</th>
         <th>単価</th>
         <th>金額</th>

branches/version-2_11-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl

@@ -25 +25 @@
         <div class="bloc_body">
             <div class="information">
-                <p class="item">商品数：<span class="attention"><!--{$arrCartList.0.TotalQuantity|number_format|default:0}-->点</span></p>
-                <p class="total">合計：<span class="price"><!--{$arrCartList.0.ProductsTotal|number_format|default:0}-->円</span></p>
+                <p class="item">合計数量：<span class="attention"><!--{$arrCartList.0.TotalQuantity|number_format|default:0}--></span></p>
+                <p class="total">商品金額：<span class="price"><!--{$arrCartList.0.ProductsTotal|number_format|default:0}-->円</span></p>
                 <!--{*************************************
                      * カゴの中に商品がある場合にのみ表示

branches/version-2_11-dev/data/class/SC_CartSession.php

@@ -148 +148 @@
     }
 
-    // カート内商品数の合計
+    // カート内商品数量の合計
     function getTotalQuantity($productTypeId) {
         $total = 0;

branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -314 +314 @@
         $objFormParam->addParam("お届け日(日)", "shipping_date_day", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $objFormParam->addParam("お届け日", "shipping_date", STEXT_LEN, 'KVa', array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $objFormParam->addParam("配送商品数", "shipping_product_quantity", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $objFormParam->addParam("配送商品数量", "shipping_product_quantity", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
 
         $objFormParam->addParam("商品規格ID", "shipment_product_class_id", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
@@ -386 +386 @@
          *
          * $arrShipmentForm['(key)'][$shipping_index][$item_index] = 値
-         * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数
+         * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数量
          */
         $arrShipmentForm = array();
@@ -401 +401 @@
                 $item_index++;
             }
-            // 配送先ごとの配送商品数を設定
+            // 配送先ごとの配送商品数量を設定
             $arrProductQuantity[$shipping_index] = count($arrShipmentItem[$shipping_id]);
         }
@@ -452 +452 @@
          *
          * $arrShipmentItem['shipment_(key)'][$shipping_index][$item_index] = 値
-         * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数
+         * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数量
          */
         $arrProductQuantity = array();

branches/version-2_11-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php

@@ -807 +807 @@
                                  '商品名',
                                  '購入件数',
-                                 '点数',
+                                 '数量',
                                  '単価',
                                  '金額'

branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -193 +193 @@
                     $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
 
-                    // 規格1が設定されている場合
+                    // 規格1が設定されていて、エラーを検出した場合
                     if($this->tpl_classcat_find1 and $this->arrErr['classcategory_id1']) {
                         // templateの変更
@@ -211 +211 @@
                     $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
 
-                    // 規格1が設定されている場合
+                    // 規格2が設定されていて、エラーを検出した場合
                     if($this->tpl_classcat_find2 and $this->arrErr['classcategory_id2']) {
                         // templateの変更
@@ -220 +220 @@
                     $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$this->objFormParam->getValue('classcategory_id1')]['#' . $this->objFormParam->getValue('classcategory_id2')]['product_class_id'];
 
-                    // 商品数の選択を行う
+                    // 数量の入力を行う
                     $this->tpl_mainpage = "products/select_item.tpl";
                     break;