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

ConvertXToProductId from attributes implemented

This commit is contained in:
Prashant Singh 2019-07-18 14:08:36 +05:30
parent 247b662b7e
commit b512666ef1
4 changed files with 95 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,7 @@
{{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
</option>
<option v-for="(label, index2) in attribute_values[index].options" :value="index2" :key="index2">@{{ label.admin_name }}</option>
<option v-for="(label, index2) in attribute_values[index].options" :value="label.id" :key="index2">@{{ label.admin_name }}</option>
</select>
{{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}

6
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
View File

@ -16,7 +16,7 @@
@csrf
<div class="page-header">
<div class="page-title fixed-action">
<div class="page-title">
<h1>
<i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
@ -24,7 +24,7 @@
</h1>
</div>
<div class="page-action">
<div class="page-action fixed-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save') }}
</button>
@ -377,7 +377,7 @@
{{ __('ui::form.select-attribute', ['attribute' => 'Values']) }}
</option>
<option v-for="(label, index2) in attribute_values[index].options" :value="index2" :key="index2">@{{ label.admin_name }}</option>
<option v-for="(label, index2) in attribute_values[index].options" :value="label.id" :key="index2">@{{ label.admin_name }}</option>
</select>
{{-- <multiselect v-model="attribute_values[index].value" :close-on-select="false" :options="attribute_values[index].options" :searchable="false" :track-by="admin_name" :custom-label="attributeListLabel" :multiple="true" ></multiselect> --}}

2
packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
View File

@ -16,7 +16,7 @@
</h1>
</div>
<div class="page-action fixed-action">
<div class="page-action fixed-action-slight">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.users.save-btn-title') }}
</button>

94
packages/Webkul/Discount/src/Helpers/ConvertXToProductId.php
View File

@ -7,6 +7,7 @@ use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
use Webkul\Attribute\Repositories\AttributeOptionRepository as AttributeOption;
use Webkul\Category\Repositories\CategoryRepository as Category;
use Webkul\Product\Repositories\ProductRepository as Product;
use Webkul\Product\Models\ProductAttributeValue as ProductAttributeValue;
class ConvertXToProductId
{
@ -35,12 +36,18 @@ class ConvertXToProductId
*/
protected $cartRule;
/**
* ProductAttributeValueRepository instance
*/
protected $pav;
public function __construct(
Category $category,
Attribute $attribute,
Product $product,
AttributeOption $attributeOption,
CartRule $cartRule
CartRule $cartRule,
ProductAttributeValue $pav
)
{
$this->category = $category;
@ -52,6 +59,8 @@ class ConvertXToProductId
$this->attributeOption = $attributeOption;
$this->cartRule = $cartRule;
$this->pav = $pav;
}
public function convertX($ruleId, $attribute_conditions)
@ -70,6 +79,8 @@ class ConvertXToProductId
$attributeResult = $this->convertFromAttributes($attributeValues);
}
dd($attributeResult);
// now call the function that will find all the unique product ids
$productIds = $this->findAllUniqueIds($attributeResult, $categoryResult);
@ -88,9 +99,77 @@ class ConvertXToProductId
*
* @return array
*/
public function convertFromAttributes($attributes)
public function convertFromAttributes($attributeOptions)
{
return $attributes;
$products = collect();
foreach ($attributeOptions as $attributeOption) {
if ($attributeOption->attribute == 'sku' || $attributeOption->attribute == 'type') {
continue;
}
$selectedOptions = $attributeOption->value;
if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
$pav = $this->attribute->findWhere([
'code' => $attributeOption->attribute
]);
$pavOptions = $pav->first()->options;
$selectedAttributeOptions = collect();
foreach ($pavOptions as $pavOption) {
foreach ($selectedOptions as $key => $value) {
if ($pavOption->id == $value) {
$selectedAttributeOptions->push($pavOption);
}
}
}
foreach($selectedAttributeOptions as $selectedAttributeOption) {
$typeColumn = $this->pav::$attributeTypeFields[$pav->first()->type];
$pavResults = $this->pav->where(
"{$typeColumn}", $selectedAttributeOption->id
)->get();
foreach ($pavResults as $pavResult) {
$products->push($pavResult->product);
}
}
} else {
$pav = $this->attribute->findWhere([
'code' => $attributeOption->attribute
]);
$pavValues = $pav->first();
$selectedAttributeValues = collect();
foreach ($pavValues as $pavValue) {
foreach ($selectedValues as $key => $value) {
if ($pavValue->id == $value) {
$selectedAttributeValues->push($pavValue);
}
}
}
foreach($selectedAttributeValues as $selectedAttributeValue) {
$typeColumn = $this->pav::$attributeTypeFields[$pav->first()->type];
$pavResults = $this->pav->where(
"{$typeColumn}", $selectedAttributeValue->id
)->get();
foreach ($pavResults as $pavResult) {
$products->push($pavResult->product);
}
}
}
}
return $products;
}
/**
@ -115,7 +194,14 @@ class ConvertXToProductId
$attributeResult = $data[0];
$categoryResult = $data[1];
dd($categoryResult, $attributeResult);
$pavs = $this->pav->all();
// find matched attribute options product ids
$attributeRelatedIds = $this->convertFromAttributes($attributeResult);
dd($attributeRelatedIds);
// find matched categories product ids
$categoryRelatedIds = $this->convertFromCategories($categoryResult);
}
/**