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

Added accept_digging to preorder

Browse Source
This commit is contained in:
Frank Schubert
2023-04-27 14:20:14 +02:00
parent dd0d97c128
commit a2b519f6f3
6 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Layout/default/Preorder/Form.php
View File

@@ -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>

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

@@ -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;

1
application/Preorder/Preorder.php
View File

@@ -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 = [];

4
application/Preorder/PreorderController.php
View File

@@ -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;

1
application/Preorder/PreorderModel.php
View File

@@ -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;

6
public/docs/preorder-api.yaml
View File

@@ -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