Merge pull request #3668 from ColoredCow/master

Release 21 June
ColoredCow · Jun 21, 2024 · 2e6d98a · 2e6d98a
2 parents 824e3b6 + d7ed808
commit 2e6d98a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 39 deletions.
diff --git a/Modules/Invoice/Resources/views/subviews/edit/invoice-details.blade.php b/Modules/Invoice/Resources/views/subviews/edit/invoice-details.blade.php
@@ -448,7 +448,6 @@
 
             data() {
                 return {
-                    clients: @json($clients),
                     invoice: @json($invoice),
                     projects: @json($invoice->client->projects),
                     allExchangeRate: @json($currencyService->getAllCurrentRatesInINR()),

diff --git a/Modules/Invoice/Services/InvoiceService.php b/Modules/Invoice/Services/InvoiceService.php
@@ -195,7 +195,6 @@ public function edit($invoice)
 
         return [
             'invoice' => $invoice,
-            'clients' => $this->getClientsForInvoice(),
             'countries' => Country::all(),
             'paymentReceivedEmailSubject' => $emailData['subject'],
             'paymentReceivedEmailBody' => $emailData['body'],

diff --git a/app/Http/Controllers/Finance/InvoiceController.php b/app/Http/Controllers/Finance/InvoiceController.php
@@ -86,17 +86,11 @@ public function store(InvoiceRequest $request)
      *
      * @param  \App\Models\Finance\Invoice  $invoice
      *
-     * @return \Illuminate\View\View
+     * @return void
      */
     public function edit(Invoice $invoice)
     {
-        $clients = Client::getInvoicableClients(collect($invoice->projectStageBillings)->pluck('id')->toArray());
-        $invoice->load('projectStageBillings', 'projectStageBillings.projectStage', 'projectStageBillings.projectStage.project');
-
-        return view('finance.invoice.edit')->with([
-            'invoice' => $invoice,
-            'clients' => $clients,
-        ]);
+        // Show the form for editing the specified resource.
     }
 
     /**

diff --git a/resources/views/finance/invoice/edit.blade.php b/resources/views/finance/invoice/edit.blade.php