Changeset 18516 for branches/version-2_4


Ignore:
Timestamp:
2010/02/01 12:16:42 (11 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18446
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

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/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.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
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100201031639-ti7ylim4f7vkh5mq
bzr:revno:
1887
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/class/helper/SC_Helper_DB.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18416
data/class/pages/products/LC_Page_Products_Detail.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18407
data/class/pages/products/LC_Page_Products_List.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18418
bzr:timestamp:
2010-02-01 12:16:39.414999962 +0900
bzr:user-agent:
bzr2.0.3+bzr-svn1.0.1
svn:original-date:
2010-02-01T03:16:39.415000Z
Message:

merged r18465

  • SALE_LIMIT_MAX が無視されている(#545)
Location:
branches/version-2_4/data/class
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/class/helper/SC_Helper_DB.php

    r18416 r18516  
    315315                        $limit = $arrData['sale_limit']; 
    316316                    } else { 
    317                         $limit = $arrData['stock']; 
     317                        // 購入制限数を在庫数に 
     318                        #$limit = $arrData['stock']; 
     319                        // 購入制限数をSALE_LIMIT_MAXに 
     320                        $limit = SALE_LIMIT_MAX; 
    318321                    } 
    319322                } else { 
     
    322325                    } 
    323326                    if ($arrData['stock_unlimited'] != '1') { 
    324                         $limit = $arrData['stock']; 
     327                        // 購入制限数を在庫数に 
     328                        #$limit = $arrData['stock']; 
     329                        // 購入制限数をSALE_LIMIT_MAXに 
     330                        $limit = SALE_LIMIT_MAX; 
    325331                    } 
    326332                } 
  • branches/version-2_4/data/class/pages/products/LC_Page_Products_Detail.php

    r18407 r18516  
    222222        $this->arrProductCode = $arrProductCode["product_code"]; 
    223223 
    224         // 購入制限数を取得 
    225         if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) { 
    226           $this->tpl_sale_limit = SALE_LIMIT_MAX; 
    227         } else { 
    228           $this->tpl_sale_limit = $this->arrProduct['sale_limit']; 
    229         } 
    230224        // サブタイトルを取得 
    231225        $arrCategory_id = $objDb->sfGetCategoryId($arrRet[0]['product_id'],'',$status); 
     
    445439        $arrProductCode = SC_Utils_Ex::sfswaparray($arrProductCode); 
    446440        $this->arrProductCode = $arrProductCode["product_code"]; 
    447  
    448         // 購入制限数を取得 
    449         if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) { 
    450             $this->tpl_sale_limit = SALE_LIMIT_MAX; 
    451         } else { 
    452             $this->tpl_sale_limit = $this->arrProduct['sale_limit']; 
    453         } 
    454441 
    455442        // サブタイトルを取得 
  • branches/version-2_4/data/class/pages/products/LC_Page_Products_List.php

    r18418 r18516  
    542542            for($i = 0; $i < count($this->arrProducts); $i++) { 
    543543                $this->lfMakeSelect($this->arrProducts[$i]['product_id'], $arrClassName, $arrClassCatName); 
    544                 // 購入制限数を取得 
    545                 $this->lfGetSaleLimit($this->arrProducts[$i]); 
    546544            } 
    547545        } 
     
    716714    } 
    717715 
    718     // 購入制限数の設定 
    719     function lfGetSaleLimit($product) { 
    720         //在庫が無限または購入制限値が設定値より大きい場合 
    721         if($product['sale_unlimited'] == 1 || $product['sale_limit'] > SALE_LIMIT_MAX) { 
    722             $this->tpl_sale_limit[$product['product_id']] = SALE_LIMIT_MAX; 
    723         } else { 
    724             $this->tpl_sale_limit[$product['product_id']] = $product['sale_limit']; 
    725         } 
    726     } 
    727  
    728716    //支払方法の取得 
    729717    //payment_id    1:代金引換 2:銀行振り込み 3:現金書留 
Note: See TracChangeset for help on using the changeset viewer.