see changelog

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to `payfast-onsite-subscriptions` will be documented in this file.
 
+## v1.4.1 - 2022-10-15
+
+- Remove illuminate contracts as dependency
+- Add normal logging back to webhook controller again
+- If testmode variable isn't set it will not fail on merchant_id giving the user a bigger clue as to .env variables that haven't been added
+- If the model doesn't have a first name or last name then just use name
+
+## v1.4.0 - 2022-10-13
+
+- Bump Nova minimum to version 4 by adding NovaRequest classes to actions
+- Update readme to specify Nova 4
+- Fix plural problem with the `Receipt[s]` resource name
+
 ## v1.3.0 - 2022-10-12
 
 - Bump PHP to 8.1

Nova/Actions/CancelSubscription.php

@@ -9,6 +9,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use FintechSystems\PayFast\Facades\PayFast;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class CancelSubscription extends Action
 {
@@ -35,7 +36,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [];
     }

Nova/Actions/ChangeEndsAt.php

@@ -11,6 +11,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Laravel\Nova\Actions\DestructiveAction;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class ChangeEndsAt extends DestructiveAction
 {
@@ -37,7 +38,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [
             Date::make('Ends At')

Nova/Actions/EnableBilling.php

@@ -9,6 +9,7 @@
 use Laravel\Nova\Fields\ActionFields;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class EnableBilling extends Action
 {
@@ -35,7 +36,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [];
     }

Nova/Actions/FetchSubscriptionInformation.php

@@ -11,6 +11,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use FintechSystems\PayFast\Facades\PayFast;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class FetchSubscriptionInformation extends Action
 {
@@ -37,7 +38,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [];
     }

Nova/Actions/OverridePayFastStatus.php

@@ -12,6 +12,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Laravel\Nova\Actions\DestructiveAction;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class OverridePayFastStatus extends DestructiveAction
 {
@@ -54,7 +55,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [
             Select::make('Payfast Status')

Nova/Receipts.php → Nova/Receipt.php

@@ -11,7 +11,7 @@
 use Laravel\Nova\Fields\DateTime;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
-class Receipts extends Resource
+class Receipt extends Resource
 {
     /**
      * The model the resource corresponds to.

README.md

@@ -12,9 +12,12 @@ Requirements:
 
 - PHP 8.1
 - Laravel 9.x
+
 - A [PayFast Sandbox account](https://sandbox.payfast.co.za/)
 - A [PayFast account](https://www.payfast.co.za/registration)
 
+If you want to use Laravel Nova, version 4 is required for the `Subscription` and `Receipt` resources.
+
 ## Installation
 
 Install the package via composer:

composer.json

@@ -32,8 +32,7 @@
         "guzzlehttp/guzzle": "^7.4.5",
         "livewire/livewire": "^2.8",
         "moneyphp/money": "^4.0",
-        "spatie/ray": "^1.34",
-        "illuminate/contracts": "^9.35",
+        "spatie/ray": "^1.34",        
         "nunomaduro/collision": "^6.3"
     },
     "require-dev": {          

resources/views/components/billing.blade.php

@@ -11,8 +11,8 @@
             <!-- Subscriptions -->            
             <div class="mt-10 sm:mt-0">                
                 @livewire('subscriptions', ['mergeFields' => [
-                        'name_first' => Auth()->user()->first_name,
-                        'name_last' => Auth()->user()->last_name,
+                        'name_first' => Auth()->user()->first_name ?? Auth()->user()->name,
+                        'name_last' => Auth()->user()->last_name ?? Auth()->user()->name,
                         'item_description' => config('app.name') . " Subscription",
                     ]] )                    
             </div>        

src/Http/Controllers/WebhookController.php

@@ -31,10 +31,13 @@ class WebhookController extends Controller
      */
     public function __invoke(Request $request)
     {
-        ray('Incoming Webhook from PayFast')->blue();
+        $message = 'Incoming Webhook from PayFast';
+        Log::info($message);
+        ray($message)->blue();
 
         $payload = $request->all();
 
+        Log::debug($payload);
         ray($payload)->green();
 
         if (isset($payload['ping'])) {

src/PayFast.php

@@ -22,7 +22,7 @@ class PayFast implements BillingProvider
 
     public function __construct($client)
     {
-        $this->testmode = $client['testmode'];
+        $this->testmode = $client['testmode'] ?? false;
 
         if ($this->testmode == true) {
             $this->merchant_id = $client['merchant_id_test'];