From cd6a48ff16eb2763ca9f3461bbcea5916c354607 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 6 Dec 2022 16:55:52 +0100 Subject: [PATCH] Added unit details to customer address in Preorder --- Layout/default/Preorder/Form.php | 42 +++++++++++++++++++- Layout/default/Preorder/Index.php | 2 +- application/Api/v1/PreorderApicontroller.php | 4 +- application/Preorder/Preorder.php | 2 +- application/Preorder/PreorderController.php | 25 +++++++----- application/Preorder/PreorderModel.php | 6 +++ 6 files changed, 65 insertions(+), 16 deletions(-) diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php index ef5ca26c5..462be6a11 100644 --- a/Layout/default/Preorder/Form.php +++ b/Layout/default/Preorder/Form.php @@ -250,10 +250,48 @@
- -
+ +
+
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index 7ac0b9988..38162a7b3 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -153,7 +153,7 @@ connection_count) ? $preorder->connection_count : 1?> company) ? $preorder->company : $preorder->firstname." ".$preorder->lastname?>
- street?>
+ street?>housenumber) ? " ".$preorder->housenumber : ""?>
zip?> city?> diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php index b291013ce..784895507 100644 --- a/application/Api/v1/PreorderApicontroller.php +++ b/application/Api/v1/PreorderApicontroller.php @@ -371,9 +371,9 @@ class PreorderApicontroller extends mfBaseApicontroller { /* * get customer data */ - foreach(['company','uid','firstname','lastname','street','zip','city','phone','email'] as $key) { + foreach(['company','uid','firstname','lastname','street','housenumber','zip','city','phone','email','block','stiege','stock','tuer'] as $key) { if(property_exists($customer, $key)) { - $preorder_data[$key] = $customer->$key; + $preorder_data[$key] = ($customer->$key) ? $customer->$key : null; } } diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php index d56d3ece9..7b2b4aabc 100644 --- a/application/Preorder/Preorder.php +++ b/application/Preorder/Preorder.php @@ -73,7 +73,7 @@ class Preorder extends mfBaseModel { $customer['firstnam'] = ($this->firstname) ? $this->firstname : null; $customer['lastname'] = ($this->lastname) ? $this->lastname : null; $customer['street'] = ($this->street) ? $this->street : null; - $customer['housenumber'] = ($this->hausnummer) ? $this->hausnummer : null; + $customer['housenumber'] = ($this->hausnummer) ? $this->housenumber : null; $customer['zip'] = ($this->plz) ? $this->plz : null; $customer['city'] = ($this->city) ? $this->city : null; $customer['bock'] = ($this->block) ? $this->block : null; diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php index cd394545a..505ac361d 100644 --- a/application/Preorder/PreorderController.php +++ b/application/Preorder/PreorderController.php @@ -277,16 +277,21 @@ class PreorderController extends mfBaseController { $data['partner_id'] = null; } - $data['company'] = $r->company; - $data['uid'] = $r->uid; - $data['firstname'] = $r->firstname; - $data['lastname'] = $r->lastname; - $data['street'] = $r->street; - $data['zip'] = $r->zip; - $data['city'] = $r->city; - $data['phone'] = $r->phone; - $data['email'] = $r->email; - $data['note'] = $r->note; + $data['company'] = (trim($r->company)) ? trim($r->company) : null; + $data['uid'] = (trim($r->uid)) ? trim($r->uid) : null; + $data['firstname'] = (trim($r->firstname)) ? trim($r->firstname) : null; + $data['lastname'] = (trim($r->lastname)) ? trim($r->lastname) : null; + $data['street'] = (trim($r->street)) ? trim($r->street) : null; + $data['housenumber'] = (trim($r->housenumber)) ? trim($r->housenumber) : null; + $data['block'] = (trim($r->block)) ? trim($r->block) : null; + $data['stiege'] = (trim($r->stiege)) ? trim($r->stiege) : null; + $data['stock'] = (trim($r->stock)) ? trim($r->stock) : null; + $data['tuer'] = (trim($r->tuer)) ? trim($r->tuer) : null; + $data['zip'] = (trim($r->zip)) ? trim($r->zip) : null; + $data['city'] = (trim($r->city)) ? trim($r->city) : null; + $data['phone'] = (trim($r->phone)) ? trim($r->phone) : null; + $data['email'] = (trim($r->email)) ? trim($r->email) : null; + $data['note'] = (trim($r->note)) ? trim($r->note) : null; $data['edit_by'] = $this->me->id; diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php index b133fbb18..a2f4f203d 100644 --- a/application/Preorder/PreorderModel.php +++ b/application/Preorder/PreorderModel.php @@ -2,6 +2,7 @@ class PreorderModel { public $ucode; + public $status_id; public $preordercampaign_id; public $adb_hausnummer_id; public $adb_wohneinheit_id; @@ -32,6 +33,11 @@ class PreorderModel { public $firstname; public $lastname; public $street; + public $housenumber; + public $block; + public $stiege; + public $stock; + public $tuer; public $zip; public $city; public $phone;