[Enhancement] AddressModel: Added 'id' parameter to getSqlFilter method
[Enhancement] PreorderModel: Added 'returnArray' parameter to reduce overhead [Refactor] DashboardController: Reworked getPartnerOrdersByStatus method
This commit is contained in:
@@ -350,11 +350,11 @@ class PreorderModel {
|
||||
|
||||
return self::count($filter);
|
||||
}
|
||||
|
||||
public static function searchActive($filter = [], $limit = false, $returnDBRessource = false) {
|
||||
if(!is_array($filter)) return false;
|
||||
|
||||
if(!array_key_exists("deleted", $filter)) {
|
||||
|
||||
public static function searchActive($filter = [], $limit = false, $returnDBRessource = false, $returnArray = false) {
|
||||
if (!is_array($filter)) return false;
|
||||
|
||||
if (!array_key_exists("deleted", $filter)) {
|
||||
$filter["deleted"] = null;
|
||||
}
|
||||
|
||||
@@ -362,8 +362,8 @@ class PreorderModel {
|
||||
&& !array_key_exists("<status_id", $filter) && !array_key_exists(">status_id", $filter) && !array_key_exists("status_id", $filter) ) {
|
||||
$filter["<status_code"] = 899;
|
||||
}
|
||||
|
||||
return self::search($filter, $limit, $returnDBRessource);
|
||||
|
||||
return self::search($filter, $limit, $returnDBRessource, $returnArray);
|
||||
}
|
||||
|
||||
public static function count($filter) {
|
||||
@@ -387,8 +387,8 @@ class PreorderModel {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static function search($filter = [], $limit = false, $returnDBRessource = false) {
|
||||
|
||||
public static function search($filter = [], $limit = false, $returnDBRessource = false, $returnArray = false) {
|
||||
$items = [];
|
||||
$db = FronkDB::singleton();
|
||||
|
||||
@@ -425,9 +425,13 @@ class PreorderModel {
|
||||
if($returnDBRessource) {
|
||||
return $res;
|
||||
}
|
||||
|
||||
while($data = $db->fetch_object($res)) {
|
||||
$items[] = new Preorder($data);
|
||||
|
||||
while ($data = $db->fetch_object($res)) {
|
||||
if ($returnArray) {
|
||||
$items[] = $data;
|
||||
} else {
|
||||
$items[] = new Preorder($data);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $items;
|
||||
|
||||
Reference in New Issue
Block a user