Time Interval Update

system/logic/account_edit/model.php

@@ -2475,7 +2475,7 @@ class AccountEditModelClass extends ModelClassEx {
 		$user2 = $this -> userLink;
 
 		foreach($user2 as $value){
-			$insertValues .=  '((\')' . $this -> detailAccount .'(\'), (\')' . $value . '(\'), NOW() + INTERVAL 16 HOUR), ';
+			$insertValues .=  '((\')' . $this -> detailAccount .'(\'), (\')' . $value . '(\'), CONVERT_TZ(NOW(),@@session.time_zone,(\')+09:00(\'))), ';
 		}
 
 		$rtn[] = rtrim($insertValues,', ');

system/logic/exchange_rate/model.php

@@ -112,16 +112,16 @@ class ExchangeRateModelClass extends ModelClassEx {
 
 		// 登録時刻（開始日）（検索項目）
 		if($this -> sFrom != NO_STRING) {
-			$rtn[] = ' a.create_time >= (\')' . $this -> sFrom . '(\')';
+			$rtn[] = ' a.create_time >= (\')'. $this -> sFrom .'(\')';
 		}else{
-			$rtn[] = ' a.create_time > DATE_ADD(NOW() + INTERVAL 16 HOUR, INTERVAL -30 DAY)';
+			$rtn[] = ' a.create_time > DATE_ADD(CONVERT_TZ(NOW(),@@session.time_zone,(\')+09:00(\')), INTERVAL -30 DAY)';
 		}
 
 		// 登録時刻（終了）（検索項目）
 		if($this -> sTo != NO_STRING) {
-			$rtn[] = ' a.create_time < DATE_ADD((\')' . $this -> sTo . '(\'), INTERVAL 1 DAY)';
+			$rtn[] = ' a.create_time < DATE_ADD((\')'.$this -> sTo.'(\'), INTERVAL 1 DAY)';
 		}else{
-			$rtn[] = ' a.create_time <= NOW() + INTERVAL 16 HOUR';
+			$rtn[] = ' a.create_time <= CONVERT_TZ(NOW(),@@session.time_zone,(\')+09:00(\'))';
 		}
 
 		// ページ数

system/logic/mst_exchange_fee/model.php

@@ -317,7 +317,7 @@ class MstExchangeFeeModelClass extends ModelClassEx {
 						$whole	= floatval($this -> getPosParameter('whole' . DELIMIT_UNDER_BAR . $from . DELIMIT_UNDER_BAR . $to));
 						$markup	= floatval($this -> getPosParameter('markup' . DELIMIT_UNDER_BAR . $from . DELIMIT_UNDER_BAR . $to));
 
-						$rtn[] = '((\')' . $pId . '(\'), (\')' . $this -> patternName . '(\'), (\')' . $from . '(\'), (\')' . $to . '(\'), (\')' . $this -> currencyToInt($whole, PERCENT) . '(\'), (\')' . $this -> currencyToInt($markup, PERCENT) . '(\'),  NOW() + INTERVAL 16 HOUR, (\')'. $this -> getAdminUserData(PARAM_FIRST_NAME) .' '. $this -> getAdminUserData(PARAM_LAST_NAME) .'(\'))';
+						$rtn[] = '((\')' . $pId . '(\'), (\')' . $this -> patternName . '(\'), (\')' . $from . '(\'), (\')' . $to . '(\'), (\')' . $this -> currencyToInt($whole, PERCENT) . '(\'), (\')' . $this -> currencyToInt($markup, PERCENT) . '(\'),  CONVERT_TZ(NOW(),@@session.time_zone,(\')+09:00(\')), (\')'. $this -> getAdminUserData(PARAM_FIRST_NAME) .' '. $this -> getAdminUserData(PARAM_LAST_NAME) .'(\'))';
 						
 					}
 				}

system/logic/transfer/model.php

@@ -4,9 +4,8 @@ class TransferModelClass extends ModelClassEx {
 	/*-------------------------------------------------------------------------
 	* @ メンバ変数
 	-------------------------------------------------------------------------*/
-	// private $fromTotal				= array();		// 結果セット（集計）
-	// private $toTotal				= array();		// 結果セット（集計）
-	private $fromToTotal				= array();		// 結果セット（集計）
+	private $fromTotal				= array();		// 結果セット（集計）
+	private $toTotal				= array();		// 結果セット（集計）
 	private $rs					= null;			// 結果セット
 	private $tId				= NO_COUNT;		// トランザクションID
 	private $from				= NO_STRING;	// 送金元口座番号
@@ -596,26 +595,14 @@ class TransferModelClass extends ModelClassEx {
 		$amount		= NO_STRING;
 
 		// データを入れ替える
-		// if($this -> isLoopData($this -> fromTotal)) {
-		// 	foreach($this -> fromTotal as $row) {
-		// 		$listsFrom[$this -> getColumnData($row, COLUMN_CURRENCY)] = $row;
-		// 	}
-		// }
-
-		// if($this -> isLoopData($this -> toTotal)) {
-		// 	foreach($this -> toTotal as $row) {
-		// 		$listsTo[$this -> getColumnData($row, COLUMN_CURRENCY)] = $row;
-		// 	}
-		// }
-
-		if($this -> isLoopData($this -> fromToTotal)) {
-			foreach($this -> fromToTotal as $row) {
+		if($this -> isLoopData($this -> fromTotal)) {
+			foreach($this -> fromTotal as $row) {
 				$listsFrom[$this -> getColumnData($row, COLUMN_CURRENCY)] = $row;
 			}
 		}
 
-		if($this -> isLoopData($this -> fromToTotal)) {
-			foreach($this -> fromToTotal as $row) {
+		if($this -> isLoopData($this -> toTotal)) {
+			foreach($this -> toTotal as $row) {
 				$listsTo[$this -> getColumnData($row, COLUMN_CURRENCY)] = $row;
 			}
 		}
@@ -814,7 +801,7 @@ class TransferModelClass extends ModelClassEx {
 			$rtnParams[] = ' transfer.process_status IN (' . implode(DELIMIT_COMMA, $this -> sProcessType) . ') ';
 		}
 
-		$rtnParams[] = ' NOW() + INTERVAL 16 HOUR > transfer.create_time';
+		$rtnParams[] = ' CONVERT_TZ(NOW(),@@session.time_zone,(\')+09:00(\')) > transfer.create_time';
 		
 		// 検索条件の結合
 		if(count($rtnParams) > NO_COUNT) {
@@ -1334,16 +1321,12 @@ class TransferModelClass extends ModelClassEx {
 		$this -> totalCount	= $listCount;
 	}
 
-	// public function setTotalFrom($rs) {
-	// 	$this -> fromTotal = $rs;
-	// }
-
-	// public function setTotalTo($rs) {
-	// 	$this -> toTotal = $rs;
-	// }
+	public function setTotalFrom($rs) {
+		$this -> fromTotal = $rs;
+	}
 
-	public function setTotalFromTo($rs) {
-		$this -> fromToTotal = $rs;
+	public function setTotalTo($rs) {
+		$this -> toTotal = $rs;
 	}
 
 	/*-------------------------------------------------------------------------