From 122debdf1b9f6f8c8624def6d7ace1122b6645f7 Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Mon, 13 Jan 2020 13:43:53 +0530 Subject: [PATCH] Issue #1795 fixed --- packages/Webkul/Core/src/Contracts/Validations/Decimal.php | 2 +- packages/Webkul/Product/src/Type/AbstractType.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Contracts/Validations/Decimal.php b/packages/Webkul/Core/src/Contracts/Validations/Decimal.php index 13840b4f5..595f5d6fb 100755 --- a/packages/Webkul/Core/src/Contracts/Validations/Decimal.php +++ b/packages/Webkul/Core/src/Contracts/Validations/Decimal.php @@ -15,7 +15,7 @@ class Decimal implements Rule */ public function passes($attribute, $value) { - return preg_match('/^\d*(\.\d{1,2})?$/', $value); + return preg_match('/^\d*(\.\d{1,4})?$/', $value); } /** diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 8ca737dd9..e0017bf12 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -184,6 +184,10 @@ abstract class AbstractType continue; } + if ($attribute->type == 'price' && isset($data[$attribute->code]) && $data[$attribute->code] == '') { + $data[$attribute->code] = null; + } + if ($attribute->type == 'date' && $data[$attribute->code] == '' && $route != 'admin.catalog.products.massupdate') { $data[$attribute->code] = null; }