2021-07-30 18:24:51 +02:00
parent 1ae970564f
commit ec0abff225
18 changed files with 1078 additions and 101 deletions
							
							
								
							
							
						
@@ -25,7 +25,7 @@ class AddressModel {
    
    foreach($data as $field => $value) {
      if(property_exists(get_called_class(), $field)) {
        $model ->$field = $value;
        $model->$field = $value;
      }
    }
    
							
							
							
								
							
						
@@ -39,6 +39,10 @@ class AddressModel {
      $model->edit_by = $me->id;
    }
    
    if(!array_key_exists("note", $data)) {
      $model->note = "";
    }
    
    return $model;
  }
  
							
								
							
							
								
							
							
						
@@ -77,6 +81,7 @@ class AddressModel {
    $db = FronkDB::singleton();
    
    $where = self::getSqlFilter($filter);
    $have = [];
    $sql = "SELECT Address.* FROM Address, Addresstype
            WHERE Addresstype.address_id = Address.id
            AND $where
							
							
							
								
							
						
@@ -86,8 +91,17 @@ class AddressModel {
    if($db->num_rows($res)) {
      while($data = $db->fetch_object($res)) {
        $items[] = new Address($data);
        $have[] = $data->id;
      }
    }
    
    $res = $db->select("Address", "*", "$where AND id NOT IN (".implode(",", $have).")");
    if($db->num_rows()) {
      while($data = $db->fetch_object($res)) {
        $items[] = new Address($data);
      }
    }
    
    return $items;
  }