From 059921d9e7883e5feca65cb930add4562244e3c2 Mon Sep 17 00:00:00 2001 From: Hirokazu Nishi Date: Fri, 20 Dec 2019 18:07:09 +0900 Subject: [PATCH 1/3] sync magento2.3.3 function definition. --- JapaneseName/Model/DataObject/Copy.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/JapaneseName/Model/DataObject/Copy.php b/JapaneseName/Model/DataObject/Copy.php index 4454850b2..cde18c492 100644 --- a/JapaneseName/Model/DataObject/Copy.php +++ b/JapaneseName/Model/DataObject/Copy.php @@ -7,6 +7,8 @@ namespace CommunityEngineering\JapaneseName\Model\DataObject; +use Magento\Framework\Api\ExtensibleDataInterface; + /** * Behavior of this class should be moved to Magento\Framework\DataObject\Copy eventually. * @@ -129,7 +131,7 @@ protected function _setFieldsetFieldValue($target, $targetCode, $value) /** * @inheritdoc */ - protected function setAttributeValueFromExtensibleDataObject($target, $code, $value) + protected function setAttributeValueFromExtensibleDataObject(\Magento\Framework\Api\ExtensibleDataInterface $target, $code, $value) { try { parent::setAttributeValueFromExtensibleDataObject($target, $code, $value); From ebf2f53e605fe900ddcd2add010f8fe16570de5e Mon Sep 17 00:00:00 2001 From: Hirokazu Nishi Date: Fri, 20 Dec 2019 18:07:43 +0900 Subject: [PATCH 2/3] update template to latest format. --- .../web/template/checkout/billing-address.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html b/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html index 4163bcd75..afcb12796 100644 --- a/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html +++ b/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html @@ -17,16 +17,10 @@
-
-
- - -
+
+
+
From a07ea8c44acf6be8fe7062669a8697c43eb05159 Mon Sep 17 00:00:00 2001 From: Hirokazu Nishi Date: Thu, 30 Jan 2020 09:54:14 +0900 Subject: [PATCH 3/3] fix ordered item options aren't rendered as expected against double byte texts. --- ConfigurablePdfFont/Model/Font.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConfigurablePdfFont/Model/Font.php b/ConfigurablePdfFont/Model/Font.php index b6d4a2ac8..d95948c12 100644 --- a/ConfigurablePdfFont/Model/Font.php +++ b/ConfigurablePdfFont/Model/Font.php @@ -55,7 +55,7 @@ public function __construct( $this->name = $data['name']; $this->regular = $data['regular']; $this->bold = $data['bold'] ?? null; - $this->italic = $data['bold'] ?? null; + $this->italic = $data['italic'] ?? null; } /**