From 438353c1e3499995a35334419f002490b5d93953 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 19 Oct 2020 12:02:32 +0530 Subject: [PATCH] '.webp' Format Added --- packages/Webkul/Admin/src/Config/system.php | 4 ++-- .../Webkul/Admin/src/Http/Requests/ConfigurationForm.php | 8 ++++---- .../src/Resources/views/catalog/products/edit.blade.php | 4 ++-- .../Category/src/Http/Controllers/CategoryController.php | 4 ++-- .../Core/src/Http/Controllers/ChannelController.php | 8 ++++---- .../Webkul/Core/src/Http/Controllers/SliderController.php | 8 ++++---- packages/Webkul/Product/src/Http/Requests/ProductForm.php | 6 +++--- packages/Webkul/Sales/src/Config/system.php | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index c2e522e97..2ad1d0c05 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -121,13 +121,13 @@ return [ 'title' => 'admin::app.admin.system.logo-image', 'type' => 'image', 'channel_based' => true, - 'validation' => 'mimes:jpeg,bmp,png,jpg', + 'validation' => 'mimes:bmp,jpeg,jpg,png,webp', ], [ 'name' => 'favicon', 'title' => 'admin::app.admin.system.favicon', 'type' => 'image', 'channel_based' => true, - 'validation' => 'mimes:jpeg,bmp,png,jpg', + 'validation' => 'mimes:bmp,jpeg,jpg,png,webp', ], ], ], [ diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php index 03a23e3dd..424a72379 100644 --- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php +++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php @@ -58,7 +58,7 @@ class ConfigurationForm extends FormRequest && ! request()->input('general.design.admin_logo.logo_image.delete') ) { $this->rules = array_merge($this->rules, [ - 'general.design.admin_logo.logo_image' => 'required|mimes:jpeg,bmp,png,jpg|max:5000', + 'general.design.admin_logo.logo_image' => 'required|mimes:bmp,jpeg,jpg,png,webp|max:5000', ]); } @@ -66,7 +66,7 @@ class ConfigurationForm extends FormRequest && ! request()->input('general.design.admin_logo.favicon.delete') ) { $this->rules = array_merge($this->rules, [ - 'general.design.admin_logo.favicon' => 'required|mimes:jpeg,bmp,png,jpg|max:5000', + 'general.design.admin_logo.favicon' => 'required|mimes:bmp,jpeg,jpg,png,webp|max:5000', ]); } @@ -74,7 +74,7 @@ class ConfigurationForm extends FormRequest && ! request()->input('sales.orderSettings.invoice_slip_design.logo.delete') ) { $this->rules = array_merge($this->rules, [ - 'sales.orderSettings.invoice_slip_design.logo' => 'required|mimes:jpeg,bmp,png,jpg|max:5000', + 'sales.orderSettings.invoice_slip_design.logo' => 'required|mimes:bmp,jpeg,jpg,png,webp|max:5000', ]); } @@ -89,7 +89,7 @@ class ConfigurationForm extends FormRequest public function messages() { return [ - 'general.design.admin_logo.logo_image.mimes' => 'Invalid file format. Use only jpeg, bmp, png, jpg.', + 'general.design.admin_logo.logo_image.mimes' => 'Invalid file format. Use only bmp, jpeg, jpg, png and webp.', 'catalog.products.storefront.products_per_page.comma_seperated_integer' => 'The "Product Per Page" field must be numeric and may contain comma.' ]; } diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 8296548a3..82850d4d7 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -96,9 +96,9 @@ array_push($validations, 'size:' . $retVal); } - if ($attribute->type == 'image') { + if ($attribute->type == 'image') { $retVal = (core()->getConfigData('catalog.products.attribute.image_attribute_upload_size')) ? core()->getConfigData('catalog.products.attribute.image_attribute_upload_size') : '2048' ; - array_push($validations, 'size:' . $retVal . '|mimes:jpeg, bmp, png, jpg'); + array_push($validations, 'size:' . $retVal . '|mimes:bmp,jpeg,jpg,png,webp'); } array_push($validations, $attribute->validation); diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index a48385795..6270e70f0 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -82,7 +82,7 @@ class CategoryController extends Controller $this->validate(request(), [ 'slug' => ['required', 'unique:category_translations,slug', new \Webkul\Core\Contracts\Validations\Slug], 'name' => 'required', - 'image.*' => 'mimes:jpeg,jpg,bmp,png', + 'image.*' => 'mimes:bmp,jpeg,jpg,png,webp', 'description' => 'required_if:display_mode,==,description_only,products_and_description', ]); @@ -127,7 +127,7 @@ class CategoryController extends Controller } }], $locale . '.name' => 'required', - 'image.*' => 'mimes:jpeg,jpg,bmp,png', + 'image.*' => 'mimes:bmp,jpeg,jpg,png,webp', ]); $this->categoryRepository->update(request()->all(), $id); diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 482c46708..991bb7191 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -69,8 +69,8 @@ class ChannelController extends Controller 'currencies' => 'required|array|min:1', 'base_currency_id' => 'required|in_array:currencies.*', 'root_category_id' => 'required', - 'logo.*' => 'mimes:jpeg,jpg,bmp,png', - 'favicon.*' => 'mimes:jpeg,jpg,bmp,png', + 'logo.*' => 'mimes:bmp,jpeg,jpg,png,webp', + 'favicon.*' => 'mimes:bmp,jpeg,jpg,png,webp', 'seo_title' => 'required|string', 'seo_description' => 'required|string', 'seo_keywords' => 'required|string', @@ -132,8 +132,8 @@ class ChannelController extends Controller 'currencies' => 'required|array|min:1', 'base_currency_id' => 'required|in_array:currencies.*', 'root_category_id' => 'required', - 'logo.*' => 'mimes:jpeg,jpg,bmp,png', - 'favicon.*' => 'mimes:jpeg,jpg,bmp,png', + 'logo.*' => 'mimes:bmp,jpeg,jpg,png,webp', + 'favicon.*' => 'mimes:bmp,jpeg,jpg,png,webp', 'hostname' => 'unique:channels,hostname,' . $id, ]); diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php index 04a0621d9..478351609 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php @@ -58,7 +58,7 @@ class SliderController extends Controller $channels = core()->getAllChannels(); $locale = request()->get('locale') ?: core()->getCurrentLocale(); - + return view($this->_config['view'])->with("locale", $locale); } @@ -72,7 +72,7 @@ class SliderController extends Controller $this->validate(request(), [ 'title' => 'string|required', 'channel_id' => 'required', - 'image.*' => 'required|mimes:jpeg,bmp,png,jpg', + 'image.*' => 'required|mimes:bmp,jpeg,jpg,png,webp', ]); $result = $this->sliderRepository->save(request()->all()); @@ -109,12 +109,12 @@ class SliderController extends Controller $this->validate(request(), [ 'title' => 'string|required', 'channel_id' => 'required', - 'image.*' => 'sometimes|mimes:jpeg,bmp,png,jpg', + 'image.*' => 'sometimes|mimes:bmp,jpeg,jpg,png,webp', ]); if ( is_null(request()->image)) { session()->flash('error', trans('admin::app.settings.sliders.update-fail')); - + return redirect()->back(); } diff --git a/packages/Webkul/Product/src/Http/Requests/ProductForm.php b/packages/Webkul/Product/src/Http/Requests/ProductForm.php index 3cca2012d..4aaa1f4ae 100755 --- a/packages/Webkul/Product/src/Http/Requests/ProductForm.php +++ b/packages/Webkul/Product/src/Http/Requests/ProductForm.php @@ -64,10 +64,10 @@ class ProductForm extends FormRequest public function rules() { $product = $this->productRepository->find($this->id); - + $this->rules = array_merge($product->getTypeInstance()->getTypeValidationRules(), [ 'sku' => ['required', 'unique:products,sku,' . $this->id, new \Webkul\Core\Contracts\Validations\Slug], - 'images.*' => 'nullable|mimes:jpeg,jpg,bmp,png', + 'images.*' => 'nullable|mimes:bmp,jpeg,jpg,png,webp', 'special_price_from' => 'nullable|date', 'special_price_to' => 'nullable|date|after_or_equal:special_price_from', 'special_price' => ['nullable', new \Webkul\Core\Contracts\Validations\Decimal, 'lt:price'], @@ -87,7 +87,7 @@ class ProductForm extends FormRequest } if ($attribute->type == 'text' && $attribute->validation) { - array_push($validations, + array_push($validations, $attribute->validation == 'decimal' ? new \Webkul\Core\Contracts\Validations\Decimal : $attribute->validation diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 23f6d2537..4a69abfa4 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -52,7 +52,7 @@ return [ 'name' => 'logo', 'title' => 'admin::app.admin.system.logo', 'type' => 'image', - 'validation' => 'mimes:jpeg,bmp,png,jpg', + 'validation' => 'mimes:bmp,jpeg,jpg,png,webp', 'channel_based' => true, ], ]