From a032cd52aa6f542d0b85ee6df0f3fcbcabb91293 Mon Sep 17 00:00:00 2001
From: Thekindbull <thekindbull@gmail.com>
Date: Wed, 18 Jun 2025 09:45:36 +0800
Subject: [PATCH] contract api updated

---
 .../Bitrix/ContractApiController.php          |  3 +-
 app/Models/Deal/Contract.php                  |  3 +-
 ..._add_plan7_id_column_to_contract_table.php | 30 +++++++
 .../views/clients/contract/index.blade.php    | 78 ++++++++++++-------
 4 files changed, 84 insertions(+), 30 deletions(-)
 create mode 100644 database/migrations/2025_06_18_095056_add_plan7_id_column_to_contract_table.php

diff --git a/app/Http/Controllers/Bitrix/ContractApiController.php b/app/Http/Controllers/Bitrix/ContractApiController.php
index bc0b4ef..5b99ccc 100644
--- a/app/Http/Controllers/Bitrix/ContractApiController.php
+++ b/app/Http/Controllers/Bitrix/ContractApiController.php
@@ -27,7 +27,8 @@ public function __invoke(Deal $deal, Request $request)
                     'room'         => $request->room,//Номер квартиры
                     'date'         => $request->date,//дата ДДУ
                     'reg_date'     => $request->reg_date,//Дата регистрации ДДУ
-                    'payment_type' => $request->payment_type//Вид оплаты
+                    'payment_type' => $request->payment_type,//Вид оплаты
+                    'plan7_id'     => $request->plan7_id
                 ]
             );
         $agent = $deal->agent;
diff --git a/app/Models/Deal/Contract.php b/app/Models/Deal/Contract.php
index b458696..208a2e0 100644
--- a/app/Models/Deal/Contract.php
+++ b/app/Models/Deal/Contract.php
@@ -23,7 +23,8 @@ class Contract extends Model
         'room',//Номер квартиры
         'date',//дата ДДУ
         'reg_date',//Дата регистрации ДДУ
-        'payment_type'//Вид оплаты
+        'payment_type',//Вид оплаты
+        'plan7_id'//ид помещения из plan7
     ];
 
     public function deal()
diff --git a/database/migrations/2025_06_18_095056_add_plan7_id_column_to_contract_table.php b/database/migrations/2025_06_18_095056_add_plan7_id_column_to_contract_table.php
new file mode 100644
index 0000000..daf95bc
--- /dev/null
+++ b/database/migrations/2025_06_18_095056_add_plan7_id_column_to_contract_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('client_contract', function (Blueprint $table)
+        {
+            $table->integer('plan7_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('client_contract', function (Blueprint $table)
+        {
+            //
+        });
+    }
+};
diff --git a/resources/views/clients/contract/index.blade.php b/resources/views/clients/contract/index.blade.php
index 6059302..d17f5b3 100644
--- a/resources/views/clients/contract/index.blade.php
+++ b/resources/views/clients/contract/index.blade.php
@@ -5,19 +5,21 @@
         <div class="col-12 col-lg-8">
             <!--Имя и контакты-->
             <div class="row py-5">
-                <div class="col-12 col-lg-4">
+                <div class="col">
                     <div class="fs-6 text-secondary">ФИО</div>
                     <div class="fw-bold fs-5 text-truncate">{{ $contract->deal->user->name }}</div>
                 </div>
-                <div class="col-12 col-lg-3">
-                    <div class="fs-6 text-secondary">Email</div>
-                    <div class="fw-bold fs-5 text-truncate">{{ $contract->deal->user->email }}</div>
-                </div>
-                <div class="col-12 col-lg-3">
+                <div class="col">
                     <div class="fs-6 text-secondary">Телефон</div>
                     <div class="fw-bold fs-5 text-truncate">{{ $contract->deal->user->phone }}</div>
                 </div>
-                <div class="d-none d-lg-block col-2 text-end">
+                @if ($contract->deal->user->email)
+                    <div class="col">
+                        <div class="fs-6 text-secondary">Email</div>
+                        <div class="fw-bold fs-5 text-truncate">{{ $contract->deal->user->email }}</div>
+                    </div>
+                @endif
+                <div class="d-none col text-end">
                     <a href="" class="btn border-1 border-secondary-subtle text-secondary rounded-4 p-3">
                         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor"
                             class="bi bi-arrow-right" viewBox="0 0 16 16">
@@ -31,24 +33,24 @@ class="bi bi-arrow-right" viewBox="0 0 16 16">
             <div class="row bg-white py-3">
                 <div class="col-9">
                     <div class="fs-5 fw-bold my-2">{{ $contract->deal->complex->city->name }}</div>
-                    <div class="fs-5 fw-bold text-secondary my-2">Не выбрано</div>
+                    <div class="fs-5 fw-bold text-secondary my-2">{{ $contract->deal->complex->name }}</div>
                 </div>
                 <div class="col-3 text-end">
