citycom oan cleanup

lib/Citycom/OanApiHelper.php

@@ -95,10 +95,6 @@ class Citycom_OanApiHelper {
         $phone = $data["phone"];
         $mobile = $data["mobile"];
 
-        if(!$execution_date) {
-            $execution_date = date("Y-m-d");
-        }
-
         $ctag_range_search = false;
 
         if(array_key_exists("ctag_range_search", $data) && $data["ctag_range_search"]) {
@@ -192,7 +188,6 @@ class Citycom_OanApiHelper {
                 "sublocation" => $sublocation_id,
                 "service_type" => $stype->id,
                 "product" => $product_id,
-                "billing_date" => $execution_date,
                 "ctag" => $ctag,
                 "company" => $company,
                 "firstname" => $firstname,
@@ -200,10 +195,11 @@ class Citycom_OanApiHelper {
                 "phone" => $phone,
                 "mobile" => $mobile,
             ];
+            if($execution_date) {
+                $service_data["billing_date"] = $execution_date;
+            }
 
-            //echo "Creating Service ".$stype->name." on sublocation $sublocation_id with product_id $product_id and ctag $ctag\n";
             $this->log->info(__METHOD__.": Creating Service ".$stype->name." on sublocation $sublocation_id with product_id $product_id and ctag $ctag");
-            //continue;
 
             // register new Service with Citycom
             $new_service = $this->api->createService($service_data);
@@ -214,28 +210,6 @@ class Citycom_OanApiHelper {
                 return false;
             }
 
-            /*$service_return[] = [
-                "service_number" => $new_service->service_number,
-                "sublocation_id" => $sublocation_id,
-                "service_type" => $ctag_service_type,
-                "ctag" => $ctag,
-                "ont" => [
-                    "serial" => $new_service->ont->serial,
-                    "fsan" => $new_service->ont->fsan,
-                ],
-            ];*/
-
-            /*$service_return[] = [
-                "sublocation_id" => $sublocation_id,
-                "service_number" => "30-fggreger-01",
-                "service_type" => $ctag_service_type,
-                "ctag" => $ctag,
-                "ont" => [
-                    "serial" => "ONT123456",
-                    "fsan" => "FSAN7890",
-                ],
-            ];*/
-
             // save ctag
             $ctag_data = $preorder_ctag_data;
             $ctag_data["ctag"] = $ctag;