Invoice & Clients sorting

This commit is contained in:
Peter Papp
2021-05-11 10:09:50 +02:00
parent 1ea8f2ce60
commit a6db642db7
16 changed files with 195 additions and 98 deletions

View File

@@ -1,22 +1,21 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Requests\Oasis\ShareInvoiceRequest;
use App\Http\Resources\Oasis\OasisInvoiceResource;
use Auth;
use Illuminate\Http\Request;
use Storage;
use Carbon\Carbon;
use Illuminate\Support\Str;
use App\Models\Oasis\Client;
use Illuminate\Http\Request;
use App\Models\Oasis\Invoice;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Notification;
use App\Http\Requests\Oasis\ShareInvoiceRequest;
use App\Http\Requests\Oasis\StoreInvoiceRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Resources\Oasis\OasisInvoiceResource;
use App\Http\Resources\Oasis\OasisViewInvoiceResource;
use App\Http\Resources\Oasis\OasisViewInvoiceCollection;
use App\Notifications\Oasis\InvoiceDeliveryNotification;
@@ -28,8 +27,13 @@ class InvoiceController extends Controller
*/
public function get_all_regular_invoices()
{
$invoices = Invoice::sortable()
->whereUserId(Auth::id())
->whereInvoiceType('regular-invoice')
->get();
return response(
new OasisViewInvoiceCollection(Auth::user()->regularInvoices),
new OasisViewInvoiceCollection($invoices),
200
);
}
@@ -39,8 +43,13 @@ class InvoiceController extends Controller
*/
public function get_all_advance_invoices()
{
$invoices = Invoice::sortable()
->whereUserId(Auth::id())
->whereInvoiceType('advance-invoice')
->get();
return response(
new OasisViewInvoiceCollection(Auth::user()->advanceInvoices),
new OasisViewInvoiceCollection($invoices),
200
);
}
@@ -63,7 +72,7 @@ class InvoiceController extends Controller
*/
public function download_invoice(Invoice $invoice)
{
if (!Storage::exists(invoice_path($invoice))) {
if (! Storage::exists(invoice_path($invoice))) {
abort(404, 'Not Found');
}
@@ -75,9 +84,9 @@ class InvoiceController extends Controller
*/
public function search()
{
$query = remove_accents(request()->input('query'));
$results = Invoice::search($query)
$results = Invoice::search(
remove_accents(request()->input('query'))
)
->where('user_id', request()->user()->id)
->where('invoice_type', request()->input('type'))
->get();
@@ -100,33 +109,33 @@ class InvoiceController extends Controller
$user = $request->user();
$invoice = Invoice::create([
'user_id' => $user->id,
'client_id' => $client->id ?? null,
'invoice_type' => $request->invoice_type,
'invoice_number' => $request->invoice_number,
'user_id' => $user->id,
'client_id' => $client->id ?? null,
'invoice_type' => $request->invoice_type,
'invoice_number' => $request->invoice_number,
'variable_number' => $request->variable_number,
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => json_decode($request->items),
'user' => $user->invoiceProfile,
'client' => [
'email' => $client->email ?? $request->client_email,
'name' => $client->name ?? $request->client_name,
'address' => $client->address ?? $request->client_address,
'city' => $client->city ?? $request->client_city,
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => json_decode($request->items),
'user' => $user->invoiceProfile,
'client' => [
'email' => $client->email ?? $request->client_email,
'name' => $client->name ?? $request->client_name,
'address' => $client->address ?? $request->client_address,
'city' => $client->city ?? $request->client_city,
'postal_code' => $client->postal_code ?? $request->client_postal_code,
'country' => $client->country ?? $request->client_country,
'ico' => $client->ico ?? $request->client_ico,
'dic' => $client->dic ?? $request->client_dic ?? null,
'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null,
'country' => $client->country ?? $request->client_country,
'ico' => $client->ico ?? $request->client_ico,
'dic' => $client->dic ?? $request->client_dic ?? null,
'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null,
],
]);
// Generate PDF
\PDF::loadView('oasis.invoices.invoice', [
'invoice' => Invoice::find($invoice->id),
'user' => $user,
'user' => $user,
])
->setPaper('a4')
->setOrientation('portrait')
@@ -158,12 +167,12 @@ class InvoiceController extends Controller
$user = $request->user();
$invoice->update([
'invoice_number' => $request->invoice_number,
'invoice_number' => $request->invoice_number,
'variable_number' => $request->variable_number,
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => json_decode($request->items),
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => json_decode($request->items),
]);
Storage::delete(invoice_path($invoice));
@@ -171,7 +180,7 @@ class InvoiceController extends Controller
// Generate PDF
\PDF::loadView('oasis.invoices.invoice', [
'invoice' => Invoice::find($invoice->id),
'user' => $user,
'user' => $user,
])
->setPaper('a4')
->setOrientation('portrait')
@@ -205,7 +214,7 @@ class InvoiceController extends Controller
);
return response(
'Done.',
'Done',
204
);
}
@@ -231,19 +240,19 @@ class InvoiceController extends Controller
$user = Auth::user();
return [
'clients' => $user->clients->map(function ($client) {
'isVatPayer' => $user->invoiceProfile->ic_dph ?? false,
'latestInvoiceNumber' => $user->regularInvoices->first()
? (int) $user->regularInvoices->first()->invoice_number
: null,
'recommendedInvoiceNumber' => $user->regularInvoices->first()
? (int) $user->regularInvoices->first()->invoice_number + 1
: Carbon::now()->format('Y') . '0001',
'clients' => $user->clients->map(function ($client) {
return [
'label' => $client->name,
'value' => $client->id,
];
}),
'isVatPayer' => $user->invoiceProfile->ic_dph ?? false,
'latestInvoiceNumber' => $user->regularInvoices->first()
? (int)$user->regularInvoices->first()->invoice_number
: null,
'recommendedInvoiceNumber' => $user->regularInvoices->first()
? (int)$user->regularInvoices->first()->invoice_number + 1
: Carbon::now()->format('Y') . '0001',
];
}
@@ -253,21 +262,21 @@ class InvoiceController extends Controller
*/
private function getOrStoreClient(StoreInvoiceRequest $request)
{
if (!Str::isUuid($request->client) && $request->store_client) {
if (! Str::isUuid($request->client) && $request->store_client) {
return $request->user()
->clients()
->create([
'avatar' => store_avatar($request, 'client_avatar') ?? null,
'name' => $request->client_name,
'email' => $request->client_email ?? null,
'avatar' => store_avatar($request, 'client_avatar') ?? null,
'name' => $request->client_name,
'email' => $request->client_email ?? null,
'phone_number' => $request->client_phone_number ?? null,
'address' => $request->client_address,
'city' => $request->client_city,
'postal_code' => $request->client_postal_code,
'country' => $request->client_country,
'ico' => $request->client_ico ?? null,
'dic' => $request->client_dic ?? null,
'ic_dph' => $request->client_ic_dph ?? null,
'address' => $request->client_address,
'city' => $request->client_city,
'postal_code' => $request->client_postal_code,
'country' => $request->client_country,
'ico' => $request->client_ico ?? null,
'dic' => $request->client_dic ?? null,
'ic_dph' => $request->client_ic_dph ?? null,
]);
}