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

Merge pull request #1736 from SevanNerse/master

Browse Source 
checkbox group is adjusted
This commit is contained in:
Cüneyt Şentürk 2021-01-07 13:20:06 +03:00 committed by GitHub
commit 5ae9f713f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/views/common/documents.js vendored
View File

@ -299,6 +299,8 @@ const app = new Vue({
add_discount: false, add_discount: false,
discount: 0, discount: 0,
total: total, total: total,
// @todo
// invoice_item_checkbox_sample: [],
}); });
this.onCalculateTotal(); this.onCalculateTotal();
@ -566,7 +568,9 @@ const app = new Vue({
tax_ids: item_taxes, tax_ids: item_taxes,
add_discount: (item.discount_rate) ? true : false, add_discount: (item.discount_rate) ? true : false,
discount: item.discount_rate, discount: item.discount_rate,
total: (item.total).toFixed(2) total: (item.total).toFixed(2),
// @todo
// invoice_item_checkbox_sample: [],
}); });
}, this); }, this);

13
resources/views/partials/form/checkbox_group.blade.php
View File

@ -9,15 +9,22 @@
<div class="row"> <div class="row">
@foreach($items as $item) @foreach($items as $item)
@php
$item_attributes = $attributes;
if (!empty($attributes[':id'])) {
$item_attributes[':id'] = str_replace(':item_id', $item->$id, $attributes[':id']);
}
@endphp
<div class="col-md-3"> <div class="col-md-3">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
{{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), [ {{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), array_merge([
'id' => 'checkbox-' . $name . '-' . $item->$id, 'id' => 'checkbox-' . $name . '-' . $item->$id,
'class' => 'custom-control-input', 'class' => 'custom-control-input',
'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name), 'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
]) }} ], $item_attributes)) }}
<label class="custom-control-label" for="checkbox-{{ $name . '-' . $item->$id}}"> <label class="custom-control-label" :for="{{ !empty($item_attributes[':id']) ? $item_attributes[':id'] : '"checkbox-' . $name . '-' . $item->$id . '"' }}">
{{ $item->$value }} {{ $item->$value }}
</label> </label>
</div> </div>