Changeset 20069 for branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

Timestamp:

2011/02/02 16:56:53 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/basis/delivery_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fdelivery_input.tpl
data/Smarty/templates/admin/products/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fconfirm.tpl
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/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/Smarty/templates/admin/products/product_class_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_confirm.tpl
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/LC_Page_Index.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_Index.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 15297@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery_Input.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/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.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
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2797

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/basis/delivery_input.tpl [email protected]
data/Smarty/templates/admin/products/confirm.tpl [email protected]
data/Smarty/templates/admin/products/product.tpl [email protected]
data/Smarty/templates/admin/products/product_class.tpl [email protected]
data/Smarty/templates/admin/products/product_class_confirm.tpl [email protected]
data/class/SC_Product.php [email protected]
data/class/SC_View.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/LC_Page_Index.php [email protected]
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php [email protected]
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php [email protected]
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php [email protected]
data/class/pages/shopping/LC_Page_Shopping.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Deliv.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-02-02 16:56:47.275000095 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-02T07:56:47.275000Z

Message:

#990(配送設定・支払方法設定の仕様変更)

• 管理画面 -> 基本情報管理, 商品管理のみ対応

File:

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

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

@@ -341 +341 @@
      *
      * @param integer $total 購入金額
-     * @param array $productClassIds 購入する商品規格IDの配列
+     * @param integer $deliv_id 配送業者ID
      * @return array 購入金額に応じた支払方法の配列
      */
-    function getPayment($total, $productClassIds) {
-        // 有効な支払方法を取得
-        $objProduct = new SC_Product();
-        $paymentIds = $objProduct->getEnablePaymentIds($productClassIds);
-
+    function getPaymentsByPrice($total, $deliv_id) {
+
+        $arrPaymentIds = $this->getPayments($deliv_id);
         $objQuery =& SC_Query::getSingletonInstance();
 
         // 削除されていない支払方法を取得
-        $where = 'del_flg = 0 AND payment_id IN (' . implode(', ', array_pad(array(), count($paymentIds), '?')) . ')';
+        $where = 'del_flg = 0 AND payment_id IN (' . implode(', ', array_pad(array(), count($arrPaymentIds), '?')) . ')';
         $objQuery->setOrder("rank DESC");
-        $payments = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image", "dtb_payment", $where, $paymentIds);
+        $payments = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image", "dtb_payment", $where, $arrPaymentIds);
 
         foreach ($payments as $data) {
@@ -485 +483 @@
 
     /**
-     * 商品種別ID から配送業者ID を取得する.
+     * 商品種別ID から配送業者を取得する.
      */
     function getDeliv($productTypeId) {
         $objQuery =& SC_Query::getSingletonInstance();
-        $result = $objQuery->get("deliv_id", "dtb_deliv", "product_type_id = ?",
+        return $objQuery->select("*", "dtb_deliv", "product_type_id = ?",
                                  array($productTypeId));
-        // XXX ダウンロード商品の場合の dtb_shipping の扱い
-        return is_null($result) ? 0 : $result;
+    }
+
+    /**
+     * 配送業者ID から, 有効な支払方法を取得する.
+     *
+     * @param integer $deliv_id 配送業者ID
+     * @return array 有効な支払方法IDの配列
+     */
+    function getPayments($deliv_id) {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $from = <<< __EOS__
+                      dtb_deliv T1
+            LEFT JOIN dtb_payment_options T2
+                   ON T1.deliv_id = T2.deliv_id
+__EOS__;
+        $objQuery->setOrder('T2.rank');
+        return $objQuery->getCol('payment_id', $from, 'T1.deliv_id = ?',
+                                 array($deliv_id), MDB2_FETCHMODE_ORDERED);
     }