[Svn-src-all:3222] [version-2_12-dev 22123] #1903 プラグインへの影響を考慮して差し戻し

[h_yoshimoto]

Subversion committed to /home/svn/open 22123
http://svn.ec-cube.net/open_trac/changeset/22123
┌────────────────────────────┐
│更新者　:  h_yoshimoto                                  │
│更新日時:  2012-12-06 19:24:26 +0900 (木, 06 12月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1903 プラグインへの影響を考慮して差し戻し

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

変更: branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php	2012-12-04 11:09:02 UTC (rev 22122)
+++ branches/version-2_12-dev/data/class/pages/cart/LC_Page_Cart.php	2012-12-06 10:24:26 UTC (rev 22123)
@@ -149,6 +149,9 @@
             $this->tpl_message .= $objCartSess->checkProducts($key);
             $this->tpl_total_inctax[$key] = $objCartSess->getAllProductsTotal($key);
             $totalIncTax += $this->tpl_total_inctax[$key];
+            $this->tpl_total_tax[$key] = $objCartSess->getAllProductsTax($key);
+            // ポイント合計
+            $this->tpl_total_point[$key] = $objCartSess->getAllProductsPoint($key);
 
             $this->arrData[$key] = $objCartSess->calculate($key, $objCustomer);
 

変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2012-12-04 11:09:02 UTC (rev 22122)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	2012-12-06 10:24:26 UTC (rev 22123)
@@ -103,6 +103,10 @@
         $this->arrCartItems = $objCartSess->getCartList($this->cartKey);
         // 合計金額
         $this->tpl_total_inctax[$this->cartKey] = $objCartSess->getAllProductsTotal($this->cartKey);
+        // 税額
+        $this->tpl_total_tax[$this->cartKey] = $objCartSess->getAllProductsTax($this->cartKey);
+        // ポイント合計
+        $this->tpl_total_point[$this->cartKey] = $objCartSess->getAllProductsPoint($this->cartKey);
 
         // 一時受注テーブルの読込
         $arrOrderTemp = $objPurchase->getOrderTemp($this->tpl_uniqid);