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

WIP Preorder web gui changes

Browse Source
This commit is contained in:
Frank Schubert
2022-10-11 12:29:26 +02:00
parent 3f7e96d320
commit 2c7223d1a0
5 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Preorder/PreorderController.php
View File

@@ -42,17 +42,15 @@ class PreorderController extends mfBaseController {
$campaign_filter = [];
if($filter['campaign_id']) {
$campaign_id = $filter['campaign_id'];
if($filter['preordercampaign_id']) {
$campaign_id = $filter['preordercampaign_id'];
if(is_numeric($campaign_id) && $campaign_id > 0) {
$campaign = new Preordercampaign($campaign_id);
$this->layout()->set("campaign", $campaign);
}
$campaign_filter["preordercampaign_id"] = $campaign_id;
}
//var_dump($campaign_filter);exit;
$preorders = PreorderModel::search($campaign_filter);
$preorders = PreorderModel::search($filter);
$this->layout()->set("preorders", $preorders);
}

12
application/Preorder/PreorderModel.php
View File

@@ -165,6 +165,18 @@ class PreorderModel {
}
}
if(array_key_exists("type", $filter)) {
$type = $filter['type'];
if(is_array($type) && count($type)) {
$where .= " AND type IN ('".implode("','",$type)."')";
} else {
$type = FronkDB::singleton()->escape($filter['type']);
if($type) {
$where .= " AND type like '%$type%'";
}
}
}
if(array_key_exists("ucode", $filter)) {
$ucode = FronkDB::singleton()->escape($filter['ucode']);
if($ucode) {

6
application/Preordercampaign/PreordercampaignModel.php
View File

@@ -47,7 +47,7 @@ class PreordercampaignModel {
$db = FronkDB::singleton();
$res = $db->select("Preordercampaign", "*", "ORDER BY `create`");
$res = $db->select("Preordercampaign", "*", "1=1 ORDER BY name,`create`");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Preordercampaign($data);
@@ -61,7 +61,7 @@ class PreordercampaignModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Preordercampaign", "*", "$where ORDER BY `create`");
$res = $db->select("Preordercampaign", "*", "$where ORDER BY name,`create`");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new Preordercampaign($data);
@@ -79,7 +79,7 @@ class PreordercampaignModel {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Preordercampaign", "*", "$where ORDER BY `create`");
$res = $db->select("Preordercampaign", "*", "$where ORDER BY name,`create`");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Preordercampaign($data);