Changeset 21407


Ignore:
Timestamp:
2012/01/17 16:23:21 (9 years ago)
Author:
Seasoft
Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21340 #1556
r21339 #1451

Location:
branches/version-2_11-dev/data/class
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/SC_CartSession.php

    r21405 r21407  
    550550                        $this->setProductValue($item['id'], 'quantity', $limit, $productTypeId); 
    551551                        $this->setProductValue($item['id'], 'total_inctax', SC_Helper_DB_Ex::sfCalcIncTax($item['price']) * $limit, $productTypeId); 
    552                         $tpl_message .= "※「" . $product['name'] . "」は販売制限(または在庫が不足)しております。一度に数量{$limit}を超える購入はできません。\n"; 
     552                        $tpl_message .= "※「" . $product['name'] . "」は販売制限(または在庫が不足)しております。一度に数量{$limit}以上の購入はできません。\n"; 
    553553                    } else { 
    554554                        $this->delProduct($item['cart_no'], $productTypeId); 
  • branches/version-2_11-dev/data/class/SC_CustomerList.php

    r21339 r21407  
    289289        if (!isset($this->arrSql['search_buy_product_code'])) $this->arrSql['search_buy_product_code'] = ""; 
    290290        if ( strlen($this->arrSql['search_buy_product_code']) > 0 ) { 
    291             $this->setWhere( "customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_code LIKE ? ) AND del_flg = 0)"); 
     291            $this->setWhere( "customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_code LIKE ? ))"); 
    292292            $search_buyproduct_code = $this->addSearchStr($this->arrSql['search_buy_product_code']); 
    293293            $this->arrVal[] = $search_buyproduct_code; 
     
    297297        if (!isset($this->arrSql['search_buy_product_name'])) $this->arrSql['search_buy_product_name'] = ""; 
    298298        if ( strlen($this->arrSql['search_buy_product_name']) > 0 ) { 
    299             $this->setWhere( "customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_name LIKE ? ) AND del_flg = 0)"); 
     299            $this->setWhere( "customer_id IN (SELECT customer_id FROM dtb_order WHERE order_id IN (SELECT order_id FROM dtb_order_detail WHERE product_name LIKE ? ))"); 
    300300            $search_buyproduct_name = $this->addSearchStr($this->arrSql['search_buy_product_name']); 
    301301            $this->arrVal[] = $search_buyproduct_name; 
     
    310310            // カテゴリで絞込みが可能の場合 
    311311            if($tmp_where != "") { 
    312                 $this->setWhere( " customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE ".$tmp_where." ) AND del_flg = 0)) "); 
     312                $this->setWhere( " customer_id IN (SELECT distinct customer_id FROM dtb_order WHERE order_id IN (SELECT distinct order_id FROM dtb_order_detail WHERE product_id IN (SELECT product_id FROM dtb_product_categories WHERE ".$tmp_where." ))) "); 
    313313                $this->arrVal = array_merge((array)$this->arrVal, (array)$tmp_arrval); 
    314314            } 
Note: See TracChangeset for help on using the changeset viewer.