From 676cd1b048aaef37a2716d8c658a81cf2d89afc7 Mon Sep 17 00:00:00 2001
From: Oscar Recio <osrecio@gmail.com>
Date: Sun, 27 Oct 2019 12:37:21 +0100
Subject: [PATCH] #1029 Add Postcode as required depending of the country
 Mutation createCustomerAddress

---
 .../Address/CreateCustomerAddress.php         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
index 9637b3e555b8..b9a9b4979682 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
@@ -10,9 +10,10 @@
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Directory\Helper\Data as DirectoryData;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Create customer address
@@ -38,23 +39,30 @@ class CreateCustomerAddress
      * @var DataObjectHelper
      */
     private $dataObjectHelper;
+    /**
+     * @var DirectoryData
+     */
+    private $directoryData;
 
     /**
      * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
      * @param AddressInterfaceFactory $addressFactory
      * @param AddressRepositoryInterface $addressRepository
      * @param DataObjectHelper $dataObjectHelper
+     * @param DirectoryData $directoryData
      */
     public function __construct(
         GetAllowedAddressAttributes $getAllowedAddressAttributes,
         AddressInterfaceFactory $addressFactory,
         AddressRepositoryInterface $addressRepository,
-        DataObjectHelper $dataObjectHelper
+        DataObjectHelper $dataObjectHelper,
+        DirectoryData $directoryData
     ) {
         $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
         $this->addressFactory = $addressFactory;
         $this->addressRepository = $addressRepository;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->directoryData = $directoryData;
     }
 
     /**
@@ -102,6 +110,13 @@ public function validateData(array $addressData): void
         $attributes = $this->getAllowedAddressAttributes->execute();
         $errorInput = [];
 
+        //Add error for empty postcode with country with no optional ZIP
+        if (!in_array($addressData['country_id'], $this->directoryData->getCountriesWithOptionalZip())
+            && (!isset($addressData['postcode']) || empty($addressData['postcode']))
+        ) {
+            $errorInput[] = 'postcode';
+        }
+
         foreach ($attributes as $attributeName => $attributeInfo) {
             if ($attributeInfo->getIsRequired()
                 && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))