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

'.webp' Format Added

This commit is contained in:
devansh bawari 2020-10-19 12:02:32 +05:30
parent 6fbbbc641c
commit 438353c1e3
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Config/system.php
View File

@ -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',
],
],
], [

8
packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
View File

@ -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.'
];
}

2
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -98,7 +98,7 @@
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);

4
packages/Webkul/Category/src/Http/Controllers/CategoryController.php
View File

@ -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);

8
packages/Webkul/Core/src/Http/Controllers/ChannelController.php
View File

@ -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,
]);

4
packages/Webkul/Core/src/Http/Controllers/SliderController.php
View File

@ -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,7 +109,7 @@ 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)) {

2
packages/Webkul/Product/src/Http/Requests/ProductForm.php
View File

@ -67,7 +67,7 @@ class ProductForm extends FormRequest
$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'],

2
packages/Webkul/Sales/src/Config/system.php
View File

@ -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,
],
]