Merge branch 'fronkdev' into 'master'

Updated preoder api docs with status flags

See merge request fronk/thetool!621

application/Api/v1/PreorderApicontroller.php

@@ -1039,12 +1039,13 @@ class PreorderApicontroller extends mfBaseApicontroller {
     }
     $return['status'] = $preorder->status->getApiArray();
     foreach($preorder->statusflags as $sflag) {
-        $return['status']['flags'][$sflag->code] = [
+        $return['status']['flags'][] = [
           "code" => (int)$sflag->code,
           "text" => $sflag->name,
           "value" => ($sflag->value->value == 1)
       ];
     }
+    //var_dump($return['status']);exit;
     if($addon_data) {
       $return["additionalData"] = $addon_data;
     }

application/Preorder/Preorder.php

@@ -608,13 +608,13 @@ class Preorder extends mfBaseModel {
         $status = $this->getProperty("status")->getApiArray();
 
         foreach($this->getProperty("statusflags") as $sflag) {
-            $status["flags"][$sflag->code] = [
+            $status["flags"][] = [
                 "code" => (int)$sflag->code,
                 "text" => $sflag->name,
                 "value" => ($sflag->value->value == 1)
             ];
         }
-
+        //var_dump($status);exit;
 
         $a = [];
         $a['code'] = strtoupper($this->ucode);