merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on prepopulating the values fields in conditions

This commit is contained in:
Prashant Singh 2019-05-06 20:02:12 +05:30
parent 2a2bcdb162
commit 01acd092a4
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php
View File

@ -103,45 +103,45 @@
<span class="control-error" v-if="errors.has('criteria')">@{{ errors.first('criteria') }}</span> <span class="control-error" v-if="errors.has('criteria')">@{{ errors.first('criteria') }}</span>
</div> </div>
<span class="btn btn-primary btn-lg" v-on:click="addCondition">Select Condition</span> <span class="btn btn-primary btn-lg" v-on:click="addCondition">Add Condition</span>
</div> </div>
<div class="condition-set"> <div class="condition-set">
<div v-for="(attr, index) in attrs"> <div v-for="(attr, index) in attrs">
<div class="control-group" :key="index" style="display: flex; flex-direction: row; align-content: center; justify-content: space-between;"> <div class="control-group" :key="index" style="display: flex; flex-direction: row; align-content: center; justify-content: flex-start;">
<span style="padding-top: 18px; margin-right: 15px;">Attribute is </span> <span style="padding-top: 18px; margin-right: 15px;">Attribute is </span>
<select class="control" name="attributes[][attribute]" v-validate="'required'" style="width: 220px;"> <select class="control" name="attributes[][attribute]" v-validate="'required'" style="width: 120px; margin-right: 15px;">
<option disabled="disabled">Select attribute</option> <option disabled="disabled">Select attribute</option>
<option v-for="attribute in attributes" :value="attribute.id">@{{ attribute.name }}</option> <option v-for="attribute in attributes" :value="attribute.id">@{{ attribute.name }}</option>
</select> </select>
<select class="control" name="attributes[][condition]" v-validate="'required'" style="width: 220px;"> <select class="control" name="attributes[][condition]" v-validate="'required'" style="width: 120px; margin-right: 15px;">
<option>Contains</option> <option>Contains</option>
<option>Is Any Of</option> <option>Is Any Of</option>
</select> </select>
<input type="text" class="control" name="attributes[][value]"> <input type="text" class="control" name="attributes[][value]" placeholder="Enter Value(s)" title="Use comma for multiple values" style="width: 180px;">
<span class="icon cross-icon" style="margin-top: 12px; height: 32px; width: 48px;" v-on:click="removeAttr(index)"></span> <span class="icon cross-icon" style="margin-top: 12px; height: 32px; width: 32px;" v-on:click="removeAttr(index)"></span>
</div> </div>
</div> </div>
<div v-for="(cat, index) in cats"> <div v-for="(cat, index) in cats">
<div class="control-group" :key="index" style="display: flex; flex-direction: row; align-content: center; justify-content: space-between;"> <div class="control-group" :key="index" style="display: flex; flex-direction: row; align-content: center; justify-content: flex-start;">
<span style="padding-top: 18px; margin-right: 15px;">Category is </span> <span style="padding-top: 18px; margin-right: 15px;">Category is </span>
<select class="control" name="categories[][category]" v-validate="'required'" value="{{ old('category') }}" data-vv-as="&quot;{{ __('admin::app.promotion.category') }}&quot;" style="width: 220px;"> <select class="control" name="categories[][category]" v-validate="'required'" value="{{ old('category') }}" data-vv-as="&quot;{{ __('admin::app.promotion.category') }}&quot;" style="width: 120px;">
<option disabled="disabled">Select Category</option> <option disabled="disabled">Select Category</option>
<option v-for="category in categories" :value="category.id">@{{ category.name }}</option> <option v-for="category in categories" :value="category.id">@{{ category.name }}</option>
</select> </select>
<select class="control" name="attributes[][condition]" v-validate="'required'" style="width: 220px;"> <select class="control" name="attributes[][condition]" v-validate="'required'" style="width: 120px;">
<option>Contains</option> <option>Contains</option>
<option>Is Any Of</option> <option>Is Any Of</option>
</select> </select>
<input type="text" class="control" name="attributes[][value]"> <input type="text" class="control" name="attributes[][value]" style="width: 180px;">
<span class="icon cross-icon" style="margin-top: 12px; height: 32px; width: 32px;" v-on:click="removeCat(index)"></span> <span class="icon cross-icon" style="margin-top: 12px; height: 32px; width: 32px;" v-on:click="removeCat(index)"></span>
</div> </div>

8
packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
View File

@ -9,6 +9,7 @@ use Illuminate\Routing\Controller;
use Webkul\Attribute\Repositories\AttributeRepository as Attribute; use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily; use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
use Webkul\Category\Repositories\CategoryRepository as Category; use Webkul\Category\Repositories\CategoryRepository as Category;
use Webkul\Product\Repositories\ProductFlatRepository as Product;
/** /**
* Catalog Rule controller * Catalog Rule controller
@ -22,13 +23,15 @@ class CatalogRuleController extends Controller
protected $attribute; protected $attribute;
protected $attributeFamily; protected $attributeFamily;
protected $category; protected $category;
protected $product;
public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category) public function __construct(Attribute $attribute, AttributeFamily $attributeFamily, Category $category, Product $product)
{ {
$this->_config = request('_config'); $this->_config = request('_config');
$this->attribute = $attribute; $this->attribute = $attribute;
$this->attributeFamily = $attributeFamily; $this->attributeFamily = $attributeFamily;
$this->category = $category; $this->category = $category;
$this->product = $product;
} }
public function index() public function index()
@ -46,7 +49,8 @@ class CatalogRuleController extends Controller
dd(request()->all()); dd(request()->all());
} }
public function fetchAttribute() { public function fetchAttribute()
{
return request()->all(); return request()->all();
} }
} }