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

Merge pull request #1380 from denisdulici/master

Browse Source 
Added discount location setting
This commit is contained in:
Denis Duliçi 2020-03-26 16:23:47 +03:00 committed by GitHub
commit 1756ffa4f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 405 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Settings/Localisation.php
View File

@ -41,12 +41,20 @@ class Localisation extends Controller
'after' => trans('settings.localisation.percent.after'), 'after' => trans('settings.localisation.percent.after'),
]; ];
$discount_locations = [
'no' => trans('general.disabled'),
'item' => trans('settings.localisation.discount_location.item'),
'total' => trans('settings.localisation.discount_location.total'),
'both' => trans('settings.localisation.discount_location.both'),
];
return view('settings.localisation.edit', compact( return view('settings.localisation.edit', compact(
'setting', 'setting',
'timezones', 'timezones',
'date_formats', 'date_formats',
'date_separators', 'date_separators',
'percent_positions' 'percent_positions',
'discount_locations'
)); ));
} }
} }

13
app/Models/Purchase/BillItem.php
View File

@ -13,6 +13,13 @@ class BillItem extends Model
protected $table = 'bill_items'; protected $table = 'bill_items';
/**
* The accessors to append to the model's array form.
*
* @var array
*/
protected $appends = ['discount'];
/** /**
* Attributes that should be mass-assignable. * Attributes that should be mass-assignable.
* *
@ -100,12 +107,12 @@ class BillItem extends Model
* *
* @return string * @return string
*/ */
public function getDiscountRateAttribute($value) public function getDiscountAttribute()
{ {
if (setting('localisation.percent_position', 'after') === 'after') { if (setting('localisation.percent_position', 'after') === 'after') {
$text = ($this->discount_type === 'normal') ? $value . '%' : $value; $text = ($this->discount_type === 'normal') ? $this->discount_rate . '%' : $this->discount_rate;
} else { } else {
$text = ($this->discount_type === 'normal') ? '%' . $value : $value; $text = ($this->discount_type === 'normal') ? '%' . $this->discount_rate : $this->discount_rate;
} }
return $text; return $text;

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

@ -12,6 +12,13 @@ class InvoiceItem extends Model
protected $table = 'invoice_items'; protected $table = 'invoice_items';
/**
* The accessors to append to the model's array form.
*
* @var array
*/
protected $appends = ['discount'];
/** /**
* Attributes that should be mass-assignable. * Attributes that should be mass-assignable.
* *
@ -99,12 +106,12 @@ class InvoiceItem extends Model
* *
* @return string * @return string
*/ */
public function getDiscountRateAttribute($value) public function getDiscountAttribute()
{ {
if (setting('localisation.percent_position', 'after') === 'after') { if (setting('localisation.percent_position', 'after') === 'after') {
$text = ($this->discount_type === 'normal') ? $value . '%' : $value; $text = ($this->discount_type === 'normal') ? $this->discount_rate . '%' : $this->discount_rate;
} else { } else {
$text = ($this->discount_type === 'normal') ? '%' . $value : $value; $text = ($this->discount_type === 'normal') ? '%' . $this->discount_rate : $this->discount_rate;
} }
return $text; return $text;

2
resources/lang/en-GB/bills.php
View File

@ -13,7 +13,7 @@ return [
'price' => 'Price', 'price' => 'Price',
'sub_total' => 'Subtotal', 'sub_total' => 'Subtotal',
'discount' => 'Discount', 'discount' => 'Discount',
'item_discount' => 'Item Discount', 'item_discount' => 'Line Discount',
'tax_total' => 'Tax Total', 'tax_total' => 'Tax Total',
'total' => 'Total', 'total' => 'Total',

2
resources/lang/en-GB/invoices.php
View File

@ -13,7 +13,7 @@ return [
'price' => 'Price', 'price' => 'Price',
'sub_total' => 'Subtotal', 'sub_total' => 'Subtotal',
'discount' => 'Discount', 'discount' => 'Discount',
'item_discount' => 'Item Discount', 'item_discount' => 'Line Discount',
'tax_total' => 'Tax Total', 'tax_total' => 'Tax Total',
'total' => 'Total', 'total' => 'Total',

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

@ -29,6 +29,12 @@ return [
'before' => 'Before Number', 'before' => 'Before Number',
'after' => 'After Number', 'after' => 'After Number',
], ],
'discount_location' => [
'name' => 'Discount Location',
'item' => 'At line',
'total' => 'At total',
'both' => 'Both line and total',
],
], ],
'invoice' => [ 'invoice' => [

19
resources/views/purchases/bills/create.blade.php
View File

@ -30,6 +30,7 @@
{{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }} {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
<div class="col-sm-12 mb-4"> <div class="col-sm-12 mb-4">
@php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'form-control-label']) !!} {!! Form::label('items', trans_choice('general.items', 2), ['class' => 'form-control-label']) !!}
<div class="table-responsive overflow-x-scroll overflow-y-hidden "> <div class="table-responsive overflow-x-scroll overflow-y-hidden ">
<table class="table table-bordered" id="items"> <table class="table table-bordered" id="items">
@ -51,9 +52,11 @@
<th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th>
@stack('price_th_end') @stack('price_th_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@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>
@ -73,13 +76,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="6" :colspan="colspan"></td> <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.sub_total') }}</strong> <strong>{{ trans('bills.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -90,9 +93,10 @@
</tr> </tr>
@stack('sub_total_td_end') @stack('sub_total_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('item_discount_td_start') @stack('item_discount_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.item_discount') }}</strong> <strong>{{ trans('bills.item_discount') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -102,10 +106,12 @@
</td> </td>
</tr> </tr>
@stack('item_discount_td_end') @stack('item_discount_td_end')
@endif
@if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -154,10 +160,11 @@
</td> </td>
</tr> </tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@endif
@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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -170,7 +177,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="6" :colspan="colspan"> <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.total') }}</strong> <strong>{{ trans('bills.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

34
resources/views/purchases/bills/edit.blade.php
View File

@ -31,6 +31,7 @@
{{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }} {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
<div class="col-sm-12 mb-4"> <div class="col-sm-12 mb-4">
@php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
{!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!} {!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!}
<div class="table-responsive overflow-x-scroll overflow-y-hidden"> <div class="table-responsive overflow-x-scroll overflow-y-hidden">
<table class="table table-bordered" id="items"> <table class="table table-bordered" id="items">
@ -52,9 +53,11 @@
<th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th>
@stack('price_th_end') @stack('price_th_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@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>
@ -74,13 +77,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="6" :colspan="colspan"></td> <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.sub_total') }}</strong> <strong>{{ trans('bills.sub_total') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -91,9 +94,25 @@
</tr> </tr>
@stack('sub_total_td_end') @stack('sub_total_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('item_discount_td_start')
<tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.item_discount') }}</strong>
</td>
<td class="text-right border-bottom-0 long-texts">
{{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
<span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
<span v-else>@money(0, $currency->code, true)</span>
</td>
</tr>
@stack('item_discount_td_end')
@endif
@if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -114,7 +133,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="discount-description"> <div class="discount-description">
<strong>{{ trans('invoices.discount_desc') }}</strong> <strong>{{ trans('bills.discount_desc') }}</strong>
</div> </div>
</div> </div>
</div> </div>
@ -130,7 +149,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link> <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('bills.add_discount') }}</el-link>
<el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link> <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
</el-popover> </el-popover>
</td> </td>
@ -142,10 +161,11 @@
</td> </td>
</tr> </tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@endif
@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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -158,7 +178,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="6" :colspan="colspan"> <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('bills.total') }}</strong> <strong>{{ trans('bills.total') }}</strong>
</td> </td>
<td class="text-right long-texts"> <td class="text-right long-texts">

2
resources/views/purchases/bills/item.blade.php
View File

@ -98,6 +98,7 @@
</td> </td>
@stack('price_td_end') @stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start') @stack('discount_td_start')
<td class="border-right-0 border-bottom-0 w-12" <td class="border-right-0 border-bottom-0 w-12"
:class="[{'has-error': form.errors.has('items.' + index + '.discount') }]"> :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
@ -128,6 +129,7 @@
@stack('discount_input_end') @stack('discount_input_end')
</td> </td>
@stack('discount_td_end') @stack('discount_td_end')
@endif
@stack('taxes_td_start') @stack('taxes_td_start')
<td class="border-right-0 border-bottom-0" <td class="border-right-0 border-bottom-0"

6
resources/views/purchases/bills/show.blade.php
View File

@ -339,9 +339,11 @@
<th class="col-sm-3 text-right d-none d-sm-block">{{ trans('bills.price') }}</th> <th class="col-sm-3 text-right d-none d-sm-block">{{ trans('bills.price') }}</th>
@stack('price_th_end') @stack('price_th_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="col-sm-1 text-center d-none d-sm-block">{{ trans('bills.discount') }}</th> <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('bills.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@stack('total_th_start') @stack('total_th_start')
<th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th> <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th>
@ -366,9 +368,11 @@
<td class="col-sm-3 text-right d-none d-sm-block">@money($bill_item->price, $bill->currency_code, true)</td> <td class="col-sm-3 text-right d-none d-sm-block">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end') @stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start') @stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $bill_item->discount_rate }}</td> <td class="col-sm-1 text-center d-none d-sm-block">{{ $bill_item->discount }}</td>
@stack('discount_td_end') @stack('discount_td_end')
@endif
@stack('total_td_start') @stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($bill_item->total, $bill->currency_code, true)</td> <td class="col-xs-4 col-sm-3 text-right pr-5">@money($bill_item->total, $bill->currency_code, true)</td>

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

@ -30,6 +30,7 @@
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }} {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }}
<div class="col-sm-12 mb-4"> <div class="col-sm-12 mb-4">
@php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'form-control-label']) !!} {!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'form-control-label']) !!}
<div class="table-responsive overflow-x-scroll overflow-y-hidden"> <div class="table-responsive overflow-x-scroll overflow-y-hidden">
<table class="table table-bordered" id="items"> <table class="table table-bordered" id="items">
@ -51,9 +52,11 @@
<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')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@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>
@ -73,13 +76,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="6" :colspan="colspan"></td> <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -90,9 +93,10 @@
</tr> </tr>
@stack('sub_total_td_end') @stack('sub_total_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('item_discount_td_start') @stack('item_discount_td_start')
<tr id="tr-subtotal"> <tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('invoices.item_discount') }}</strong> <strong>{{ trans('invoices.item_discount') }}</strong>
</td> </td>
<td class="text-right border-bottom-0 long-texts"> <td class="text-right border-bottom-0 long-texts">
@ -102,10 +106,12 @@
</td> </td>
</tr> </tr>
@stack('item_discount_td_end') @stack('item_discount_td_end')
@endif
@if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -154,10 +160,11 @@
</td> </td>
</tr> </tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@endif
@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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -170,7 +177,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="6" :colspan="colspan"> <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :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">

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

