merge with master
This commit is contained in:
parent
ae0e7d2c05
commit
ebab486fc1
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<accordian :title="'{{ __('admin::app.catalog.products.categories') }}'" :active="false">
|
||||
<div slot="body">
|
||||
|
||||
|
||||
{!! view_render_event('bagisto.admin.catalog.product.edit_form_accordian.categories.controls.before', ['product' => $product]) !!}
|
||||
|
||||
<tree-view behavior="normal" value-field="id" name-field="categories" input-type="checkbox" items='@json($categories)' value='@json($product->categories->pluck("id"))'></tree-view>
|
||||
|
|
|
|||
|
|
@ -519,6 +519,8 @@
|
|||
this.condition.value = this.condition.value == '' && this.condition.value != undefined ? [] : [ this.condition.value ];
|
||||
}
|
||||
|
||||
console.log(this.condition.value);
|
||||
|
||||
return matchedAttribute[0];
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue