добавил вывод срока уникальности

This commit is contained in:
developer 2026-04-22 09:50:31 +08:00
parent 4886817adf
commit 23ccaad96f
5 changed files with 19 additions and 4 deletions

View File

@ -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 {

View File

@ -36,6 +36,9 @@ class="bi bi-arrow-right" viewBox="0 0 16 16">
<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">{{ $contract->deal->complex->name }}</div>
@if($contract->deal->unique_until)
<div class="text-secondary my-2"><i class="bi bi-info-circle-fill"></i> Срок уникальности истечет {{ \Carbon\Carbon::parse($contract->deal->unique_until)->diffForHumans() }}
@endif
</div>
<div class="col-3 text-end">
</div>

View File

@ -13,7 +13,7 @@ public function up(): void
{
Schema::table('deals', function (Blueprint $table)
{
$table->date('unique_untill')->nullable();
$table->date('unique_until')->nullable();
});
}

View File

@ -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');

View File

@ -16,7 +16,10 @@
foreach ($clientDeals as $deal) {
//echo 'dId:' . $deal->id;
$filterRow[] = 'filter[deal_id][]=' . $deal->id;
$complexesNames[] = $deal->complex?->name;
$complexesNames[] = '<span>'
. $deal->complex?->name
. (($deal->unique_until) ? '<span class="ms-1" title="Срок уникальности истечет ' . \Carbon\Carbon::parse($deal->unique_until)->diffForHumans() . '">'. '<i class="bi bi-info-circle-fill"></i>' . '</span>' : '' )
. '</span>';
$companiesNames[] = $deal->agent?->company?->name;
$agentsNames[] = $deal->agent?->user?->name;
}