Merge branch 'fronkdev' into 'master'

PreorderApi:getAllPreorders: new optional parameter include_deleted

See merge request fronk/thetool!1527

application/AddressDB/AddressDB.php

@@ -239,11 +239,13 @@ class AddressDB {
                     $log->debug(__METHOD__.": Setting Preorder Status to ".$preorderstatus);
                     $preorder->setNewStatusCode($preorderstatus);
                     $preorder->save();
+                    $preorder->resetSaveNesting();
                 }
                 if($preorderstatus_flag) {
                     $log->debug(__METHOD__.": Setting Preorder Status Flag ".$preorderstatus);
                     $preorder->setNewStatusCode($preorderstatus);
                     $preorder->save();
+                    $preorder->resetSaveNesting();
                 }
             }
 

application/Api/v1/PreorderApicontroller.php

@@ -233,6 +233,10 @@ class PreorderApicontroller extends mfBaseApicontroller {
 
     protected function getAllPreorders() {
         $ts = $this->get['ts'];
+        $include_deleted = false;
+        if(array_key_exists("include_deleted", $this->get) && $this->get["include_deleted"]) {
+            $include_deleted = true;
+        }
 
         $update_ts = 0;
 
@@ -247,11 +251,13 @@ class PreorderApicontroller extends mfBaseApicontroller {
             }
         }
 
-        $preorder_search = [
-            "deleted" => 0
-        ];
+        $preorder_search = [];
 
         if($this->me->is("preorderaddressreporting")) {
+            if(!$include_deleted) {
+                $preorder_search["deleted"] = 0;
+            }
+
             $user_networks_json = $this->me->getFlag("preorder_networks");
             $user_networks = json_decode($user_networks_json);
 
@@ -268,8 +274,8 @@ class PreorderApicontroller extends mfBaseApicontroller {
             }
 
             $preorder_search['preordercampaign_id'] = $user_campaigns;
-
         } else {
+            $preorder_search["deleted"] = 0;
             $preorder_search['partner_id'] = $this->me->address_id;
 
             if(count($this->filter_salescluster_ids)) {

application/Preorder/PreorderModel.php

@@ -570,7 +570,7 @@ class PreorderModel
 
         if (array_key_exists("deleted", $filter)) {
             $deleted = $filter['deleted'];
-            if ($deleted === null || $deleted === false) {
+            if ($deleted === null || $deleted === false || $deleted === 0) {
                 $where .= " AND (deleted IS NULL OR deleted = 0)";
             } elseif ($deleted) {
                 $where .= " AND deleted > 0";