sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #2190 - restaurant_hour_override overides ALL restaurants

Browse Source
This commit is contained in:
Daniel Camargo 2013-11-29 11:44:40 -02:00
parent 9bbf68d98f
commit 06ae4ce26f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/library/Crunchbutton/Restaurant.php
View File

@ -1429,7 +1429,7 @@ class Crunchbutton_Restaurant extends Cana_Table_Trackchange {
foreach( $overrides as $override ){
$monday = new DateTime( date('Y-m-d H:i:s', strtotime('monday this week') ), new DateTimeZone( $this->timezone ) );
$monday = new DateTime( date( 'Y-m-d H:i:s', strtotime( 'monday this week' ) ), new DateTimeZone( $this->timezone ) );
$date_start = new DateTime( $override->date_start, new DateTimeZone( $this->timezone ) );
// Limit the override to this week
if( $date_start < $monday ){
@ -1449,7 +1449,7 @@ class Crunchbutton_Restaurant extends Cana_Table_Trackchange {
$hour_close = ( $dayshours + intval( $date_end->format( 'H' ) ) * 100 ) + intval( $date_end->format( 'i' ) );
if( $override->type == Crunchbutton_Restaurant_Hour_Override::TYPE_CLOSED ){
$hoursStartFinishOverrideClose[] = [ 'start' => $hour_open, 'end' => $hour_close ];
$hoursStartFinishOverrideClose[] = [ 'start' => $hour_open, 'end' => $hour_close, '_start' => $date_start->format( 'Y-m-d H:i:s' ), '_data_end' => $date_end->format( 'Y-m-d H:i:s' ) ];
} else if( $override->type == 'open' ){
// Merge the override open hours at the open/close array
$hoursStartFinish[] = [ 'open' => $hour_open, 'close' => $hour_close ];
@ -1477,6 +1477,8 @@ class Crunchbutton_Restaurant extends Cana_Table_Trackchange {
}
}
// nao está pegando o fechamento de sexta as 17h!
foreach( $hoursStartFinishOverrideClose as $keyClose => $valClose ){
foreach( $hoursStartFinish as $keyOpen => $valOpen ){
// the close override is between a segment
@ -1485,20 +1487,28 @@ class Crunchbutton_Restaurant extends Cana_Table_Trackchange {
$hoursStartFinish[] = [ 'open' => $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ], 'close' => $hoursStartFinish[ $keyOpen ][ 'close' ] ];
$hoursStartFinish[ $keyOpen ][ 'close' ] = $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ];
} else
// the close override start after the segment but ends before it
// the close override starts after the segment but ends before it
if( $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ] <= $hoursStartFinish[ $keyOpen ][ 'open' ]
&& $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ] > $hoursStartFinish[ $keyOpen ][ 'open' ]
&& $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ] > $hoursStartFinish[ $keyOpen ][ 'close' ] ){
unset( $hoursStartFinish[ $keyOpen ] );
} else
// the close override starts before the regular hour and ends after it
if( $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ] <= $hoursStartFinish[ $keyOpen ][ 'open' ]
&& $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ] > $hoursStartFinish[ $keyOpen ][ 'open' ] ){
$hoursStartFinish[ $keyOpen ][ 'open' ] = $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ];
} else
// the close override starts after the regular hour and ends after it
if( $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ] >= $hoursStartFinish[ $keyOpen ][ 'open' ]
&& $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ] < $hoursStartFinish[ $keyOpen ][ 'close' ]
&& $hoursStartFinishOverrideClose[ $keyClose ][ 'end' ] > $hoursStartFinish[ $keyOpen ][ 'close' ] ){
$hoursStartFinish[ $keyOpen ][ 'close' ] = $hoursStartFinishOverrideClose[ $keyClose ][ 'start' ];
}
}
}
$hoursStartFinish = Cana_Util::sort_col( $hoursStartFinish, 'open' );
foreach( $hoursStartFinish as $key => $val ){
$getNext = false;
foreach( $hoursStartFinish as $keyNext => $valNext ){

6
include/library/Crunchbutton/Restaurant/Hour/Override.php
View File

@ -42,7 +42,7 @@ class Crunchbutton_Restaurant_Hour_Override extends Cana_Table {
$today = new DateTime( 'now', new DateTimeZone( $restaurant->timezone ) );
$today_mysql = $today->format('Y-m-d H:i');
$type_closed = Crunchbutton_Restaurant_Hour_Override::TYPE_CLOSED;
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' and date_end >= '{$today_mysql}' AND type = '{$type_closed}' LIMIT 1" );
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' AND date_end >= '{$today_mysql}' AND type = '{$type_closed}' AND id_restaurant = {$id_restaurant} LIMIT 1" );
if( $overrides->count() > 0 ){
return true;
}
@ -54,7 +54,7 @@ class Crunchbutton_Restaurant_Hour_Override extends Cana_Table {
$today = new DateTime( 'now', new DateTimeZone( $restaurant->timezone ) );
$today_mysql = $today->format('Y-m-d H:i');
$type_opened = Crunchbutton_Restaurant_Hour_Override::TYPE_OPENED;
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' and date_end >= '{$today_mysql}' AND type = '{$type_opened}' LIMIT 1" );
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' and date_end >= '{$today_mysql}' AND type = '{$type_opened}' AND id_restaurant = {$id_restaurant} LIMIT 1" );
if( $overrides->count() > 0 ){
return true;
}
@ -65,7 +65,7 @@ class Crunchbutton_Restaurant_Hour_Override extends Cana_Table {
$restaurant = Restaurant::o( $id_restaurant );
$today = new DateTime( 'now', new DateTimeZone( $restaurant->timezone ) );
$today_mysql = $today->format('Y-m-d H:i');
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' and date_end >= '{$today_mysql}'" );
$overrides = Crunchbutton_Restaurant_Hour_Override::q( "SELECT * FROM restaurant_hour_override WHERE date_start <= '{$today_mysql}' and date_end >= '{$today_mysql}' AND id_restaurant = {$id_restaurant} " );
if( $overrides->count() > 0 ){
foreach( $overrides as $override ){
if( $override->type == Crunchbutton_Restaurant_Hour_Override::TYPE_CLOSED ){