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

Add discount per item for invoice

Browse Source
This commit is contained in:
Burak Çakırel
2020-03-21 04:42:45 +03:00
parent 307e93c53c
commit a1ccfc8b22
15 changed files with 235 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Sales/Invoices.php
View File

@@ -77,6 +77,8 @@ class Invoices extends Controller
$date_format = $this->getCompanyDateFormat(); $date_format = $this->getCompanyDateFormat();
$discount_location = $invoice->totals->contains($invoice->totals->where('code', 'discount')->first()) ? 'in_totals' : 'per_item';
// Get Invoice Totals // Get Invoice Totals
foreach ($invoice->totals as $invoice_total) { foreach ($invoice->totals as $invoice_total) {
$invoice->{$invoice_total->code} = $invoice_total->amount; $invoice->{$invoice_total->code} = $invoice_total->amount;
@@ -90,7 +92,22 @@ class Invoices extends Controller
$invoice->grand_total = round($invoice->total - $invoice->paid, $currency->precision); $invoice->grand_total = round($invoice->total - $invoice->paid, $currency->precision);
} }
return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format')); return view(
'sales.invoices.show',
compact(
'invoice',
'accounts',
'currencies',
'currency',
'account_currency_code',
'customers',
'categories',
'payment_methods',
'signed_url',
'date_format',
'discount_location'
)
);
} }
/** /**

8
app/Http/Controllers/Settings/Defaults.php
View File

@@ -27,12 +27,18 @@ class Defaults extends Controller
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
$discount_locations = [
'in_totals' => trans('settings.default.discount_in_totals'),
'per_item' => trans('settings.default.discount_per_item'),
];
return view('settings.default.edit', compact( return view('settings.default.edit', compact(
'setting', 'setting',
'accounts', 'accounts',
'currencies', 'currencies',
'taxes', 'taxes',
'payment_methods' 'payment_methods',
'discount_locations'
)); ));
} }
} }

3
app/Jobs/Sale/CreateInvoiceItem.php
View File

@@ -40,7 +40,7 @@ class CreateInvoiceItem extends Job
// Apply discount to amount // Apply discount to amount
if (!empty($this->request['discount'])) { if (!empty($this->request['discount'])) {
$item_discounted_amount = $item_amount - ($item_amount * ($this->request['discount'] / 100)); $item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100));
} }
$tax_amount = 0; $tax_amount = 0;
@@ -138,6 +138,7 @@ class CreateInvoiceItem extends Job
'quantity' => (double) $this->request['quantity'], 'quantity' => (double) $this->request['quantity'],
'price' => (double) $this->request['price'], 'price' => (double) $this->request['price'],
'tax' => $item_tax_total, 'tax' => $item_tax_total,
'discount_rate' => $this->request['discount'],
'total' => $item_amount, 'total' => $item_amount,
]); ]);

29
app/Models/Sale/InvoiceItem.php
View File

@@ -17,7 +17,18 @@ class InvoiceItem extends Model
* *
* @var array * @var array
*/ */
protected $fillable = ['company_id', 'invoice_id', 'item_id', 'name', 'quantity', 'price', 'total', 'tax']; protected $fillable = [
'company_id',
'invoice_id',
'item_id',
'name',
'quantity',
'price',
'total',
'tax',
'discount_rate',
'discount_type',
];
/** /**
* Clonable relationships. * Clonable relationships.
@@ -83,6 +94,22 @@ class InvoiceItem extends Model
$this->attributes['tax'] = (double) $value; $this->attributes['tax'] = (double) $value;
} }
/**
* Get the formatted discount.
*
* @return string
*/
public function getDiscountRateAttribute($value)
{
if (setting('localisation.percent_position', 'after') === 'after') {
$text = ($this->discount_type === 'normal') ? $value . '%' : $value;
} else {
$text = ($this->discount_type === 'normal') ? '%' . $value : $value;
}
return $text;
}
/** /**
* Convert tax to Array. * Convert tax to Array.
* *

42
app/Models/Sale/InvoiceItemDiscount.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
namespace App\Models\Sale;
use App\Abstracts\Model;
use App\Traits\Currencies;
use Znck\Eloquent\Traits\BelongsToThrough;
class InvoiceItemDiscount extends Model
{
use Currencies, BelongsToThrough;
protected $table = 'invoice_item_discounts';
/**
* Attributes that should be mass-assignable.
*
* @var array
*/
protected $fillable = ['company_id', 'invoice_id', 'invoice_item_id', 'rate', 'type', 'name', 'amount'];
public function invoice()
{
return $this->belongsTo('App\Models\Sale\Invoice');
}
public function item()
{
return $this->belongsToThrough('App\Models\Common\Item', 'App\Models\Sale\InvoiceItem', 'invoice_item_id')->withDefault(['name' => trans('general.na')]);
}
/**
* Convert rate to double.
*
* @param string $value
* @return void
*/
public function setRateAttribute($value)
{
$this->attributes['rate'] = (double) $value;
}
}

