diff --git a/assets/functions.php b/assets/functions.php index 015f9bf..c2a96ba 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -950,6 +950,7 @@ function serviceEvents ($messages,$page){ '.$equipment_label9.' '.$equipment_label3.' '.$general_createdby.' + '.$general_created.' '.$view_asset_actions.' @@ -996,6 +997,7 @@ function serviceEvents ($messages,$page){ '.$service_renewal_date.' '.$service_status.' '.$message->createdby.' + '.getRelativeTime($message->created).' '.$general_view.' PDF '; @@ -1295,11 +1297,11 @@ function serviceReport($history, $request, $country_code) if (str_contains($history->description, "service_mandatory_question")) { // New Report foreach ($json_array->final as $final) { - if ($final->id == "service_action_clean" && $final->value == "Yes") { + if ($final->id == "service_action_clean" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_clean . '
  • '; $actions++; } - if ($final->id == "service_action_battery" && $final->value == "Yes") { + if ($final->id == "service_action_battery" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_battery . '
  • '; $actions++; } @@ -1321,23 +1323,23 @@ function serviceReport($history, $request, $country_code) '; if (str_contains($history->description, "service_mandatory_question")) { foreach ($json_array->final as $final) { - if ($final->id == "service_action_serial" && $final->value == "Yes") { + if ($final->id == "service_action_serial" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_serial . '
  • '; $repairs++; } - if ($final->id == "service_action_cover" && $final->value == "Yes") { + if ($final->id == "service_action_cover" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_cover . '
  • '; $repairs++; } - if ($final->id == "service_action_spudger" && $final->value == "Yes") { + if ($final->id == "service_action_spudger" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_spudger . '
  • '; $repairs++; } - if ($final->id == "service_action_case" && $final->value == "Yes") { + if ($final->id == "service_action_case" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_case . '
  • '; $repairs++; } - if ($final->id == "service_action_instructions" && $final->value == "Yes") { + if ($final->id == "service_action_instructions" && $final->value == 1) { $servicereport .= '
  • ' . $service_action_instructions . '
  • '; $repairs++; } diff --git a/histories.php b/histories.php index bddbc19..da791c3 100644 --- a/histories.php +++ b/histories.php @@ -119,7 +119,7 @@ $view .= ' $view .= ' '.$response->historyID.' '.$response->type.' - '.$response->created.' + '.getRelativeTime($response->created).' '.$response->createdby.'
    ' . $description . '
    '.$general_view .'