From c2679f9c8d0aa40ad36735e607250dc0b0eda131 Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Wed, 29 Jul 2020 20:10:19 +0530
Subject: [PATCH] resolve conflict problem

---
 .../promotions/cart-rules/create.blade.php      |  4 ----
 .../promotions/catalog-rules/create.blade.php   |  4 ----
 .../Http/Controllers/AttributeController.php    |  4 ----
 .../guest/compare/compare-products.blade.php    | 14 +++-----------
 .../guest/compare/compare-products.blade.php    | 17 ++++-------------
 5 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
index 908f4c6da..156a964ad 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
@@ -21,12 +21,8 @@
                 <div class="page-header">
                     <div class="page-title">
                         <h1>
-<<<<<<< 951ac00df22edd19a9c40d894d2f632e11c2151a
                             <i class="icon angle-left-icon back-link"
                             onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-=======
-                            <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
->>>>>>> Back icon is not working in catalog and cart rule grid - Bug Fixed
 
                             {{ __('admin::app.promotions.cart-rules.add-title') }}
                         </h1>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
index 256c516fc..c843a272c 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
@@ -21,12 +21,8 @@
                 <div class="page-header">
                     <div class="page-title">
                         <h1>
-<<<<<<< 951ac00df22edd19a9c40d894d2f632e11c2151a
                         <i class="icon angle-left-icon back-link"
                             onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
-=======
-                            <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
->>>>>>> Back icon is not working in catalog and cart rule grid - Bug Fixed
 
                             {{ __('admin::app.promotions.catalog-rules.add-title') }}
                         </h1>
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index 80cc824fa..05e023153 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -69,10 +69,6 @@ class AttributeController extends Controller
 
         $data = request()->all();
 
-        if ($data['code'] == 'image') {
-            $data['code'] = 'Image';
-        }
-
         $data['is_user_defined'] = 1;
 
         $attribute = $this->attributeRepository->create($data);
diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
index fb0ea1267..6867c0b9f 100644
--- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
@@ -25,7 +25,7 @@
                         $comparableAttributes = $comparableAttributes->toArray();
 
                         array_splice($comparableAttributes, 1, 0, [[
-                            'code' => 'productImage',
+                            'code' => 'image',
                             'admin_name' => 'Product Image'
                         ]]);
 
@@ -49,11 +49,11 @@
                                         </a>
                                         @break
 
-                                    @case('productImage')
+                                    @case('image')
                                         <a :href="`${baseUrl}/${product.url_key}`" class="unset">
                                             <img
                                                 class="image-wrapper"
-                                                :src="product['image']"
+                                                :src="product['{{ $attribute['code'] }}']"
                                                 :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
                                         </a>
                                         @break
@@ -91,14 +91,6 @@
                                                             : '{{ __('velocity::app.shop.general.no') }}'"
                                                 ></span>
                                                 @break;
-
-                                            @case('image')
-                                                <img
-                                                class="image-wrapper"
-                                                :src="'/storage/' + product['{{ $attribute['code'] }}']"
-                                                :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
-                                                @break;  
-
                                             @default
                                                 <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
                                                 @break;
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
index ee2f16a77..e54cdecef 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
@@ -39,7 +39,7 @@
                         $comparableAttributes = $comparableAttributes->toArray();
 
                         array_splice($comparableAttributes, 1, 0, [[
-                            'code' => 'productImage',
+                            'code' => 'image',
                             'admin_name' => __('velocity::app.customer.compare.product_image')
                         ]]);
 
@@ -63,11 +63,11 @@
                                         </a>
                                         @break
 
-                                    @case('productImage')
+                                    @case('image')
                                         <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset">
                                             <img
                                                 class="image-wrapper"
-                                                :src="product['image']"
+                                                :src="product['{{ $attribute['code'] }}']"
                                                 onload="window.updateHeight ? window.updateHeight() : ''"
                                                 :onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
                                         </a>
@@ -110,16 +110,7 @@
                                                             ? '{{ __('velocity::app.shop.general.yes') }}'
                                                             : '{{ __('velocity::app.shop.general.no') }}'"
                                                 ></span>
-                                                @break;
-
-                                            @case('image')
-                                                <img
-                                                class="image-wrapper"
-                                                :src="'/storage/' + product['{{ $attribute['code'] }}']"
-                                                onload="window.updateHeight ? window.updateHeight() : ''"
-                                                :onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
-                                                @break; 
-                                                   
+                                                @break;                                                   
                                             @default
                                                 <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
                                                 @break;