Changeset 17568


Ignore:
Timestamp:
2008/08/28 09:33:38 (13 years ago)
Author:
Seasoft
Message:

merge 17212,17213,17214,17216,17218,17219,17220

Location:
branches/comu-ver2/data/class
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/class/SC_CustomerList.php

    r17425 r17568  
    392392                dtb_customer.tel03, 
    393393                dtb_customer.pref, 
     394                dtb_customer.create_date, 
    394395                dtb_customer.mailmaga_flg"; 
    395396 
  • branches/comu-ver2/data/class/SC_SendMail.php

    r17484 r17568  
    112112    function setSubject($subject) { 
    113113        $this->subject = mb_encode_mimeheader($subject, "JIS", 'B', "\n"); 
     114        $this->subject = str_replace("\x0D\x0A", "\n", $this->subject); 
     115        $this->subject = str_replace("\x0D", "\n", $this->subject); 
     116        $this->subject = str_replace("\x0A", "\n", $this->subject); 
    114117    } 
    115118 
  • branches/comu-ver2/data/class/helper/SC_Helper_CSV.php

    r17294 r17568  
    236236            switch($key) { 
    237237            case 'order_pref': 
     238            case 'deliv_pref': 
    238239                $tmp = $this->arrPref[$val]; 
    239240                break; 
  • branches/comu-ver2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

    r17369 r17568  
    310310                    //- 都道府県/職業の変換 
    311311                    for($i = 0; $i < count($this->search_data); $i ++) { 
    312                         $this->search_data[$i]["pref"] = $arrPref[ $this->search_data[$i]["pref"] ]; 
    313                         $this->search_data[$i]["job"]  = $arrJob[ $this->search_data[$i]["job"] ]; 
     312                        $this->search_data[$i]["pref"] = $this->arrPref[ $this->search_data[$i]["pref"] ]; 
     313                        $this->search_data[$i]["job"]  = $this->arrJob[ $this->search_data[$i]["job"] ]; 
    314314                    } 
    315315 
  • branches/comu-ver2/data/class/pages/admin/total/LC_Page_Admin_Total.php

    • Property svn:mime-type set to text/x-httpd-php; charset=UTF-8
    r17546 r17568  
    638638 
    639639        // 会員集計の取得 
    640         $col = "COUNT(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average, order_sex"; 
     640        $col = "COUNT(*) AS order_count, SUM(total) AS total, trunc(AVG(total)) AS total_average, order_sex"; 
    641641        $from = "dtb_order"; 
    642642        $objQuery = new SC_Query(); 
     
    704704    /** 職業別集計 **/ 
    705705    function lfGetOrderJob($type, $sdate, $edate, &$objPage, $graph = true) { 
    706         global $arrJob; 
    707  
    708706        list($where, $arrval) = $this->lfGetWhereMember('T2.create_date', $sdate, $edate, $type); 
    709707 
    710         $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average "; 
     708        $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, trunc(AVG(total)) AS total_average "; 
    711709        $sql.= "FROM dtb_customer AS T1 LEFT JOIN dtb_order AS T2 USING ( customer_id ) WHERE $where AND T2.del_flg = 0 and T2.status <> " . ORDER_CANCEL; 
    712710        $sql.= " GROUP BY job ORDER BY total DESC"; 
  • branches/comu-ver2/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php

    r17137 r17568  
    9191            if(count($arrErr) == 0) { 
    9292                if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) { 
    93                     $this->sendRedirect($this->getLocation($_POST['url'], array(), false)); 
     93                    $this->sendRedirect($this->getLocation(URL_DIR, array(), false)); 
    9494                    exit; 
    9595                } else { 
     
    119119                $this->sendRedirect($this->getLocation(URL_DIR . "mypage/login.php", array(), false)); 
    120120            }else{ 
    121                 $this->sendRedirect($this->getLocation($_POST['url'], array(), false)); 
     121                $this->sendRedirect($this->getLocation(URL_DIR, array(), false)); 
    122122            } 
    123123            exit; 
Note: See TracChangeset for help on using the changeset viewer.