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

Done the validation from laravel validation

This commit is contained in:
Abhishek Kathuria 2022-08-24 16:28:26 +05:30
parent d83f49f504
commit 4efc70496f
20 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -1613,7 +1613,6 @@ return [
'set-order-status' => 'قم بتعيين حالة الطلب بعد إنشاء الفاتورة إلى',
'generate-invoice-applicable' => 'قابل للتطبيق إذا تم تمكين إنشاء الفاتورة تلقائيًا',
'records-found' => 'تم العثور على السجلات ',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/ben/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/de/app.php
View File

@ -1589,7 +1589,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Datensätze gefunden ',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/es/app.php
View File

@ -1611,7 +1611,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'registros encontrados',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -1590,7 +1590,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Record(s) found',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/fr/app.php
View File

@ -1627,7 +1627,6 @@ return [
'set-order-status' => 'Définissez le statut de la commande après la création de la facture sur',
'generate-invoice-applicable' => 'Applicable si la génération automatique de facture est activée',
'records-found' => 'enregistrements trouvés',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/he/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
View File

@ -1628,7 +1628,6 @@ return [
'logo-size' => 'छवि संकल्प 112px X 41px जैसा होना चाहिए',
'favicon-size' => 'छवि संकल्प 16px X 16px जैसा होना चाहिए',
'invoice-logo-size' => 'इमेज रेजोल्यूशन 192px X 50px जैसा होना चाहिए',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/it/app.php
View File

@ -1598,7 +1598,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicabile se la generazione automatica di fatture é abilitata',
'records-found' => 'Record(s) trovati',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/ja/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -1590,7 +1590,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Record(s) found',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/pl/app.php
View File

@ -1579,7 +1579,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Record(s) found',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -1593,7 +1593,6 @@ return [
'set-order-status' => 'Set the order status after creating the invoice to',
'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
'records-found' => 'Record(s) found',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/ru/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/sin/app.php
View File

@ -1631,7 +1631,6 @@ return [
'logo-size' => 'Image resolution should be like 112px X 41px',
'favicon-size' => 'Image resolution should be like 16px X 16px',
'invoice-logo-size' => 'Image resolution should be like 192px X 50px',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/tr/app.php
View File

@ -1588,7 +1588,6 @@ return [
'set-order-status' => 'Faturayı oluşturduktan sonra sipariş durumunu ayarlayın.',
'generate-invoice-applicable' => 'Otomatik fatura oluştur etkinse geçerlidir',
'records-found' => 'Kayıt(lar) bulundu',
'image-required' => 'Image is required'
],
],

1
packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
View File

@ -1586,7 +1586,6 @@ return [
'logo-size' => '图像分辨率应该是 112px X 41px',
'favicon-size' => '图像分辨率应该是 16px X 16px',
'invoice-logo-size' => '图像分辨率应该是 192px X 50px',
'image-required' => 'Image is required'
],
],
'api' => [

11
packages/Webkul/Product/src/Http/Controllers/ProductController.php
View File

@ -155,17 +155,6 @@ class ProductController extends Controller
*/
public function update(ProductForm $request, $id)
{
foreach (request()->images['files'] as $fileExists) {
if (! $fileExists) {
session()->flash('error', trans('admin::app.admin.system.image-required'));
return redirect()->back();
}
}
$this->productRepository->update(request()->all(), $id);
Event::dispatch('catalog.product.update.before', $id);
$product = $this->productRepository->update(request()->all(), $id);

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

@ -2,13 +2,14 @@
namespace Webkul\Product\Http\Requests;
use Illuminate\Support\Str;
use Illuminate\Foundation\Http\FormRequest;
use Webkul\Admin\Validations\ProductCategoryUniqueSlug;
use Webkul\Core\Contracts\Validations\Decimal;
use Webkul\Core\Contracts\Validations\Slug;
use Webkul\Core\Contracts\Validations\Decimal;
use Webkul\Product\Models\ProductAttributeValue;
use Webkul\Product\Repositories\ProductAttributeValueRepository;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Admin\Validations\ProductCategoryUniqueSlug;
use Webkul\Product\Repositories\ProductAttributeValueRepository;
class ProductForm extends FormRequest
{
@ -66,6 +67,14 @@ class ProductForm extends FormRequest
'special_price' => ['nullable', new Decimal, 'lt:price'],
]);
foreach (request()->images['files'] as $key => $file) {
if (Str::contains($key, 'image_')) {
$this->rules = array_merge($this->rules, [
'images.files.' . $key => ['required', 'mimes:bmp,jpeg,jpg,png,webp'],
]);
}
}
foreach ($product->getEditableAttributes() as $attribute) {
if (
in_array($attribute->code, ['sku', 'url_key'])