shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Invoice and Bill into Document

Browse Source
This commit is contained in:
Burak Çakırel
2020-12-24 01:28:38 +03:00
parent 830cc05957
commit 0c1424db47
436 changed files with 31655 additions and 37350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Abstracts/Http/PaymentController.php
View File

@ -2,9 +2,9 @@
namespace App\Abstracts\Http;
use App\Events\Sale\PaymentReceived;
use App\Events\Document\PaymentReceived;
use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
use App\Models\Sale\Invoice;
use App\Models\Document\Document;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\URL;
use Monolog\Logger;
@ -41,15 +41,15 @@ abstract class PaymentController extends BaseController
});
}
public function show(Invoice $invoice, PaymentRequest $request)
public function show(Document $document, PaymentRequest $request)
{
$this->setContactFirstLastName($invoice);
$this->setContactFirstLastName($document);
$confirm_url = $this->getConfirmUrl($invoice);
$confirm_url = $this->getConfirmUrl($document);
$html = view('partials.portal.payment_method.' . $this->type, [
'setting' => $this->setting,
'invoice' => $invoice,
'invoice' => $document,
'confirm_url' => $confirm_url,
])->render();
@ -62,12 +62,12 @@ abstract class PaymentController extends BaseController
]);
}
public function signed(Invoice $invoice, PaymentRequest $request)
public function signed(Document $document, PaymentRequest $request)
{
return $this->show($invoice, $request);
return $this->show($document, $request);
}
public function cancel(Invoice $invoice, $force_redirect = false)
public function cancel(Document $invoice, $force_redirect = false)
{
$message = trans('messages.warning.payment_cancel', ['method' => setting($this->alias . '.name')]);