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

Timestamp:

2011/02/08 00:39:38 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/select_deliv.tpl select_deliv.tpl-20110207152600-lm5bjhtot5ipow7j-1
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.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/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2840

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/shopping/confirm.tpl [email protected]
data/Smarty/templates/default/shopping/payment.tpl [email protected]
data/Smarty/templates/mobile/shopping/confirm.tpl [email protected]
data/Smarty/templates/mobile/shopping/payment.tpl [email protected]
data/Smarty/templates/mobile/shopping/select_deliv.tpl [email protected]
data/Smarty/templates/sphone/shopping/confirm.tpl [email protected]
data/Smarty/templates/sphone/shopping/payment.tpl [email protected]
data/class/SC_CartSession.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]

bzr:timestamp:

2011-02-08 00:39:32.996000051 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-07T15:39:32.996000Z

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

@@ -461 +461 @@
 
     /**
-     * 商品種別ID からお届け時間の配列を取得する.
-     */
-    function getDelivTime($productTypeId) {
-        $objQuery =& SC_Query::getSingletonInstance();
-        $from = <<< __EOS__
-                 dtb_deliv T1
-            JOIN dtb_delivtime T2
-              ON T1.deliv_id = T2. deliv_id
-__EOS__;
-            $objQuery->setOrder("time_id");
-            $results = $objQuery->select("time_id, deliv_time", $from,
-                                         "product_type_id = ?", array($productTypeId));
-            $arrDelivTime = array();
-            foreach ($results as $val) {
-                $arrDelivTime[$val['time_id']] = $val['deliv_time'];
-            }
-            return $arrDelivTime;
+     * 配送業者IDからお届け時間の配列を取得する.
+     *
+     * @param integer $deliv_id 配送業者ID
+     * @return array お届け時間の配列
+     */
+    function getDelivTime($deliv_id) {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $objQuery->setOrder('time_id');
+        $results = $objQuery->select('time_id, deliv_time',
+                                     'dtb_delivtime',
+                                     'deliv_id = ?', array($deliv_id));
+        $arrDelivTime = array();
+        foreach ($results as $val) {
+            $arrDelivTime[$val['time_id']] = $val['deliv_time'];
+        }
+        return $arrDelivTime;
     }
 
     /**
      * 商品種別ID から配送業者を取得する.
-     */
-    function getDeliv($productTypeId) {
-        $objQuery =& SC_Query::getSingletonInstance();
-        return $objQuery->select("*", "dtb_deliv", "product_type_id = ?",
-                                 array($productTypeId));
-    }
-
-    /**
-     * 配送業者ID から, 有効な支払方法を取得する.
+     *
+     * @param integer $product_type_id 商品種別ID
+     * @return array 配送業者の配列
+     */
+    function getDeliv($product_type_id) {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $objQuery->setOrder('rank');
+        return $objQuery->select('*', 'dtb_deliv', 'product_type_id = ?',
+                                 array($product_type_id));
+    }
+
+    /**
+     * 配送業者ID から, 有効な支払方法IDを取得する.
      *
      * @param integer $deliv_id 配送業者ID
@@ -497 +500 @@
     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 = ?',
+        $objQuery->setOrder('rank');
+        return $objQuery->getCol('payment_id', 'dtb_payment_options',
+                                 'deliv_id = ?',
                                  array($deliv_id), MDB2_FETCHMODE_ORDERED);
     }