[Svn-src-all:4311] [version-2_13_0 23225] #2400 税込計算処理を追加

[m_uehara]

Subversion committed to /home/svn/open 23225
http://svn.ec-cube.net/open_trac/changeset/23225
┌────────────────────────────┐
│更新者　:  m_uehara                                     │
│更新日時:  2013-09-17 16:47:32 +0900 (火, 17  9月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2400 税込計算処理を追加

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13_0/data/Smarty/templates/default/mail_templates/order_mail.tpl
U   branches/version-2_13_0/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
U   branches/version-2_13_0/data/class/SC_Product.php

変更: branches/version-2_13_0/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/default/mail_templates/order_mail.tpl	2013-09-17 01:52:56 UTC (rev 23224)
+++ branches/version-2_13_0/data/Smarty/templates/default/mail_templates/order_mail.tpl	2013-09-17 07:47:32 UTC (rev 23225)
@@ -111,8 +111,9 @@
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
 商品コード: <!--{$item.product_code}-->
 商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥<!--{$item.price|number_format}-->
-数量：<!--{$item.quantity}-->
+<!--{assign var=shipping_product value=$item.productsClass}-->
+単価：￥<!--{$shipping_product.price02_inctax|number_format}-->
+数量：<!--{$item.quantity|number_format}-->
 
 <!--{/foreach}-->
 <!--{/foreach}-->

変更: branches/version-2_13_0/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_13_0/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2013-09-17 01:52:56 UTC (rev 23224)
+++ branches/version-2_13_0/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2013-09-17 07:47:32 UTC (rev 23225)
@@ -84,8 +84,9 @@
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
 商品コード：<!--{$item.product_code}-->
 商品名：<!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥<!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
-数量：<!--{$item.quantity}-->
+<!--{assign var=shipping_product value=$item.productsClass}-->
+単価：￥<!--{$shipping_product.price02_inctax|number_format}-->
+数量：<!--{$item.quantity|number_format}-->
 
 <!--{/foreach}-->
 <!--{/foreach}-->

変更: branches/version-2_13_0/data/class/SC_Product.php
===================================================================
--- branches/version-2_13_0/data/class/SC_Product.php	2013-09-17 01:52:56 UTC (rev 23224)
+++ branches/version-2_13_0/data/class/SC_Product.php	2013-09-17 07:47:32 UTC (rev 23225)
@@ -404,7 +404,17 @@
         $objQuery->setWhere('product_class_id = ? AND T1.del_flg = 0');
         $arrRes = $this->getProductsClassByQuery($objQuery, $productClassId);
 
-        return (array) $arrRes[0];
+        $arrProduct = (array) $arrRes[0];
+
+        // 税込計算
+        if(!SC_Utils_Ex::isBlank($arrProduct['price01'])) {
+            $arrProduct['price01_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price01'], $arrProduct['product_id'], $productClassId);        
+        }
+        if(!SC_Utils_Ex::isBlank($arrProduct['price02'])) {
+            $arrProduct['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price02'], $arrProduct['product_id'], $productClassId);        
+        }
+
+        return $arrProduct;
     }
 
     /**