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

working on #40

Browse Source
This commit is contained in:
denisdulici 2017-11-15 21:53:40 +03:00
parent 518863fbec
commit 05336abd01
4 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/Http/Controllers/Incomes/Invoices.php
View File

@ -407,41 +407,6 @@ class Invoices extends Controller
return redirect()->back();
}
/**
* Mark the invoice as paid.
*
* @param Invoice $invoice
*
* @return Response
*/
public function payInvoice(Invoice $invoice)
{
$paid = 0;
foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code;
$paid += $item->getDynamicConvertedAmount();
}
$amount = $invoice->amount - $paid;
$request = new PaymentRequest();
$request['company_id'] = $invoice->company_id;
$request['invoice_id'] = $invoice->id;
$request['account_id'] = setting('general.default_account');
$request['payment_method'] = setting('general.default_payment_method');
$request['currency_code'] = $invoice->currency_code;
$request['amount'] = $amount;
$request['paid_at'] = Date::now();
$request['_token'] = csrf_token();
$this->payment($request);
return redirect()->back();
}
/**
* Print the invoice.
*
@ -501,6 +466,41 @@ class Invoices extends Controller
return $pdf->download($file_name);
}
/**
* Mark the invoice as paid.
*
* @param Invoice $invoice
*
* @return Response
*/
public function markPaid(Invoice $invoice)
{
$paid = 0;
foreach ($invoice->payments as $item) {
$item->default_currency_code = $invoice->currency_code;
$paid += $item->getDynamicConvertedAmount();
}
$amount = $invoice->amount - $paid;
$request = new PaymentRequest();
$request['company_id'] = $invoice->company_id;
$request['invoice_id'] = $invoice->id;
$request['account_id'] = setting('general.default_account');
$request['payment_method'] = setting('general.default_payment_method');
$request['currency_code'] = $invoice->currency_code;
$request['amount'] = $amount;
$request['paid_at'] = Date::now();
$request['_token'] = csrf_token();
$this->payment($request);
return redirect()->back();
}
/**
* Add payment to the invoice.
*

4
resources/views/expenses/bills/show.blade.php
View File

@ -373,10 +373,6 @@
});
});
$(document).on('click', '#button-pdf', function (e) {
location.href = "{{ url('expenses/bills/' . $bill->id . '/pdf') }}";
});
$(document).on('click', '#button-email', function (e) {
$('#email-modal').remove();

4
resources/views/incomes/invoices/show.blade.php
View File

@ -378,10 +378,6 @@
});
});
$(document).on('click', '#button-pdf', function (e) {
location.href = "{{ url('incomes/invoices/' . $invoice->id . '/pdf') }}";
});
$(document).on('click', '#button-email', function (e) {
$('#email-modal').remove();

3
routes/web.php
View File

@ -45,7 +45,8 @@ Route::group(['middleware' => 'language'], function () {
Route::get('customers/currency', 'Incomes\Customers@currency');
Route::resource('customers', 'Incomes\Customers');
Route::get('invoices/{invoice}/sent', 'Incomes\Invoices@markSent');
Route::get('invoices/{invoice}/pay', 'Incomes\Invoices@payInvoice');
Route::get('invoices/{invoice}/email', 'Incomes\Invoices@emailInvoice');
Route::get('invoices/{invoice}/pay', 'Incomes\Invoices@markPaid');
Route::get('invoices/{invoice}/print', 'Incomes\Invoices@printInvoice');
Route::get('invoices/{invoice}/pdf', 'Incomes\Invoices@pdfInvoice');
Route::post('invoices/payment', 'Incomes\Invoices@payment');