Skip to content

Commit 1dd593c

Browse files
cybersoldattechmckenziearts
cybersoldattech
and
mckenziearts
authored
fix:[lar-146] undefined name fix after payement (#270)
Co-authored-by: Arthur Monney <monneylobe@gmail.com>
1 parent 4767893 commit 1dd593c

File tree

5 files changed

+32
-37
lines changed

5 files changed

+32
-37
lines changed

‎app/Livewire/Components/SponsorSubscription.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public function submit(): void
111111

112112
$email = data_get($this->form->getState(), 'email');
113113
$amount = data_get($this->form->getState(), 'amount');
114+
$name = data_get($this->form->getState(), 'name');
114115

115116
/** @var User $user */
116117
$user = Auth::check() ? Auth::user() : User::findByEmailAddress(config('lcm.support_email'));
@@ -121,7 +122,7 @@ public function submit(): void
121122
$payload = Payment::initialize([
122123
'amount' => $amount,
123124
'email' => $email,
124-
'name' => data_get($this->form->getState(), 'name'),
125+
'name' => $name,
125126
'currency' => data_get($this->form->getState(), 'currency'),
126127
'reference' => $user->id.'-'.$user->username().'-'.uniqid(),
127128
'callback' => route('notchpay-callback'),
@@ -141,6 +142,7 @@ public function submit(): void
141142
'merchant' => [
142143
'reference' => $payload->transaction->merchant_reference,
143144
'customer' => $payload->transaction->customer,
145+
'name' => $name,
144146
'laravel_cm_id' => Auth::id() ?? null,
145147
'profile' => data_get($this->form->getState(), 'profile'),
146148
],

‎lang/fr/pages/account.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
'latest_of' => 'Dernières activités de :name',
2929
'empty' => 'Aucune activité pour le moment.',
3030
'empty_articles' => "n'a pas encore rédigé d'articles",
31-
'empty_discussions' => "n'a pas encore démarrer de discussions",
31+
'empty_discussions' => "n'a pas encore démarré de discussions",
3232
'empty_threads' => "n'a pas encore posté de sujets",
3333
],
3434

‎resources/views/components/sponsor-profile.blade.php

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,41 @@
22
'sponsor',
33
])
44

