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

resolve conflict problem

This commit is contained in:
vishal-webkul 2020-07-29 20:10:19 +05:30
parent 11edf9e4fb
commit c2679f9c8d
5 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,8 @@
<div class="page-header"> <div class="page-header">
<div class="page-title"> <div class="page-title">
<h1> <h1>
<<<<<<< 951ac00df22edd19a9c40d894d2f632e11c2151a
<i class="icon angle-left-icon back-link" <i class="icon angle-left-icon back-link"
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i> 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') }} {{ __('admin::app.promotions.cart-rules.add-title') }}
</h1> </h1>

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

@ -21,12 +21,8 @@
<div class="page-header"> <div class="page-header">
<div class="page-title"> <div class="page-title">
<h1> <h1>
<<<<<<< 951ac00df22edd19a9c40d894d2f632e11c2151a
<i class="icon angle-left-icon back-link" <i class="icon angle-left-icon back-link"
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i> 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') }} {{ __('admin::app.promotions.catalog-rules.add-title') }}
</h1> </h1>

4
packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
View File

@ -69,10 +69,6 @@ class AttributeController extends Controller
$data = request()->all(); $data = request()->all();
if ($data['code'] == 'image') {
$data['code'] = 'Image';
}
$data['is_user_defined'] = 1; $data['is_user_defined'] = 1;
$attribute = $this->attributeRepository->create($data); $attribute = $this->attributeRepository->create($data);

14
packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
View File

@ -25,7 +25,7 @@
$comparableAttributes = $comparableAttributes->toArray(); $comparableAttributes = $comparableAttributes->toArray();
array_splice($comparableAttributes, 1, 0, [[ array_splice($comparableAttributes, 1, 0, [[
'code' => 'productImage', 'code' => 'image',
'admin_name' => 'Product Image' 'admin_name' => 'Product Image'
]]); ]]);
@ -49,11 +49,11 @@
</a> </a>
@break @break
@case('productImage') @case('image')
<a :href="`${baseUrl}/${product.url_key}`" class="unset"> <a :href="`${baseUrl}/${product.url_key}`" class="unset">
<img <img
class="image-wrapper" class="image-wrapper"
:src="product['image']" :src="product['{{ $attribute['code'] }}']"
:onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" /> :onerror="`this.src='${baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
</a> </a>
@break @break
@ -91,14 +91,6 @@
: '{{ __('velocity::app.shop.general.no') }}'" : '{{ __('velocity::app.shop.general.no') }}'"
></span> ></span>
@break; @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 @default
<span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span> <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
@break; @break;

15
packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
View File

@ -39,7 +39,7 @@
$comparableAttributes = $comparableAttributes->toArray(); $comparableAttributes = $comparableAttributes->toArray();
array_splice($comparableAttributes, 1, 0, [[ array_splice($comparableAttributes, 1, 0, [[
'code' => 'productImage', 'code' => 'image',
'admin_name' => __('velocity::app.customer.compare.product_image') 'admin_name' => __('velocity::app.customer.compare.product_image')
]]); ]]);
@ -63,11 +63,11 @@
</a> </a>
@break @break
@case('productImage') @case('image')
<a :href="`${$root.baseUrl}/${product.url_key}`" class="unset"> <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset">
<img <img
class="image-wrapper" class="image-wrapper"
:src="product['image']" :src="product['{{ $attribute['code'] }}']"
onload="window.updateHeight ? window.updateHeight() : ''" onload="window.updateHeight ? window.updateHeight() : ''"
:onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" /> :onerror="`this.src='${$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
</a> </a>
@ -111,15 +111,6 @@
: '{{ __('velocity::app.shop.general.no') }}'" : '{{ __('velocity::app.shop.general.no') }}'"
></span> ></span>
@break; @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;
@default @default
<span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span> <span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
@break; @break;