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

Merge branch 'fronkdev' into 'master'

Browse Source 
Added rimo_external_id to preorderadressreporting api

See merge request fronk/thetool!1007
This commit is contained in:
Frank Schubert
2025-02-10 15:28:40 +00:00
parent def9c94c25 bef7dcb48c
commit 827817a895
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Api/v1/AddressdbApicontroller.php
+8
View File
@@ -447,6 +447,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
'sort_key' => $sort_key, 'sort_key' => $sort_key,
'oaid' => $data->hausnummer_oaid, 'oaid' => $data->hausnummer_oaid,
'cluster_id' => $data->netzgebiet_extref, 'cluster_id' => $data->netzgebiet_extref,
'rimo_external_id' => null,
'visibility' => null, 'visibility' => null,
'adrcd' => null, 'adrcd' => null,
'subcd' => null, 'subcd' => null,
@@ -476,10 +477,12 @@ class AddressdbApicontroller extends mfBaseApicontroller {
unset($tmp_addresses[$address_key]['municipality']); unset($tmp_addresses[$address_key]['municipality']);
} }
if($this->me->is("preorderaddressreporting")) { if($this->me->is("preorderaddressreporting")) {
$tmp_addresses[$address_key]['rimo_external_id'] = $data->hausnummer_rimo_id;
$tmp_addresses[$address_key]['visibility'] = $data->visibility; $tmp_addresses[$address_key]['visibility'] = $data->visibility;
$tmp_addresses[$address_key]['adrcd'] = $data->adrcd; $tmp_addresses[$address_key]['adrcd'] = $data->adrcd;
$tmp_addresses[$address_key]['subcd'] = $data->subcd; $tmp_addresses[$address_key]['subcd'] = $data->subcd;
} else { } else {
unset($tmp_addresses[$address_key]['rimo_external_id']);
unset($tmp_addresses[$address_key]["visibility"]); unset($tmp_addresses[$address_key]["visibility"]);
unset($tmp_addresses[$address_key]["adrcd"]); unset($tmp_addresses[$address_key]["adrcd"]);
unset($tmp_addresses[$address_key]["subcd"]); unset($tmp_addresses[$address_key]["subcd"]);
@@ -601,6 +604,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
$new_address['ordered'] = $u['ordered']; $new_address['ordered'] = $u['ordered'];
$new_address['orderType'] = $u['orderType']; $new_address['orderType'] = $u['orderType'];
$new_address['ispName'] = $u['ispName']; $new_address['ispName'] = $u['ispName'];
$new_address['rimo_external_id'] = $ta['rimo_external_id'];
$new_address['visibility'] = $ta['visibility']; $new_address['visibility'] = $ta['visibility'];
$new_address['adrcd'] = $ta['adrcd']; $new_address['adrcd'] = $ta['adrcd'];
$new_address['subcd'] = $ta['subcd']; $new_address['subcd'] = $ta['subcd'];
@@ -758,6 +762,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
$tmp_addresses[$address_key] = [ $tmp_addresses[$address_key] = [
'oaid' => $data->hausnummer_oaid, 'oaid' => $data->hausnummer_oaid,
'cluster_id' => $data->netzgebiet_extref, 'cluster_id' => $data->netzgebiet_extref,
'rimo_external_id' => null,
'visibility' => null, 'visibility' => null,
'adrcd' => null, 'adrcd' => null,
'subcd' => null, 'subcd' => null,
@@ -787,10 +792,12 @@ class AddressdbApicontroller extends mfBaseApicontroller {
unset($tmp_addresses[$address_key]['municipality']); unset($tmp_addresses[$address_key]['municipality']);
} }
if($this->me->is("preorderaddressreporting")) { if($this->me->is("preorderaddressreporting")) {
$tmp_addresses[$address_key]['rimo_external_id'] = $data->hausnummer_rimo_id;
$tmp_addresses[$address_key]['visibility'] = $data->visibility; $tmp_addresses[$address_key]['visibility'] = $data->visibility;
$tmp_addresses[$address_key]['adrcd'] = $data->adrcd; $tmp_addresses[$address_key]['adrcd'] = $data->adrcd;
$tmp_addresses[$address_key]['subcd'] = $data->subcd; $tmp_addresses[$address_key]['subcd'] = $data->subcd;
} else { } else {
unset($tmp_addresses[$address_key]['rimo_external_id']);
unset($tmp_addresses[$address_key]["visibility"]); unset($tmp_addresses[$address_key]["visibility"]);
unset($tmp_addresses[$address_key]["adrcd"]); unset($tmp_addresses[$address_key]["adrcd"]);
unset($tmp_addresses[$address_key]["subcd"]); unset($tmp_addresses[$address_key]["subcd"]);
@@ -834,6 +841,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
$new_address['ordered'] = $u['ordered']; $new_address['ordered'] = $u['ordered'];
$new_address['orderType'] = $u['orderType']; $new_address['orderType'] = $u['orderType'];
$new_address['ispName'] = $u['ispName']; $new_address['ispName'] = $u['ispName'];
$new_address['rimo_external_id'] = $ta['rimo_external_id'];
$new_address['visibility'] = $ta['visibility']; $new_address['visibility'] = $ta['visibility'];
$new_address['adrcd'] = $ta['adrcd']; $new_address['adrcd'] = $ta['adrcd'];
$new_address['subcd'] = $ta['subcd']; $new_address['subcd'] = $ta['subcd'];