fix bugs on creating addresses

elbgoods · Oct 15, 2020 · 64b86c5 · 64b86c5
1 parent a2a9f9c
commit 64b86c5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
             "Elbgoods\\NovaAddressField\\": "src/"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "scripts": {
         "fix": "vendor/bin/php-cs-fixer fix --using-cache=no --config=vendor/elbgoods/ci-test-tools/configs/.php_cs.dist src",

diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/resources/js/components/FormField.vue b/resources/js/components/FormField.vue
@@ -90,12 +90,13 @@ export default {
      */
     setInitialValue () {
       if (typeof this.field.value === 'object') {
-        this.value = this.field.value
+        this.value = this.field.value || {}
       } else if (typeof this.field.value === 'string') {
         this.value = JSON.parse(this.field.value)
       } else {
         this.value = {}
       }
+
       this.value.country_code = 'DE'
     },
 

diff --git a/src/NovaAddressField.php b/src/NovaAddressField.php
@@ -2,6 +2,7 @@
 
 namespace Elbgoods\NovaAddressField;
 
+use Elbgoods\LaravelAddressable\Models\Address;
 use Laravel\Nova\Fields\Field;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
@@ -97,7 +98,17 @@ public function longitude(string $field): self
     protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute): void
     {
         if ($request->exists($requestAttribute)) {
-            $model->{$attribute} = json_decode($request[$requestAttribute], true);
+            $addressAttribute = $model->{$attribute};
+            $addressData = json_decode($request[$requestAttribute], true);
+            if ($addressAttribute instanceof Address) {
+                $addressAttribute->properties = json_decode($request[$requestAttribute], true);
+                $addressAttribute->country_code = $addressData['country_code'];
+            } else {
+                $model->{$attribute} = [
+                    'properties' => json_decode($request[$requestAttribute], true),
+                    'country_code' => $addressData['country_code'],
+                ];
+            }
         }
     }
 }