From 73085952e437d28f44e2c91a7acbab6aaba9a6cd Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Mon, 10 Oct 2016 17:11:00 +0300
Subject: [PATCH] MAGETWO-59365: Countries list is not loaded if change
customer website after country was selected
---
.../Magento/Directory/Model/ResourceModel/Region/Collection.php | 2 +-
app/code/Magento/Ui/view/base/web/js/form/element/country.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
index 718e0c0223d..ed353f1ef4e 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php
@@ -206,7 +206,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
if (count($options) > 0) {
array_unshift(
$options,
- ['title' => null, 'value' => null, 'label' => __('Please select a region, state or province.')]
+ ['title' => '', 'value' => '', 'label' => __('Please select a region, state or province.')]
);
}
return $options;
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/country.js b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
index c72d02c595b..cd611a04a15 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/country.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
@@ -42,6 +42,7 @@ define([
});
this.setOptions(result);
+ this.reset();
}
});
});
--
GitLab