+
+
'.$contract_billinglabel.'
+
'.($$contract_billingplan_text ?? '').'
+
+
'.$contract_start_date.'
'.$responses->start_date.'
@@ -130,7 +137,13 @@ $view .= '
'.$contract_end_date.'
'.$date.'
-
';
+
+
+
'.$contract_service.'
+
'.$responses->service_count.'
+
+ ';
+
}
$view .='
@@ -165,22 +178,30 @@ $view .='
';
$view .= '
';
-
-//Usageview
-
//get all assigned serialnumbers
$url_input = '';
foreach($servicetools as $service_tool){
$url_input .= $service_tool.',';
}
+//get ignore list
+$ignored_serialnumbers = '';
+if (!empty($ignore_lists) || $ignore_lists != ''){
+ foreach($ignore_lists as $list){
+ $ignored_serialnumbers .= $list.',';
+ }
+ $ignored_serialnumbers = '&ignore='.substr($ignored_serialnumbers,0,-1);
+}
//Return report_usage_servicereports
-$api_url = '/v1/application/type=ServiceReport&serialnumber='.substr($url_input,0,-1).'/contract_usage_servicereports';
+$api_url = '/v1/application/type=ServiceReport&serialnumber='.substr($url_input,0,-1).$ignored_serialnumbers.'&between='.$responses->start_date.'||'.$date.'/contract_usage_servicereports';
$contract_usage_servicereports = ioServer($api_url,'');
+
//Decode Payload
if (!empty($contract_usage_servicereports)){$contract_usage_servicereports = decode_payload($contract_usage_servicereports);}else{$contract_usage_servicereports = null;}
-$service_events = usageView(json_decode(json_encode($contract_usage_servicereports),true));
+$contract_usage_servicereports = json_decode(json_encode($contract_usage_servicereports),true);
+
+$service_events = usageView($contract_usage_servicereports);
$view .= '