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

Enabled Statusflags in Preorder Api

Browse Source
This commit is contained in:
Frank Schubert
2024-08-18 22:38:59 +02:00
parent 7531d700c0
commit 03a53bbbd2
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/Api/v1/PreorderApicontroller.php
View File

@@ -1038,13 +1038,13 @@ class PreorderApicontroller extends mfBaseApicontroller {
$return['orderDate'] = date("Y-m-d",$preorder->order_date); $return['orderDate'] = date("Y-m-d",$preorder->order_date);
} }
$return['status'] = $preorder->status->getApiArray(); $return['status'] = $preorder->status->getApiArray();
/*foreach($preorder->statusflags as $sflag) { foreach($preorder->statusflags as $sflag) {
$return['status']['flags'][$sflag->code] = [ $return['status']['flags'][$sflag->code] = [
"code" => $sflag->code, "code" => (int)$sflag->code,
"text" => $sflag->name, "text" => $sflag->name,
"value" => ($sflag->value->value == 1) "value" => ($sflag->value->value == 1)
]; ];
}*/ }
if($addon_data) { if($addon_data) {
$return["additionalData"] = $addon_data; $return["additionalData"] = $addon_data;
} }

6
application/Preorder/Preorder.php
View File

@@ -603,13 +603,13 @@ class Preorder extends mfBaseModel {
$campaign = $this->getProperty("campaign"); $campaign = $this->getProperty("campaign");
$status = $this->getProperty("status")->getApiArray(); $status = $this->getProperty("status")->getApiArray();
/*foreach($this->getProperty("statusflags") as $sflag) { foreach($this->getProperty("statusflags") as $sflag) {
$status["flags"][$sflag->code] = [ $status["flags"][$sflag->code] = [
"code" => $sflag->code, "code" => (int)$sflag->code,
"text" => $sflag->name, "text" => $sflag->name,
"value" => ($sflag->value->value == 1) "value" => ($sflag->value->value == 1)
]; ];
}*/ }
$a = []; $a = [];

4
application/Preorder/PreorderController.php
View File

@@ -915,7 +915,7 @@ class PreorderController extends mfBaseController {
$return = $this->savePatchpositionApi(); $return = $this->savePatchpositionApi();
break; break;
case "setStatusFlag": case "setStatusFlag":
$return = $this->setStatusFlagAction(); $return = $this->setStatusFlagApi();
break; break;
default: default:
$return = false; $return = false;
@@ -930,7 +930,7 @@ class PreorderController extends mfBaseController {
$this->returnJson($data); $this->returnJson($data);
} }
private function setStatusFlagAction() { private function setStatusFlagApi() {
$preorder_id = $this->request->preorder_id; $preorder_id = $this->request->preorder_id;
$flag_id = $this->request->flag_id; $flag_id = $this->request->flag_id;
$value = $this->request->value; $value = $this->request->value;

1
application/PreorderStatusflagValue/PreorderStatusflagValue.php
View File

@@ -11,6 +11,7 @@ class PreorderStatusflagValue extends mfBaseModel {
"old_value" => property_exists($this->_old_data, "value") ? $this->_old_data->value : null, "old_value" => property_exists($this->_old_data, "value") ? $this->_old_data->value : null,
"new_value" => $this->data->value "new_value" => $this->data->value
]); ]);
$history->save(); $history->save();
$this->getProperty("preorder")->afterSave(); $this->getProperty("preorder")->afterSave();
} }

2
application/Preorderstatus/Preorderstatus.php
View File

@@ -10,7 +10,7 @@ class Preorderstatus extends mfBaseModel {
$a = []; $a = [];
$a['code'] = (int)$this->code; $a['code'] = (int)$this->code;
$a['text'] = $this->name; $a['text'] = $this->name;
//$a['flags'] = []; $a['flags'] = [];
return $a; return $a;
} }