v.2.30
Добавлен расширенный отчет по реализации Добавлен монитор активности
This commit is contained in:
@@ -3,7 +3,12 @@
|
||||
namespace App\Commands;
|
||||
|
||||
use App\Component\Models\ActionTypes;
|
||||
use App\Component\Models\Base;
|
||||
use App\Component\Models\Dishes;
|
||||
use App\Component\Models\ExchangeActions;
|
||||
use App\Component\Models\ExchangeDeleted;
|
||||
use App\Component\Models\ExchangeItems;
|
||||
use App\Component\Models\ExchangeOrders;
|
||||
use App\Component\Models\ShiftOnlineActions;
|
||||
use App\Component\Models\ShiftOnlineDeleted;
|
||||
use App\Component\Models\ShiftOnlineItems;
|
||||
@@ -20,6 +25,244 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
public function command($input, $output = null) {
|
||||
|
||||
if (isset($input['order_id'])) {
|
||||
|
||||
if (isset($input['opened']) && isset($input['closed'])) {
|
||||
$order_find = ExchangeOrders::where('opened', urldecode($input['opened']))
|
||||
->where('closed', urldecode($input['closed']))
|
||||
->where('code', $input['order_id'])
|
||||
->first();
|
||||
$shift_id = $order_find['shift_id'];
|
||||
$bill_count = 0;
|
||||
$slice_trigger = 0;
|
||||
$slice_order = 0;
|
||||
$merged_order_items = $sliced_order_items = $moved_order_data = [];
|
||||
$merge_trigger = 0;
|
||||
$move_trigger = 0;
|
||||
|
||||
$order_info = [];
|
||||
$order = ExchangeActions::where('order_code', $input['order_id'])
|
||||
->where('shift_id', $shift_id)
|
||||
->orderBy('time', 'asc')
|
||||
->get();
|
||||
foreach ($order as $key => $item) {
|
||||
$action_type = ActionTypes::where('type_id', $item['action_type'])->first();
|
||||
$action_name = $action_type['name'];
|
||||
$staff_name = Staff::getName($item['who']);
|
||||
|
||||
if ($item['action_type'] == 1) {
|
||||
$action_name = 'Заказ создан';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 2) {
|
||||
$shiftOnlineItem = ExchangeItems::where('order_code', $item['order_code'])
|
||||
->where('shift_id', $shift_id)
|
||||
->where('dishes_code', $item['more'])
|
||||
->first();
|
||||
$unitsList = UnitsList::where('id', $shiftOnlineItem['units_code'])->first();
|
||||
$units = Units::where('id', $unitsList['unit_id'])->first();
|
||||
if ($units) {
|
||||
$unit_name = $units['name'];
|
||||
} else {
|
||||
$unit_name = 'шт';
|
||||
}
|
||||
$dish = Dishes::getName($item['more']);
|
||||
$action_name = $action_name . ': ' . $dish . ' в количестве ' . $item['value'] . ' ' . $unit_name;
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 5) {
|
||||
$shiftOnlineDeletedItem = ExchangeDeleted::where('order_code', $item['order_code'])
|
||||
->where('shift_id', $shift_id)
|
||||
->where('item_id', $item['order_position'])
|
||||
->first();
|
||||
$unitsList = UnitsList::where('id', $shiftOnlineDeletedItem['units_id'])->first();
|
||||
$units = Units::where('id', $unitsList['unit_id'])->first();
|
||||
if ($units) {
|
||||
$unit_name = $units['name'];
|
||||
} else {
|
||||
$unit_name = 'шт';
|
||||
}
|
||||
|
||||
$dish = Dishes::getName($shiftOnlineDeletedItem['dishes_code']);
|
||||
$action_name = $action_name . ': ' . $dish . ' в количестве ' . $item['value'] . ' ' . $unit_name;
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 11) {
|
||||
$action_name = 'Назначен гость: ' . Base::data_decode($item['value']);
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 12) {
|
||||
$action_name = 'Гость отменен: ' . Base::data_decode($item['value']);
|
||||
}
|
||||
if ($item['action_type'] == 21) {
|
||||
$item_more = Base::data_decode($item['more']);
|
||||
$item_value = Base::data_decode($item['value']);
|
||||
if ($item_more == 'предчек' && $item_value != 'HRC Pay Box') {
|
||||
$action_name = 'Распечатан предчек';
|
||||
$bill_count = $bill_count + 1;
|
||||
} elseif ($item_more == 'счет') {
|
||||
$action_name = 'Распечатан окончательный счет';
|
||||
} elseif ($item_value == 'HRC Pay Box') {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 22) {
|
||||
$dish = Dishes::getName($item['order_position']);
|
||||
$action_name = 'Отменена позиции: ' . $dish . ' в количестве ' . $item['value'];
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 24) {
|
||||
$action_name = 'Оплачено наличными: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 25) {
|
||||
$action_name = 'Безналичный расчет: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 26) {
|
||||
$action_name = 'Оплачено кредитной картой: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 26) {
|
||||
$action_name = 'Оплачено кредитной картой: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 27) {
|
||||
$action_name = 'Питание штата: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 28) {
|
||||
$action_name = 'Зачтен аванс: ' . $item['value'] . ' BYN';
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 29 && $item['value'] > 0) {
|
||||
$action_name = 'Сдача: ' . $item['value'] . ' BYN';
|
||||
} elseif ($item['action_type'] == 29 && $item['value'] == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 35) {
|
||||
$action_name = $action_name . ': ' . $item['value'];
|
||||
$slice_items = [];
|
||||
if ($item['more']) {
|
||||
if (Base::validate_json($item['more'])) {
|
||||
$slice_order_items = json_decode(utf8_encode($item['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
} else {
|
||||
$slice_order_items = json_decode(utf8_encode(base64_decode($item['more'], TRUE)), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
}
|
||||
$slice_order_items = $slice_order_items['items'];
|
||||
$slice_order = $item['value'];
|
||||
foreach ($slice_order_items as $key => $slice_order_item) {
|
||||
$slice_items[] = array('id' => $key + 1, 'name' => $slice_order_item['name'], 'count' => $slice_order_item['count']);
|
||||
}
|
||||
$staff_name = Staff::getName($item['who']);
|
||||
$sliced_order_items[] = array('order' => $slice_order, 'time' => date('d.m.Y H:i:s', strtotime($item['time'])), 'staff' => $staff_name, 'items' => $slice_items);
|
||||
$slice_trigger = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 31) {
|
||||
$action_name = $action_name . ' c заказом: ' . $item['value'];
|
||||
$merge_order = $item['value'];
|
||||
$item_actions = ExchangeActions::where('order_code', $item['value'] + 0)
|
||||
->where('shift_id', $shift_id)
|
||||
->where('action_type', 32)
|
||||
->get();
|
||||
foreach ($item_actions as $key => $item_action) {
|
||||
if ($item_action['more'] != '') {
|
||||
$merge_items_before = $merge_items_after = $merge_items = $merge_order_item_before = $merge_order_item_after = $merged_items = [];
|
||||
if (Base::validate_json($item_action['more'])) {
|
||||
$merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
} else {
|
||||
$merge_order_items = json_decode(base64_decode($item_action['more']), true);
|
||||
}
|
||||
|
||||
$merge_order_items_before = $merge_order_items['before']['items'];
|
||||
$merge_order_items_after = $merge_order_items['after']['items'];
|
||||
|
||||
foreach ($merge_order_items_before as $key => $merge_order_item_before) {
|
||||
$merge_items_before[] = array('id' => $key + 1,
|
||||
'code' => $merge_order_item_before['id'],
|
||||
'name' => $merge_order_item_before['name'],
|
||||
'count' => $merge_order_item_before['count']);
|
||||
}
|
||||
foreach ($merge_order_items_after as $key => $merge_order_item_after) {
|
||||
$merge_items_after[] = array('id' => $key + 1,
|
||||
'code' => $merge_order_item_after['id'],
|
||||
'name' => $merge_order_item_after['name'],
|
||||
'count' => $merge_order_item_after['count']);
|
||||
}
|
||||
foreach ($merge_order_items_after as $key => $merge_order_item_after) {
|
||||
if (!in_array(array('id' => $key + 1,
|
||||
'code' => $merge_order_item_after['id'],
|
||||
'name' => $merge_order_item_after['name'],
|
||||
'count' => $merge_order_item_after['count']), $merge_items_before, true)) {
|
||||
$merged_items[] = array('code' => $merge_order_item_after['id'],
|
||||
'name' => $merge_order_item_after['name'],
|
||||
'count' => $merge_order_item_after['count']);
|
||||
}
|
||||
}
|
||||
foreach ($merged_items as $key => $merged_item) {
|
||||
$merge_items[] = array('id' => $key + 1,
|
||||
'code' => $merged_item['code'],
|
||||
'name' => $merged_item['name'],
|
||||
'count' => $merged_item['count']);
|
||||
}
|
||||
$staff_name = Staff::getName($item['who']);
|
||||
$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['action_type'] == 39) {
|
||||
$action_name = Base::data_decode($item['value']);
|
||||
$order_data = ExchangeActions::where('order_code', $item['order_code'] + 0)
|
||||
->where('shift_id', $shift_id)
|
||||
->where('action_type', 39)
|
||||
->get();
|
||||
foreach ($order_data as $key => $data) {
|
||||
$staff_name = Staff::getName($data['who']);
|
||||
$moved_order_data[] = array('staff_name' => $staff_name, 'time' => date('d.m.Y H:i:s', strtotime($data['time'])), 'data' => Base::data_decode($data['value']));
|
||||
$move_trigger = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 45) {
|
||||
$action_name = Base::data_decode($item['value']);
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 46) {
|
||||
$action_name = 'Изменено количество гостей: ' . $item['value'];
|
||||
}
|
||||
|
||||
if ($item['action_type'] == 47) {
|
||||
$items = ExchangeItems::where('code', $item['order_position'])
|
||||
->where('shift_id', $shift_id)
|
||||
->first();
|
||||
$dish = Dishes::getName($items['menu_code']);
|
||||
$course = $item['value'] + 1;
|
||||
$action_name = 'Установлен курс №' . $course . ' для позиции: ' . $dish;
|
||||
}
|
||||
|
||||
$order_info[] = array('id' => $key, 'action' => $action_name, 'who' => $staff_name, 'time' => $item['time'], 'workgroup' => $item['workgroup'], 'workcode' => $item['workcode']);
|
||||
}
|
||||
return [
|
||||
'status' => 'success',
|
||||
'actions' => $order_info,
|
||||
'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,
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*---*/
|
||||
$bill_count = 0;
|
||||
$slice_trigger = 0;
|
||||
$slice_order = 0;
|
||||
@@ -27,111 +270,6 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
$merge_trigger = 0;
|
||||
$move_trigger = 0;
|
||||
|
||||
function json_validate($string)
|
||||
{
|
||||
// decode the JSON data
|
||||
$result = json_decode(utf8_encode($string), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
|
||||
// switch and check possible JSON errors
|
||||
switch (json_last_error()) {
|
||||
case JSON_ERROR_NONE:
|
||||
$error = ''; // JSON is valid // No error has occurred
|
||||
break;
|
||||
case JSON_ERROR_DEPTH:
|
||||
$error = 'The maximum stack depth has been exceeded.';
|
||||
break;
|
||||
case JSON_ERROR_STATE_MISMATCH:
|
||||
$error = 'Invalid or malformed JSON.';
|
||||
break;
|
||||
case JSON_ERROR_CTRL_CHAR:
|
||||
$error = 'Control character error, possibly incorrectly encoded.';
|
||||
break;
|
||||
case JSON_ERROR_SYNTAX:
|
||||
$error = 'Syntax error, malformed JSON.';
|
||||
break;
|
||||
// PHP >= 5.3.3
|
||||
case JSON_ERROR_UTF8:
|
||||
$error = 'Malformed UTF-8 characters, possibly incorrectly encoded.';
|
||||
break;
|
||||
// PHP >= 5.5.0
|
||||
case JSON_ERROR_RECURSION:
|
||||
$error = 'One or more recursive references in the value to be encoded.';
|
||||
break;
|
||||
// PHP >= 5.5.0
|
||||
case JSON_ERROR_INF_OR_NAN:
|
||||
$error = 'One or more NAN or INF values in the value to be encoded.';
|
||||
break;
|
||||
case JSON_ERROR_UNSUPPORTED_TYPE:
|
||||
$error = 'A value of a type that cannot be encoded was given.';
|
||||
break;
|
||||
default:
|
||||
$error = 'Unknown JSON error occured.';
|
||||
break;
|
||||
}
|
||||
|
||||
if ($error !== '') {
|
||||
// throw the Exception or exit // or whatever :)
|
||||
return false;
|
||||
}
|
||||
|
||||
// everything is OK
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
function data_decode($data) {
|
||||
$alph = [
|
||||
"А", "Б", "В", "Г", "Д",
|
||||
"Е", "Ё", "Ж", "З", "И",
|
||||
"Й", "К", "Л", "М", "Н",
|
||||
"О", "П", "Р", "С", "Т",
|
||||
"У", "Ф", "Х", "Ц", "Ч",
|
||||
"Ш", "Щ", "Ъ", "Ы", "Ь",
|
||||
"Э", "Ю", "Я",
|
||||
"а", "б", "в", "г", "д",
|
||||
"е", "ё", "ж", "з", "и",
|
||||
"й", "к", "л", "м", "н",
|
||||
"о", "п", "р", "с", "т",
|
||||
"у", "ф", "х", "ц", "ч",
|
||||
"ш", "щ", "ъ", "ы", "ь",
|
||||
"э", "ю", "я",
|
||||
];
|
||||
|
||||
foreach ($alph as $key => $letter) {
|
||||
$haystack = mb_convert_encoding($data, "CP1251", "UTF-8");
|
||||
$needle = $letter;
|
||||
$pos = strripos($haystack, $needle);
|
||||
if ($pos === false) {
|
||||
$after_conv = false;
|
||||
} else {
|
||||
$after_conv = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$after_conv) {
|
||||
foreach ($alph as $key => $letter) {
|
||||
$haystack = $data;
|
||||
$needle = $letter;
|
||||
$pos = strripos($haystack, $needle);
|
||||
if ($pos === false) {
|
||||
$before_conv = false;
|
||||
} else {
|
||||
$before_conv = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($after_conv) {
|
||||
$retval = mb_convert_encoding($data, "CP1251", "UTF-8");
|
||||
} elseif ($before_conv) {
|
||||
$retval = $data;
|
||||
} else {
|
||||
$retval = $data;
|
||||
}
|
||||
return $retval;
|
||||
}
|
||||
|
||||
$order = ShiftOnlineActions::where('order_code', $input['order_id'])->orderBy('time', 'asc')->get();
|
||||
foreach ($order as $key => $item) {
|
||||
@@ -171,15 +309,15 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
}
|
||||
|
||||
if ($item['type_action'] == 11) {
|
||||
$action_name = 'Назначен гость: ' . data_decode($item['value']);
|
||||
$action_name = 'Назначен гость: ' . Base::data_decode($item['value']);
|
||||
}
|
||||
|
||||
if ($item['type_action'] == 12) {
|
||||
$action_name = 'Гость отменен: ' . data_decode($item['value']);
|
||||
$action_name = 'Гость отменен: ' . Base::data_decode($item['value']);
|
||||
}
|
||||
if ($item['type_action'] == 21) {
|
||||
$item_more = data_decode($item['more']);
|
||||
$item_value = data_decode($item['value']);
|
||||
$item_more = Base::data_decode($item['more']);
|
||||
$item_value = Base::data_decode($item['value']);
|
||||
if ($item_more == 'предчек' && $item_value != 'HRC Pay Box') {
|
||||
$action_name = 'Распечатан предчек';
|
||||
$bill_count = $bill_count + 1;
|
||||
@@ -229,7 +367,7 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
$action_name = $action_name . ': ' . $item['value'];
|
||||
$slice_items = [];
|
||||
if ($item['more']) {
|
||||
if (json_validate($item['more'])) {
|
||||
if (Base::validate_json($item['more'])) {
|
||||
$slice_order_items = json_decode(utf8_encode($item['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
} else {
|
||||
$slice_order_items = json_decode(utf8_encode(base64_decode($item['more'], TRUE)), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
@@ -254,14 +392,13 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
foreach ($item_actions as $key => $item_action) {
|
||||
if ($item_action['more'] != '') {
|
||||
$merge_items_before = $merge_items_after = $merge_items = $merge_order_item_before = $merge_order_item_after = $merged_items = [];
|
||||
if (json_validate($item_action['more'])) {
|
||||
if (Base::validate_json($item_action['more'])) {
|
||||
$merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
} else {
|
||||
$merge_order_items = json_decode(base64_decode($item_action['more']), true);
|
||||
}
|
||||
|
||||
//$merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
|
||||
$merge_order_items_before = $merge_order_items['before']['items'];
|
||||
$merge_order_items_before = $merge_order_items['before']['items'];
|
||||
$merge_order_items_after = $merge_order_items['after']['items'];
|
||||
|
||||
foreach ($merge_order_items_before as $key => $merge_order_item_before) {
|
||||
@@ -299,24 +436,31 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
|
||||
}
|
||||
}
|
||||
if ($item['type_action'] == 39) {
|
||||
$action_name = data_decode($item['value']);
|
||||
$action_name = Base::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::getName($data['who']);
|
||||
$moved_order_data[] = array('staff_name' => $staff_name, 'time' => date('d.m.Y H:i:s', strtotime($data['time'])), 'data' => data_decode($data['value']));
|
||||
$moved_order_data[] = array('staff_name' => $staff_name, 'time' => date('d.m.Y H:i:s', strtotime($data['time'])), 'data' => Base::data_decode($data['value']));
|
||||
$move_trigger = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if ($item['type_action'] == 46) {
|
||||
$action_name = 'Изменено количество гостей: ' . $item['value'];
|
||||
if ($item['type_action'] == 45) {
|
||||
$action_name = Base::data_decode($item['value']);
|
||||
}
|
||||
|
||||
if ($item['type_action'] == 45) {
|
||||
$action_name = data_decode($item['value']);
|
||||
}
|
||||
if ($item['type_action'] == 46) {
|
||||
$action_name = 'Изменено количество гостей: ' . $item['value'];
|
||||
}
|
||||
|
||||
if ($item['type_action'] == 47) {
|
||||
$items = ShiftOnlineItems::where('code', $item['order_position'])->first();
|
||||
$dish = Dishes::getName($items['menu_code']);
|
||||
$course = $item['value'] + 1;
|
||||
$action_name = 'Установлен курс №' . $course . ' для позиции: ' . $dish;
|
||||
}
|
||||
|
||||
$order_info[] = array('id' => $key, 'action' => $action_name, 'who' => $staff_name, 'time' => $item['time'], 'workgroup' => $item['workgroup'], 'workcode' => $item['workcode']);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user