Ignore:
Timestamp:
2010/02/01 15:34:04 (13 years ago)
Author:
nanasess
Message:

merged r18472

  • お届けに関わる語句に揺らぎ(#530)
Location:
branches/version-2_4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4

  • branches/version-2_4/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r18414 r18521  
    111111        $objSiteInfo = new SC_SiteInfo(); 
    112112        $objDb = new SC_Helper_DB_Ex(); 
     113        $objDate = new SC_Date(1901);  
     114          $this->arrYearDelivDate = $objDate->getYear('', date('Y'), '');  
     115            $this->arrMonthDelivDate = $objDate->getMonth(true);  
     116            $this->arrDayDelivDate = $objDate->getDay(true); 
    113117        $arrInfo = $objSiteInfo->data; 
    114118 
     
    283287        // 支払い方法の取得 
    284288        $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method"); 
    285         // 配送時間の取得 
     289        // お届け時間の取得 
    286290        $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id')); 
    287291        $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time'); 
     
    349353        $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    350354 
    351         // 配送先情報 
     355        // お届け先情報 
    352356        $this->objFormParam->addParam("お名前1", "deliv_name01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    353357        $this->objFormParam->addParam("お名前2", "deliv_name02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
     
    375379 
    376380        $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 
    377         $this->objFormParam->addParam("配送時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
     381        $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    378382        $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 
    379383        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
     384          $this->objFormParam->addParam("お届け日(年)", "deliv_date_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));  
     385            $this->objFormParam->addParam("お届け日(月)", "deliv_date_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));  
     386            $this->objFormParam->addParam("お届け日(日)", "deliv_date_day", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));  
    380387        $this->objFormParam->addParam("お支払方法名称", "payment_method"); 
    381         $this->objFormParam->addParam("配送時間", "deliv_time"); 
     388        $this->objFormParam->addParam("お届け時間", "deliv_time"); 
    382389 
    383390        // 受注詳細情報 
     
    406413        $this->objFormParam->addParam("受注日", "create_date"); 
    407414        $this->objFormParam->addParam("発送日", "commit_date"); 
     415        $this->objFormParam->addParam("お届け日", "deliv_date");  
    408416    } 
    409417 
     
    419427            $this->objFormParam->setValue('total_point', $total_point); 
    420428            $this->objFormParam->setValue('point', $point); 
     429            $delivDate = split(" ", $arrRet[0]["deliv_date"]);  
     430              $delivDate = split("-", $delivDate[0]);  
     431              $this->objFormParam->setValue('deliv_date_year', $delivDate[0]);  
     432              $this->objFormParam->setValue('deliv_date_month', isset($delivDate[1]) ? $delivDate[1] : "");  
     433              $this->objFormParam->setValue('deliv_date_day', isset($delivDate[2]) ? $delivDate[2] : ""); 
    421434            $this->arrForm = $arrRet[0]; 
     435 
    422436            // 受注詳細データの取得 
    423437            $arrRet = $this->lfGetOrderDetail($order_id); 
     
    456470        $objErr = new SC_CheckError($arrRet); 
    457471        $objErr->arrErr = $this->objFormParam->checkError(); 
     472 
     473        $objErr->doFunc(array("お届け日", "deliv_date_year", "deliv_date_month", "deliv_date_day"), array("CHECK_DATE")); 
     474 
     475        if (count($objErr->arrErr) >= 1) { 
     476            return $objErr->arrErr; 
     477        } 
    458478 
    459479        return $objErr->arrErr; 
     
    538558            } 
    539559        } 
     560        $sqlval['update_date'] = 'Now()'; 
     561 
     562        if (strlen($sqlval['deliv_date_year']) >= 0) { 
     563            $sqlval['deliv_date'] = $sqlval['deliv_date_year'] . '-' . $sqlval['deliv_date_month'] . '-' . $sqlval['deliv_date_day']; 
     564        } 
     565        unset($sqlval['deliv_date_year']); 
     566        unset($sqlval['deliv_date_month']); 
     567        unset($sqlval['deliv_date_day']); 
    540568 
    541569        unset($sqlval['total_point']); 
    542570        unset($sqlval['point']); 
     571        unset($sqlval['commit_date']); 
    543572 
    544573        $where = "order_id = ?"; 
Note: See TracChangeset for help on using the changeset viewer.