5
database/migrations/2020_01_08_000000_core_v200.php
View File

@@ -240,6 +240,11 @@ class CoreV200 extends Migration
Schema::table('users', function (Blueprint $table) { Schema::table('users', function (Blueprint $table) {
$table->string('landing_page', 70)->nullable()->default('dashboard'); $table->string('landing_page', 70)->nullable()->default('dashboard');
}); });
Schema::table('invoice_items', function (Blueprint $table) {
$table->double('discount_rate', 15, 4)->default('0.0000');
$table->string('discount_type')->default('normal');
});
} }
/** /**

1
database/seeds/Settings.php
View File

@@ -63,6 +63,7 @@ class Settings extends Seeder
'invoice.color' => '#55588b', 'invoice.color' => '#55588b',
'default.payment_method' => 'offline-payments.cash.1', 'default.payment_method' => 'offline-payments.cash.1',
'default.list_limit' => '25', 'default.list_limit' => '25',
'default.discount_location' => 'in_totals',
'default.use_gravatar' => '0', 'default.use_gravatar' => '0',
'email.protocol' => 'mail', 'email.protocol' => 'mail',
'email.sendmail_path' => '/usr/sbin/sendmail -bs', 'email.sendmail_path' => '/usr/sbin/sendmail -bs',

8
public/css/custom.css vendored
View File

@@ -740,6 +740,14 @@ table .align-items-center td span.badge
/*--Quantity Width Finish--*/ /*--Quantity Width Finish--*/
/*--Discount Width--*/
.w-12
{
width: 12%;
}
/*--Discount Width Finish--*/
/*--------Responsive--------*/ /*--------Responsive--------*/
/*--Xs Breakpoint--*/ /*--Xs Breakpoint--*/
@media (max-width: 575.98px) @media (max-width: 575.98px)

20
resources/assets/js/views/sales/invoices.js vendored
View File

