diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index f57eb387..0b90b812 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -486,7 +486,7 @@ wrenchboard=# array("uid"=>"149b7a30-f089-48c3-b351-3eb90e417c4c", "title"=>" General science quiz"), ]; } - public function summaryReturnData($in,$outResult){ + public function summaryReturnData($in,$outResult, $extraOut=[]){ if ($in["action"] == -1 ){ $final_out = $outResult; } @@ -494,6 +494,10 @@ wrenchboard=# $final_out = ( new \App\Models\ResultFormatter() )->processOutJson($in, $outResult); } + if( isset( $extraOut['offers_list'])){ + $final_out["offers_list"] = $extraOut['offers_list']; + } + $final_out["environment"] = $this->current_env + 0; $final_out["session_image_server"] = $this->primary_image_sever; $final_out["server_tag"] = $this->server_tag; diff --git a/www-api/app/Controllers/WrenchBanners.php b/www-api/app/Controllers/WrenchBanners.php index 96bfcbb3..39c01cfa 100644 --- a/www-api/app/Controllers/WrenchBanners.php +++ b/www-api/app/Controllers/WrenchBanners.php @@ -71,12 +71,12 @@ class WrenchBanners extends BaseController $this->saveCache($endpoint,$out,1500); } + $extra_out["offers_list"] = $this->bannerGetOffers($in); + + return $this->summaryReturnData($in,$out, $extra_out); //json_encode( $final_out ); - $final_out = $this->summaryReturnData($in,$out); //json_encode( $final_out ); - $final_out["offers_list"] = $this->bannerGetOffers($in); - - return $final_out; + //return $final_out; } public function apigate(){ log_message('critical', "0001");