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

invoice item multible

Browse Source
This commit is contained in:
cuneytsenturk 2018-10-20 18:52:37 +03:00
parent 983015509a
commit 39e6e0b07c
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/css/app.css vendored
View File

@ -745,3 +745,23 @@ input[type="number"] {
padding-left: 0;
padding-right: 0;
}
#items .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #6da252;
border: 1px solid #6da252;
margin-bottom: 5px;
}
#items .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
color: #fffdfd;
}
#items span.select2.select2-container.select2-container--default .select2-selection.select2-selection--multiple {
border-color: #d2d6de;
border-radius: 0;
}
#items .select2-container--default.select2-container--focus .select2-selection--multiple {
border-color: #6da252;
border-radius: 0;
}

26
resources/views/incomes/invoices/create.blade.php
View File

@ -248,6 +248,14 @@
placeholder: {
id: '-1', // the value of the option
text: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
},
escapeMarkup: function (markup) {
return markup;
},
language: {
noResults: function () {
return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
}
}
});
@ -269,6 +277,24 @@
placeholder : '{{ trans('general.form.no_file_selected') }}'
});
$(document).on('click', '#tax-add-new', function(e){
tax_name = $('.select2-search__field').val();
$('#modal-create-tax').remove();
$.ajax({
url: '{{ url("modals/taxes/create") }}',
type: 'GET',
dataType: 'JSON',
data: {name: tax_name},
success: function(json) {
if (json['success']) {
$('body').append(json['html']);
}
}
});
});
var autocomplete_path = "{{ url('common/items/autocomplete') }}";
$(document).on('click', '.form-control.typeahead', function() {

10
resources/views/incomes/invoices/item.blade.php
View File

@ -7,7 +7,7 @@
</td>
@stack('actions_td_end')
@stack('name_td_start')
<td {!! $errors->has('item.' . $item_row . '.name') ? 'class="has-error"' : '' !!}">
<td {!! $errors->has('item.' . $item_row . '.name') ? 'class="has-error"' : '' !!}>
@stack('name_input_start')
<input value="{{ empty($item) ? '' : $item->name }}" class="form-control typeahead" required="required" placeholder="{{ trans('general.form.enter', ['field' => trans_choice('invoices.item_name', 1)]) }}" name="item[{{ $item_row }}][name]" type="text" id="item-name-{{ $item_row }}" autocomplete="off">
<input value="{{ empty($item) ? '' : $item->item_id }}" name="item[{{ $item_row }}][item_id]" type="hidden" id="item-id-{{ $item_row }}">
@ -16,7 +16,7 @@
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}">
<td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}>
@stack('quantity_input_start')
<input value="{{ empty($item) ? '' : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
{!! $errors->first('item.' . $item_row . '.quantity', '<p class="help-block">:message</p>') !!}
@ -24,7 +24,7 @@
</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td {{ $errors->has('item.' . $item_row . 'price') ? 'class="has-error"' : '' }}">
<td {{ $errors->has('item.' . $item_row . 'price') ? 'class="has-error"' : '' }}>
@stack('price_input_start')
<input value="{{ empty($item) ? '' : $item->price }}" class="form-control text-right input-price" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
<input value="{{ $currency->code }}" name="item[{{ $item_row }}][currency]" type="hidden" id="item-currency-{{ $item_row }}">
@ -33,9 +33,9 @@
</td>
@stack('price_td_end')
@stack('taxes_td_start')
<td {{ $errors->has('item.' . $item_row . '.tax_id') ? 'class="has-error"' : '' }}">
<td {{ $errors->has('item.' . $item_row . '.tax_id') ? 'class="has-error"' : '' }}>
@stack('tax_id_input_start')
{!! Form::select('item[' . $item_row . '][tax_id]', $taxes, empty($item) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
{!! Form::select('item[' . $item_row . '][tax_id][]', $taxes, empty($item) ? setting('general.default_tax') : $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]), 'multiple' => 'true']) !!}
{!! $errors->first('item.' . $item_row . '.tax_id', '<p class="help-block">:message</p>') !!}
@stack('tax_id_input_end')
</td>