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

Holiday feature broken--can't add a new time #2715

Browse Source
This commit is contained in:
Daniel Camargo 2014-04-22 16:45:15 -03:00
parent 1c45f0fa4e
commit e4457eba4f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/controllers/default/cockpit/api/houroverride.php
View File

@ -48,7 +48,7 @@ class Controller_api_houroverride extends Crunchbutton_Controller_RestAccount {
$date_start_hr = $date_start_hour[ 0 ]; $date_start_hr = $date_start_hour[ 0 ];
$date_start_mn = $date_start_hour[ 1 ]; $date_start_mn = $date_start_hour[ 1 ];
$hour_override_date_start_ampm = $this->request()[ 'hour_override_date_start_ampm' ]; $hour_override_date_start_ampm = $this->request()[ 'hour_override_date_start_ampm' ];
if( $hour_override_date_start_ampm == 'PM' ){ if( $hour_override_date_start_ampm == 'PM' && $date_start_hr < 12 ){
$date_start_hr = $date_start_hr + 12; $date_start_hr = $date_start_hr + 12;
} }
@ -61,7 +61,7 @@ class Controller_api_houroverride extends Crunchbutton_Controller_RestAccount {
$date_end_hr = $date_end_hour[ 0 ]; $date_end_hr = $date_end_hour[ 0 ];
$date_end_mn = $date_end_hour[ 1 ]; $date_end_mn = $date_end_hour[ 1 ];
$hour_override_date_end_ampm = $this->request()[ 'hour_override_date_end_ampm' ]; $hour_override_date_end_ampm = $this->request()[ 'hour_override_date_end_ampm' ];
if( $hour_override_date_end_ampm == 'PM' ){ if( $hour_override_date_end_ampm == 'PM' && $date_end_hr < 12 ){
$date_end_hr = $date_end_hr + 12; $date_end_hr = $date_end_hr + 12;
} }

3
include/views/default/cockpit/restaurants/hour_override.phtml
View File

@ -162,5 +162,4 @@ if( $date_end ){
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>