Changeset 18852 for branches/version-2_5-dev/data/class/SC_Product.php
- Timestamp:
- 2010/10/13 18:03:46 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18851
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/cart/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fcart%2Findex.tpl
data/Smarty/templates/default/list.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Flist.tpl
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/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/cart/LC_Page_Cart.php 15179@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcart%2FLC_Page_Cart.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Cart.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
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/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20101013090342-ipwymntv4wfnpwcf
- bzr:revno:
- 2332
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/cart/index.tpl ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/Smarty/templates/default/list.tpl ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/SC_Product.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/cart/LC_Page_Cart.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/pages/shopping/LC_Page_Shopping_Complete.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz- bzr:timestamp:
- 2010-10-13 18:03:42.963999987 +0900
- bzr:user-agent:
- bzr2.2.0+bzr-svn1.0.3
- svn:original-date:
- 2010-10-13T09:03:42.964000Z
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/SC_Product.php
r18833 r18852 188 188 $stock_find_class = ($productsClass['stock_unlimited'] || $productsClass['stock'] > 0); 189 189 190 $classCategories[$productsClass1][$productsClass2]['name'] = $productsClass[' name2'] . ($stock_find_class ? '' : ' (品切れ中)');190 $classCategories[$productsClass1][$productsClass2]['name'] = $productsClass['classcategory_name2'] . ($stock_find_class ? '' : ' (品切れ中)'); 191 191 192 192 $classCategories[$productsClass1][$productsClass2]['stock_find'] = $stock_find_class; … … 197 197 198 198 if (!in_array($classcat_id1, $classCats1)) { 199 $classCats1[$productsClass1] = $productsClass[' name1']199 $classCats1[$productsClass1] = $productsClass['classcategory_name1'] 200 200 . ($productsClass2 == 0 && !$stock_find_class ? ' (品切れ中)' : ''); 201 201 } … … 258 258 T2.classcategory_id, 259 259 T2.level, 260 T3.name ,260 T3.name AS classcategory_name, 261 261 T4.name AS class_name, 262 262 T4.class_id … … 290 290 T1.parent_class_combination_id, 291 291 T1.level, 292 T2.name ,292 T2.name AS classcategory_name, 293 293 T3.name AS class_name, 294 294 T3.class_id … … 325 325 $val['class_id' . $val['level']] = $val['class_id']; 326 326 $val['class_name' . $val['level']] = $val['class_name']; 327 $val[' name' . $val['level']] = $val['name'];327 $val['classcategory_name' . $val['level']] = $val['classcategory_name']; 328 328 $val['classcategory_id' . $val['level']] = $val['classcategory_id']; 329 329 $arrProductsClass[] = $val; … … 421 421 } 422 422 return $productsClass; 423 } 424 425 /** 426 * 商品詳細の結果から, 購入制限数を取得する. 427 * 428 * getDetailAndProductsClass() の結果から, 購入制限数を取得する. 429 * 430 * @param array $p 商品詳細の検索結果の配列 431 * @return integer 商品詳細の結果から求めた購入制限数. 432 * @see getDetailAndProductsClass() 433 */ 434 function getBuyLimit($p) { 435 $limit = null; 436 if ($p['stock_unlimited'] != '1' && is_numeric($p['sale_limit'])) { 437 $limit = min($p['sale_limit'], $p['stock']); 438 } elseif (is_numeric($p['sale_limit'])) { 439 $limit = $p['sale_limit']; 440 } elseif ($p['stock_unlimited'] != '1') { 441 $limit = $p['stock']; 442 } 443 return $limit; 423 444 } 424 445
Note: See TracChangeset
for help on using the changeset viewer.