Merge pull request #60 from SamNewism/master

fix issue caused by expecting field to be called address
newism · Jul 31, 2020 · 08ae7b3 · 08ae7b3
2 parents 95478a6 + a32808b
commit 08ae7b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/src/assetbundles/addressfield/dist/js/Address.js b/src/assetbundles/addressfield/dist/js/Address.js
@@ -154,6 +154,7 @@
           'CRAFT_CSRF_TOKEN': Craft.cp.$primaryForm.find('[name="CRAFT_CSRF_TOKEN"]').val(),
           'countryCode': this.currentCountryCode,
           'namespace': this.options.namespace,
+          'handle': this.options.id,
         },
         $.proxy(function (response, textStatus) {
           this.$spinner.addClass('hidden');

diff --git a/src/controllers/AddressController.php b/src/controllers/AddressController.php
@@ -64,7 +64,7 @@ public function actionRefreshCountry(): Response
     {
         $this->requireAcceptsJson();
 
-        $address = Craft::$app->fields->getFieldByHandle('address');
+        $address = Craft::$app->fields->getFieldByHandle(Craft::$app->request->post('handle'));
 
         $addressModel = new AddressModel([
             'countryCode' => Craft::$app->request->post('countryCode')

diff --git a/src/icon.svg b/src/icon.svg