@ -31,6 +31,7 @@
{{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }} {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
<div class="col-sm-12 mb-4"> <div class="col-sm-12 mb-4">
@php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
{!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'control-label']) !!} {!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'control-label']) !!}
<div class="table-responsive overflow-x-scroll overflow-y-hidden"> <div class="table-responsive overflow-x-scroll overflow-y-hidden">
<table class="table table-bordered" id="items"> <table class="table table-bordered" id="items">
@ -52,9 +53,11 @@
<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')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th> <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@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>
@ -74,13 +77,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="6" :colspan="colspan"></td> <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -91,9 +94,25 @@
</tr> </tr>
@stack('sub_total_td_end') @stack('sub_total_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('item_discount_td_start')
<tr id="tr-subtotal">
<td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<strong>{{ trans('invoices.item_discount') }}</strong>
</td>
<td class="text-right border-bottom-0 long-texts">
{{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
<span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
<span v-else>@money(0, $currency->code, true)</span>
</td>
</tr>
@stack('item_discount_td_end')
@endif
@if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
@stack('add_discount_td_start') @stack('add_discount_td_start')
<tr id="tr-discount"> <tr id="tr-discount">
<td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
<el-popover <el-popover
popper-class="p-0 h-0" popper-class="p-0 h-0"
placement="bottom" placement="bottom"
@ -142,10 +161,11 @@
</td> </td>
</tr> </tr>
@stack('add_discount_td_end') @stack('add_discount_td_end')
@endif
@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="6" :colspan="colspan"> <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :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">
@ -158,7 +178,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="6" :colspan="colspan"> <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :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">

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

@ -98,6 +98,7 @@
</td> </td>
@stack('price_td_end') @stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start') @stack('discount_td_start')
<td class="border-right-0 border-bottom-0 w-12" <td class="border-right-0 border-bottom-0 w-12"
:class="[{'has-error': form.errors.has('items.' + index + '.discount') }]"> :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
@ -128,6 +129,7 @@
@stack('discount_input_end') @stack('discount_input_end')
</td> </td>
@stack('discount_td_end') @stack('discount_td_end')
@endif
@stack('taxes_td_start') @stack('taxes_td_start')
<td class="border-right-0 border-bottom-0" <td class="border-right-0 border-bottom-0"

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

@ -356,9 +356,11 @@
<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')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start') @stack('discount_th_start')
<th class="col-sm-1 text-center d-none d-sm-block">{{ trans('invoices.discount') }}</th> <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('invoices.discount') }}</th>
@stack('discount_th_end') @stack('discount_th_end')
@endif
@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>
@ -383,9 +385,11 @@
<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')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start') @stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount_rate }}</td> <td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount }}</td>
@stack('discount_td_end') @stack('discount_td_end')
@endif
@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>

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

@ -27,6 +27,8 @@
{{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, $setting['date_separator'], []) }} {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, $setting['date_separator'], []) }}
{{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, $setting['percent_position'], []) }} {{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, $setting['percent_position'], []) }}
{{ Form::selectGroup('discount_location', trans('settings.localisation.discount_location.name'), 'percent', $discount_locations, !empty($setting['discount_location']) ? $setting['discount_location'] : 'total', []) }}
</div> </div>
</div> </div>