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

partial #4866

Browse Source
This commit is contained in:
Pererinha 2015-02-26 16:24:26 -03:00
parent a6661b7654
commit 5a553d379d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/library/Crunchbutton/Community/Shift.php
View File

@ -954,14 +954,14 @@ class Crunchbutton_Community_Shift extends Cana_Table {
if( $community->id_community ){ if( $community->id_community ){
$now = new DateTime( 'now', new DateTimeZone( $community->timezone ) ); $now = new DateTime( 'now', new DateTimeZone( $community->timezone ) );
$now->modify( '- 2 hours' ); $now->modify( '+ 15 min' );
$from = $now->format( 'Y-m-d' ); $from = $now->format( 'Y-m-d H:i' );
$now->modify( '+ 7 days' ); $now->modify( '+ 7 days' );
$to = $now->format( 'Y-m-d' ); $to = $now->format( 'Y-m-d H:i' );
$query = 'SELECT DISTINCT( cs.id_community_shift ) AS id, cs.* FROM admin_shift_assign asa $query = 'SELECT DISTINCT( cs.id_community_shift ) AS id, cs.* FROM admin_shift_assign asa
INNER JOIN community_shift cs ON cs.id_community_shift = asa.id_community_shift INNER JOIN community_shift cs ON cs.id_community_shift = asa.id_community_shift
WHERE DATE_FORMAT( cs.date_start, "%Y-%m-%d" ) >= "' . $from . '" AND DATE_FORMAT( cs.date_start, "%Y-%m-%d" ) <= "' . $to . '" AND cs.id_community = "' . $community->id_community . '"'; WHERE DATE_FORMAT( cs.date_start, "%Y-%m-%d %H:%i" ) >= "' . $from . '" AND DATE_FORMAT( cs.date_start, "%Y-%m-%d %H:%i" ) <= "' . $to . '" AND cs.id_community = "' . $community->id_community . '"';
$nextShifts = Crunchbutton_Community_Shift::q( $query ); $nextShifts = Crunchbutton_Community_Shift::q( $query );

1
include/library/Crunchbutton/Hour.php
View File

@ -209,6 +209,7 @@ class Crunchbutton_Hour extends Cana_Table_Trackchange {
// If the restaurant is 3rd party delivery and the community is auto close // If the restaurant is 3rd party delivery and the community is auto close
// due to it has no driver get the commuinity shift hours // due to it has no driver get the commuinity shift hours
// added a config key if we need to disable it on live // added a config key if we need to disable it on live
if( $restaurant->delivery_service && if( $restaurant->delivery_service &&
$restaurant->isCommunityAutoClosed() && $restaurant->isCommunityAutoClosed() &&
intval( Crunchbutton_Config::getVal( 'auto_close_use_community_hours' ) ) ){ intval( Crunchbutton_Config::getVal( 'auto_close_use_community_hours' ) ) ){