-                    <a href="" class="btn border-1 border-secondary-subtle text-secondary rounded-4 p-3">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor"
-                            class="bi bi-trash3" viewBox="0 0 16 16">
-                            <path
-                                d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5M11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47M8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5" />
-                        </svg>
-                    </a>
+                    <!--<a href="" class="btn border-1 border-secondary-subtle text-secondary rounded-4 p-3">
+                                                                                                                                        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor"
+                                                                                                                                            class="bi bi-trash3" viewBox="0 0 16 16">
+                                                                                                                                            <path
+                                                                                                                                                d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5M11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47M8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5" />
+                                                                                                                                        </svg>
+                                                                                                                                    </a>
 
-                    <a href="" class="btn border-1 border-secondary-subtle text-secondary rounded-4 p-3">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor"
-                            class="bi bi-pen" viewBox="0 0 16 16">
-                            <path
-                                d="m13.498.795.149-.149a1.207 1.207 0 1 1 1.707 1.708l-.149.148a1.5 1.5 0 0 1-.059 2.059L4.854 14.854a.5.5 0 0 1-.233.131l-4 1a.5.5 0 0 1-.606-.606l1-4a.5.5 0 0 1 .131-.232l9.642-9.642a.5.5 0 0 0-.642.056L6.854 4.854a.5.5 0 1 1-.708-.708L9.44.854A1.5 1.5 0 0 1 11.5.796a1.5 1.5 0 0 1 1.998-.001m-.644.766a.5.5 0 0 0-.707 0L1.95 11.756l-.764 3.057 3.057-.764L14.44 3.854a.5.5 0 0 0 0-.708z" />
-                        </svg>
-                    </a>
+                                                                                                                                    <a href="" class="btn border-1 border-secondary-subtle text-secondary rounded-4 p-3">
+                                                                                                                                        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor"
+                                                                                                                                            class="bi bi-pen" viewBox="0 0 16 16">
+                                                                                                                                            <path
+                                                                                                                                                d="m13.498.795.149-.149a1.207 1.207 0 1 1 1.707 1.708l-.149.148a1.5 1.5 0 0 1-.059 2.059L4.854 14.854a.5.5 0 0 1-.233.131l-4 1a.5.5 0 0 1-.606-.606l1-4a.5.5 0 0 1 .131-.232l9.642-9.642a.5.5 0 0 0-.642.056L6.854 4.854a.5.5 0 1 1-.708-.708L9.44.854A1.5 1.5 0 0 1 11.5.796a1.5 1.5 0 0 1 1.998-.001m-.644.766a.5.5 0 0 0-.707 0L1.95 11.756l-.764 3.057 3.057-.764L14.44 3.854a.5.5 0 0 0 0-.708z" />
+                                                                                                                                        </svg>
+                                                                                                                                    </a>-->
                 </div>
             </div>
             <!--Основная часть-->
@@ -62,19 +64,39 @@ class="bi bi-pen" viewBox="0 0 16 16">
                             </div>
                         </div>
                         <div class="col col-md-6">
-                            <div class="fs-6 text-secondary">Дата создания</div>
+                            <div class="fs-6 text-secondary">Дата обновления</div>
                             <div class="fw-bold fs-5 text-truncate text-dark-emphasis">
-                                {{ $contract->created_at->format('d.m.y H:i') }}</div>
+                                {{ $contract->updated_at->format('d.m.y H:i') }}</div>
+                        </div>
+                    </div>
+                    <div class="row my-4">
+                        <div class="col col-md-4">
+                            <div class="fs-6 text-secondary">Площадь объекта</div>
+                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">{{ $contract->square }}</div>
+                        </div>
+                        <div class="col col-md-4">
+                            <div class="fs-6 text-secondary">Этаж</div>
+                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">{{ $contract->floor }}</div>
+                        </div>
+                        <div class="col col-md-4">
+                            <div class="fs-6 text-secondary">Помещение</div>
+                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">{{ $contract->room }}</div>
                         </div>
                     </div>
                     <div class="row my-4">
                         <div class="col col-md-6">
-                            <div class="fs-6 text-secondary">Площадь объекта</div>
-                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">{{ $contract->square }}</div>
+                            <div class="fs-6 text-secondary">Стоимость</div>
+                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">
+                                {{ number_format($contract->price, 2, ',', ' ') }}
+                                <div class="fs-6">
+                                    <span class="badge bg-secondary">{{ $contract->payment_type }}</span>
+                                </div>
+                            </div>
                         </div>
                         <div class="col col-md-6">
-                            <div class="fs-6 text-secondary">Этаж</div>
-                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">{{ $contract->floor }}</div>
+                            <div class="fs-6 text-secondary">Вознаграждение</div>
+                            <div class="fw-bold fs-5 text-truncate text-dark-emphasis">
+                                {{ number_format($contract->reward, 2, ',', ' ') }}</div>
                         </div>
                     </div>
                     <div class="row my-4">