From c18348a43d162e8d2f6af66e07eef22e24f7b837 Mon Sep 17 00:00:00 2001
From: Rustem <sapargaliyev.r@yandex.kz>
Date: Mon, 2 Jun 2025 10:22:45 +0500
Subject: [PATCH] master

---
 modules/applications/app.json | 61 ++++++++++++-----------------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/modules/applications/app.json b/modules/applications/app.json
index 4c91be8..ea195b0 100644
--- a/modules/applications/app.json
+++ b/modules/applications/app.json
@@ -35,9 +35,6 @@
             "phone": {
                 "type": "string"
             },
-            "status": {
-                "type": "string"
-            },
             "user_name": {
                 "type": "string"
             },
@@ -70,12 +67,11 @@
                 { "name": "car_id", "caption": "Машина" },
                 { "name": "user_id", "caption": "Пользователь" },
                 { "name": "phone", "caption": "Телефон" },
-                { "name": "status", "caption": "Статус" },
                 { "name": "user_name", "caption": "Имя" },
                 { "name": "user_surname", "caption": "Фамилия" },
                 { "name": "user_email", "caption": "Email" },
                 { "name": "started_at", "caption": "Начало" },
-                { "name": "ended_at", "caption": "Окончания" }
+                { "name": "ended_at", "caption": "Окончание" }
             ],
             "action": {
                 "head": [
@@ -118,8 +114,7 @@
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "phone", "label": "Телефон" } },
-                                { "size": 6, "input": { "name": "status", "label": "Статус" } }
+                                { "size": 6, "input": { "name": "phone", "label": "Телефон" } }
                             ]
                         },
                         {
@@ -136,7 +131,7 @@
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "ended_at", "label": "Окончания" } },
+                                { "size": 6, "input": { "name": "ended_at", "label": "Окончание" } },
                                 { "size": 6, "input": { "name": "photos", "label": "Фотографии", "type": "files"} }
                             ]
                         }
@@ -157,25 +152,20 @@
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "phone", "label": "Телефон" } },
-                                { "size": 6, "input": { "name": "status", "label": "Статус" } }
+                                { "size": 4, "input": { "name": "phone", "label": "Телефон" } },
+                                { "size": 4, "input": { "name": "user_name", "label": "Имя" } },
+                                { "size": 4, "input": { "name": "user_surname", "label": "Фамилия" } }
                             ]
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "user_name", "label": "Имя" } },
-                                { "size": 6, "input": { "name": "user_surname", "label": "Фамилия" } }
+                                { "size": 4, "input": { "name": "user_email", "label": "Email" } },
+                                { "size": 4, "input": { "name": "started_at", "label": "Начало" } },
+                                { "size": 4, "input": { "name": "ended_at", "label": "Окончание" } }
                             ]
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "user_email", "label": "Email" } },
-                                { "size": 6, "input": { "name": "started_at", "label": "Начало" } }
-                            ]
-                        },
-                        {
-                            "cols": [
-                                { "size": 6, "input": { "name": "ended_at", "label": "Окончания" } },
                                 { "size": 6, "input": { "name": "photos", "label": "Фотографии", "type": "files"} }
                             ]
                         }
@@ -200,25 +190,20 @@
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "phone", "label": "Телефон" } },
-                                { "size": 6, "input": { "name": "status", "label": "Статус" } }
+                                { "size": 4, "input": { "name": "phone", "label": "Телефон" } },
+                                { "size": 4, "input": { "name": "user_name", "label": "Имя" } },
+                                { "size": 4, "input": { "name": "user_surname", "label": "Фамилия" } }
                             ]
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "user_name", "label": "Имя" } },
-                                { "size": 6, "input": { "name": "user_surname", "label": "Фамилия" } }
+                                { "size": 4, "input": { "name": "user_email", "label": "Email" } },
+                                { "size": 4, "input": { "name": "started_at", "label": "Начало" } },
+                                { "size": 4, "input": { "name": "ended_at", "label": "Окончание" } }
                             ]
                         },
                         {
                             "cols": [
-                                { "size": 6, "input": { "name": "user_email", "label": "Email" } },
-                                { "size": 6, "input": { "name": "started_at", "label": "Начало" } }
-                            ]
-                        },
-                        {
-                            "cols": [
-                                { "size": 6, "input": { "name": "ended_at", "label": "Окончания" } },
                                 { "size": 6, "input": { "name": "photos", "label": "Фотографии", "type": "files"} }
                             ]
                         }
@@ -228,24 +213,20 @@
                             "type": "logic",
                             "name": "App.Modules.applications.Logic.Approve",
                             "label": "Подтвердить заявку",
-                            "icon": "bi bi-check",
                             "btn": "btn btn-success",
                             "condition": "status,==,pending"
                         },
                         {
                             "type": "logic",
-                            "name": "App.Modules.applications.Logic.Extend",
-                            "label": "Продлить аренду",
-                            "icon": "bi bi-check",
-                            "btn": "btn btn-success",
-                            "condition": "status,==,approved"
+                            "name": "App.Modules.applications.Logic.Cancel",
+                            "label": "Отменить заявку",
+                            "btn": "btn btn-danger"
                         },
                         {
                             "type": "logic",
-                            "name": "App.Modules.applications.Logic.Cancel",
-                            "label": "Отменить заявку",
-                            "icon": "bi bi-check",
-                            "btn": "btn btn-danger"
+                            "name": "App.Modules.applications.Logic.Extend",
+                            "label": "Продлить аренду",
+                            "btn": "btn btn-success"
                         },
                         "struct:crud.form.submit.save",
                         "struct:crud.form.submit.close"