horeca/admin-php-module
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v.2.8

Browse Source 
-Redused time for online sync
-Fix dish name for TopDishes
This commit is contained in:
miroman-afk
2022-01-26 20:56:40 +03:00
parent 3894932e4c
commit 284d2bcb60
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands/POSTRestoreShift.php
View File

@@ -50,7 +50,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
$baseTime = date_create($terminal_online['next_at']); $baseTime = date_create($terminal_online['next_at']);
$baseTime = date_format($baseTime, 'U'); $baseTime = date_format($baseTime, 'U');
$old_date = date_create($terminal_online['next_at']); $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'); $new_date = date_format($old_date, 'Y-m-d H:i:s');
$newTime = $nowTime + ($terminal_online['period'] * 60); $newTime = $nowTime + ($terminal_online['period'] * 60);
if ($newTime >= $baseTime) { if ($newTime >= $baseTime) {

9
commands/TopDishes.php
View File

@@ -26,7 +26,14 @@ class TopDishes extends HRCCommand implements HRCCommandInterface {
$onlineDishInfo = OnlineItems::where('menu_code', '=', $item['menu_code']) $onlineDishInfo = OnlineItems::where('menu_code', '=', $item['menu_code'])
->where('dish_code', '=', $item['dish_code']) ->where('dish_code', '=', $item['dish_code'])
->first(); ->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'); $dishCount = OnlineItems::where('menu_code', '=', $item['menu_code'])->sum('count');
$dishSum = $onlineDishInfo['real_price'] * $dishCount; $dishSum = $onlineDishInfo['real_price'] * $dishCount;
if ($dishSum > 0) { if ($dishSum > 0) {

2
composer.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "hrc-admin/hello-world", "name": "hrc-admin/hello-world",
"version": "2.7", "version": "2.8",
"require": { "require": {
"horeca/admin-php-module-core": "dev-master" "horeca/admin-php-module-core": "dev-master"
}, },

4
module.ini
View File

@@ -1,5 +1,5 @@
[info] [info]
name=V1 name=V1
version=2.7 version=2.8
[build] [build]
version=2.7 version=2.8