v.2.8
-Redused time for online sync -Fix dish name for TopDishes
This commit is contained in:
@@ -50,7 +50,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
|
||||
$baseTime = date_create($terminal_online['next_at']);
|
||||
$baseTime = date_format($baseTime, 'U');
|
||||
$old_date = date_create($terminal_online['next_at']);
|
||||
date_modify($old_date, '+1 hour');
|
||||
date_modify($old_date, '+30 minutes');
|
||||
$new_date = date_format($old_date, 'Y-m-d H:i:s');
|
||||
$newTime = $nowTime + ($terminal_online['period'] * 60);
|
||||
if ($newTime >= $baseTime) {
|
||||
|
||||
@@ -26,7 +26,14 @@ class TopDishes extends HRCCommand implements HRCCommandInterface {
|
||||
$onlineDishInfo = OnlineItems::where('menu_code', '=', $item['menu_code'])
|
||||
->where('dish_code', '=', $item['dish_code'])
|
||||
->first();
|
||||
$dishName = $dishInfo['name'];
|
||||
if ($dishInfo['name'] == '') {
|
||||
$dishHistInfo = Dishes::where('code', '=', $item['menu_code'])
|
||||
->where('legacy_code', '=', $item['dish_code'])
|
||||
->first();
|
||||
$dishName = $dishHistInfo['name'];
|
||||
} else {
|
||||
$dishName = $dishInfo['name'];
|
||||
}
|
||||
$dishCount = OnlineItems::where('menu_code', '=', $item['menu_code'])->sum('count');
|
||||
$dishSum = $onlineDishInfo['real_price'] * $dishCount;
|
||||
if ($dishSum > 0) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "hrc-admin/hello-world",
|
||||
"version": "2.7",
|
||||
"version": "2.8",
|
||||
"require": {
|
||||
"horeca/admin-php-module-core": "dev-master"
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[info]
|
||||
name=V1
|
||||
version=2.7
|
||||
version=2.8
|
||||
[build]
|
||||
version=2.7
|
||||
version=2.8
|
||||
|
||||
Reference in New Issue
Block a user