Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

New Preorder cancelling

Browse Source
This commit is contained in:
Frank Schubert
2024-02-15 20:44:04 +01:00
parent 0d62e07d3e
commit dfa8d7ca1d
14 changed files with 138 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/Preorder/PreorderController.php
View File

@@ -150,8 +150,8 @@ class PreorderController extends mfBaseController {
$pagination['maxItems'] = PreorderModel::countOrderedAddonservices($filter);
$preorders = PreorderModel::searchOrderedAddonservices($filter, $pagination);
} else {
$pagination['maxItems'] = PreorderModel::count($filter);
$preorders = PreorderModel::search($filter, $pagination);
$pagination['maxItems'] = PreorderModel::countActive($filter);
$preorders = PreorderModel::searchActive($filter, $pagination);
}
$this->layout()->set("pagination", $pagination);
$this->layout()->set("preorders", $preorders);
@@ -161,17 +161,17 @@ class PreorderController extends mfBaseController {
private function getPreparedFilter($filter) {
$new_filter = [];
if(array_key_exists("show_deleted", $filter)) {
/*if(array_key_exists("show_deleted", $filter)) {
if($filter['show_deleted'] == "show") {
$new_filter['deleted'] = null;
} elseif($filter['show_deleted'] == "only") {
$new_filter['deleted'] = 1;
} else {
$new_filter['deleted'] = 0;
$new_filter['deleted'] = null;
}
} else {
$new_filter['deleted'] = 0;
}
$new_filter['deleted'] = null;
}*/
$new_filter['add-where'] = "";
@@ -796,11 +796,11 @@ class PreorderController extends mfBaseController {
$preorder_filter["preordercampaign_id"] = $campaign_ids;
}
$preorder_filter['<status_code'] = 800;
//$preorder_filter['<status_code'] = 800;
// Get mysqli resource from Model, so layout can output data as it's retrieved
// Works around lousy performance and horrendous memory usage
$res = PreorderModel::search($preorder_filter, [], true);
$res = PreorderModel::searchActive($preorder_filter, [], true);
$this->layout()->setTemplate("Preorder/export.csv");
$this->layout()->set("res", $res);
@@ -913,7 +913,7 @@ class PreorderController extends mfBaseController {
if(!$filter['preordercampaign_id']) $filter['preordercampaign_id'] = 0;
//var_dump($filter);exit;
$results = PreorderModel::search($filter);
$results = PreorderModel::searchActive($filter);
foreach($results as $preorder) {
//$this->log->debug("building status: ".print_r($building->status,true));
$data = clone($preorder->data);
@@ -1003,11 +1003,12 @@ class PreorderController extends mfBaseController {
}
$preorder->status_id = $status_id;
$preorder->edit_by = $this->me->id;
$preorder->save();
$update = [];
foreach(PreorderModel::search(["deleted" => 0, "adb_hausnummer_id" => $preorder->adb_hausnummer_id]) as $affected_preorder) {
foreach(PreorderModel::searchActive(["adb_hausnummer_id" => $preorder->adb_hausnummer_id]) as $affected_preorder) {
$up = [
"id" => $affected_preorder->id,
"sid" => $affected_preorder->status_id,