From a2b519f6f3ce635a4c44cf3d3d945123b7075149 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 27 Apr 2023 14:20:14 +0200
Subject: [PATCH] Added accept_digging to preorder

---
 Layout/default/Preorder/Form.php             | 3 ++-
 application/Api/v1/PreorderApicontroller.php | 3 +++
 application/Preorder/Preorder.php            | 1 +
 application/Preorder/PreorderController.php  | 4 ++++
 application/Preorder/PreorderModel.php       | 1 +
 public/docs/preorder-api.yaml                | 6 ++++++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 1630e429e..ddeb416ca 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -309,7 +309,8 @@
                         <label><input type="checkbox" name="accept_agb" id="accept_agb" value="1" disabled="disabled" checked="checked" /> AGB akzeptiert</label><br />
                         <label><input type="checkbox" name="accept_dsgvo" id="accept_dsgvo" value="1" disabled="disabled" checked="checked" /> DSGVO akzeptiert</label><br />
                         <label><input type="checkbox" name="accept_withdrawal" id="accept_withdrawal" value="1" disabled="disabled" checked="checked" /> Rücktrittsrecht akzeptiert</label><br />
-                        <label><input type="checkbox" name="accept_marketing" id="accept_marketing" value="1" <?=($preorder->accept_marketing) ? "checked='checked'" : ""?> /> Datenweitergabe akzeptiert</label>
+                        <label><input type="checkbox" name="accept_marketing" id="accept_marketing" value="1" <?=($preorder->accept_marketing) ? "checked='checked'" : ""?> /> Datenweitergabe akzeptiert</label><br />
+                        <label><input type="checkbox" name="accept_digging" id="accept_digging" value="1" <?=($preorder->accept_digging) ? "checked='checked'" : ""?> /> Zustimmung zu Grabungsarbeiten</label>
                       </div>
                     </div>
                     
diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php
index 1b4a7036d..87ea35a1c 100644
--- a/application/Api/v1/PreorderApicontroller.php
+++ b/application/Api/v1/PreorderApicontroller.php
@@ -508,6 +508,9 @@ class PreorderApicontroller extends mfBaseApicontroller {
     if($this->post['acceptWithdrawal'] === true) {
       $preorder_data['accept_withdrawal'] = 1;
     }
+    if($this->post['acceptDigging'] === true) {
+      $preorder_data['accept_digging'] = 1;
+    }
     
     if($is_additional_order) {
       $preorder_data['is_additional_order'] = 1;
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 1f3d6ced5..9ed9e1517 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -61,6 +61,7 @@ class Preorder extends mfBaseModel {
     $a['acceptAgb'] = ($this->accept_agb) ? true : false;
     $a['acceptDsgvo'] = ($this->accept_dsgvo) ? true : false;
     $a['acceptWithdrawal'] = ($this->accept_withdrawal) ? true : false;
+    $a['acceptDigging'] = ($this->accept_digging) ? true : false;
     $a['address_info'] = ($this->address_info) ? $this->address_info : null;
     
     $address = [];
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index f81e1dc13..bb6dec5be 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -315,6 +315,10 @@ class PreorderController extends mfBaseController {
     if($r->accept_marketing == 1) {
       $data['accept_marketing'] = 1;
     }
+    $data['accept_digging'] = 0;
+    if($r->accept_digging== 1) {
+      $data['accept_digging'] = 1;
+    }
     
     $data['price'] = ($r->price) ? Layout::commaToDot($r->price) : 0;
     $data['price_setup'] = ($r->price_setup) ? Layout::commaToDot($r->price_setup) : 0;
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 30c171222..842cb3f8e 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -29,6 +29,7 @@ class PreorderModel {
   public $accept_dsgvo;
   public $accept_marketing;
   public $accept_withdrawal;
+  public $accept_digging;
   public $contact_type;
   public $company;
   public $uid;
diff --git a/public/docs/preorder-api.yaml b/public/docs/preorder-api.yaml
index 838ca2bfa..8ba7c6b90 100644
--- a/public/docs/preorder-api.yaml
+++ b/public/docs/preorder-api.yaml
@@ -1109,6 +1109,9 @@ components:
         acceptWithdrawal:
           type: boolean
           description: Informationen zu Rücktrittsrecht akzeptiert
+        acceptDigging:
+          type: boolean
+          description: Zustimmung zu Grabungsarbeiten auf Privatgrund/Privatstraße gegeben
         address:
           type: object
           description: Anschlussadresse
@@ -1360,6 +1363,9 @@ components:
         acceptWithdrawal:
           type: boolean
           description: Informationen zu Rücktrittsrecht akzeptiert
+        acceptDigging:
+          type: boolean
+          description: Zustimmung zu Grabungsarbeiten auf Privatgrund/Privatstraße gegeben
         address_info:
           type: string
           description: Zusätzliche Info zur Adresse