| Starterpaket versandt: |
logistics && $preorder->logistics->sent) ? ' '.date("d.m.Y H:i", $preorder->logistics->sent) : ''?> |
@@ -466,187 +466,3 @@
-
\ No newline at end of file
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 56f4c7e9e..bac244e20 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -48,6 +48,8 @@ class Preorder extends mfBaseModel {
$this->save();
}
+ // run triggers based on new status
+ $this->runStatusTrigger();
// Cascade status changes down to adb_hausnummer and adb_wohneinheit
$this->cascadeStatus();
// Cascade status changes down all active preorders with the same hausnummer
@@ -56,6 +58,59 @@ class Preorder extends mfBaseModel {
$this->in_after_save--;
}
+ public function runStatusTrigger() {
+ if(!$this->id) return true;
+ if($this->status_id == $this->_old_data->status_id) return true;
+
+ $this->log->debug(__METHOD__." running");
+
+ $new_status = $this->getProperty("status");
+ $old_status = new Preorderstatus($this->_old_data->status_id);
+
+ if(!$new_status->id || !$old_status->id) return true;
+ $this->log->debug(__METHOD__." status changed from '".($old_status ? $old_status->code : "")."' to '".$new_status->code."'");
+
+ if($new_status->code <= $old_status->code) return true;
+
+ if(!defined("TT_PREORDER_STATUS_MATRIX") || !TT_PREORDER_STATUS_MATRIX) {
+ $this->log->error("config TT_PREORDER_STATUS_MATRIX not defined!");
+ }
+
+ // run every trigger bnetween old and new status code
+ foreach(TT_PREORDER_STATUS_MATRIX as $intermediate_code => $status) {
+ if($intermediate_code <= $old_status->code) continue;
+ if($intermediate_code > $new_status->code) continue;
+
+ $code = $intermediate_code;
+ // find trigger for new status code
+ $classname = "Preorder_Statustrigger_$code";
+ $filepath = __DIR__."/statustrigger/$code.php";
+
+ $this->log->debug(__METHOD__.": Looking for $classname in $filepath");
+
+ if(!file_exists($filepath)) {
+ $this->log->debug(__METHOD__.": $filepath not found");
+ continue;
+ }
+
+ require_once $filepath;
+
+ if(!class_exists($classname)) {
+ $this->log->debug(__METHOD__.": $classname not found");
+ continue;
+ }
+
+ $trigger = new $classname($this, $new_status);
+ $trigger->run();
+
+ }
+
+
+
+ return true;
+
+ }
+
/*
* Cascade status changes down to adb_hausnummer and adb_wohneinheit
*/
@@ -400,6 +455,7 @@ class Preorder extends mfBaseModel {
$hausnummer = $this->getProperty("adb_hausnummer");
$wohneinheit = $this->getProperty("adb_wohneinheit");
+ $campaign = $this->getProperty("campaign");
$a = [];
$a["ciftoken"] = $this->ciftoken;
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 076cdab90..dba08c0bc 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1016,6 +1016,9 @@ class PreorderController extends mfBaseController {
"text" => $affected_preorder->status->name,
"bcode" => $affected_preorder->adb_hausnummer->status->code,
"btext" => $affected_preorder->adb_hausnummer->status->name,
+ "ciftoken" => $affected_preorder->ciftoken,
+ "cifurl" => $affected_preorder->cifurl,
+ "cifcableurl" => $affected_preorder->cifcableurl,
];
if($preorder->adb_wohneinheit_id) {
$up["ucode"] = $affected_preorder->adb_wohneinheit->status->code;
diff --git a/application/Preorder/statustrigger/145.php b/application/Preorder/statustrigger/145.php
new file mode 100644
index 000000000..7930e1d54
--- /dev/null
+++ b/application/Preorder/statustrigger/145.php
@@ -0,0 +1,46 @@
+log = mfLoghandler::singleton();
+
+ $this->preorder = $preorder;
+ $this->new_status = $new_status;
+ }
+
+ public function run() {
+ $this->log->debug(__METHOD__.": running trigger");
+
+ $changes = false;
+
+ if(!$this->preorder->ciftoken) {
+ $this->preorder->ciftoken = $this->preorder->createCiftoken();
+ $changes = true;
+ }
+
+ /*if(!$this->preorder->ciftoken) {
+ $this->log->warning("Error creating ciftoken for preorder ".$this->preorder->id);
+ return true;
+ }*/
+ if(!$this->preorder->cifurl) {
+ $this->preorder->cifurl = $this->preorder->generateCifUrl();
+ $changes = true;
+ }
+
+ if(!$this->preorder->cifcableurl) {
+ $this->preorder->cifcableurl = $this->preorder->generateCifCableUrl();
+ $changes = true;
+ }
+
+ if($changes) {
+ $this->preorder->save();
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/application/UserToken/UserToken.php b/application/UserToken/UserToken.php
index 57866cbd8..4cd271839 100644
--- a/application/UserToken/UserToken.php
+++ b/application/UserToken/UserToken.php
@@ -6,6 +6,7 @@ class UserToken extends mfBaseController
public static function checkToken()
{
if (isset($_COOKIE[MFAPPNAME . '_remembertoken'])) {
+ $refresh = false;
$cookie = explode(':', $_COOKIE[MFAPPNAME . '_remembertoken']);
if (count($cookie) === 2) {
$db = new FronkDB();
diff --git a/public/docs/preorder-api.yaml b/public/docs/preorder-api.yaml
index 69883fe49..5df8b0e6a 100644
--- a/public/docs/preorder-api.yaml
+++ b/public/docs/preorder-api.yaml
@@ -14,6 +14,8 @@ tags:
description: Abfrage von GWR-Daten
- name: preorder
description: Abfragen und Operationen zu Vorbestellungen
+ - name: Customer Installation Feedback
+ description: Kundenfeedback Lehrrohrverlegung
paths:
/addressdb/getClusters:
get:
@@ -806,6 +808,62 @@ paths:
description: Unauthorized
'404':
description: Vorbestellung nicht gefunden
+ /preorder/customerInstallationFeedback:
+ get:
+ tags:
+ - Customer Installation Feedback
+ summary: Anschluss-/Kundendaten zu ciftoken
+ description: Gibt Anschluss-/Kundendaten zum abgefragten CIF-Token zurück. Dient zum Validieren des Anschlusses durch den Kunden
+ operationId: getCifData
+ parameters:
+ - name: ciftoken
+ in: query
+ description: Client Installation Feedback Token
+ required: true
+ schema:
+ type: string
+ responses:
+ '200':
+ description: Successful operation
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ status:
+ type: string
+ description: Status string
+ example: OK
+ result:
+ $ref: '#/components/schemas/cifResponseData'
+ '400':
+ description: ciftoken missing
+ '401':
+ description: Unauthorized
+ '404':
+ description: Invalid ciftoken
+ post:
+ tags:
+ - Customer Installation Feedback
+ summary: Bestellung auf Status 200 - Rohr im Gebäude setzen
+ description: Setzt Status der Bestellung auf 200 - Rohr im Gebäude. Wird gesetzt wenn beim Kunden die Lehrrohrinstallation abgeschlossen ist. (CIF)
+ operationId: setCifData
+ parameters:
+ - name: ciftoken
+ in: query
+ description: Client Installation Feedback Token
+ required: true
+ schema:
+ type: string
+ responses:
+ '200':
+ description: Successful operation
+ '400':
+ description: ciftoken missing
+ '401':
+ description: Unauthorized
+ '404':
+ description: Invalid ciftoken
components:
schemas:
timestampString:
@@ -1595,6 +1653,75 @@ components:
type: integer
description: Zeitpunkt der letzten Bearbeitung der Bestellung in Sekunden seit der Unix Epoche
example: 1675206000
+ cifResponseData:
+ type: object
+ properties:
+ ciftoken:
+ code:
+ type: string
+ description: Eindeutiger Code der Vorbestellung
+ example: A1B2C3D4
+ oaid:
+ type: string
+ description: Open Access ID der Wohneinheit
+ example: AT-9999-abcdef01.001
+ company:
+ type: string
+ description: Firmenname Kunde
+ example:
+ uid:
+ type: string
+ description: UID (wenn Firmenkunde)
+ example:
+ firstname:
+ type: string
+ description: Vorname Kunde
+ example: Vor
+ lastname:
+ type: string
+ description: Nachname Kunde
+ example: Nachname
+ street:
+ type: string
+ description: Straße Kunde
+ example: Beispielstraße
+ housenumber:
+ type: string
+ description: Hausnummer Kunde
+ example: 42
+ zip:
+ type: string
+ description: PLZ Kunde
+ example: 9999
+ city:
+ type: string
+ description: Gemeinde oder Ortschaft
+ example: Gemeinde/Ort
+ municipality:
+ type: string
+ description: Gemeinde
+ example: Gemeinde
+ district:
+ type: string
+ description: Ortschaft/Ortsteil
+ example: Ortschaft/Ortsteil
+ block:
+ type: string
+ description: Adresszusatz
+ example: null
+ stiege:
+ type: string
+ description: Adresszusatz
+ example: null
+ stock:
+ type: string
+ description: Adresszusatz
+ example: null
+ tuer:
+ type: string
+ description: Adresszusatz
+ example: null
+
securitySchemes:
api_key_header:
type: apiKey