Skip to content

Commit 3ccbebb

Browse files
mckenzieartsmckenziearts
authored
Migrate notchpay (#122)
* Add new tags * Delete telescope styles * Update NotchPay payment process * Update phpstan error
1 parent 2057888 commit 3ccbebb

File tree

23 files changed

+126130
-734
lines changed

23 files changed

+126130
-734
lines changed

‎app/Http/Controllers/NotchPayCallBackController.php‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
use App\Models\Transaction;
1010
use Illuminate\Http\RedirectResponse;
1111
use Illuminate\Http\Request;
12+
use Illuminate\Support\Facades\Cache;
13+
use Illuminate\Support\Facades\Log;
14+
use NotchPay\NotchPay;
15+
use NotchPay\Payment;
1216

1317
class NotchPayCallBackController extends Controller
1418
{
@@ -18,18 +22,40 @@ public function __invoke(Request $request): RedirectResponse
1822
$transaction = Transaction::query()
1923
->where('transaction_reference', $request->get('reference'))
2024
->firstOrFail();
21-
$transaction->update(['status' => $request->get('status')]);
2225

23-
if ($request->get('status') === TransactionStatus::CANCELED->value) {
24-
session()->flash('error', __('Votre paiement a été annulé veuillez relancer si vous souhaitez soutenir Laravel Cameroun, Merci.'));
25-
} else {
26-
// @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
27-
event(new SponsoringPaymentInitialize($transaction));
28-
29-
session()->flash('status', __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.'));
26+
NotchPay::setApiKey(
27+
apiKey: config('lcm.notch-pay-public-token')
28+
);
29+
30+
try {
31+
$verifyTransaction = Payment::verify(reference: $request->get('reference'));
32+
$transaction->update(['status' => $verifyTransaction->transaction->status]); // @phpstan-ignore-line
33+
34+
// @phpstan-ignore-next-line
35+
if ($verifyTransaction->transaction->status === TransactionStatus::CANCELED->value) {
36+
session()->flash(
37+
key: 'error',
38+
value: __('Votre paiement a été annulé veuillez relancer pour soutenir Laravel Cameroun, Merci.')
39+
);
40+
} else {
41+
// @ToDO Envoie de mail de notification de remerciement pour le sponsoring si l'utilisateur est dans la base de données
42+
event(new SponsoringPaymentInitialize($transaction));
43+
Cache::forget(key: 'sponsors');
44+
45+
session()->flash(
46+
key: 'status',
47+
value: __('Votre paiement a été pris en compte merci de soutenir Laravel Cameroun.')
48+
);
49+
}
50+
51+
} catch (\NotchPay\Exceptions\ApiException $e) {
52+
Log::error($e->getMessage());
53+
session()->flash(
54+
key: 'error',
55+
value: __('Une erreur s\'est produite lors de votre paiement. Veuillez relancer Merci.')
56+
);
3057
}
3158

32-
3359
return redirect(route('sponsors'));
3460
}
3561
}

‎app/Http/Controllers/SponsoringController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class SponsoringController extends Controller
1313
public function sponsors(): View
1414
{
1515
$sponsors = Cache::remember(
16-
'sponsors',
17-
3600,
18-
fn () => Transaction::with(['user', 'user.media'])
16+
key: 'sponsors',
17+
ttl: 3600,
18+
callback: fn () => Transaction::with(['user', 'user.media'])
1919
->scopes('complete')
2020
->get(['id', 'user_id', 'metadata'])
2121
);

‎app/Http/Livewire/Modals/AnonymousSponsors.php‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
use App\Models\Transaction;
1010
use App\Models\User;
1111
use Illuminate\Contracts\View\View;
12+
use Illuminate\Support\Facades\Log;
1213
use LivewireUI\Modal\ModalComponent;
1314
use NotchPay\NotchPay;
15+
use NotchPay\Payment;
1416

1517
class AnonymousSponsors extends ModalComponent
1618
{
@@ -31,22 +33,28 @@ public function mount(string $amount, string $option, string $currency): void
3133

3234
public function submit(): void
3335
{
34-
$this->validate([
35-
'name' => 'required',
36-
'email' => 'required|email',
37-
], [
38-
'name.required' => __('Votre nom est requis'),
39-
'email.required' => __('Une adresse e-mail est requise'),
40-
'email.email' => __('Veuillez renseigner une adresse e-mail valide'),
41-
]);
36+
$this->validate(
37+
rules: [
38+
'name' => 'required',
39+
'email' => 'required|email',
40+
],
41+
messages: [
42+
'name.required' => __('Votre nom est requis'),
43+
'email.required' => __('Une adresse e-mail est requise'),
44+
'email.email' => __('Veuillez renseigner une adresse e-mail valide'),
45+
]
46+
);
4247

43-
$adminUser = User::findByEmailAddress('support@laravel.cm');
48+
$adminUser = User::findByEmailAddress(
49+
emailAddress: app()->environment('production') ? 'support@laravel.cm' : 'user@laravel.cm'
50+
);
4451

45-
$notchPay = new NotchPay(config('lcm.notch-pay-public-token'));
52+
NotchPay::setApiKey(
53+
apiKey: config('lcm.notch-pay-public-token')
54+
);
4655

4756
try {
48-
// @phpstan-ignore-next-line
49-
$payload = $notchPay->payment->initialize([
57+
$payload = Payment::initialize([
5058
'amount' => $this->amount,
5159
'email' => $this->email,
5260
'name' => $this->name,
@@ -80,9 +88,13 @@ public function submit(): void
8088
]
8189
]);
8290

83-
$this->redirect($payload->authorization_url);
84-
} catch (NotchPay\Exception\ApiException $e) {
85-
session()->flash('error', __('Impossible de procéder au paiement, veuillez recommencer plus tard. Merci'));
91+
$this->redirect($payload->authorization_url); // @phpstan-ignore-line
92+
} catch (\NotchPay\Exceptions\ApiException $e) {
93+
Log::error($e->getMessage());
94+
session()->flash(
95+
key: 'error',
96+
value: __('Impossible de procéder au paiement, veuillez recommencer plus tard. Merci')
97+
);
8698
}
8799
}
88100

‎app/Http/Livewire/SponsorSubscription.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
use App\Models\Transaction;
1010
use Illuminate\Contracts\View\View;
1111
use Illuminate\Support\Facades\Auth;
12+
use Illuminate\Support\Facades\Log;
1213
use Livewire\Component;
1314
use NotchPay\NotchPay;
15+
use NotchPay\Payment;
1416

1517
class SponsorSubscription extends Component
1618
{
@@ -37,11 +39,10 @@ public function subscribe(): void
3739
return;
3840
}
3941

40-
$notchPay = new NotchPay(config('lcm.notch-pay-public-token'));
42+
NotchPay::setApiKey(apiKey: config('lcm.notch-pay-public-token'));
4143

4244
try {
43-
// @phpstan-ignore-next-line
44-
$payload = $notchPay->payment->initialize([
45+
$payload = Payment::initialize([
4546
'amount' => $this->amount,
4647
'email' => Auth::user()?->email,
4748
'name' => Auth::user()?->name,
@@ -76,8 +77,9 @@ public function subscribe(): void
7677
],
7778
]);
7879

79-
$this->redirect($payload->authorization_url);
80-
} catch (NotchPay\Exception\ApiException $e) {
80+
$this->redirect($payload->authorization_url); // @phpstan-ignore-line
81+
} catch (\NotchPay\Exceptions\ApiException $e) {
82+
Log::error($e->getMessage());
8183
session()->flash('error', __('Impossible de procéder au paiement, veuillez recommencer plus tard. Merci'));
8284
}
8385
}

‎app/Http/Middleware/Authenticate.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ class Authenticate extends Middleware
1414
* @param \Illuminate\Http\Request $request
1515
* @return string|null
1616
*/
17-
protected function redirectTo($request)
17+
protected function redirectTo($request): ?string
1818
{
1919
if (! $request->expectsJson()) {
2020
return route('login');
2121
}
22+
23+
return null;
2224
}
2325
}

‎composer.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,62 @@
99
"ext-fileinfo": "*",
1010
"ext-json": "*",
1111
"archtechx/laravel-seo": "^0.5.1",
12-
"arrilot/laravel-widgets": "^3.13",
13-
"bensampo/laravel-enum": "^6.0",
12+
"arrilot/laravel-widgets": "^3.13.2",
13+
"bensampo/laravel-enum": "^6.3.3",
1414
"blade-ui-kit/blade-heroicons": "^1.4",
15-
"blade-ui-kit/blade-ui-kit": "^0.3",
15+
"blade-ui-kit/blade-ui-kit": "^0.3.4",
1616
"cyrildewit/eloquent-viewable": "^6.1",
17-
"doctrine/dbal": "^3.5",
18-
"filament/notifications": "^2.17",
17+
"doctrine/dbal": "^3.6.4",
18+
"filament/notifications": "^2.17.49",
1919
"francescomalatesta/laravel-feature": "^3.0",
2020
"graham-campbell/markdown": "^14.0",
21-
"guzzlehttp/guzzle": "^7.0.1",
22-
"jenssegers/agent": "^2.6",
23-
"laravel-notification-channels/telegram": "^2.0",
24-
"laravel-notification-channels/twitter": "^6.0",
25-
"laravel/fortify": "^1.13",
26-
"laravel/framework": "^9.47",
27-
"laravel/sanctum": "^3.2",
28-
"laravel/slack-notification-channel": "^2.4",
29-
"laravel/socialite": "^5.2",
30-
"laravel/tinker": "^2.5",
31-
"livewire/livewire": "^2.11",
32-
"lorisleiva/laravel-actions": "^2.5",
33-
"nnjeim/world": "^1.1",
34-
"notchpay/php-sdk": "^2.2",
35-
"qcod/laravel-gamify": "^1.0.6",
36-
"ramsey/uuid": "^4.2",
21+
"guzzlehttp/guzzle": "^7.7.0",
22+
"jenssegers/agent": "^2.6.4",
23+
"laravel-notification-channels/telegram": "^2.1",
24+
"laravel-notification-channels/twitter": "^6.2",
25+
"laravel/fortify": "^1.17.4",
26+
"laravel/framework": "^9.52.10",
27+
"laravel/sanctum": "^3.2.5",
28+
"laravel/slack-notification-channel": "^2.5",
29+
"laravel/socialite": "^5.6.3",
30+
"laravel/tinker": "^2.8.1",
31+
"livewire/livewire": "^2.12.3",
32+
"lorisleiva/laravel-actions": "^2.6",
33+
"nnjeim/world": "^1.1.27",
34+
"notchpay/notchpay-php": "^1.3",
35+
"qcod/laravel-gamify": "^1.0.7",
36+
"ramsey/uuid": "^4.7.4",
3737
"rinvex/laravel-subscriptions": "^6.1",
38-
"sentry/sentry-laravel": "^2.10",
39-
"socialiteproviders/twitter": "^4.1",
40-
"spatie/laravel-feed": "^4.1",
41-
"spatie/laravel-google-fonts": "^1.2",
42-
"spatie/laravel-medialibrary": "^10.4.3",
43-
"spatie/laravel-permission": "^5.1",
44-
"spatie/laravel-sitemap": "^6.1",
45-
"stevebauman/location": "^6.2",
46-
"symfony/http-client": "^6.0",
47-
"symfony/mailgun-mailer": "^6.0",
38+
"sentry/sentry-laravel": "^2.14.2",
39+
"socialiteproviders/twitter": "^4.1.2",
40+
"spatie/laravel-feed": "^4.2.1",
41+
"spatie/laravel-google-fonts": "^1.2.3",
42+
"spatie/laravel-medialibrary": "^10.10.0",
43+
"spatie/laravel-permission": "^5.10.1",
44+
"spatie/laravel-sitemap": "^6.3.1",
45+
"stevebauman/location": "^6.6.2",
46+
"symfony/http-client": "^6.3.1",
47+
"symfony/mailgun-mailer": "^6.3",
4848
"torchlight/torchlight-commonmark": "^0.5.5",
49-
"wire-elements/modal": "^1.0",
50-
"wire-elements/spotlight": "^1.0",
51-
"yarri/link-finder": "^2.7"
49+
"wire-elements/modal": "^1.0.8",
50+
"wire-elements/spotlight": "^1.0.7",
51+
"yarri/link-finder": "^2.7.10"
5252
},
5353
"require-dev": {
54-
"barryvdh/laravel-debugbar": "^3.7",
55-
"barryvdh/laravel-ide-helper": "^2.12",
56-
"brianium/paratest": "^6.3",
57-
"fakerphp/faker": "^1.9.1",
58-
"laravel/pint": "^1.1",
59-
"laravel/sail": "^1.0.1",
60-
"mockery/mockery": "^1.4.2",
61-
"nunomaduro/collision": "^6.0",
62-
"nunomaduro/larastan": "^2.0",
63-
"pestphp/pest-plugin-laravel": "^1.2.0",
54+
"barryvdh/laravel-debugbar": "^3.8.1",
55+
"barryvdh/laravel-ide-helper": "^2.13",
56+
"brianium/paratest": "^6.10",
57+
"fakerphp/faker": "^1.23.0",
58+
"laravel/pint": "^1.10.3",
59+
"laravel/sail": "^1.23.0",
60+
"mockery/mockery": "^1.6.2",
61+
"nunomaduro/collision": "^6.4",
62+
"nunomaduro/larastan": "^2.6.3",
63+
"pestphp/pest-plugin-laravel": "^1.4.0",
6464
"pestphp/pest-plugin-livewire": "^1.0",
65-
"phpunit/phpunit": "^9.5.20",
66-
"spatie/laravel-ignition": "^1.0",
67-
"spatie/test-time": "^1.2"
65+
"phpunit/phpunit": "^9.6.9",
66+
"spatie/laravel-ignition": "^1.6.4",
67+
"spatie/test-time": "^1.3.2"
6868
},
6969
"autoload": {
7070
"files": [
@@ -106,7 +106,7 @@
106106
"./vendor/bin/pint"
107107
],
108108
"stan": [
109-
"./vendor/bin/phpstan analyse"
109+
"./vendor/bin/phpstan analyse --memory-limit=3g"
110110
],
111111
"test": [
112112
"@php artisan test"

0 commit comments

Comments
 (0)