Added order position deletion; added fontawesome pro

application/Preorder/PreorderModel.php

@@ -22,6 +22,10 @@ class PreorderModel {
     
     foreach($data as $field => $value) {
       if(property_exists(get_called_class(), $field)) {
+        if(substr($field, 0, 5) == "vlan_" && !$value) {
+          $model->$field = null;
+          continue;
+        }
         $model->$field = $value;
       }
     }
@@ -43,12 +47,13 @@ class PreorderModel {
     return $model;
   }
   
+  
   public static function getAll() {
     $items = [];
     
     $db = FronkDB::singleton();
     
-    $res = $db->select("Preorder", "*", "ORDER BY `create`");
+    $res = $db->select("Preorder", "*");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);
@@ -62,7 +67,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY `create`");
+    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
     if($db->num_rows($res)) {
       $data = $db->fetch_object($res);
       $item = new Preorder($data);
@@ -80,7 +85,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY `create`");
+    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);