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 
Snopp/Citycom Service Order Api

See merge request fronk/thetool!1643
This commit is contained in:
Frank Schubert
2025-08-18 16:04:48 +00:00
parent d7b3073d92 2322226712
commit dbbf4f204e
7 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Citycom/OanApiClient.php
View File

@@ -309,7 +309,7 @@ class Citycom_OanApiClient {
return true;
}
private function runApiRequest($url, $ctx_opts, $url_params = [], $page_num = 1) {
private function runApiRequest($url, $ctx_opts, $url_params = [], $page_num = 1) : mixed {
$current_page = $page_num;
$return_data = [];

21
lib/Citycom/OanApiHelper.php
View File

@@ -94,6 +94,9 @@ class Citycom_OanApiHelper {
$execution_date = date("Y-m-d");
}
if(array_key_exists("ctag_range_search", $data) && $data["ctag_range_search"]) {
$ctag_range_search = $data["ctag_range_search"];
}
$product_data = [
"up" => $up,
@@ -113,10 +116,16 @@ class Citycom_OanApiHelper {
$new_services = [];
$ctags = $preorder->getNextFreeCtags();
if($ctag_range_search) {
$ctags = $preorder->getFreeCtagsInSet($ctag_range_search);
} else {
$ctags = $preorder->getNextFreeCtags();
}
$this->log->debug(print_r($ctags, true));
if(!$ctags) {
$this->log->error(__METHOD__.": No New Free Ctags (Preorder ".$preorder->id.")");
$this->log->error(__METHOD__.": No Free Ctags (Preorder ".$preorder->id.")");
return false;
}
@@ -156,7 +165,7 @@ class Citycom_OanApiHelper {
//continue;
// register new Service with Citycom
/*$new_service = $this->api->createService($service_data);
$new_service = $this->api->createService($service_data);
if(!$new_service) {
$this->log->error(__METHOD__.": Error creating service");
@@ -173,9 +182,9 @@ class Citycom_OanApiHelper {
"serial" => $new_service->ont->serial,
"fsan" => $new_service->ont->fsan,
],
];*/
];
$service_return[] = [
/*$service_return[] = [
"sublocation_id" => $sublocation_id,
"service_number" => "30-fggreger-01",
"service_type" => $ctag_service_type,
@@ -184,7 +193,7 @@ class Citycom_OanApiHelper {
"serial" => "ONT123456",
"fsan" => "FSAN7890",
],
];
];*/
// save ctag
$ctag_data = $preorder_ctag_data;