From 5c1e3e06d05a44af621ac24f2ff33eece6f901b2 Mon Sep 17 00:00:00 2001 From: vishal-webkul Date: Tue, 11 Aug 2020 11:39:13 +0530 Subject: [PATCH 1/4] upload image in custom file type attribute #3564 fixed --- .../src/Resources/views/catalog/products/edit.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) 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 80e734aba..894e35ff5 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 @@ -91,6 +91,14 @@ array_push($validations, 'decimal'); } + if ($attribute->type == 'file') { + array_push($validations, 'size:2048'); + } + + if ($attribute->type == 'image') { + array_push($validations, 'size:2048'); + } + array_push($validations, $attribute->validation); $validations = implode('|', array_filter($validations)); From 875ab07abc0b2a99ed26353443689af88cf3bfdb Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Wed, 12 Aug 2020 17:12:53 +0530 Subject: [PATCH 2/4] provide configuration for max file size --- packages/Webkul/Admin/src/Config/system.php | 15 +++++++++++++++ .../Webkul/Admin/src/Resources/lang/en/app.php | 3 +++ .../views/catalog/products/edit.blade.php | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 419e79d55..ef32cb708 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -194,6 +194,21 @@ return [ 'type' => 'boolean', ], ], + ], [ + 'key' => 'catalog.products.attribute', + 'name' => 'admin::app.admin.system.attribute', + 'sort' => 4, + 'fields' => [ + [ + 'name' => 'image_attribute_upload_size', + 'title' => 'admin::app.admin.system.image-upload-size', + 'type' => 'text', + ], [ + 'name' => 'file_attribute_upload_size', + 'title' => 'admin::app.admin.system.file-upload-size', + 'type' => 'text', + ] + ], ], [ 'key' => 'catalog.inventory', 'name' => 'admin::app.admin.system.inventory', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index fd1c381bf..c2bec60c4 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1258,6 +1258,9 @@ return [ 'guest-checkout' => 'Guest Checkout', 'allow-guest-checkout' => 'Allow Guest Checkout', 'allow-guest-checkout-hint' => 'Hint: If turned on, this option can be configured for each product specifically.', + 'attribute' => 'Attribute', + 'image-upload-size' => 'Allowed Image Upload Size (in Kb)', + 'file-upload-size' => 'Allowed File Upload Size (in Kb)', 'review' => 'Review', 'allow-guest-review' => 'Allow Guest Review', 'inventory' => 'Inventory', 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 894e35ff5..e8636393c 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 @@ -92,11 +92,13 @@ } if ($attribute->type == 'file') { - array_push($validations, 'size:2048'); + $retVal = (core()->getConfigData('catalog.products.attribute.file_attribute_upload_size')) ? core()->getConfigData('catalog.products.attribute.file_attribute_upload_size') : '2048' ; + array_push($validations, 'size:'.$retVal); } if ($attribute->type == 'image') { - array_push($validations, 'size:2048'); + $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); } array_push($validations, $attribute->validation); From 78f0cbf785705758517817c322a1845ef41c6528 Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Wed, 12 Aug 2020 20:43:05 +0530 Subject: [PATCH 3/4] add validation for image type --- .../src/Resources/views/catalog/products/edit.blade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 e8636393c..e3c233ba2 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,10 @@ 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); + array_push($validations, 'size:'.$retVal.'|mimes:jpeg,bmp,png,jpg'); + } array_push($validations, $attribute->validation); From 8b78ba8ee7246adf25d6ae1d94f2cc7ff8ce0fa5 Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Thu, 13 Aug 2020 15:30:13 +0530 Subject: [PATCH 4/4] update in code --- .../src/Resources/views/catalog/products/edit.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 e3c233ba2..11425e929 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 @@ -93,13 +93,12 @@ if ($attribute->type == 'file') { $retVal = (core()->getConfigData('catalog.products.attribute.file_attribute_upload_size')) ? core()->getConfigData('catalog.products.attribute.file_attribute_upload_size') : '2048' ; - array_push($validations, 'size:'.$retVal); + array_push($validations, 'size:' . $retVal); } 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:jpeg, bmp, png, jpg'); } array_push($validations, $attribute->validation);