Added parent id to address

application/Address/AddressController.php

@@ -14,6 +14,9 @@ class AddressController extends mfBaseController {
   
   protected function addAction() {
     $this->layout()->setTemplate("Address/Form");
+
+    $parents = AddressModel::search(['parent_id' => null]);
+    $this->layout()->set("parents", $parents);
   }
   
   protected function editAction() {
@@ -26,9 +29,6 @@ class AddressController extends mfBaseController {
       return $this->addAction();
     }
     
-    $parents = AddressModel::search(['parent_id' => 0]);
-    $this->layout()->set("parents", $parents);
-    
     return $this->addAction();
   }
   
@@ -53,7 +53,7 @@ class AddressController extends mfBaseController {
     //var_dump($r->addresstypes);exit;
     
     $data = [];
-    $data['parent_id'] = $r->parent_id;
+    $data['parent_id'] = (!$r->parent_id) ? null : $r->parent_id;
     $data['company'] = $r->company;
     $data['firstname'] = $r->firstname;
     $data['lastname'] = $r->lastname;

application/Address/AddressModel.php

@@ -1,7 +1,7 @@
 <?php
 
 class AddressModel {
-  public $parant_id = null;
+  public $parent_id = null;
   public $company = null;
   public $firstname = null;
   public $lastname = null;
@@ -119,6 +119,17 @@ class AddressModel {
         $where .= " AND ( $or )";
       }
     }
+    //var_dump($filter);exit;
+    if(array_key_exists("parent_id", $filter)) {
+      
+      $parentid = $filter['parent_id'];
+      if($parentid === null) {
+        $where .= " AND parent_id IS NULL";
+      } elseif(is_numeric($parentid)) {
+        $where .= " AND parent_id=$parentid";
+      }
+      
+    }
     
     return $where;
   }