issues #1056 & 1058

This commit is contained in:
rahul shukla 2019-06-18 17:58:34 +05:30
parent 3af3996439
commit 9166daa31b
2 changed files with 5 additions and 3 deletions

View File

@ -809,6 +809,7 @@ return [
'create-cart-rule' => 'Create Cart Rule',
'save-btn-title' => 'Create',
'edit-btn-title' => 'Edit',
'save' => 'Save',
'select-attr' => 'Select Attribute',
'select-attr-fam' => 'Select Attribute Family',
'select-cart-attr' => 'Select Cart Attribute',
@ -845,7 +846,8 @@ return [
'free-shipping' => 'Free Shipping',
'is-guest' => 'For Guests',
'disc_qty' => 'Max. Quantity Allowed To Be Discounted',
'test-mode' => 'Choose how to test conditions'
'test-mode' => 'Choose how to test conditions',
'lables' => 'Labels'
],
'status' => [

View File

@ -26,7 +26,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.edit-btn-title') }}
{{ __('admin::app.promotion.save') }}
</button>
</div>
</div>
@ -358,7 +358,7 @@
</div>
</accordian>
<accordian :active="false" title="labels">
<accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.lables') }}'">
<div slot="body">
@foreach($cart_rule[3]->labels as $label)
<span>[{{ $label->channel->code }}]</span>