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

v.2.15

Browse Source 
Добавлен журнал заказов
Добавлены отчеты: по переносам, по объединениям, по разбиениям
This commit is contained in:
miroman-afk
2022-06-13 13:16:50 +03:00
parent 2d148e3eb5
commit ebd1180d89
9 changed files with 605 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
commands/GETOrderHistory.php
View File

@@ -22,8 +22,9 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
$bill_count = 0;
$slice_trigger = 0;
$slice_order = 0;
$merged_order_items = $sliced_order_items = [];
$merged_order_items = $sliced_order_items = $moved_order_data = [];
$merge_trigger = 0;
$move_trigger = 0;
function data_decode($data) {
$alph = [
@@ -197,7 +198,6 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
->get();
foreach ($item_actions as $key => $item_action) {
if ($item_action['more']) {
$merge_trigger = 1;
$merge_items_before = $merge_items_after = $merge_items = $merge_order_item_before = $merge_order_item_after = $merged_items = [];
$merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
$merge_order_items_before = $merge_order_items['before']['items'];
@@ -242,15 +242,37 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
}
}
$merged_order_items[] = array('order' => $merge_order, 'time' => date('d.m.Y H:i:s', strtotime($item['time'])), 'staff' => $staff_name, 'items' => $merge_items);
$merge_trigger = 1;
}
}
}
if ($item['type_action'] == 39) {
$action_name = data_decode($item['value']);
$order_data = ShiftOnlineActions::where('order_code', $item['order_code'] + 0)
->where('type_action', 39)
->get();
foreach ($order_data as $key => $data) {
$staff_name = Staff::where('code', $data['who'])->where('is_history', 0)->first();
if ($staff_name) {
$staff_name = $staff_name['name'];
} else {
$staff_name = Staff::where('code', $data['who'])->where('is_history', 1)->first();
if ($staff_name) {
$staff_name = $staff_name['name'];
} else {
$staff_name = 'Связанный персонал не найден';
}
}
$moved_order_data[] = array('staff_name' => $staff_name, 'time' => date('d.m.Y H:i:s', strtotime($data['time'])), 'data' => data_decode($data['value']));
$move_trigger = 1;
}
}
if ($item['type_action'] == 46) {
$action_name = 'Изменено количество гостей: ' . $item['value'];
}
if ($item['type_action'] == 45 || $item['type_action'] == 39) {
if ($item['type_action'] == 45) {
$action_name = data_decode($item['value']);
}
@@ -262,8 +284,10 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
'bill' => $bill_count,
'slice_trigger' => $slice_trigger,
'merge_trigger' => $merge_trigger,
'move_trigger' => $move_trigger,
'sliced_order_items' => $sliced_order_items,
'merged_order_items' => $merged_order_items,
'moved_order_data' => $moved_order_data,
];
} else {
return [