Merge pull request #105 from Veriteworks/improve-for-multisite

Improve for multisite
magento · Jan 24, 2020 · 78398d7 · 78398d7
2 parents 6680cc8 + 241da42
commit 78398d7
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 13 deletions.
diff --git a/JapaneseAddress/Block/Checkout/BillingAddressComponent.php b/JapaneseAddress/Block/Checkout/BillingAddressComponent.php
@@ -8,6 +8,9 @@
 namespace CommunityEngineering\JapaneseAddress\Block\Checkout;
 
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 /**
  * Billing address component template can not be configured through layout XML as generated by PHP.
@@ -16,11 +19,31 @@
  */
 class BillingAddressComponent implements LayoutProcessorInterface
 {
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * BillingAddressComponent constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
     /**
      * @inheritDoc
      */
     public function process($jsLayout)
     {
+        $locale = $this->getStoreLocale();
+        if($locale != 'ja_JP') {
+            return $jsLayout;
+        }
         if (!isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step'])) {
             return $jsLayout;
         }
@@ -68,4 +91,14 @@ private function walkChildren(array $component): array
         }
         return $component;
     }
+
+    /**
+     * Retrieve current store locale from system configuration.
+     *
+     * @return mixed
+     */
+    private function getStoreLocale()
+    {
+        return $this->scopeConfig->getValue(DirectoryHelper::XML_PATH_DEFAULT_LOCALE, ScopeInterface::SCOPE_STORE);
+    }
 }
diff --git a/JapaneseAddress/Model/Config/CountryInputConfig.php b/JapaneseAddress/Model/Config/CountryInputConfig.php
@@ -8,6 +8,7 @@
 namespace CommunityEngineering\JapaneseAddress\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Configuration for country field displaying.
@@ -34,7 +35,7 @@ public function __construct(ScopeConfigInterface $config)
      */
     public function isVisibleAtStorefront(): bool
     {
-        $configValue = $this->config->getValue('customer/address/country_show');
+        $configValue = $this->config->getValue('customer/address/country_show', ScopeInterface::SCOPE_STORE);
         return (bool)$configValue;
     }
 }
diff --git a/JapaneseAddress/Model/Config/CustomerRegistrationConfig.php b/JapaneseAddress/Model/Config/CustomerRegistrationConfig.php
@@ -8,6 +8,7 @@
 namespace CommunityEngineering\JapaneseAddress\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Address usage configuration for customer registration.
@@ -34,7 +35,7 @@ public function __construct(ScopeConfigInterface $config)
      */
     public function isAddressRequired(): bool
     {
-        $configValue = $this->config->getValue('customer/create_account/request_address');
+        $configValue = $this->config->getValue('customer/create_account/request_address', ScopeInterface::SCOPE_STORE);
         return (bool)$configValue;
     }
 }
diff --git a/JapaneseAddress/Plugin/Sales/Model/Order/Address/Name.php b/JapaneseAddress/Plugin/Sales/Model/Order/Address/Name.php
@@ -63,7 +63,7 @@ public function afterGetName(
         }
 
         $namekana = trim(sprintf('%s %s', $extensions->getLastnamekana(), $extensions->getFirstnamekana()));
-        if (!empty($namekana)) {
+        if ($namekana !== '') {
             $name = sprintf('%s (%s)', $name, $namekana);
         }
 

diff --git a/JapaneseAddress/Plugin/Sales/Model/Order/CustomerName.php b/JapaneseAddress/Plugin/Sales/Model/Order/CustomerName.php
@@ -64,7 +64,7 @@ public function afterGetCustomerName(
             $extensions->getCustomerLastnamekana(),
             $extensions->getCustomerFirstnamekana()
         );
-        if (!empty($customerNamekana)) {
+        if (!empty(trim($customerNamekana))) {
             $customerName = sprintf('%s (%s)', $customerName, $customerNamekana);
         }
 

diff --git a/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html b/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html
@@ -16,8 +16,7 @@
 
     <!-- ko template: 'CommunityEngineering_JapaneseAddress/checkout/billing-address/details' --><!-- /ko -->
     <fieldset class="fieldset" data-bind="visible: !isAddressDetailsVisible()">
-        <!-- ko template: 'Magento_Checkout/billing-address/list' --><!-- /ko -->
-        <!-- ko template: 'Magento_Checkout/billing-address/form' --><!-- /ko -->
+        <each args="getRegion('billing-address-list')" render="" />
         <div class="actions-toolbar">
             <div class="primary">
                 <button class="action action-update" type="button" data-bind="click: updateAddress">

diff --git a/JapaneseName/Model/Config/KanaFieldsConfig.php b/JapaneseName/Model/Config/KanaFieldsConfig.php
@@ -8,6 +8,7 @@
 namespace CommunityEngineering\JapaneseName\Model\Config;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Configuration of kana usage.
@@ -34,7 +35,7 @@ public function __construct(ScopeConfigInterface $config)
      */
     public function areEnabled(): bool
     {
-        $configValue = $this->config->getValue('customer/address/use_kana');
+        $configValue = $this->config->getValue('customer/address/use_kana', ScopeInterface::SCOPE_STORE);
         return (bool)$configValue;
     }
 
@@ -49,7 +50,7 @@ public function areRequired(): bool
             return false;
         }
 
-        $configValue = $this->config->getValue('customer/address/require_kana');
+        $configValue = $this->config->getValue('customer/address/require_kana', ScopeInterface::SCOPE_STORE);
         return (bool)$configValue;
     }
 
