Merge pull request #7643 from turbo124/v5-develop

Minor fixes for rendering payments

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -97,8 +97,20 @@ class PaymentController extends Controller
         $client = $invoice ? $invoice->client : auth()->guard('contact')->user()->client;
 
         // 09-07-2022 catch duplicate responses for invoices that already paid here.
-        if($invoice && $invoice->status_id == Invoice::STATUS_PAID)
+        if($invoice && $invoice->status_id == Invoice::STATUS_PAID){
-            abort(400, 'Invoice paid. Duplicate submission');
+
+            $data = [
+                'invoice' => $invoice,
+                'key' => false
+            ];
+
+            if ($request->query('mode') === 'fullscreen') {
+                return render('invoices.show-fullscreen', $data);
+            }
+
+            return $this->render('invoices.show', $data);
+
+        }
 
             return $gateway
                 ->driver($client)

app/Http/Requests/Request.php

@@ -123,7 +123,7 @@ class Request extends FormRequest
             }
         }
 
-        if (isset($input['invitations'])) {
+        if (isset($input['invitations']) && is_array($input['invitations'])) {
             foreach ($input['invitations'] as $key => $value) {
                 if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
                     unset($input['invitations'][$key]['id']);

app/Models/BaseModel.php

@@ -204,4 +204,9 @@ class BaseModel extends Model
         return $formatted_number;
     }
 
+    public function translate_entity()
+    {
+        return ctrans('texts.item');
+    }
+
 }

app/Models/PurchaseOrder.php

@@ -271,4 +271,8 @@ class PurchaseOrder extends BaseModel
         return $purchase_order_calc->build();
     }
 
+    public function translate_entity()
+    {
+        return ctrans('texts.purchase_order');
+    }
 }