From 2d62465d60d6a4d3518e38b40787f4ac7663b46e Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 20 Feb 2019 17:14:14 +0530
Subject: [PATCH] issues #596 and #597

---
 .../field-types/multiselect.blade.php         |  2 +-
 packages/Webkul/Product/src/Helpers/View.php  | 35 +++++++++++++++++--
 .../src/Repositories/ProductRepository.php    |  4 +++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php
index b5d405335..f05e1be55 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php
@@ -1,4 +1,4 @@
-<select v-validate="'{{$validations}}'" class="control" id="{{ $attribute->code }}" name="{{ $attribute->code }}" data-vv-as="&quot;{{ $attribute->admin_name }}&quot;" multiple {{ $disabled ? 'disabled' : '' }}>
+<select v-validate="'{{$validations}}'" class="control" id="{{ $attribute->code }}" name="{{ $attribute->code }}[]" data-vv-as="&quot;{{ $attribute->admin_name }}&quot;" multiple {{ $disabled ? 'disabled' : '' }}>
 
     @foreach ($attribute->options as $option)
         <option value="{{ $option->id }}" {{ in_array($option->id, explode(',', $attribute[$attribute->code])) ? 'selected' : ''}}>
diff --git a/packages/Webkul/Product/src/Helpers/View.php b/packages/Webkul/Product/src/Helpers/View.php
index 0eb212f5a..43b181eec 100755
--- a/packages/Webkul/Product/src/Helpers/View.php
+++ b/packages/Webkul/Product/src/Helpers/View.php
@@ -19,10 +19,25 @@ class View extends AbstractProduct
         $attributeOptionReposotory = app('Webkul\Attribute\Repositories\AttributeOptionRepository');
 
         foreach ($attributes as $attribute) {
-            if ($attribute->is_visible_on_front && $product->{$attribute->code}) {
+            if ($attribute->type == 'boolean') {
+                $value = $product->{$attribute->code};
+                if ($attribute->is_visible_on_front ) {
+                    if ($value == 1) {
+                        $value = 'Yes';
+                    } else {
+                        $value = 'No';
+                    }
+
+                    $data[] = [
+                        'code' => $attribute->code,
+                        'label' => $attribute->name,
+                        'value' => $value,
+                        ];
+                }
+            } else if ($attribute->is_visible_on_front && $product->{$attribute->code}) {
                 $value = $product->{$attribute->code};
 
-                if (($attribute->type == 'select') || ($attribute->type == 'multiselect')) {
+                if ($attribute->type == 'select') {
                     $attributeOption = $attributeOptionReposotory->find($value);
 
                     if ($attributeOption) {
@@ -30,6 +45,22 @@ class View extends AbstractProduct
                     }
                 }
 
+                if ($attribute->type == 'multiselect') {
+                    $values = explode(",", $value);
+
+                    $result = [];
+                    foreach ($values as $value) {
+                        $attributeOption = $attributeOptionReposotory->find($value);
+
+                        if ($attributeOption) {
+                            $value = $attributeOption->translate(app()->getLocale())->label;
+                            $result[] = $value;
+                        }
+                    }
+
+                    $value = implode(",", $result);
+                }
+
                 $data[] = [
                     'code' => $attribute->code,
                     'label' => $attribute->name,
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index f8f2db446..6aec699b3 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -162,6 +162,10 @@ class ProductRepository extends Repository
             if (! isset($data[$attribute->code]) || (in_array($attribute->type, ['date', 'datetime']) && ! $data[$attribute->code]))
                 continue;
 
+            if ($attribute->type == 'multiselect') {
+                $data[$attribute->code] = implode(",", $data[$attribute->code]);
+            }
+
             $attributeValue = $this->attributeValue->findOneWhere([
                     'product_id' => $product->id,
                     'attribute_id' => $attribute->id,