From 474946c0b8997aa6636ad19a06729339c668948c Mon Sep 17 00:00:00 2001 From: Madhu Date: Sat, 19 May 2018 15:06:11 +0530 Subject: [PATCH 1/4] 6305 Resolved product custom option title save issue --- .../Product/Option/Validator/DefaultValidator.php | 15 ++++++++++++++- .../Model/ResourceModel/Product/Option/Value.php | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php index 1e5c7f76d829b..c6fb2243bed10 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php @@ -106,7 +106,9 @@ protected function isValidOptionTitle($title, $storeId) if ($storeId > \Magento\Store\Model\Store::DEFAULT_STORE_ID && $title === null) { return true; } - if ($this->isEmpty($title)) { + + // checking whether title is null and also changed is_empty to is_null + if ($this->isNull($title)) { return false; } @@ -168,4 +170,15 @@ protected function isNegative($value) { return intval($value) < 0; } + + /** + * check whether title is null + * + * @param $title + * @return bool + */ + protected function isNull($title) + { + return is_null($title); + } } diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php index 91bb99ca971a7..88944624ed5f3 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php @@ -256,7 +256,8 @@ protected function _saveValueTitles(AbstractModel $object) $object->unsetData('title'); } - if ($object->getTitle()) { + /*** Checking whether title is not null ***/ + if ($object->getTitle()!= null) { if ($existInCurrentStore) { if ($storeId == $object->getStoreId()) { $where = [ From 9dd89455549fc6bcf4d10af9dd874d1610dc525b Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Sun, 20 May 2018 07:29:42 +0300 Subject: [PATCH 2/4] Update DefaultValidator.php --- .../Product/Option/Validator/DefaultValidator.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php index c6fb2243bed10..78a52f0b27e28 100644 --- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php +++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php @@ -108,7 +108,7 @@ protected function isValidOptionTitle($title, $storeId) } // checking whether title is null and also changed is_empty to is_null - if ($this->isNull($title)) { + if ($title === null) { return false; } @@ -170,15 +170,4 @@ protected function isNegative($value) { return intval($value) < 0; } - - /** - * check whether title is null - * - * @param $title - * @return bool - */ - protected function isNull($title) - { - return is_null($title); - } } From 641c5565421c53a48158d8eef804d6652c327a51 Mon Sep 17 00:00:00 2001 From: Madhu Date: Thu, 24 May 2018 17:28:16 +0530 Subject: [PATCH 3/4] 2.2.6-dev-6305 fixed issue on displaying option title in invoice and shipment pdf --- .../Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php | 3 ++- .../Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php index 7d62e839ad924..e9e34c3abf611 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php @@ -127,7 +127,8 @@ public function draw() 'feed' => 35, ]; - if ($option['value']) { + // Checking if option value is null not as empty + if ($option['value']!= null) { if (isset($option['print_value'])) { $printValue = $option['print_value']; } else { diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php index 0e6f345e19bc3..eb1bcc869ab74 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php @@ -89,7 +89,8 @@ public function draw() ]; // draw options value - if ($option['value']) { + // Checking if option value is null not as empty + if ($option['value']!= null) { $printValue = isset( $option['print_value'] ) ? $option['print_value'] : $this->filterManager->stripTags( From 3c444ce889b1a2dd6fc03d5222122d94a67f09d0 Mon Sep 17 00:00:00 2001 From: Madhu Date: Fri, 25 May 2018 10:49:50 +0530 Subject: [PATCH 4/4] 2.2.6-dev-6305 changes comment and repushed again for pdf issue --- .../Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php | 2 +- .../Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php index e9e34c3abf611..49c2c42696191 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php @@ -127,7 +127,7 @@ public function draw() 'feed' => 35, ]; - // Checking if option value is null not as empty + // Checking whether option value is not null if ($option['value']!= null) { if (isset($option['print_value'])) { $printValue = $option['print_value']; diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php index eb1bcc869ab74..433a4b7e314f4 100644 --- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php +++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php @@ -89,7 +89,6 @@ public function draw() ]; // draw options value - // Checking if option value is null not as empty if ($option['value']!= null) { $printValue = isset( $option['print_value']