diff --git a/Logs/10.06.2021_13.34.39.log b/Logs/10.06.2021_13.34.39.log new file mode 100644 index 0000000..4d7184e --- /dev/null +++ b/Logs/10.06.2021_13.34.39.log @@ -0,0 +1 @@ +{"status":"success","version":"1.6","file":"http:\/\/portal.hrc.by\/uploads\/modules\/v1\/1.6\/build.zip","name":"v1"} diff --git a/Logs/10.06.2021_16.12.38.log b/Logs/10.06.2021_16.12.38.log new file mode 100644 index 0000000..4d7184e --- /dev/null +++ b/Logs/10.06.2021_16.12.38.log @@ -0,0 +1 @@ +{"status":"success","version":"1.6","file":"http:\/\/portal.hrc.by\/uploads\/modules\/v1\/1.6\/build.zip","name":"v1"} diff --git a/commands/Bot.php b/commands/Bot.php index 2ba680e..e15a5ce 100644 --- a/commands/Bot.php +++ b/commands/Bot.php @@ -4,7 +4,7 @@ namespace App\Commands; use App\Component\Models\Dishes; use App\Component\Models\Folders; -use App\Component\Models\Orders; +use App\Component\Models\OrderBot; use App\Component\Models\Settings; use App\Component\Models\Tasks; use App\Console\Commands\HRCCommand; @@ -22,7 +22,7 @@ class Bot extends HRCCommand implements HRCCommandInterface { $ordersinfo = Tasks::where('method', '=', 'orderinfo')->get(); $delete_params = ['closed', 'deleted']; foreach ($ordersinfo as $more) { - $order = Orders::where('id', '=', $more['more'])->whereIn('status', $delete_params)->get(); + $order = OrderBot::where('id', '=', $more['more'])->whereIn('status', $delete_params)->get(); foreach ($order as $value) { $delete = Tasks::where('method', '=', 'orderinfo')->where('more', '=', $value['id'])->delete(); } diff --git a/commands/ClientFile.php b/commands/ClientFile.php index d5bae49..9b81c8a 100644 --- a/commands/ClientFile.php +++ b/commands/ClientFile.php @@ -11,7 +11,7 @@ class ClientFile extends HRCCommand implements HRCCommandInterface { protected $signature = 'getclientfile'; public function command($input, $output = null) { - $terminal = Terminal::where('soft', '=', 1)->where('is_active', '=', 1)->where('work_code', '=', 1)->first(); + $terminal = Terminal::where('soft', '=', 1)->where('is_active', '=', 1)->first(); $tmp_dirname = __DIR__ . "\\..\\..\\..\\Exchange\\" . $terminal['key'] . "\\tmp\\" . $terminal['key'] . "\\"; $dirname = __DIR__ . "\\..\\..\\..\\Exchange\\" . $terminal['key'] . "\\"; $code = ''; @@ -57,24 +57,25 @@ class ClientFile extends HRCCommand implements HRCCommandInterface { 'filedate' => $file, ]; } - $clientsCount = Client::count(); - $urlThread = $input['th']; - $mainThreads = 4; - $countPerThread = ceil($clientsCount / $mainThreads); - $offset = ($urlThread - 1) * $countPerThread; - $clients = Client::with('clientPhone:client_guid,phone')->skip($offset)->take($countPerThread)->get(); + + $clientsCount = Client::count(); + $urlThread = $input['th']; + $mainThreads = 4; + $countPerThread = ceil($clientsCount / $mainThreads); + $offset = ($urlThread - 1) * $countPerThread; + $clients = Client::with('clientPhone:client_guid')->skip($offset)->take($countPerThread)->get(); - if (!is_dir($tmp_dirname)) { - mkdir($tmp_dirname, 0755, 'w+'); - } - $filename = str_replace(' ', '_', date("d.m.Y H.i.s")) . '_' . $urlThread . '.tmp'; - $handle = fopen($tmp_dirname . $filename, 'w+'); - fputs($handle, chr(0xEF) . chr(0xBB) . chr(0xBF)); // BOM - $filename = str_replace('_', ' ', $filename); - foreach ($clients as $row) { - if (($row['clientPhone']->phone !== '') && ($row['clientPhone']->phone !== '+375 ( ) - -')) { - $row = array($row['name'], $row['clientPhone']->phone); - fputcsv($handle, $row, ';'); + if (!is_dir($tmp_dirname)) { + mkdir($tmp_dirname, 0755, 'w+'); + } + $filename = str_replace(' ', '_', date("d.m.Y H.i.s")) . '_' . $urlThread . '.tmp'; + $handle = fopen($tmp_dirname . $filename, 'w+'); + $filename = str_replace('_', ' ', $filename); + foreach ($clients as $row) { + if (($row['clientPhone']->phone !== '') && ($row['clientPhone']->phone !== '+375 ( ) - -')) { + $row = array($row['name'], $row['clientPhone']->phone); + fputcsv($handle, $row, ';'); + } } } fclose($handle); diff --git a/commands/CreateClient.php b/commands/CreateClient.php index 86ec7e5..28238fe 100644 --- a/commands/CreateClient.php +++ b/commands/CreateClient.php @@ -15,9 +15,22 @@ class CreateClient extends HRCCommand implements HRCCommandInterface { protected $signature = 'postcreateclient'; public function command($input, $output = null) { - $group = ClientsGroup::where('id', '=', $input['group_id'])->first(); + if (isset($input['group_id'])) { + $group = ClientsGroup::where('id', '=', $input['group_id'])->first(); + } else { + $group['code'] = 0; + } + + if (!isset($input['email'])) { + $input['email'] = ''; + } + + if (!isset($input['address'])) { + $input['address'] = ''; + } + $total = Client::where('name', '=', $input['name'])->count(); - if ($input['is_special_price'] == 'true') { + if (isset($input['is_special_price']) && $input['is_special_price'] == 'true') { $specialPrice = 1; } else { $specialPrice = 0; @@ -51,23 +64,32 @@ class CreateClient extends HRCCommand implements HRCCommandInterface { $clientPhone->phone = $phone; $clientPhone->client_guid = $client->user_code; - $clientBarcode = new ClientsBarcode; - $clientBarcode->code_id = urldecode($input['barcode']); - $clientBarcode->name = ''; - $clientBarcode->client_guid = $client->user_code; - $clientBarcode->value = urldecode($input['barcode']); - $clientBarcode->block = 0; - $clientBarcode->symptom_block = 0; - - $clientBarcode->save(); - $clientEmail->save(); - $clientAddress->save(); - $client->save(); - $clientPhone->save(); + if (isset($input['barcode']) && $input['barcode'] > 0) { + $client->barcode_type = 1; + $clientBarcode = new ClientsBarcode; + $clientBarcode->code_id = urldecode($input['barcode']); + $clientBarcode->name = ''; + $clientBarcode->client_guid = $client->user_code; + $clientBarcode->value = urldecode($input['barcode']); + $clientBarcode->block = 0; + $clientBarcode->symptom_block = 0; + $client->save(); + $clientPhone->save(); + $clientEmail->save(); + $clientAddress->save(); + $clientBarcode->save(); + } else { + $client->barcode_type = 0; + $client->save(); + $clientPhone->save(); + $clientEmail->save(); + $clientAddress->save(); + } return [ 'status' => 'success', 'message' => 'Клиент создан', + 'client' => $client, ]; } } \ No newline at end of file diff --git a/commands/GETOrder.php b/commands/GETOrder.php new file mode 100644 index 0000000..4759747 --- /dev/null +++ b/commands/GETOrder.php @@ -0,0 +1,129 @@ +first(); + + if (isset($order->client_id) && $order->client_id !== null && $order->client_id !== '') { + $client = Client::where('user_code', '=', $order->client_id)->first(); + $client = $client->name; + $client_phone = ClientsPhone::where('client_guid', '=', $order->client_id)->first(); + $client_phone = $client_phone->phone; + $client_address = ClientsAddress::where('client_guid', '=', $order->client_id)->first(); + $client_address = $client_address->address; + } else { + $client = ''; + $client_phone = ''; + $client_address = ''; + } + + $orderItems = OrderItems::where('order_id', '=', $order->id)->whereNull('modifier_id')->get(); + $modOut = array(); + if (isset($orderItems)) { + foreach ($orderItems as $key => $item) { + $itemName = Dishes::where('code', '=', $item->item_id)->first(); + $itemName = $itemName->name; + $itemModifiers = OrderItems::where('order_id', '=', $order->id)->where('parent_id', '=', $item->id)->whereNotNull('modifier_id')->get(); + if (isset($itemModifiers)) { + foreach ($itemModifiers as $key => $itemModifier) { + $modifier = Modifier::where('id', '=', $itemModifier->modifier_id)->first(); + if ($modifier->dish_code == 0 && $modifier->unit_id == 0) { + $modOut[] = array('' => , ); + } + } + } + $output[] = array('id' => $item->id, + 'num' => $key + 1, + 'order_id' => $item->order_id, + 'item_id' => $item->item_id, + 'item_name' => $itemName, + 'item_count' => $item->item_count, + 'item_price' => $item->item_price, + ); + } + } else { + $output = []; + } + + return [ + 'status' => 'success', + 'message' => 'Заказ №' . $order->id, + 'order' => $order, + 'orderItems' => $output, + 'client_name' => $client, + 'client_phone' => $client_phone, + 'client_address' => $client_address, + 'totalCount' => $order->total_count, + 'totalPrice' => $order->total_price, + ]; + } + + if ($input['task'] == 'list') { + $orders = Orders::all(); + foreach ($orders as $key => $order) { + $client = Client::where('user_code', '=', $order->client_id)->first(); + $client_phone = ClientsPhone::where('client_guid', '=', $order->client_id)->first(); + $client_address = ClientsAddress::where('client_guid', '=', $order->client_id)->first(); + if (isset($client)) { + $output[] = array('id' => $order->id, 'client_name' => $client->name, 'client_phone' => $client_phone->phone, 'client_address' => $client_address->address, 'total_count' => $order->total_count, 'total_price' => $order->total_price, 'is_send' => $order->is_send); + } else { + $output[] = array('id' => $order->id, 'client_name' => '', 'client_phone' => '', 'client_address' => '', 'total_count' => $order->total_count, 'total_price' => $order->total_price, 'is_send' => $order->is_send); + } + } + return [ + 'status' => 'success', + 'message' => 'Список заказов', + 'orders' => $output, + ]; + } + + if ($input['task'] == 'clientsearch' && $input['search']) { + $input['search'] = urldecode($input['search']); + $phone = '+375 (' . substr($input['search'], 0, 2) . ') ' . substr($input['search'], 2, 3) . '-' . substr($input['search'], 5, 2) . '-' . substr($input['search'], 7, 2); + $clients = ClientsPhone::where('phone', '=', $phone)->get(); + if (isset($clients)) { + foreach ($clients as $key => $client) { + $client_name = Client::where('user_code', '=', $client->client_guid)->first(); + $client_name = $client_name->name; + $client_address = ClientsAddress::where('client_guid', '=', $client->client_guid)->first(); + $client_phone = $client->phone; + $client_guid = $client->client_guid; + $output[] = array('guid' => $client_guid, 'name' => $client_name, 'phone' => $client_phone, 'address' => $client_address->address); + } + } + + if (!isset($clients)) { + $clients = []; + } + + return [ + 'status' => 'success', + 'message' => 'Список клиентов', + 'clients' => $output, + ]; + } + + } else { + return [ + 'status' => 'success', + 'error_message' => 'Проверьте введенные данные', + ]; + } + } +} \ No newline at end of file diff --git a/commands/HelloWorld.php b/commands/HelloWorld.php new file mode 100644 index 0000000..4ab7d74 --- /dev/null +++ b/commands/HelloWorld.php @@ -0,0 +1,20 @@ + 'success', + 'users' => $users, + ]; + } +} \ No newline at end of file diff --git a/commands/Import.php b/commands/Import.php index b400244..8793160 100644 --- a/commands/Import.php +++ b/commands/Import.php @@ -31,6 +31,7 @@ class Import extends HRCCommand implements HRCCommandInterface { $search_response = curl_exec($search); curl_close($search); $responses = json_decode($search_response, TRUE)['files']; + foreach ($responses as $key => $response) { if (array_key_exists('filename', $response)) { $fulldate = date_parse_from_format('d-m-Y-H-i-s', $response['filename']); diff --git a/commands/OutOrders.php b/commands/OutOrders.php index 5a71e70..de0d749 100644 --- a/commands/OutOrders.php +++ b/commands/OutOrders.php @@ -2,7 +2,7 @@ namespace App\Commands; -use App\Component\Models\Orders; +use App\Component\Models\OrderBot; use App\Component\Models\Report; use App\Component\Models\Shifts; use App\Console\Commands\HRCCommand; @@ -19,7 +19,7 @@ class OutOrders extends HRCCommand implements HRCCommandInterface { $out = array('id' => $shift['id'], 'opened' => $shift['opened'], 'closed' => $shift['closed']); } } - $orders = Orders::select('id', 'order', 'created_at')->where('created_at', '>', $out['opened'])->where('created_at', '<=', $out['closed'])->get(); + $orders = OrderBot::select('id', 'order', 'created_at')->where('created_at', '>', $out['opened'])->where('created_at', '<=', $out['closed'])->get(); $count_items = 0; if (is_array($orders) || is_object($orders)) { foreach ($orders as $order) { @@ -73,7 +73,7 @@ class OutOrders extends HRCCommand implements HRCCommandInterface { $end_t = strtotime($input['end_date']) - 1; $start = date('Y-m-d H:i:s', $start_t); $end = date('Y-m-d H:i:s', $end_t); - $orders = Orders::select('id', 'order', 'created_at')->where('created_at', '>', $start)->where('created_at', '<=', $end)->get(); + $orders = OrderBot::select('id', 'order', 'created_at')->where('created_at', '>', $start)->where('created_at', '<=', $end)->get(); $count_items = 0; if (is_array($orders) || is_object($orders)) { foreach ($orders as $order) { diff --git a/commands/POSTOrder.php b/commands/POSTOrder.php new file mode 100644 index 0000000..e13289d --- /dev/null +++ b/commands/POSTOrder.php @@ -0,0 +1,107 @@ +staff_id = 1; + $order->is_send = 0; + $order->save(); + $order = Orders::where('id', '=', $order->id)->first(); + $orderItems = OrderItems::where('order_id', '=', $order->id)->get(); + if (!isset($orderItems)) { + $orderItems = []; + } + return [ + 'status' => 'success', + 'order' => $order, + 'orderItems' => $orderItems, + 'message' => 'Заказ создан', + ]; + } + + if ($input['task'] == 'delete' && isset($input['id'])) { + $order = Orders::where('id', '=', $input['id'])->first(); + if ($order->total_count > 0) { + return [ + 'status' => 'success', + 'error_message' => 'Разрешено удаление только пустых заказов.', + ]; + } else { + $order->delete(); + return [ + 'status' => 'success', + 'message' => 'Заказ удален', + ]; + } + + } + + if ($input['task'] == 'update' && isset($input['order_id'])) { + $order = Orders::find($input['order_id']); + if (isset($input['item']) && $input['item'] == 'add') { + $orderItem = new OrderItems; + $orderItem->order_id = $input['order_id']; + $orderItem->item_id = $input['item_id']; + $orderItem->item_count = $input['item_count']; + $item_price = Dishes::where('code', '=', $input['item_id'])->first(); + $orderItem->item_price = $item_price->cosht; + $orderItem->staff_id = 1; + $orderItem->save(); + } + if (isset($input['client_id'])) { + if ($input['client_id'] !== null) { + $order->client_id = $input['client_id']; + } else { + $order->client_id = null; + } + + } + if (isset($input['item_count'])) { + $order->total_count = $order->total_count + $input['item_count']; + $order->total_price = $order->total_price + ($item_price->cosht * $input['item_count']); + } + + $order->is_send = 0; + $order->save(); + return [ + 'status' => 'success', + 'message' => 'Заказ обновлен', + ]; + } + + if ($input['task'] == 'complete' && isset($input['id'])) { + $order = Orders::find($input['id']); + $order->is_send = 1; + if (isset($input['client_id'])) { + $order->client_id = $input['client_id']; + } + $order->is_delivery = $input['is_delivery']; + $order->is_pickup = $input['is_pickup']; + $order->save(); + return [ + 'status' => 'success', + 'message' => 'Заказ отправлен', + ]; + } + + } else { + return [ + 'status' => 'success', + 'error_message' => 'Проверьте введенные данные', + ]; + } + } +} \ No newline at end of file diff --git a/commands/POSTOrderItem.php b/commands/POSTOrderItem.php new file mode 100644 index 0000000..5e51a34 --- /dev/null +++ b/commands/POSTOrderItem.php @@ -0,0 +1,88 @@ +order_id = $input['order_id']; + $order_item->item_id = $input['item_id']; + $order_item->item_count = $input['item_count']; + $order_item->item_price = $input['item_price']; + $order_item->staff_id = 1; + $order_item->save(); + + return [ + 'status' => 'success', + 'order' => $order_item, + 'message' => 'Товар добавлен в заказ №' . $input['order_id'], + ]; + } + + if ($input['task'] == 'delete' && isset($input['id'])) { + $order_item = OrderItems::where('order_id', '=', $input['order_id'])->where('id', '=', $input['id'])->first(); + $order_item->delete(); + $order = Orders::where('id', '=', $input['order_id'])->first(); + $orderItems = OrderItems::where('order_id', '=', $input['order_id'])->get(); + $totalCount = 0; + $totalPrice = 0; + foreach ($orderItems as $key => $item) { + $totalCount = $totalCount + $item->item_count; + $totalPrice = $totalPrice + $item->item_count * $item->item_price; + } + $order->total_count = $totalCount; + $order->total_price = $totalPrice; + $order->save(); + return [ + 'status' => 'success', + 'message' => 'Позиция удалена', + ]; + } + + if ($input['task'] == 'update' && isset($input['id']) && isset($input['item_count'])) { + $order_item = OrderItems::where('order_id', '=', $input['order_id'])->where('id', '=', $input['id'])->first(); + if ($input['item_count'] == 0) { + $order_item->delete(); + return [ + 'status' => 'success', + 'message' => 'Позиция удалена', + ]; + } else { + $order_item->item_count = $input['item_count']; + $order_item->save(); + + $order = Orders::where('id', '=', $input['order_id'])->first(); + $orderItems = OrderItems::where('order_id', '=', $input['order_id'])->get(); + $totalCount = 0; + $totalPrice = 0; + foreach ($orderItems as $key => $item) { + $totalCount = $totalCount + $item->item_count; + $totalPrice = $totalPrice + $item->item_count * $item->item_price; + } + $order->total_count = $totalCount; + $order->total_price = $totalPrice; + $order->save(); + return [ + 'status' => 'success', + 'message' => 'Заказ обновлен', + ]; + } + } + + } else { + return [ + 'status' => 'success', + 'error_message' => 'Проверьте введенные данные', + ]; + } + } +} \ No newline at end of file diff --git a/composer.json b/composer.json index 288b94b..b915bf9 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "hrc-admin/hello-world", - "version": "1.2", + "version": "1.7", "require": { "horeca/admin-php-module-core": "dev-master" }, diff --git a/database/migrations/2021_08_02_132704_create_orders_table.php b/database/migrations/2021_08_02_132704_create_orders_table.php new file mode 100644 index 0000000..9998129 --- /dev/null +++ b/database/migrations/2021_08_02_132704_create_orders_table.php @@ -0,0 +1,35 @@ +id(); + $table->integer('total_count')->nullable(); + $table->integer('total_price')->nullable(); + $table->integer('staff_id'); + $table->string('client_id')->nullable(); + $table->integer('is_send'); + $table->integer('is_delivery')->nullable(); + $table->integer('is_pickup')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() { + Schema::dropIfExists('orders'); + } +} diff --git a/database/migrations/2021_08_02_133250_create_order_items_table.php b/database/migrations/2021_08_02_133250_create_order_items_table.php new file mode 100644 index 0000000..febe0f6 --- /dev/null +++ b/database/migrations/2021_08_02_133250_create_order_items_table.php @@ -0,0 +1,35 @@ +id(); + $table->integer('order_id'); + $table->integer('item_id'); + $table->integer('modifier_id')->nullable(); + $table->integer('parent_id')->nullable(); + $table->integer('item_count'); + $table->integer('item_price'); + $table->integer('staff_id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() { + Schema::dropIfExists('order_items'); + } +} diff --git a/models/Modifier.php b/models/Modifier.php new file mode 100644 index 0000000..977b078 --- /dev/null +++ b/models/Modifier.php @@ -0,0 +1,9 @@ + 1) { + $scope.selectMenuNavigationStack.pop(); + var page = $scope.selectMenuNavigationStack.pop(); + + if(page.type === 'menu') { + $scope.openMenuItem(page.value); + } + + if(page.type === 'folder') { + $scope.openFolderItem(page.value); + } + } + else { + $scope.selectMenuItem(); + } + }; + /* END MENU BLOCK */ + + /* CLIENT BLOCK */ + $scope.selectClientItemParams = { + clients: [], + groups: [], + isParent: true + }; + + $scope.selectClientItem = function() { + $scope.selectClientItemParams = { + clients: [], + groups: [], + isParent: true + }; + $scope.currentPage = 1; + $scope.pages = 1; + smartRequest.get('v1/clientgroup', function(data) { + $scope.selectClientItemParams.groups = data.groups; + }); + }; + + $scope.openGroup = function(group) { + $scope.selectClientItemParams.isParent = false; + $scope.currentGroup = group.id; + $scope.currentPage = 1; + $scope.selectClientItemParams.groups = []; + $scope.selectClientItemParams.clients = []; + + smartRequest.get('v1/clients?group_id=' + $scope.currentGroup + '&page=' + $scope.currentPage, function(data) { + $scope.selectClientItemParams.clients = data.clients; + $scope.pages = data.pages; + $scope.currentGroup = data.currentGroup; + }); + }; + + $scope.pager = function(currentPage) { + $scope.selectClientItemParams.isParent = false; + $scope.selectClientItemParams.groups = []; + $scope.selectClientItemParams.clients = []; + smartRequest.get('v1/clients?group_id=' + $scope.currentGroup + '&page=' + $scope.currentPage, function(data) { + $scope.selectClientItemParams.clients = data.clients; + $scope.pages = data.pages; + $scope.currentGroup = data.currentGroup; + }); + }; + + $scope.upGroup = function() { + $scope.selectClientItemParams = { + clients: [], + groups: [], + isParent: true + }; + + smartRequest.get('v1/clientgroup', function(data) { + $scope.selectClientItemParams.groups = data.groups; + }); + }; + /* END CLIENT BLOCK */ + + $scope.selectItem = function(value, type, info) { + $scope.selectedElement.value = value; + $scope.selectedElement.type = type; + $scope.selectedElement.info = info; + }; + + $scope.editTermParam = function(param) { + $scope.$eval(param.type[0].toLowerCase() + param.type.slice(1) + '()'); + + $scope.selectedElement = { + type: param.type, + value: param.value, + currentModal: '#edit-' + param.type.toLowerCase(), + param: param, + info: param.info, + subtype: param.subtype + }; + + $($scope.selectedElement.currentModal).modal(); + }; + + $scope.confirmSelect = function() { + $($scope.selectedElement.currentModal).modal('toggle'); + + $scope.selectedElement.param.value = $scope.selectedElement.value; + $scope.selectedElement.param.info = $scope.selectedElement.info; + $scope.selectedElement.param.subtype = $scope.selectedElement.type; + }; + + $scope.update(); + + smartRequest.get('discount/type/list', function(data) { + $scope.terms = data.discount_types; + $scope.defaultTerm = data.default.code; + }); + + smartRequest.get('menu/readonly', function (data) { + $scope.readonlyMode = data.readonly; + + if (data.readonly) { + Notification.error('Режим просмотра!'); + } + }); + } +})(); \ No newline at end of file diff --git a/web/views/orders/createnewclient.html b/web/views/orders/createnewclient.html new file mode 100644 index 0000000..e697667 --- /dev/null +++ b/web/views/orders/createnewclient.html @@ -0,0 +1,31 @@ +
+
+
+
Создание нового клиента
+
+
+
+
+
+ +

+

+
+ +

+

+
+
+ +

+

+
+
+
+ +
+ + +
+
+
\ No newline at end of file diff --git a/web/views/orders/edit.html b/web/views/orders/edit.html new file mode 100644 index 0000000..78c8b33 --- /dev/null +++ b/web/views/orders/edit.html @@ -0,0 +1,110 @@ +
+
+
+
Заказ №{{orderId}}
+
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +

+

+
+ +

+

+
+
+ +

+

+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
#НаименованиеКоличествоЦенаИтого#
{{ item.num }}{{ item.item_name }} +
+ + + +
+ 		{{ item.item_price }} BYN{{ item.item_price * item.item_count }} BYN + +
+
+
+
+
+
+
Количество товаров: {{totalCount}}
+
Итоговая сумма заказа: {{totalPrice}} BYN
+
+
+
+ +
+ + + +
+
+
+ + + \ No newline at end of file diff --git a/web/views/orders/orders.html b/web/views/orders/orders.html new file mode 100644 index 0000000..c94ab8b --- /dev/null +++ b/web/views/orders/orders.html @@ -0,0 +1,96 @@ +
+
+ +
+ +
+ +
+ +
+

+

+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
#ИмяТелефонАдресТоваровСуммаСтатус заказа
{{ order.id }}{{ order.client_name }}{{ order.client_phone }}{{ order.client_address }}{{ order.total_count }}{{ order.total_price }} BYN{{ order.is_send }}
+
+
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/web/views/orders/selectclientitem.html b/web/views/orders/selectclientitem.html new file mode 100644 index 0000000..352b704 --- /dev/null +++ b/web/views/orders/selectclientitem.html @@ -0,0 +1,65 @@ +
+
+
+
Выбор клиента
+
+ +
+
+
+
+ + + +
+ +
...
+
+
+ +
+
+
+ + + +
+ +
+ {{ group.name }} +
+
+
+ +
+
+
+ + + +
+ +
+ {{ client.name }} +
+
+
+
+
+
+ < + {{currentPage}}/{{pages}} + > +
+
+
+ + +
+
+
\ No newline at end of file diff --git a/web/views/orders/selectitemcount.html b/web/views/orders/selectitemcount.html new file mode 100644 index 0000000..b01676d --- /dev/null +++ b/web/views/orders/selectitemcount.html @@ -0,0 +1,20 @@ +
+
+
+
Укажите количество
+
+
+
+
+
+ +
+
+
+
+ +
+ +
+
+
\ No newline at end of file diff --git a/web/views/orders/selectmenuitem.html b/web/views/orders/selectmenuitem.html new file mode 100644 index 0000000..87872d6 --- /dev/null +++ b/web/views/orders/selectmenuitem.html @@ -0,0 +1,104 @@ +
+
+
+
Выбор элемента меню
+
+ +
+
+
+
+ + + +
+ +
...
+
+
+ +
+
+
+
+ + + +
+ +
+ {{ menu.name }} +
+
+
+
+ +
+
+
+
+ + + +
+ +
+ {{ folder.name }} +
+
+
+
+ +
+
+
  • +
    + + + +
    + +
    +
    +
    +
    + {{ item.name }} #{{ item.code }} + {{ item.cosht | curr }} BYN +
    +
    +
    + + + +
    +
    +
    +
    + + + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    • +
    +
    +
    + +
    + +
    +
    +
    \ No newline at end of file