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

discount

Browse Source
This commit is contained in:
denisdulici
2018-04-17 16:40:52 +03:00
parent cfda5585a4
commit 18a3a3f6cb
19 changed files with 344 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
app/Http/Controllers/Expenses/Bills.php
View File

@ -84,9 +84,7 @@ class Bills extends Controller
$payment_methods = Modules::getPaymentMethods();
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'taxes'));
return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
}
/**
@ -148,6 +146,8 @@ class Bills extends Controller
$tax_total = 0;
$sub_total = 0;
$discount_total = 0;
$discount = $request['discount'];
$bill_item = [];
$bill_item['company_id'] = $request['company_id'];
@ -177,6 +177,11 @@ class Bills extends Controller
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}
}
$bill_item['item_id'] = $item['item_id'];
@ -210,12 +215,21 @@ class Bills extends Controller
}
}
$request['amount'] += $sub_total + $tax_total;
$s_total = $sub_total;
// Apply discount to total
if ($discount) {
$s_discount = $s_total * ($discount / 100);
$discount_total += $s_discount;
$s_total = $s_total - $s_discount;
}
$request['amount'] = $s_total + $tax_total;
$bill->update($request->input());
// Add bill totals
$this->addTotals($bill, $request, $taxes, $sub_total, $tax_total);
$this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total);
// Add bill history
BillHistory::create([
@ -336,6 +350,8 @@ class Bills extends Controller
$taxes = [];
$tax_total = 0;
$sub_total = 0;
$discount_total = 0;
$discount = $request['discount'];
$bill_item = [];
$bill_item['company_id'] = $request['company_id'];
@ -363,6 +379,11 @@ class Bills extends Controller
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}
}
$bill_item['item_id'] = $item['item_id'];
@ -392,7 +413,16 @@ class Bills extends Controller
}
}
$request['amount'] = $sub_total + $tax_total;
$s_total = $sub_total;
// Apply discount to total
if ($discount) {
$s_discount = $s_total * ($discount / 100);
$discount_total += $s_discount;
$s_total = $s_total - $s_discount;
}
$request['amount'] = $s_total + $tax_total;
$bill->update($request->input());
@ -407,7 +437,8 @@ class Bills extends Controller
BillTotal::where('bill_id', $bill->id)->delete();
// Add bill totals
$this->addTotals($bill, $request, $taxes, $sub_total, $tax_total);
$bill->totals()->delete();
$this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total);
// Fire the event to make it extendible
event(new BillUpdated($bill));
@ -478,9 +509,7 @@ class Bills extends Controller
$logo = $this->getLogo($bill);
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view($bill->template_path, compact('bill', 'logo', 'taxes'));
return view($bill->template_path, compact('bill', 'logo'));
}
/**
@ -496,9 +525,7 @@ class Bills extends Controller
$logo = $this->getLogo($bill);
$taxes = Tax::enabled()->get()->pluck('title', 'name');
$html = view($bill->template_path, compact('bill', 'logo', 'taxes'))->render();
$html = view($bill->template_path, compact('bill', 'logo'))->render();
$pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html);
@ -646,11 +673,11 @@ class Bills extends Controller
return $bill;
}
protected function addTotals($bill, $request, $taxes, $sub_total, $tax_total)
protected function addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total)
{
$sort_order = 1;
// Added bill total sub total
// Added bill sub total
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
@ -662,7 +689,24 @@ class Bills extends Controller
$sort_order++;
// Added bill total taxes
// Added bill discount
if ($discount_total) {
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'code' => 'discount',
'name' => 'bills.discount',
'amount' => $discount_total,
'sort_order' => $sort_order,
]);
// This is for total
$sub_total = $sub_total - $discount_total;
}
$sort_order++;
// Added bill taxes
if ($taxes) {
foreach ($taxes as $tax) {
BillTotal::create([
@ -678,7 +722,7 @@ class Bills extends Controller
}
}
// Added bill total total
// Added bill total
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,

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

@ -87,9 +87,7 @@ class Invoices extends Controller
$payment_methods = Modules::getPaymentMethods();
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'taxes'));
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
}
/**
@ -153,6 +151,8 @@ class Invoices extends Controller
$tax_total = 0;
$sub_total = 0;
$discount_total = 0;
$discount = $request['discount'];
$invoice_item = [];
$invoice_item['company_id'] = $request['company_id'];
@ -192,6 +192,11 @@ class Invoices extends Controller
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}
}
$invoice_item['item_id'] = $item['item_id'];
@ -225,12 +230,21 @@ class Invoices extends Controller
}
}
$request['amount'] = $sub_total + $tax_total;
$s_total = $sub_total;
// Apply discount to total
if ($discount) {
$s_discount = $s_total * ($discount / 100);
$discount_total += $s_discount;
$s_total = $s_total - $s_discount;
}
$request['amount'] = $s_total + $tax_total;
$invoice->update($request->input());
// Add invoice totals
$this->addTotals($invoice, $request, $taxes, $sub_total, $tax_total);
$this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total);
// Add invoice history
InvoiceHistory::create([
@ -357,6 +371,8 @@ class Invoices extends Controller
$taxes = [];
$tax_total = 0;
$sub_total = 0;
$discount_total = 0;
$discount = $request['discount'];
$invoice_item = [];
$invoice_item['company_id'] = $request['company_id'];
@ -384,6 +400,11 @@ class Invoices extends Controller
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}
}
$invoice_item['item_id'] = $item['item_id'];
@ -413,7 +434,16 @@ class Invoices extends Controller
}
}
$request['amount'] = $sub_total + $tax_total;
$s_total = $sub_total;
// Apply discount to total
if ($discount) {
$s_discount = $s_total * ($discount / 100);
$discount_total += $s_discount;
$s_total = $s_total - $s_discount;
}
$request['amount'] = $s_total + $tax_total;
$invoice->update($request->input());
@ -428,7 +458,8 @@ class Invoices extends Controller
InvoiceTotal::where('invoice_id', $invoice->id)->delete();
// Add invoice totals
$this->addTotals($invoice, $request, $taxes, $sub_total, $tax_total);
$invoice->totals()->delete();
$this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total);
// Fire the event to make it extendible
event(new InvoiceUpdated($invoice));
@ -513,11 +544,7 @@ class Invoices extends Controller
$logo = $this->getLogo();
$taxes = collect(Tax::enabled()->get())->each(function ($item) {
$item->title = $item->name . ' (' . $item->rate . '%)';
})->pluck('title', 'name');
$html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render();
$html = view($invoice->template_path, compact('invoice', 'logo'))->render();
$pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html);
@ -573,9 +600,7 @@ class Invoices extends Controller
$logo = $this->getLogo();
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view($invoice->template_path, compact('invoice', 'logo', 'taxes'));
return view($invoice->template_path, compact('invoice', 'logo'));
}
/**
@ -591,9 +616,7 @@ class Invoices extends Controller
$logo = $this->getLogo();
$taxes = Tax::enabled()->get()->pluck('title', 'name');
$html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render();
$html = view($invoice->template_path, compact('invoice', 'logo'))->render();
$pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html);
@ -783,11 +806,11 @@ class Invoices extends Controller
return $invoice;
}
protected function addTotals($invoice, $request, $taxes, $sub_total, $tax_total)
protected function addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total)
{
$sort_order = 1;
// Added invoice total sub total
// Added invoice sub total
InvoiceTotal::create([
'company_id' => $request['company_id'],
'invoice_id' => $invoice->id,
@ -799,7 +822,24 @@ class Invoices extends Controller
$sort_order++;
// Added invoice total taxes
// Added invoice discount
if ($discount_total) {
InvoiceTotal::create([
'company_id' => $request['company_id'],
'invoice_id' => $invoice->id,
'code' => 'discount',
'name' => 'invoices.discount',
'amount' => $discount_total,
'sort_order' => $sort_order,
]);
// This is for total
$sub_total = $sub_total - $discount_total;
}
$sort_order++;
// Added invoice taxes
if ($taxes) {
foreach ($taxes as $tax) {
InvoiceTotal::create([
@ -815,7 +855,7 @@ class Invoices extends Controller
}
}
// Added invoice total total
// Added invoice total
InvoiceTotal::create([
'company_id' => $request['company_id'],
'invoice_id' => $invoice->id,

12
app/Http/Controllers/Items/Items.php
View File

@ -246,6 +246,7 @@ class Items extends Controller
{
$input_items = request('item');
$currency_code = request('currency_code');
$discount = request('discount');
if (empty($currency_code)) {
$currency_code = setting('general.default_currency');
@ -273,6 +274,12 @@ class Items extends Controller
}
$sub_total += $item_sub_total;
// Apply discount to tax
if ($discount) {
$item_tax_total = $item_tax_total - ($item_tax_total * ($discount / 100));
}
$tax_total += $item_tax_total;
$total = $item_sub_total + $item_tax_total;
@ -287,6 +294,11 @@ class Items extends Controller
$json->tax_total = money($tax_total, $currency_code, true)->format();
// Apply discount to total
if ($discount) {
$sub_total = $sub_total - ($sub_total * ($discount / 100));
}
$grand_total = $sub_total + $tax_total;
$json->grand_total = money($grand_total, $currency_code, true)->format();