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

Timestamp:

2011/01/19 23:34:04 (15 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/products/complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fcomplete.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_complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_complete.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/Smarty/templates/default/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Fdetail.tpl
data/Smarty/templates/default/products/list.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Flist.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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
html/user_data/packages/admin/css/admin_contents.css 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fcss%2Fadmin_contents.css

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2722

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/products/complete.tpl [email protected]
data/Smarty/templates/admin/products/product_class.tpl [email protected]
data/Smarty/templates/admin/products/product_class_complete.tpl [email protected]
data/Smarty/templates/admin/products/product_class_confirm.tpl [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php [email protected]
html/user_data/packages/admin/css/admin_contents.css [email protected]

bzr:timestamp:

2011-01-19 23:34:00.638999939 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-19T14:34:00.639000Z

Message:

#781(規格のデータベースを木構造に)

• 管理画面規格管理, フロント商品一覧/詳細を修正

#792（ダウンロード販売機能）

• 規格管理画面からアップロードできなかったのを修正

File:

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

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

@@ -489 +489 @@
     function getDeliv($productTypeId) {
         $objQuery =& SC_Query::getSingletonInstance();
-        return $objQuery->get("deliv_id", "dtb_deliv", "product_type_id = ?",
+        $result = $objQuery->get("deliv_id", "dtb_deliv", "product_type_id = ?",
                                  array($productTypeId));
+        // XXX ダウンロード商品の場合の dtb_shipping の扱い
+        return is_null($result) ? 0 : $result;
     }