Changeset 19688 for branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

Timestamp:

2010/11/29 20:59:11 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19687

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

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/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.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/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

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2418

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-11-29 20:59:04.048000097 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-29T11:59:04.048000Z

Message:

#823 商品種別によってカートを分ける

• 商品種別に応じて配送方法を取得するよう変更
• 商品規格に応じて支払方法を取得するよう変更

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php (modified) (4 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

@@ -1484 +1484 @@
 
     /**
-     * お届け時間を取得する.
-     *
-     * @param integer $payment_id 支払い方法ID
+     * 商品種別からお届け時間を取得する.
+     *
+     * @param integer $productTypeId 商品種別ID
      * @return array お届け時間の配列
      */
-    function sfGetDelivTime($payment_id = "") {
+    function sfGetDelivTime($productTypeId) {
         $objQuery =& SC_Query::getSingletonInstance();
 
@@ -1496 +1496 @@
 
         if($payment_id != "") {
-            $where = "del_flg = 0 AND payment_id = ?";
-            $arrRet = $objQuery->select("deliv_id", "dtb_payment", $where, array($payment_id));
+            $where = "del_flg = 0 AND product_type_id = ?";
+            $arrRet = $objQuery->select("deliv_id", "dtb_payment", $where, array($productTypeId));
             $deliv_id = $arrRet[0]['deliv_id'];
         }
@@ -1516 +1516 @@
      * @return string 指定の都道府県, 支払い方法の配送料金
      */
-    function sfGetDelivFee($arrData) {
-        $pref = $arrData['deliv_pref'];
-        $payment_id = isset($arrData['payment_id']) ? $arrData['payment_id'] : "";
-
-        $objQuery =& SC_Query::getSingletonInstance();
-
-        $deliv_id = "";
-
-        // 支払い方法が指定されている場合は、対応した配送業者を取得する
-        if($payment_id != "") {
-            $where = "del_flg = 0 AND payment_id = ?";
-            $arrRet = $objQuery->select("deliv_id", "dtb_payment", $where, array($payment_id));
-            $deliv_id = $arrRet[0]['deliv_id'];
-        // 支払い方法が指定されていない場合は、先頭の配送業者を取得する
-        } else {
-            $where = "del_flg = 0";
-            $objQuery->setOrder("rank DESC");
-            $objQuery->setLimitOffset(1);
-            $arrRet = $objQuery->select("deliv_id", "dtb_deliv", $where);
-            $deliv_id = $arrRet[0]['deliv_id'];
-        }
+    function sfGetDelivFee($pref_id, $product_type_id) {
+        $objQuery =& SC_Query::getSingletonInstance();
 
         // 配送業者から配送料を取得
@@ -1542 +1523 @@
 
             // 都道府県が指定されていない場合は、東京都の番号を指定しておく
-            if($pref == "") {
-                $pref = 13;
+            if($pref_id == "") {
+                $pref_id = 13;
             }
 
             $objQuery =& SC_Query::getSingletonInstance();
-            $where = "deliv_id = ? AND pref = ?";
-            $arrRet= $objQuery->select("fee", "dtb_delivfee", $where, array($deliv_id, $pref));
+            $where = "product_type_id = ? AND pref = ?";
+            $arrRet= $objQuery->select("fee", "dtb_delivfee", $where, array($product_type_id, $pref_id));
         }
         return $arrRet[0]['fee'];