@@ -75,6 +75,7 @@ const app = new Vue({
price: (item.price).toFixed(2), price: (item.price).toFixed(2),
quantity: item.quantity, quantity: item.quantity,
tax_id: item.tax_id, tax_id: item.tax_id,
discount: item.discount_rate,
total: (item.total).toFixed(2) total: (item.total).toFixed(2)
}); });
}); });
@@ -109,7 +110,8 @@ const app = new Vue({
let tax_total = 0; let tax_total = 0;
let grand_total = 0; let grand_total = 0;
let items = this.form.items; let items = this.form.items;
let discount = this.form.discount; let discount_in_totals = this.form.discount;
let discount = '';
if (items.length) { if (items.length) {
let index = 0; let index = 0;
@@ -125,8 +127,14 @@ const app = new Vue({
// item discount calculate. // item discount calculate.
let item_discounted_total = item_sub_total; let item_discounted_total = item_sub_total;
if (discount) { if (discount_in_totals) {
item_discounted_total = item_sub_total - (item_sub_total * (discount / 100)); item_discounted_total = item_sub_total - (item_sub_total * (discount_in_totals / 100));
discount = discount_in_totals;
}
if (item.discount) {
item_discounted_total = item_sub_total = item_sub_total - (item_sub_total * (item.discount / 100));
discount = item.discount;
} }
// item tax calculate. // item tax calculate.
@@ -202,12 +210,12 @@ const app = new Vue({
this.totals.tax = tax_total; this.totals.tax = tax_total;
// Apply discount to total // Apply discount to total
if (discount) { if (discount_in_totals) {
discount_total = sub_total * (discount / 100); discount_total = sub_total * (discount_in_totals / 100);
this.totals.discount = discount_total; this.totals.discount = discount_total;
sub_total = sub_total - (sub_total * (discount / 100)); sub_total = sub_total - (sub_total * (discount_in_totals / 100));
} }
// set all item grand total. // set all item grand total.

9
resources/lang/en-GB/settings.php
View File

@@ -59,9 +59,12 @@ return [
], ],
'default' => [ 'default' => [
'description' => 'Default account, currency, language of your company', 'description' => 'Default account, currency, language of your company',
'list_limit' => 'Records Per Page', 'list_limit' => 'Records Per Page',
'use_gravatar' => 'Use Gravatar', 'use_gravatar' => 'Use Gravatar',
'discount_location' => 'Discount',
'discount_per_item' => 'Per Item',
'discount_in_totals' => 'In Totals',
], ],
'email' => [ 'email' => [

100
resources/views/sales/invoices/create.blade.php
View File

@@ -51,6 +51,12 @@
<th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th>
@stack('price_th_end') @stack('price_th_end')
@stack('discount_th_start')
@if(setting('default.discount_location', 'in_totals') === 'per_item')
<th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
@endif
@stack('discount_th_end')
@stack('taxes_th_start') @stack('taxes_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end') @stack('taxes_th_end')
@@ -69,13 +75,13 @@
<button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i> <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
</button> </button>
</td> </td>
<td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td> <td class="text-right border-bottom-0" colspan="6" :colspan="colspan"></td>
</tr> </tr>
@stack('add_item_td_end') @stack('add_item_td_end')
@stack('sub_total_td_start') @stack('sub_total_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
<strong>{{ trans('invoices.sub_total') }}</strong> <strong>{{ trans('invoices.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@@ -87,60 +93,62 @@
@stack('sub_total_td_end') @stack('sub_total_td_end')
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> @if(setting('default.discount_location', 'in_totals') === 'in_totals')
<td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan"> <tr id="tr-discount">
<el-popover <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
popper-class="p-0 h-0" <el-popover
placement="bottom" popper-class="p-0 h-0"
width="300" placement="bottom"
v-model="discount"> width="300"
<div class="card d-none" :class="[{'show' : discount}]"> v-model="discount">
<div class="discount card-body"> <div class="card d-none" :class="[{'show' : discount}]">
<div class="row align-items-center"> <div class="discount card-body">
<div class="col-sm-6"> <div class="row align-items-center">
<div class="input-group input-group-merge"> <div class="col-sm-6">
<div class="input-group-prepend"> <div class="input-group input-group-merge">
<span class="input-group-text" id="input-discount"> <div class="input-group-prepend">
<i class="fa fa-percent"></i> <span class="input-group-text" id="input-discount">
</span> <i class="fa fa-percent"></i>
</span>
</div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div>
</div>
<div class="col-sm-6">
<div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong>
</div> </div>
{!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
</div> </div>
</div> </div>
<div class="col-sm-6"> </div>
<div class="discount-description"> <div class="discount card-footer">
<strong>{{ trans('invoices.discount_desc') }}</strong> <div class="row float-right">
<div class="col-xs-12 col-sm-12">
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
{{ trans('general.cancel') }}
</a>
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="discount card-footer"> <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
<div class="row float-right"> <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
<div class="col-xs-12 col-sm-12"> </el-popover>
<a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment"> </td>
{{ trans('general.cancel') }} <td class="text-right border-bottom-0">
</a> {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
{!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!} <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
</div> <span v-else>@money(0, $currency->code, true)</span>
</div> {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
</div> </td>
</div> </tr>
<el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link> @endif
<el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
</el-popover>
</td>
<td class="text-right border-bottom-0">
{{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
<span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
<span v-else>@money(0, $currency->code, true)</span>
{!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
</td>
</tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@stack('tax_total_td_start') @stack('tax_total_td_start')
<tr id="tr-tax"> <tr id="tr-tax">
<td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
<strong>{{ trans_choice('general.taxes', 1) }}</strong> <strong>{{ trans_choice('general.taxes', 1) }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@@ -153,7 +161,7 @@
@stack('grand_total_td_start') @stack('grand_total_td_start')
<tr id="tr-total"> <tr id="tr-total">
<td class="text-right border-right-0" colspan="5" :colspan="colspan"> <td class="text-right border-right-0" colspan="6" :colspan="colspan">
<strong>{{ trans('invoices.total') }}</strong> <strong>{{ trans('invoices.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

6
resources/views/sales/invoices/edit.blade.php
View File

@@ -52,6 +52,10 @@
<th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th>
@stack('price_th_end') @stack('price_th_end')
@stack('discount_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
@stack('discount_th_end')
@stack('taxes_th_start') @stack('taxes_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@stack('taxes_th_end') @stack('taxes_th_end')
@@ -88,7 +92,7 @@
@stack('sub_total_td_end') @stack('sub_total_td_end')
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr v-if="totals.discount" id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"

31
resources/views/sales/invoices/item.blade.php
View File

@@ -98,6 +98,37 @@
</td> </td>
@stack('price_td_end') @stack('price_td_end')
@stack('discount_td_start')
<td class="border-right-0 border-bottom-0 w-12"
:class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
@stack('discount_input_start')
<div class="input-group input-group-merge">
<div class="input-group-prepend">
<span class="input-group-text" id="input-discount">
<i class="fa fa-percent"></i>
</span>
</div>
<input type="number"
max="100"
min="0"
class="form-control text-center"
:name="'items.' + index + '.discount'"
autocomplete="off"
required="required"
data-item="quantity"
v-model="row.discount"
@input="onCalculateTotal"
@change="form.errors.clear('items.' + index + '.discount')">
<div class="invalid-feedback d-block"
v-if="form.errors.has('items.' + index + '.discount')"
v-html="form.errors.get('items.' + index + '.discount')">
</div>
</div>
@stack('discount_input_end')
</td>
@stack('discount_td_end')
@stack('taxes_td_start') @stack('taxes_td_start')
<td class="border-right-0 border-bottom-0" <td class="border-right-0 border-bottom-0"
:class="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]"> :class="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]">

12
resources/views/sales/invoices/show.blade.php
View File

@@ -356,6 +356,12 @@
<th class="col-sm-3 text-right d-none d-sm-block">{{ trans($text_override['price']) }}</th> <th class="col-sm-3 text-right d-none d-sm-block">{{ trans($text_override['price']) }}</th>
@stack('price_th_end') @stack('price_th_end')
@stack('discount_th_start')
@if($discount_location === 'per_item')
<th class="col-sm-1 text-center d-none d-sm-block">{{ trans('invoices.discount') }}</th>
@endif
@stack('discount_th_end')
@stack('total_th_start') @stack('total_th_start')
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
@stack('total_th_end') @stack('total_th_end')
@@ -379,6 +385,12 @@
<td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@stack('discount_td_start')
@if($discount_location === 'per_item')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount_rate }}</td>
@endif
@stack('discount_td_end')
@stack('total_td_start') @stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td> <td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
@stack('total_td_end') @stack('total_td_end')

2
resources/views/settings/default/edit.blade.php
View File

@@ -30,6 +30,8 @@
{{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }} {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }}
{{ Form::selectGroup('discount_location', trans('settings.default.discount_location'), 'percent', $discount_locations, !empty($setting['discount_location']) ? $setting['discount_location'] : 'in_totals', []) }}
{{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->get('use_gravatar')) }} {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->get('use_gravatar')) }}
</div> </div>
</div> </div>