diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js index f96ea5e66..5c9bc7190 100644 --- a/resources/assets/js/views/common/documents.js +++ b/resources/assets/js/views/common/documents.js @@ -299,6 +299,8 @@ const app = new Vue({ add_discount: false, discount: 0, total: total, + // @todo + // invoice_item_checkbox_sample: [], }); this.onCalculateTotal(); @@ -566,7 +568,9 @@ const app = new Vue({ tax_ids: item_taxes, add_discount: (item.discount_rate) ? true : false, discount: item.discount_rate, - total: (item.total).toFixed(2) + total: (item.total).toFixed(2), + // @todo + // invoice_item_checkbox_sample: [], }); }, this); diff --git a/resources/views/partials/form/checkbox_group.blade.php b/resources/views/partials/form/checkbox_group.blade.php index fed6c679e..f09b974b4 100644 --- a/resources/views/partials/form/checkbox_group.blade.php +++ b/resources/views/partials/form/checkbox_group.blade.php @@ -9,15 +9,22 @@
@foreach($items as $item) + @php + $item_attributes = $attributes; + + if (!empty($attributes[':id'])) { + $item_attributes[':id'] = str_replace(':item_id', $item->$id, $attributes[':id']); + } + @endphp
- {{ 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, 'class' => 'custom-control-input', 'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name), - ]) }} + ], $item_attributes)) }} -