v.2.21

Обновлен перенос клиента из группы в группу Обновлен метод восстановления смены Добавлен метод загрузки меню 1с из облака
2022-07-25 23:26:44 +03:00
parent 9c3b633098
commit 1af2b267f5
14 changed files with 1848 additions and 309 deletions
--- a/commands/GETDataReport.php
+++ b/commands/GETDataReport.php
@@ -14,6 +14,58 @@ class GETDataReport extends HRCCommand implements HRCCommandInterface {
 	protected $signature = 'getdatareport';

 	public function command($input, $output = null) {
+
+        function validate_json($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 = [
 				"А", "Б", "В", "Г", "Д",
@@ -103,7 +155,12 @@ class GETDataReport extends HRCCommand implements HRCCommandInterface {
 								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);
+                                    if (validate_json($item['more'])) {
+                                        $merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                                    } else {
+                                        $merge_order_items = json_decode(utf8_encode(base64_decode($item_action['more'], TRUE)), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                                    }
+
 									$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) {
@@ -168,13 +225,21 @@ class GETDataReport extends HRCCommand implements HRCCommandInterface {
 						foreach ($actions as $key => $action) {
 							$value = $action['value'];
 							$codeOrder = $action['order_code'];
-							$moved_items = json_decode(utf8_encode($action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            if (validate_json($action['more'])) {
+                                $moved_items = json_decode(utf8_encode($action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            } else {
+                                $moved_items = json_decode(utf8_encode(base64_decode($action['more'], TRUE)), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            }
 							$from_place = ExchangeActions::where('order_code', $codeOrder)->where('action_type', 45)->where('shift_id', $input['shift_id'])->first();
 							$from_place = data_decode($from_place['value']);
 							$to_place = ExchangeActions::where('order_code', $value)->where('action_type', 45)->where('shift_id', $input['shift_id'])->first();
 							$to_place = data_decode($to_place['value']);
 							$to_action = ExchangeActions::where('value', $codeOrder)->where('order_code', $value)->where('action_type', 34)->where('shift_id', $input['shift_id'])->first();
-							$start_data = json_decode(utf8_encode($to_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            if (validate_json($to_action['more'])) {
+                                $start_data = json_decode(utf8_encode($to_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            } else {
+                                $start_data = json_decode(utf8_encode(base64_decode($to_action['more'], TRUE)), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            }
 							$staff_name = staffName($action['who']);
 							$time = date('d.m.Y H:i:s', strtotime($action['time']));
 							$sliced_order_data[] = array('from_order' => $codeOrder, 'from_place' => $from_place, 'staff' => $staff_name, 'time' => $time, 'start_data' => $start_data, 'to_order' => $value, 'to_place' => $to_place, 'moved_items' => $moved_items);
--- a/commands/GETImportMenu.php
+++ b/commands/GETImportMenu.php
--- a/commands/GETOrderHistory.php
+++ b/commands/GETOrderHistory.php
@@ -12,6 +12,7 @@ use App\Component\Models\Units;
 use App\Component\Models\UnitsList;
 use App\Console\Commands\HRCCommand;
 use App\Console\Commands\HRCCommandInterface;
+use Illuminate\Support\Facades\Log;

 class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
 	protected $signature = 'getorderhistory';
@@ -26,6 +27,57 @@ 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 dishName($data) {
 				$dish_name = Dishes::where('code', $data)->where('is_history', 0)->first();
 				if ($dish_name) {
@@ -206,7 +258,12 @@ class GETOrderHistory extends HRCCommand implements HRCCommandInterface {
 					$action_name = $action_name . ': ' . $item['value'];
 					$slice_items = [];
 					if ($item['more']) {
-						$slice_order_items = json_decode(utf8_encode($item['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                        if (json_validate($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 = json_decode(utf8_encode($item['more']), 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) {
@@ -227,7 +284,12 @@ 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 = [];
-							$merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            if (json_validate($item['more'])) {
+                                $merge_order_items = json_decode(utf8_encode($item_action['more']), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            } else {
+                                $merge_order_items = json_decode(utf8_encode(base64_decode($item_action['more'])), true, JSON_INVALID_UTF8_SUBSTITUTE);
+                            }
+							//$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_after = $merge_order_items['after']['items'];
 							foreach ($merge_order_items_before as $key => $merge_order_item_before) {
--- a/commands/POSTClient.php
+++ b/commands/POSTClient.php
@@ -10,6 +10,7 @@ use App\Component\Models\ClientsGroup;
 use App\Component\Models\ClientsPhone;
 use App\Console\Commands\HRCCommand;
 use App\Console\Commands\HRCCommandInterface;
+use Illuminate\Support\Facades\Log;

 class POSTClient extends HRCCommand implements HRCCommandInterface {
 	protected $signature = 'postclient';
@@ -18,18 +19,17 @@ class POSTClient extends HRCCommand implements HRCCommandInterface {

 		if (isset($input['task']) && isset($input['id'])) {
 			if ($input['task'] == 'update') {
+                $phone = urldecode($input['phone']);
 				$client = Client::find($input['id']);
 				$client->name = urldecode($input['name']);
 				$client->unloaded = 0;
-
-				$clientGroup = ClientsGroup::find($input['group_id']);
+				$clientGroup = ClientsGroup::where('id', $input['group_id'])->first();
 				$client->group_id = urldecode($clientGroup['code']);
-
 				$clientPhone = ClientsPhone::where('client_guid', $client->user_code)->first();
 				if ($clientPhone) {
 					$clientPhone = ClientsPhone::find($clientPhone['id']);
-					if ($input['phone'] !== '') {
-						if (substr($input['phone'], 0, 1) == '+') {
+					if ($phone !== '' && $phone !== '+375 (  )    -  -') {
+						if (substr($phone, 0, 1) == '+') {
 							$phoneData = urldecode($input['phone']);
 						} else {
 							$phoneData = urldecode($input['phone']);
@@ -74,8 +74,7 @@ class POSTClient extends HRCCommand implements HRCCommandInterface {
 					$clientBarcode->save();
 				}

-				$client->save();
-				$clientGroup->save();
+                $client->save();

 				return [
 					'status' => 'success',
--- a/commands/POSTClientGroup.php
+++ b/commands/POSTClientGroup.php
@@ -15,7 +15,7 @@ class POSTClientGroup extends HRCCommand implements HRCCommandInterface {
 		if (isset($input['task']) && isset($input['id'])) {
 			if ($input['task'] == 'update') {
 				$group = ClientsGroup::find($input['id']);
-				$group->name = $input['name'];
+				$group->name = urldecode($input['name']);
 				$group->save();

 				return [
--- a/commands/POSTRestoreShift.php
+++ b/commands/POSTRestoreShift.php
@@ -15,6 +15,7 @@ use App\Component\Models\Shifts;
 use App\Component\Models\TerminalUpdate;
 use App\Console\Commands\HRCCommand;
 use App\Console\Commands\HRCCommandInterface;
+use Illuminate\Support\Facades\Log;

 class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 	protected $signature = 'postrestoreshift';
@@ -37,45 +38,65 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 		}
 		$shift_id = $input['shift_id'];
 		$cache_dir = __DIR__ . "\\..\\..\\..\\Cache\\";
-		dirDel($cache_dir);
+

 		$nowTime = time();
 		$update = true;
-		$alph = [
-			"А",
-			"Б",
-			"В",
-			"Г",
-			"Д",
-			"Е",
-			"Ё",
-			"Ж",
-			"З",
-			"И",
-			"Й",
-			"К",
-			"Л",
-			"М",
-			"Н",
-			"О",
-			"П",
-			"Р",
-			"С",
-			"Т",
-			"У",
-			"Ф",
-			"Х",
-			"Ц",
-			"Ч",
-			"Ш",
-			"Щ",
-			"Ъ",
-			"Ы",
-			"Ь",
-			"Э",
-			"Ю",
-			"Я",
-		];
+
+        function decode_text($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;
+        }
+
 		$exchange_shifts = ExchangeShifts::where('id', '=', $shift_id)->first();
 		$exchange_orders = ExchangeOrders::where('shift_id', '=', $shift_id)->get();
 		$exchange_items = ExchangeItems::where('shift_id', '=', $shift_id)->get();
@@ -109,6 +130,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {

 				//clear shift_online_orders
 				ShiftOnlineOrders::truncate();
+                Log::debug('ShiftOnlineOrders cleaned');
 				foreach ($exchange_orders as $key => $exchange_order) {
 					$shift_online_order = new ShiftOnlineOrders;
 					$shift_online_order->cash = $exchange_order["cash"];
@@ -141,45 +163,8 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 					$shift_online_order->opened = $exchange_order["opened"];
 					$shift_online_order->order_sum = $exchange_order["order_sum"];
 					$shift_online_order->params_code = $exchange_order["params_id"];
-
-					$place_name_bd = $exchange_order["place_name"];
-					$place_name_d = mb_convert_encoding($place_name_bd, "CP1251", "UTF-8");
-
-					foreach ($alph as $key => $letter) {
-						$haystack = $place_name_d;
-						$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 = $place_name_bd;
-							$needle = $letter;
-							$pos = strripos($haystack, $needle);
-							if ($pos === false) {
-								$before_conv = false;
-							} else {
-								$before_conv = true;
-								break;
-							}
-						}
-					}
-
-					if ($after_conv) {
-						$place_name_decoded = $place_name_d;
-					} elseif ($before_conv) {
-						$place_name_decoded = $place_name_bd;
-					} else {
-						$place_name_decoded = $place_name_bd;
-					}
-
-					$shift_online_order->place_name = $place_name_decoded;
+					$shift_online_order->place_name = mb_convert_encoding(decode_text($exchange_order["place_name"]), 'UTF-8', 'UTF-8');
+                    log::debug(decode_text($exchange_order["place_name"]));
 					$shift_online_order->presale = $exchange_order["presale"];
 					$shift_online_order->sale_sum = $exchange_order["sale_sum"];
 					$shift_online_order->self = $exchange_order["self"];
@@ -193,6 +178,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 				}

 				ShiftOnlineItems::truncate();
+                Log::debug('ShiftOnlineItems cleaned');
 				foreach ($exchange_items as $key => $exchange_item) {
 					$shift_online_item = new ShiftOnlineItems;
 					$shift_online_item->code = $exchange_item["code"];
@@ -218,6 +204,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 				}

 				ShiftOnlineActions::truncate();
+                Log::debug('ShiftOnlineActions cleaned');
 				foreach ($exchange_actions as $key => $exchange_action) {
 					$shift_online_action = new ShiftOnlineActions;
 					$shift_online_action->type_action = $exchange_action["action_type"];
@@ -235,6 +222,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface {
 				}

 				ShiftOnlineDeleted::truncate();
+                Log::debug('ShiftOnlineDeleted cleaned');
 				foreach ($exchange_deleted as $key => $exchange_deleted_item) {
 					$shift_online_deleted_item = new ShiftOnlineDeleted;
 					$shift_online_deleted_item->code = $exchange_deleted_item["code"];
@@ -253,6 +241,7 @@ 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();
+                dirDel($cache_dir);
 				return [
 					'status' => 'success',
 					'message' => 'Данные автоматически синхронизируются с POS-системой ' . $terminal_online['next_at'],
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,9 @@
 {
  "name": "hrc-admin/hello-world",
-  "version": "2.19",
+  "version": "2.21",
  "require": {
-    "horeca/admin-php-module-core": "dev-master"
+    "horeca/admin-php-module-core": "dev-master",
+    "guzzlehttp/guzzle": "^7.4"
  },
  "repositories": [
    {
@@ -10,4 +11,4 @@
      "url": "https://git.hrc.by/horeca/admin-php-module-core"
    }
  ]
-}
+}
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "bc6a3225c331314f6774aa596a35b169",
+    "content-hash": "12bbb4dae295b5fc8e876ec17a6ff017",
    "packages": [
        {
            "name": "brick/math",
@@ -810,6 +810,329 @@
            ],
            "time": "2020-04-13T13:17:36+00:00"
        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "7.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.5",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "ext-curl": "*",
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
+            },
+            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.4-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "psr-18",
+                "psr-7",
+                "rest",
+                "web service"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-20T22:16:13+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-22T20:56:57+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "13388f00956b1503577598873fffb5ae994b5737"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
+                "reference": "13388f00956b1503577598873fffb5ae994b5737",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "ralouphie/getallheaders": "^3.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "http-interop/http-factory-tests": "^0.9",
+                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+            },
+            "suggest": {
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-20T21:43:11+00:00"
+        },
        {
            "name": "horeca/admin-php-module-core",
            "version": "dev-master",
@@ -2869,6 +3192,166 @@
            },
            "time": "2019-01-08T18:20:26+00:00"
        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
+            "time": "2020-06-29T06:28:15+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
+            "time": "2019-04-30T12:38:16+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
+            "time": "2016-08-06T14:39:51+00:00"
+        },
        {
            "name": "psr/log",
            "version": "1.1.3",
@@ -2970,6 +3453,50 @@
            },
            "time": "2017-10-23T01:57:42+00:00"
        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
+            "time": "2019-03-08T08:55:37+00:00"
+        },
        {
            "name": "ramsey/collection",
            "version": "1.1.3",
--- a/database/migrations/2022_06_24_002213_add_columns_to_units_list_and_units.php
+++ b/database/migrations/2022_06_24_002213_add_columns_to_units_list_and_units.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnsToUnitsListAndUnits extends Migration {
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up() {
+
+		if (!Schema::hasColumn('units', 'is_history')) {
+			Schema::table('units', function (Blueprint $table) {
+				$table->tinyInteger('is_history')->nullable()->default(0);
+			});
+		}
+
+        if (!Schema::hasColumn('modifiers', 'is_history')) {
+            Schema::table('modifiers', function (Blueprint $table) {
+                $table->tinyInteger('is_history')->nullable()->default(0);
+            });
+        }
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down() {
+		Schema::table('units', function (Blueprint $table) {
+			$table->dropColumn('is_history');
+		});
+        Schema::table('modifiers', function (Blueprint $table) {
+            $table->dropColumn('is_history');
+        });
+
+	}
+}
--- a/models/ModifiersList.php
+++ b/models/ModifiersList.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Component\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ModifiersList extends Model {
+	protected $table = 'modifiers_list';
+	/**
+	 * The attributes that aren't mass assignable.
+	 *
+	 * @var array
+	 */
+	protected $guarded = [];
+}
--- a/models/Printer.php
+++ b/models/Printer.php
@@ -6,4 +6,10 @@ use Illuminate\Database\Eloquent\Model;

 class Printer extends Model {
 	protected $table = 'printers';
-}
+	/**
+	 * The attributes that aren't mass assignable.
+	 *
+	 * @var array
+	 */
+	protected $guarded = [];
+}
--- a/module.ini
+++ b/module.ini
@@ -1,5 +1,5 @@
 [info]
 name=V1
-version=2.19
+version=2.21
 [build]
-version=2.19
+version=2.21
--- a/web/controllers/clients.js
+++ b/web/controllers/clients.js
@@ -65,6 +65,7 @@
 				$scope.currentGroup = data.currentGroup;
 				$scope.total = data.total;
 			});
+
 		};
 		
 		$scope.editGroup = function (group) {
@@ -111,19 +112,19 @@
 		
 		$scope.editClient = function (client, group) {
 			$scope.contextElement = client;
-
+			$scope.contextGroup = group;
 			$('#edit-client').modal('toggle');
 			console.log(client);
-			console.log(group);
+			console.log($scope.contextGroup);
 		};

-		$scope.updateClient = function () {
+		$scope.updateClient = function (group) {
 			$('#edit-client').modal('toggle');

 			smartRequest.post('v1/client', {
 				id: $scope.contextElement.id,
 				name: $scope.contextElement.name,
-				group_id: $scope.contextElement.client_group,
+				group_id: group,
 				phone: $scope.contextElement.phone,
 				address: $scope.contextElement.address,
 				email: $scope.contextElement.email,
@@ -132,7 +133,7 @@
 			}, function (data) {
 				if (data.status == 'success') {
 					Notification.success(data.message);
-					$scope.openGroup($scope.contextElement.client_group);
+					$scope.openGroup(group);
 				}
 				if (data.error_message) {
 					Notification.error(data.error_message);
--- a/web/views/clients/edit_client.html
+++ b/web/views/clients/edit_client.html
@@ -8,7 +8,7 @@
                <div class="form-group row">
                    <div class="col-sm-12">
 					<span>Группа: </span>   					
-					<select name="group" class="form-control input-c" ng-options="opt.id as opt.name for opt in groups" ng-model="currentGroup"></select>
+					<select name="group" class="form-control input-c" ng-options="opt.id as opt.name for opt in groups" ng-model="contextGroup"></select>
 					<span>Имя: </span><input class="form-control" placeholder="Название" type="text" ng-model="contextElement.name">
 					<span>Телефон: </span><input class="form-control" type="text" ng-model="contextElement.phone" ui-mask="+375 (99) 999-99-99">
 					<span>Адрес: </span><input class="form-control" placeholder="Введите email" type="text" ng-model="contextElement.address">
@@ -23,7 +23,7 @@
            <button type="button" class="btn danger p-x-md pull-left" data-toggle="modal" data-target="#client-confirm-delete"><i class="material-icons">&#xE872;</i></button>

            <button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
-            <button type="button" class="btn success p-x-md" ng-click="updateClient()">Сохранить</button>
+            <button type="button" class="btn success p-x-md" ng-click="updateClient(contextGroup)">Сохранить</button>
        </div>
    </div>
 </div>