Added zone support to payment methods

Changelog.md

@@ -33,6 +33,7 @@
 - Added the listing of order item adjustments
 - Added the `domain` field to the channel form
 - Added billing and shipping zones to the channel form
+- Added zone support to payment methods
 
 ## 3.7.1
 ##### 2023-12-17

src/Http/Controllers/PaymentMethodController.php

@@ -14,6 +14,7 @@
 
 namespace Vanilo\Admin\Http\Controllers;
 
+use Konekt\Address\Query\Zones;
 use Konekt\AppShell\Http\Controllers\BaseController;
 use Vanilo\Admin\Contracts\Requests\CreatePaymentMethod;
 use Vanilo\Admin\Contracts\Requests\UpdatePaymentMethod;
@@ -43,6 +44,7 @@ public function create()
         return view('vanilo::payment-method.create', [
             'paymentMethod' => app(PaymentMethod::class),
             'gateways' => PaymentGateways::choices(),
+            'zones' => Zones::withBillingScope()->get(),
             'multiChannelEnabled' => Features::isMultiChannelEnabled(),
             'channels' => $this->channelsForUi(),
         ]);
@@ -79,6 +81,7 @@ public function edit(PaymentMethod $paymentMethod)
         return view('vanilo::payment-method.edit', [
             'paymentMethod' => $paymentMethod,
             'gateways' => PaymentGateways::choices(),
+            'zones' => Zones::withBillingScope()->get(),
             'multiChannelEnabled' => Features::isMultiChannelEnabled(),
             'channels' => $this->channelsForUi(),
         ]);

src/Http/Requests/CreatePaymentMethod.php

@@ -29,6 +29,7 @@ public function rules()
             'name' => 'required|min:2|max:255',
             'gateway' => ['required', Rule::in(PaymentGateways::ids())],
             'configuration' => 'sometimes|json',
+            'zone_id' => 'sometimes|nullable|exists:zones,id',
             'is_enabled' => 'sometimes|boolean',
             'description' => 'sometimes|nullable|string',
             'channels' => 'sometimes|array',

src/Http/Requests/UpdatePaymentMethod.php

@@ -28,6 +28,7 @@ public function rules()
             'gateway' => ['required', Rule::in(PaymentGateways::ids())],
             'configuration' => 'sometimes|json',
             'is_enabled' => 'sometimes|boolean',
+            'zone_id' => 'sometimes|nullable|exists:zones,id',
             'description' => 'sometimes|nullable|string',
         ];
     }

src/resources/views/payment-method/_form.blade.php

@@ -49,6 +49,22 @@
 
 <hr>
 
+<div class="mb-3 row">
+    <label class="col-form-label col-form-label-sm col-md-2">{{ __('Restricted to Zone') }}</label>
+    <div class="col-md-10">
+        {{ Form::select('zone_id', $zones->pluck('name', 'id'), null, [
+                'class' => 'form-select form-select-sm' . ($errors->has('zone_id') ? ' is-invalid': ''),
+                'placeholder' => '<' . __('Unrestricted') . '>',
+           ])
+        }}
+        @if ($errors->has('zone_id'))
+            <div class="invalid-feedback">{{ $errors->first('zone_id') }}</div>
+        @endif
+    </div>
+</div>
+
+<hr>
+
 <div class="mb-3 row">
     <label class="col-form-label col-form-label-sm col-md-2">{{ __('Configuration') }}</label>
     <div class="col-md-10">

src/resources/widgets/payment-method/table.widget.php

@@ -27,6 +27,16 @@
                 ],
                 'title' => __('Name'),
             ],
+            'zone' => [
+                'title' => __('Zone'),
+                'valign' => 'middle',
+                'widget' => [
+                    'type' => 'badge',
+                    'color' => ['bool' => ['info', 'secondary']],
+                    'text' => '$model.zone.name',
+                    'modifier' => sprintf('text_if_empty:%s', __('Unrestricted'))
+                ]
+            ],
             'transaction_count' => [
                 'title' => __('No. of Transactions'),
                 'valign' => 'middle',