v.2.6
Small fix
This commit is contained in:
@@ -52,7 +52,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
|
||||
$old_date = date_create($terminal_online['next_at']);
|
||||
date_modify($old_date, '+1 hour');
|
||||
$new_date = date_format($old_date, 'Y-m-d H:i:s');
|
||||
if (($nowTime + 3600) >= $baseTime) {
|
||||
if (($nowTime + ($terminal_online['period']*60) >= $baseTime) {
|
||||
$new_terminal_online = TerminalUpdate::find($terminal_online['id']);
|
||||
$new_terminal_online->next_at = $new_date;
|
||||
$new_terminal_online->save();
|
||||
@@ -128,7 +128,11 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
|
||||
$shift_online_item->count_return = $exchange_item["count_return"];
|
||||
$shift_online_item->dish_code = $exchange_item["dishes_code"];
|
||||
$shift_online_item->menu_code = $exchange_item["menu_code"];
|
||||
$shift_online_item->modificator_code = $exchange_item["modificator_code"];
|
||||
if ($exchange_item["modificator_code"] > 0) {
|
||||
$shift_online_item->modificator_code = 1;
|
||||
} else {
|
||||
$shift_online_item->modificator_code = 0;
|
||||
}
|
||||
$shift_online_item->order_code = $exchange_item["order_code"];
|
||||
$shift_online_item->parent_id = $exchange_item["parent_id"];
|
||||
$shift_online_item->real_price = $exchange_item["real_price"];
|
||||
@@ -173,9 +177,10 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
|
||||
}
|
||||
$exc_time = time();
|
||||
$diff_time = $exc_time - $nowTime;
|
||||
$terminal_online = TerminalUpdate::where('method', 'online')->where('terminal_id', $exchange_shifts['terminal_id'])->first();
|
||||
return [
|
||||
'status' => 'success',
|
||||
'message' => 'Смена восстановлена за ' . $diff_time . ' сек',
|
||||
'message' => 'Данные автоматически синхронизируются с POS-системой ' . $terminal_online['next_at'],
|
||||
];
|
||||
} else {
|
||||
return [
|
||||
|
||||
Reference in New Issue
Block a user