Merge Invoice and Bill into Document
This commit is contained in:
@ -4,18 +4,23 @@ namespace App\Http\Controllers\Portal;
|
||||
|
||||
use App\Abstracts\Http\Controller;
|
||||
use App\Http\Requests\Portal\InvoiceShow as Request;
|
||||
use App\Models\Sale\Invoice;
|
||||
use App\Models\Document\Document;
|
||||
use App\Models\Setting\Category;
|
||||
use App\Traits\Currencies;
|
||||
use App\Traits\DateTime;
|
||||
use App\Traits\Sales;
|
||||
use App\Traits\Documents;
|
||||
use App\Traits\Uploads;
|
||||
use App\Utilities\Modules;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
class Invoices extends Controller
|
||||
{
|
||||
use DateTime, Currencies, Sales, Uploads;
|
||||
use DateTime, Currencies, Documents, Uploads;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public $type = Document::INVOICE_TYPE;
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
@ -24,13 +29,13 @@ class Invoices extends Controller
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$invoices = Invoice::with('contact', 'histories', 'items', 'payments')
|
||||
$invoices = Document::invoice()->with('contact', 'histories', 'items', 'payments')
|
||||
->accrued()->where('contact_id', user()->contact->id)
|
||||
->collect(['invoice_number'=> 'desc']);
|
||||
->collect(['document_number'=> 'desc']);
|
||||
|
||||
$categories = collect(Category::income()->enabled()->orderBy('name')->pluck('name', 'id'));
|
||||
|
||||
$statuses = $this->getInvoiceStatuses();
|
||||
$statuses = $this->getDocumentStatuses(Document::INVOICE_TYPE);
|
||||
|
||||
return $this->response('portal.invoices.index', compact('invoices', 'categories', 'statuses'));
|
||||
}
|
||||
@ -38,15 +43,15 @@ class Invoices extends Controller
|
||||
/**
|
||||
* Show the form for viewing the specified resource.
|
||||
*
|
||||
* @param Invoice $invoice
|
||||
* @param Document $invoice
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function show(Invoice $invoice, Request $request)
|
||||
public function show(Document $invoice, Request $request)
|
||||
{
|
||||
$payment_methods = Modules::getPaymentMethods();
|
||||
|
||||
event(new \App\Events\Sale\InvoiceViewed($invoice));
|
||||
event(new \App\Events\Document\DocumentViewed($invoice));
|
||||
|
||||
return view('portal.invoices.show', compact('invoice', 'payment_methods'));
|
||||
}
|
||||
@ -54,11 +59,11 @@ class Invoices extends Controller
|
||||
/**
|
||||
* Show the form for viewing the specified resource.
|
||||
*
|
||||
* @param Invoice $invoice
|
||||
* @param Document $invoice
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function printInvoice(Invoice $invoice, Request $request)
|
||||
public function printInvoice(Document $invoice, Request $request)
|
||||
{
|
||||
$invoice = $this->prepareInvoice($invoice);
|
||||
|
||||
@ -68,11 +73,11 @@ class Invoices extends Controller
|
||||
/**
|
||||
* Show the form for viewing the specified resource.
|
||||
*
|
||||
* @param Invoice $invoice
|
||||
* @param Document $invoice
|
||||
*
|
||||
* @return Response
|
||||
*/
|
||||
public function pdfInvoice(Invoice $invoice, Request $request)
|
||||
public function pdfInvoice(Document $invoice, Request $request)
|
||||
{
|
||||
$invoice = $this->prepareInvoice($invoice);
|
||||
|
||||
@ -91,16 +96,16 @@ class Invoices extends Controller
|
||||
return $pdf->download($file_name);
|
||||
}
|
||||
|
||||
protected function prepareInvoice(Invoice $invoice)
|
||||
protected function prepareInvoice(Document $invoice)
|
||||
{
|
||||
$invoice->template_path = 'sales.invoices.print_' . setting('invoice.template' ,'default');
|
||||
|
||||
event(new \App\Events\Sale\InvoicePrinting($invoice));
|
||||
event(new \App\Events\Document\DocumentPrinting($invoice));
|
||||
|
||||
return $invoice;
|
||||
}
|
||||
|
||||
public function signed(Invoice $invoice)
|
||||
public function signed(Document $invoice)
|
||||
{
|
||||
if (empty($invoice)) {
|
||||
redirect()->route('login');
|
||||
@ -121,7 +126,7 @@ class Invoices extends Controller
|
||||
$print_action = URL::signedRoute('signed.invoices.print', [$invoice->id, 'company_id' => session('company_id')]);
|
||||
$pdf_action = URL::signedRoute('signed.invoices.pdf', [$invoice->id, 'company_id' => session('company_id')]);
|
||||
|
||||
event(new \App\Events\Sale\InvoiceViewed($invoice));
|
||||
event(new \App\Events\Document\DocumentViewed($invoice));
|
||||
|
||||
return view('portal.invoices.signed', compact('invoice', 'payment_methods', 'payment_actions', 'print_action', 'pdf_action'));
|
||||
}
|
||||
|
Reference in New Issue
Block a user