Merge branch 'refs/heads/master' into Settlement
This commit is contained in:
commit
8f198b57e4
@ -207,9 +207,9 @@ class Controller_api_settlement extends Crunchbutton_Controller_RestAccount {
|
|||||||
|
|
||||||
private function _range(){
|
private function _range(){
|
||||||
$now = new DateTime( 'now', new DateTimeZone( c::config()->timezone ) );
|
$now = new DateTime( 'now', new DateTimeZone( c::config()->timezone ) );
|
||||||
$range = [ 'end' => '2014,05,10' /*$now->format( 'Y,m,d' ) */ ];
|
$range = [ 'end' => $now->format( 'Y,m,d' ) ];
|
||||||
$now->modify( '-1 week' );
|
$now->modify( '-1 week' );
|
||||||
$range[ 'start' ] = '2014,05,04' /*$now->format( 'Y,m,d' )*/;
|
$range[ 'start' ] = $now->format( 'Y,m,d' );
|
||||||
echo json_encode( $range );
|
echo json_encode( $range );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user