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

product Image helper removed

This commit is contained in:
prateek srivastava 2021-01-04 17:44:33 +05:30
parent b57bcdc39e
commit 5935fbf28c
26 changed files with 26 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/repository.php
View File

@ -169,7 +169,8 @@ return [
*/
'acceptedConditions' => [
'=',
'like'
'like',
'in'
],
/*
|--------------------------------------------------------------------------

6
packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php
View File

@ -192,8 +192,6 @@
</div>
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<div class="sale-stock">
<div class="card">
<div class="card-title">
@ -208,7 +206,7 @@
<li>
<a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
<div class="product image">
<?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($item->product); ?>
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>
@ -318,7 +316,7 @@
<li>
<a href="{{ route('admin.catalog.products.edit', $item->product_id) }}">
<div class="image">
<?php $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($item->product); ?>
<img class="item-image" src="{{ $productBaseImage['small_image_url'] }}" />
</div>

20
packages/Webkul/Product/src/Helpers/ConfigurableOption.php
View File

@ -7,24 +7,6 @@ use Webkul\Product\Models\ProductAttributeValue;
class ConfigurableOption extends AbstractProduct
{
/**
* ProductImage object
*
* @var array
*/
protected $productImage;
/**
* Create a new controller instance.
*
* @param \Webkul\Product\Helpers\ProductImage $productImage
* @return void
*/
public function __construct(ProductImage $productImage)
{
$this->productImage = $productImage;
}
/**
* Returns the allowed variants
*
@ -223,7 +205,7 @@ class ConfigurableOption extends AbstractProduct
$variantId = $variant->id;
}
$images[$variantId] = $this->productImage->getGalleryImages($variant);
$images[$variantId] = ProductImage::getGalleryImages($variant);
}
return $images;

2
packages/Webkul/Product/src/Type/AbstractType.php
View File

@ -849,7 +849,7 @@ abstract class AbstractType
*/
public function getBaseImage($item)
{
return $this->productImageHelper->getProductBaseImage($item->product);
return ProductImage::getProductBaseImage($item->product);
}
/**

2
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -5,8 +5,6 @@
@stop
@section('content-wrapper')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<section class="cart">
@if ($cart)
<div class="title">

2
packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<?php $cart = cart()->getCart(); ?>
@if ($cart)

2
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -68,8 +68,6 @@
</div>
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<div class="cart-item-list mt-20">
@foreach ($cart->items as $item)
@php

4
packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::layouts.master')
@section('page_title')
@ -34,7 +32,7 @@
@foreach ($reviews as $review)
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getProductBaseImage($review->product); ?>
<?php $image = ProductImage::getProductBaseImage($review->product); ?>
<a href="{{ route('shop.productOrCategory.index', $review->product->url_key) }}" title="{{ $review->product->name }}">
<img class="media" src="{{ $image['small_image_url'] }}" alt=""/>
</a>

4
packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::layouts.master')
@section('page_title')
@ -21,7 +19,7 @@
@foreach ($reviews as $review)
<div class="account-item-card mt-15 mb-15">
<div class="media-info">
<?php $image = $productImageHelper->getGalleryImages($review->product); ?>
<?php $image = ProductImage::getGalleryImages($review->product); ?>
<img class="media" src="{{ $image[0]['small_image_url'] }}" alt="" />
<div class="info mt-20">

2
packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
View File

@ -6,8 +6,6 @@
@section('content-wrapper')
<div class="account-content">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@include('shop::customers.account.partials.sidemenu')
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')

4
packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
View File

@ -2,9 +2,7 @@
<div class="product-card">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
@if ($product->new)
<div class="sticker new">

3
packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
View File

@ -10,9 +10,8 @@
<div class="review-layouter mb-20">
<div class="product-info">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
<div class="product-image">
<a href="{{ route('shop.productOrCategory.index', $product->url_key) }}" title="{{ $product->name }}">

4
packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php
View File

@ -9,11 +9,9 @@
<section class="review">
<div class="review-layouter">
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
<?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
<div class="product-info">
<div class="product-image">

2
packages/Webkul/Shop/src/Resources/views/products/view.blade.php
View File

@ -15,7 +15,7 @@
</script>
@endif
<?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
<meta name="twitter:card" content="summary_large_image" />

7
packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
View File

@ -1,13 +1,12 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
<?php
$images = $productImageHelper->getGalleryImages($product);
<?php
$images = ProductImage::getGalleryImages($product);
$videos = $productVideoHelper->getVideos($product);
$images = array_merge($images, $videos);
$images = array_merge($images, $videos);
?>

5
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -307,14 +307,13 @@ class Helper extends Review
public function formatProduct($product, $list = false, $metaInformation = [])
{
$reviewHelper = app('Webkul\Product\Helpers\Review');
$productImageHelper = app('Webkul\Product\Helpers\ProductImage');
$totalReviews = $reviewHelper->getTotalReviews($product);
$avgRatings = ceil($reviewHelper->getAverageRating($product));
$galleryImages = $productImageHelper->getGalleryImages($product);
$productImage = $productImageHelper->getProductBaseImage($product)['medium_image_url'];
$galleryImages = ProductImage::getGalleryImages($product);
$productImage = ProductImage::getProductBaseImage($product)['medium_image_url'];
$largeProductImageName = "large-product-placeholder.png";
$mediumProductImageName = "meduim-product-placeholder.png";

1
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -1,5 +1,4 @@
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::layouts.master')

2
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<div class="form-container review-checkout-conainer">
<accordian :title="'{{ __('shop::app.checkout.onepage.summary') }}'" :active="true">
<div class="form-header mb-30" slot="header">

4
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/reviews/index.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::customers.account.index')
@section('page_title')
@ -33,7 +31,7 @@
<div class="row col-12 fs16">
<div class="col-12 row">
@php
$image = $productImageHelper->getProductBaseImage($review->product);
$image = ProductImage::getProductBaseImage($review->product);
@endphp
<a

1
packages/Webkul/Velocity/src/Resources/views/shop/home/index.blade.php
View File

@ -1,6 +1,5 @@
@extends('shop::layouts.master')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('productRatingHelper', 'Webkul\Product\Helpers\Review')
@php

7
packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
View File

@ -1,6 +1,5 @@
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@push('css')
<style type="text/css">
@ -21,15 +20,15 @@
}
if (isset($item)) {
$productBaseImage = $productImageHelper->getProductImage($item);
$productBaseImage = ProductImage::getProductImage($item);
} else {
$productBaseImage = $productImageHelper->getProductBaseImage($product);
$productBaseImage = ProductImage::getProductBaseImage($product);
}
$totalReviews = $reviewHelper->getTotalReviews($product);
$avgRatings = ceil($reviewHelper->getAverageRating($product));
$galleryImages = $productImageHelper->getGalleryImages($product);
$galleryImages = ProductImage::getGalleryImages($product);
$priceHTML = view('shop::products.price', ['product' => $product])->render();
$product->__set('priceHTML', $priceHTML);

2
packages/Webkul/Velocity/src/Resources/views/shop/products/reviews/create.blade.php
View File

@ -1,5 +1,3 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::layouts.master')
@section('page_title')

5
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -2,7 +2,6 @@
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@inject ('customHelper', 'Webkul\Velocity\Helpers\Helper')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@php
$total = $reviewHelper->getTotalReviews($product);
@ -11,7 +10,7 @@
$avgStarRating = round($avgRatings);
$productImages = [];
$images = $productImageHelper->getGalleryImages($product);
$images = ProductImage::getGalleryImages($product);
foreach ($images as $key => $image) {
array_push($productImages, $image['medium_image_url']);
@ -33,7 +32,7 @@
</script>
@endif
<?php $productBaseImage = app('Webkul\Product\Helpers\ProductImage')->getProductBaseImage($product); ?>
<?php $productBaseImage = ProductImage::getProductBaseImage($product); ?>
<meta name="twitter:card" content="summary_large_image" />

3
packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
View File

@ -1,11 +1,10 @@
@if (Webkul\Product\Helpers\ProductType::hasVariants($product->type))
@inject ('configurableOptionHelper', 'Webkul\Product\Helpers\ConfigurableOption')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@php
$config = $configurableOptionHelper->getConfigurationConfig($product);
$galleryImages = $productImageHelper->getGalleryImages($product);
$galleryImages = ProductImage::getGalleryImages($product);
@endphp
{!! view_render_event('bagisto.shop.products.view.configurable-options.before', ['product' => $product]) !!}

3
packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
View File

@ -1,9 +1,8 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
@php
$images = $productImageHelper->getGalleryImages($product);
$images = ProductImage::getGalleryImages($product);
$videos = $productVideoHelper->getVideos($product);
$videoData = $imageData = [];

4
packages/Webkul/Velocity/src/Resources/views/shop/products/view/small-view.blade.php
View File

@ -1,7 +1,5 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@php
$productBaseImage = $productImageHelper->getProductBaseImage($product);
$productBaseImage = ProductImage::getProductBaseImage($product);
@endphp
<div class="col-lg-3 col-md-12">