diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index e88ece23..c8290baf 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -519,18 +519,13 @@ wrenchboard=# ]; } public function summaryReturnData($in,$outResult, $extraOut=[]){ - // log_message('critical', "summaryReturnData:: ********* IN ".serialize($in) ); - if ($in["action"] == -1 ){ $final_out = $outResult; } else{ - // log_message('critical', "summaryReturnData:: ********* ENTER FORMATTER ***** action == ".$in["action"] ); $final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $outResult); } - // log_message('critical', "summaryReturnData:: ********* OUT ".serialize($outResult) ); - if( isset( $extraOut['offers_list'])){ $final_out["offers_list"] = $extraOut['offers_list']; } @@ -538,20 +533,18 @@ wrenchboard=# if( isset( $extraOut['activetaskslist'])){ $final_out["active_tasks_list"] = $extraOut['activetaskslist']; } - $final_out['user_server_name'] = $this->user_server_name; - $final_out["environment"] = $this->current_env + 0; - $final_out["session_image_server"] = $this->primary_image_sever; - $final_out["server_tag"] = $this->server_tag; - $final_out["language"] = "en"; - //$final_out["ip_loc"] = $this->getIpData(); - $final_out["current_version"] = 20250614; - $final_out["family_types"] = $this->familyTypes(); - $final_out["history_types"] = $this->historyTypes(); - $final_out["generative_types"] = $this->generativeTypes(); - // $final_out["refer_link"] = "https://www.wrenchboard.com/myref/"; - // log_message('critical', "summaryReturnData:: ********* FINAL OUT ".serialize($final_out) ); - //return json_encode( $final_out ); - return $final_out ; + + $final_out['user_server_name'] = $this->user_server_name; + $final_out["environment"] = $this->current_env + 0; + $final_out["session_image_server"] = $this->primary_image_sever; + $final_out["server_tag"] = $this->server_tag; + $final_out["language"] = "en"; + //$final_out["ip_loc"] = $this->getIpData(); + $final_out["current_version"] = 20250614; + $final_out["family_types"] = $this->familyTypes(); + $final_out["history_types"] = $this->historyTypes(); + $final_out["generative_types"] = $this->generativeTypes(); + return $final_out ; } diff --git a/www-api/app/Controllers/WrenchTransactions.php b/www-api/app/Controllers/WrenchTransactions.php index b4d4d13e..9dc6d182 100644 --- a/www-api/app/Controllers/WrenchTransactions.php +++ b/www-api/app/Controllers/WrenchTransactions.php @@ -113,7 +113,9 @@ class WrenchTransactions extends BaseController // $result_response = ( new \App\Models\ResultFormatter() )->processOutJson($in, $out); // return $this->response->setJson($result_response); //return $this->respond( $this->summaryReturnData($in,$out), 200); - return $this->respond( json_encode( $out ), 200); + //return $this->respond( json_encode( $out ), 200); + + return $this->respond( $this->summaryReturnData($in,$out), 200); } private function rawDataToInData($in){