diff --git a/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php b/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php index 714a31d..f242520 100644 --- a/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php +++ b/app/Modules/Bitrix/Http/Controllers/BitrixApiController.php @@ -50,9 +50,12 @@ public function confirmCompany(Request $request, $company) public function confirmDeal(Deal $deal, Request $request) { $agent = $deal->agent; - $request->is_unique = json_decode($request->is_unique, true); + $request->is_unique = json_decode($request->is_unique, true);//т.к. приходит в строке if ($request->is_unique == true) { $deal->status = DealStatus::UNIQUE; + if ($request->has('unique_until')) { + $deal->unique_until = $request->unique_until; + } $agent->user->notify(new UniqueContact($deal)); $deal->notify(new DealUnique()); } else { diff --git a/app/Modules/Contracts/Views/contract.blade.php b/app/Modules/Contracts/Views/contract.blade.php index 78b5177..6968f61 100644 --- a/app/Modules/Contracts/Views/contract.blade.php +++ b/app/Modules/Contracts/Views/contract.blade.php @@ -36,6 +36,9 @@ class="bi bi-arrow-right" viewBox="0 0 16 16">
{{ $contract->deal->complex->city->name }}
{{ $contract->deal->complex->name }}
+ @if($contract->deal->unique_until) +
Срок уникальности истечет {{ \Carbon\Carbon::parse($contract->deal->unique_until)->diffForHumans() }} + @endif
diff --git a/app/Modules/Main/Database/Migrations/2026_04_21_000001_add_unique_untill_field_to_deals_table.php b/app/Modules/Main/Database/Migrations/2026_04_21_000001_add_unique_untill_field_to_deals_table.php index dbfcde9..4aeb9d8 100644 --- a/app/Modules/Main/Database/Migrations/2026_04_21_000001_add_unique_untill_field_to_deals_table.php +++ b/app/Modules/Main/Database/Migrations/2026_04_21_000001_add_unique_untill_field_to_deals_table.php @@ -13,7 +13,7 @@ public function up(): void { Schema::table('deals', function (Blueprint $table) { - $table->date('unique_untill')->nullable(); + $table->date('unique_until')->nullable(); }); } diff --git a/app/Modules/Main/Models/Deal/Deal.php b/app/Modules/Main/Models/Deal/Deal.php index 2f67f93..2f17cc9 100644 --- a/app/Modules/Main/Models/Deal/Deal.php +++ b/app/Modules/Main/Models/Deal/Deal.php @@ -25,8 +25,14 @@ class Deal extends Model 'bitrix_id', 'is_unique', 'confirm_token', - 'plan7_data' + 'plan7_data', + 'unique_until' ]; + + protected $dates =[ + 'unique_until','deleted_at' + ]; + public function complex() { return $this->belongsTo(Complex::class, 'complex_id'); diff --git a/resources/views/livewire/clients-table.blade.php b/resources/views/livewire/clients-table.blade.php index 5006630..4e13bee 100644 --- a/resources/views/livewire/clients-table.blade.php +++ b/resources/views/livewire/clients-table.blade.php @@ -16,7 +16,10 @@ foreach ($clientDeals as $deal) { //echo 'dId:' . $deal->id; $filterRow[] = 'filter[deal_id][]=' . $deal->id; - $complexesNames[] = $deal->complex?->name; + $complexesNames[] = '' + . $deal->complex?->name + . (($deal->unique_until) ? ''. '' . '' : '' ) + . ''; $companiesNames[] = $deal->agent?->company?->name; $agentsNames[] = $deal->agent?->user?->name; }