From 413768bcec793fa43b715eed0c934bb355bbdf10 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 25 Oct 2022 17:05:46 +0200
Subject: [PATCH] Added addonServices and additionalData to POST /preorder

---
 application/Api/v1/PreorderApicontroller.php | 19 +++++++++++++++++++
 application/Preorder/Preorder.php            |  6 ++++++
 application/Preorder/PreorderController.php  |  5 +----
 application/Preorder/PreorderModel.php       |  2 ++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php
index 90e665fc6..3fd9dc7cf 100644
--- a/application/Api/v1/PreorderApicontroller.php
+++ b/application/Api/v1/PreorderApicontroller.php
@@ -302,6 +302,25 @@ class PreorderApicontroller extends mfBaseApicontroller {
       }
     }
     
+    /*
+     * check for addon services
+     */
+    if(array_key_exists("addonServices", $this->post)) {
+      $addon_services = $this->post['addonServices'];
+      if($addon_services) {
+        $preorder_data['addon_services'] = json_encode($addon_services);
+      }
+    }
+    
+    /*
+     * check for addon data
+     */
+    if(array_key_exists("additionalData", $this->post)) {
+      $addon_data = $this->post['additionalData'];
+      if($addon_data) {
+        $preorder_data['addon_data'] = json_encode($addon_data);
+      }
+    }
     
     /*
      * create preorder record
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 03a07369c..28f0c6300 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -9,6 +9,12 @@ class Preorder extends mfBaseModel {
   private $adb_wohneinheit;
   
   
+  public function afterLoad() {
+    if($this->uid === "string") {
+      $this->uid = "";
+    }
+  }
+  
   public function createUcode() {
     $ucode = $this->generateNewUcode();
     while(PreorderModel::search(['ucode' => $ucode])) {
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 6157e2c75..7b7d622c9 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -30,15 +30,12 @@ class PreorderController extends mfBaseController {
     // pagination defaults
     $pagination = [];
     $pagination['start'] = 0;
-    $pagination['count'] = 25;
+    $pagination['count'] = 5;
     $pagination['maxItems'] = 0;
     
     if(is_numeric($this->request->s)) {
       $pagination['start'] = intval($this->request->s);
     }
-    //var_dump($filter);exit;
-    //$pagination['maxItems'] = AddressModel::count($filter);
-    
     
     $campaign_filter = [];
     
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 63c59b948..f9c966c82 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -35,6 +35,8 @@ class PreorderModel {
   public $city;
   public $phone;
   public $email;
+  public $addon_services;
+  public $addon_data;
   public $submit_type;
   public $submit_request;