5+
@php
6+
$isUser = data_get($sponsor->getMetadata('merchant'), 'laravel_cm_id')
7+
@endphp
8+
59
<div x-data id="{{ $sponsor->id }}">
610
<template x-ref="template">
7-
<div class="w-full max-w-xs rounded-md bg-skin-card px-4 py-2">
11+
<div class="w-full max-w-xs px-3 py-2">
812
<div class="flex items-center space-x-2">
9-
@if ($sponsor->getMetadata('merchant')['laravel_cm_id'])
10-
<img
11-
class="size-8 rounded-full object-cover"
12-
src="{{ $sponsor->user->profile_photo_url }}"
13-
alt=""
14-
/>
13+
@if ($isUser)
14+
<x-user.avatar :user="$sponsor->user" class="size-6" />
1515
@else
16-
<svg class="size-8 text-gray-400 dark:text-gray-500" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
16+
<svg class="size-6 text-gray-400 dark:text-gray-500" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
1717
<path
1818
fill-rule="evenodd"
1919
d="M18.685 19.097A9.723 9.723 0 0021.75 12c0-5.385-4.365-9.75-9.75-9.75S2.25 6.615 2.25 12a9.723 9.723 0 003.065 7.097A9.716 9.716 0 0012 21.75a9.716 9.716 0 006.685-2.653zm-12.54-1.285A7.486 7.486 0 0112 15a7.486 7.486 0 015.855 2.812A8.224 8.224 0 0112 20.25a8.224 8.224 0 01-5.855-2.438zM15.75 9a3.75 3.75 0 11-7.5 0 3.75 3.75 0 017.5 0z"
2020
clip-rule="evenodd"
2121
/>
2222
</svg>
2323
@endif
24-
<div class="flex items-center text-sm leading-5 text-gray-500 dark:text-gray-400">
25-
@if ($sponsor->getMetadata('merchant')['laravel_cm_id'])
26-
<span>{{ $sponsor->user->username }}</span>
27-
<span class="ml-1 font-medium text-gray-700 dark:text-gray-300">{{ $sponsor->user->name }}</span>
28-
@else
29-
<span>{{ $sponsor->getMetadata('merchant')['name'] }}</span>
24+
25+
<div class="flex items-center text-xs/5 text-gray-400">
26+
@if ($isUser)
27+
<span>{{ $sponsor->user->username }} -</span>
28+
<span class="ml-1 font-medium text-gray-300">{{ $sponsor->user->name }}</span>
3029
@endif
30+
31+
@if(!$isUser && data_get($sponsor->getMetadata('merchant'), 'name'))
32+
<span>{{ $sponsor->getMetadata('merchant')['name'] }}</span>
33+
@endisset
3134
</div>
3235
</div>
33-
@if ($sponsor->getMetadata('merchant')['laravel_cm_id'])
34-
<p class="line-clamp-3 text-sm leading-5 text-gray-500 dark:text-gray-400">{{ $sponsor->user->bio ?? ' ' }}</p>
36+
@if ($isUser)
37+
<p class="line-clamp-2 text-xs/5 text-white">
38+
{{ $sponsor->user->bio ? \Illuminate\Support\Str::limit($sponsor->user->bio, 50) : '' }}
39+
</p>
3540
@endif
3641
</div>
3742
</template>
@@ -42,14 +47,10 @@ class="size-8 rounded-full object-cover"
4247
appendTo: $root,
4348
}"
4449
class="relative inline-flex items-center"
45-
href="{{ $sponsor->getMetadata('merchant')['laravel_cm_id'] ? route('profile', ['username' => $sponsor->user->username]) : '#' }}"
50+
href="{{ $isUser ? route('profile', $sponsor->user) : '#' }}"
4651
>
47-
@if ($sponsor->getMetadata('merchant')['laravel_cm_id'])
48-
<img
49-
class="mx-auto size-8 rounded-full object-cover"
50-
src="{{ $sponsor->user->profile_photo_url }}"
51-
alt=""
52-
/>
52+
@if ($isUser)
53+
<x-user.avatar :user="$sponsor->user" class="size-8" />
5354
@else
5455
<span class="flex size-10 items-center">
5556
<svg class="h-full w-full text-gray-400 dark:text-gray-500" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">

‎resources/views/livewire/pages/account/profile.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ class="size-24 !ring-4 ring-white dark:ring-gray-800 lg:size-32"
4343
</time>
4444
</p>
4545

46-
@isset($user->location)
46+
@if ($user->location)
4747
<div class="mt-1 text-sm flex items-center gap-2">
4848
<h5 class="sr-only">{{ __('pages/account.account.location') }}</h5>
4949
<x-untitledui-marker-pin-02 class="size-4 text-gray-400 dark:text-gray-500" aria-hidden="true" />
5050
<p class="text-gray-500 dark:text-gray-400">
5151
{{ $user->location }}
5252
</p>
5353
</div>
54-
@endisset
54+
@endif
5555

56-
@isset($user->bio)
56+
@if ($user->bio)
5757
<div class="mt-4">
5858
<h5 class="sr-only">{{ __('pages/account.account.biography') }}</h5>
5959
<p class="text-sm text-gray-600 max-w-lg dark:text-gray-300">
6060
{{ $user->bio }}
6161
</p>
6262
</div>
63-
@endisset
63+
@endif
6464

6565
@if ($user->githubUsername() || $user->twitter() || $user->linkedin() || $user->website)
6666
<div class="mt-5 flex items-center gap-4">

‎routes/features/account.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@
22

33
declare(strict_types=1);
44

5-
use App\Http\Controllers\User;
65
use App\Livewire\Pages\Account;
76
use Illuminate\Support\Facades\Route;
87

9-
// Settings
10-
/*Route::prefix('settings')->as('user.')->middleware(['auth', 'checkIfBanned'])->group(function (): void {
11-
Route::put('/', [User\SettingController::class, 'update'])->name('settings.update');
12-
Route::view('/customization', 'user.settings.customization')->name('customization')->middleware('verified');
13-
Route::view('/notifications', 'user.settings.notifications')->name('notifications')->middleware('verified');
14-
});*/
15-
168
Route::middleware(['auth', 'checkIfBanned', 'verified'])->group(function (): void {
179
Route::get('/settings', Account\Settings::class)->name('settings');
1810
Route::get('/dashboard', Account\Dashboard::class)->name('dashboard');

0 commit comments

Comments
 (0)