excluding deleted preorders in Preordernotification

This commit is contained in:
Frank Schubert
2023-07-10 11:27:48 +02:00
parent 9974d39536
commit e69e9697fb
3 changed files with 4 additions and 0 deletions

View File

@@ -300,6 +300,8 @@ class PreorderModel {
$deleted = $filter['deleted'];
if(is_numeric($deleted)) {
$where .= " AND deleted=$deleted";
} elseif($deleted == null) {
$where .= " (AND deleted IS NULL OR deleted = 0)"
}
}

View File

@@ -13,6 +13,7 @@ class Preordernotification extends mfBaseModel {
$preorder_filter = json_decode($this->preorder_filter, true);
$preorder_filter['preordercampaign_id'] = $this->preordercampaign_id;
$preorder_filter['deleted'] = null;
$preorders = PreorderModel::search($preorder_filter);
return $preorders;

View File

@@ -363,6 +363,7 @@ class PreordernotificationController extends mfBaseController {
// get and save preorder count
$preorder_filter = json_decode($notification->preorder_filter, true);
$preorder_filter['preordercampaign_id'] = $notification->preordercampaign_id;
$preorder_filter['deleted'] = null;
$preorder_count = PreorderModel::count($preorder_filter);
$notification->recipient_count = $preorder_count;
$notification->save();