@@ -60,7 +61,7 @@ public function areRequired(): bool
      */
     public function getKanaType(): int
     {
-        $configValue = $this->config->getValue('customer/address/kana_type');
+        $configValue = $this->config->getValue('customer/address/kana_type', ScopeInterface::SCOPE_STORE);
         if (!in_array($configValue, [
             Source\Kana::TYPE_HIRAGANA,
             Source\Kana::TYPE_KATAKANA,

diff --git a/JapaneseName/Plugin/Customer/Block/Widget/Name.php b/JapaneseName/Plugin/Customer/Block/Widget/Name.php
@@ -8,12 +8,28 @@
 namespace CommunityEngineering\JapaneseName\Plugin\Customer\Block\Widget;
 
 use Magento\Customer\Block\Widget\Name as Subject;
+use CommunityEngineering\JapaneseName\Model\Config\KanaFieldsConfig;
 
 /**
  * Use name widget that corresponds to Japanese traditions and contains kana fields.
  */
 class Name
 {
+    /**
+     * @var KanaFieldsConfig
+     */
+    private $kanaFieldsConfig;
+
+    /**
+     * Name constructor.
+     * @param KanaFieldsConfig $kanaFieldsConfig
+     */
+    public function __construct(
+        KanaFieldsConfig $kanaFieldsConfig
+    ) {
+        $this->kanaFieldsConfig = $kanaFieldsConfig;
+    }
+
     /**
      * Substitute default template.
      *
@@ -24,7 +40,7 @@ class Name
      */
     public function beforeSetTemplate(Subject $subject, string $template)
     {
-        if ($template === 'Magento_Customer::widget/name.phtml') {
+        if ($template === 'Magento_Customer::widget/name.phtml' && $this->kanaFieldsConfig->areEnabled()) {
             return ['CommunityEngineering_JapaneseName::customer/widget/name.phtml'];
         }
         return [$template];

diff --git a/JapaneseName/i18n/ja_JP.csv b/JapaneseName/i18n/ja_JP.csv
@@ -13,3 +13,6 @@
 "Last Name Kana","フリガナ（姓）"
 "Billing Firstname Kana","支払人の名 (フリガナ)"
 "Billing Lastname Kana","支払人の姓 (フリガナ)"
+"Please use full width kana only in this field.","全角かなで入力してください。"
+"Please use full width Katakana only in this field.","全角カタカナで入力してください。"
+"Please use Hiragana only in this field.","全角ひらがなで入力してください。"
diff --git a/JapaneseName/view/frontend/web/js/validation.js b/JapaneseName/view/frontend/web/js/validation.js
@@ -27,7 +27,7 @@ define([
             handler: function (value) {
                 return /^([\u3040-\u309F|\u30FB-\u30FC])*$/.test(value);
             },
-            errorMessage: 'Please use Hiragana only in this field.'
+            errorMessage: $.mage.__('Please use Hiragana only in this field.')
         },
         {
             id: 'validate-katakana',
@@ -41,7 +41,7 @@ define([
             handler: function (value) {
                 return /^([\u30A1-\u30FC])*$/.test(value);
             },
-            errorMessage: 'Please use full width Katakana only in this field.'
+            errorMessage: $.mage.__('Please use full width Katakana only in this field.')
         },
         {
             id: 'validate-kana',
@@ -55,7 +55,7 @@ define([
             handler: function (value) {
                 return /^([\u3040-\u309F|\u30FB-\u30FC|\u30A1-\u30FC])*$/.test(value);
             },
-            errorMessage: 'Please use full width kana only in this field.'
+            errorMessage: $.mage.__('Please use full width kana only in this field.')
         }
     ];