bug fix

app/Http/Controllers/Api/HistoryController.php

@@ -20,9 +20,9 @@ class HistoryController extends Controller
     {
     }
 
-    public function list($locate = 'tw')
+    public function list($locale = 'tw')
     {
-        $locate = $locate == "tw" ? "zh_TW" : $locate;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $data = History::where("visible", 1)->orderByDesc("selected_year", "desc")->orderByDesc("selected_month")->get();
         $yearList = History::select("selected_year", \DB::raw("concat(selected_year, '年') as lable"))->distinct()->orderBy("selected_year", "desc")->pluck('lable', 'selected_year');
         $result = [];
@@ -30,7 +30,7 @@ class HistoryController extends Controller
         foreach($data as $item){
             $result["list"][$item->selected_year][] = [
                 "operateMonth " => $item->selected_year . "." . $item->selected_month,
-                "title" => $item->getTranslation("title", $locate),
+                "title" => $item->getTranslation("title", $locale),
                 "imgUrl" => $item->img_url_link
             ];
         }

app/Http/Controllers/Api/HomePageController.php

@@ -24,9 +24,9 @@ class HomePageController extends Controller
     {
     }
 
-    public function list($locate = 'tw')
+    public function list($locale = 'tw')
     {
-        $locate = $locate == "tw" ? "zh_TW" : $locate;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $result = [];
 
         $webNews = News::where("visible", 1)->orderByDesc("post_date")->limit(3)->get();
@@ -34,9 +34,9 @@ class HomePageController extends Controller
             $result["list"][] = [
                 "id" => $item->id,
                 "categoryId" => $item->newsCategory->id,
-                "category" => $item->newsCategory->getTranslation("name", $locate),
+                "category" => $item->newsCategory->getTranslation("name", $locale),
                 "postDate" => Carbon::parse($item->post_date)->format("Y.m.d"),
-                "title" => $item->getTranslation("title", $locate),
+                "title" => $item->getTranslation("title", $locale),
             ];
         }
         return Response::ok($result);

app/Http/Controllers/Api/NewsController.php

@@ -22,9 +22,9 @@ class NewsController extends Controller
     {
     }
 
-    public function list(Request $request, $locate = 'tw')
+    public function list(Request $request, $locale = 'tw')
     {
-        $locate = $locate == "tw" ? "zh_TW" : $locate;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $request_ordering = $request->ordering ?? "desc";
         $result = [];
 
@@ -37,11 +37,11 @@ class NewsController extends Controller
             $result["top"][] = [
                 "id" => $top->id,
                 "categoryId" => $top->news_category_id,
-                "category" => $top->newsCategory->getTranslation("name", $locate),
+                "category" => $top->newsCategory->getTranslation("name", $locale),
                 "postDate" => Carbon::parse($top->post_date)->format("Y/m/d"),
-                "title" => $top->getTranslation("title", $locate),
+                "title" => $top->getTranslation("title", $locale),
                 "imgUrl" => $top->news_img_url,
-                "imgAlt" => $top->getTranslation("news_img_alt", $locate),
+                "imgAlt" => $top->getTranslation("news_img_alt", $locale),
             ];
 
         //文章列表
@@ -51,27 +51,27 @@ class NewsController extends Controller
             $result["list"][] = [
                 "id" => $item->id,
                 "categoryId" => $item->news_category_id,
-                "category" => $item->newsCategory->getTranslation("name", $locate),
+                "category" => $item->newsCategory->getTranslation("name", $locale),
                 "postDate" => Carbon::parse($item->post_date)->format("Y/m/d"),
-                "title" => $item->getTranslation("title", $locate),
+                "title" => $item->getTranslation("title", $locale),
                 "imgUrl" => $item->news_img_url,
-                "imgAlt" => $item->getTranslation("news_img_alt", $locate),
+                "imgAlt" => $item->getTranslation("news_img_alt", $locale),
             ];
         }
         return Response::ok($result);
     }
 
     public function detail($locale = 'tw', $id){
-        $locate = $locale == "tw" ? "zh_TW" : $locale;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $news = News::find($id);
         $paragraphs = [];
         foreach($news->paragraphs as $paragraph){
             $paragraphs[] = [
                 "type" => $paragraph->contentType(),
                 "imgUrl" => $paragraph->paragraph_img,
-                "alt" => $paragraph->getTranslation("img_alt", $locate),
+                "alt" => $paragraph->getTranslation("img_alt", $locale),
                 "imgOutLink" => $paragraph->image_link,
-                "content" => nl2br($paragraph->getTranslation("text_content", $locate)),
+                "content" => nl2br($paragraph->getTranslation("text_content", $locale)),
             ];
         }
 
@@ -85,28 +85,28 @@ class NewsController extends Controller
             $otherNewsList[] = [
                 "id" => $item->id,
                 "categoryId" => $item->newsCategory->id,
-                "category" => $item->newsCategory->getTranslation("name", $locate),
+                "category" => $item->newsCategory->getTranslation("name", $locale),
                 "postDate" => Carbon::parse($item->post_date)->format("Y.m.d"),
-                "title" => $item->getTranslation("title", $locate),
+                "title" => $item->getTranslation("title", $locale),
                 "imgUrl" => $item->news_img_url,
-                "imgAlt" => $item->getTranslation("news_img_alt", $locate),
-                "written" => $item->getTranslation("written_by", $locate),
-                "description" => $item->getTranslation("description", $locate),
+                "imgAlt" => $item->getTranslation("news_img_alt", $locale),
+                "written" => $item->getTranslation("written_by", $locale),
+                "description" => $item->getTranslation("description", $locale),
             ];
         }
         $result = [
             "id" => $news->id,
             "categoryId" => $news->newsCategory->id,
-            "category" => $news->newsCategory->getTranslation("name", $locate),
+            "category" => $news->newsCategory->getTranslation("name", $locale),
             "postDate" => Carbon::parse($news->post_date)->format("Y.m.d"),
-            "title" => $news->getTranslation("title", $locate),
+            "title" => $news->getTranslation("title", $locale),
             "imgUrl" => $item->news_img_url,
-            "imgAlt" => $item->getTranslation("news_img_alt", $locate),
-            "written" => $news->getTranslation("written_by", $locate),
-            "description" => $news->getTranslation("description", $locate),
-            "metaTitle" => $news->getTranslation("meta_title", $locate),
-            "metaKeyword" => $news->getTranslation("meta_keyword", $locate),
-            "metaDesc" => $news->getTranslation("meta_description", $locate),
+            "imgAlt" => $item->getTranslation("news_img_alt", $locale),
+            "written" => $news->getTranslation("written_by", $locale),
+            "description" => $news->getTranslation("description", $locale),
+            "metaTitle" => $news->getTranslation("meta_title", $locale),
+            "metaKeyword" => $news->getTranslation("meta_keyword", $locale),
+            "metaDesc" => $news->getTranslation("meta_description", $locale),
             "metaImg" => $news->meta_img,
             "paragraphs" => $paragraphs,
             "otherNews" => $otherNewsList

app/Http/Controllers/Api/ProfilePageController.php

@@ -21,17 +21,17 @@ class ProfilePageController extends Controller
     {
     }
 
-    public function list($locate = 'tw')
+    public function list($locale = 'tw')
     {
-        $locate = $locate == "tw" ? "zh_TW" : $locate;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $data = ProfilePart::where("visible", 1)->orderByDesc("order")->get();
         $result = [];
         foreach($data as $item){
             $result["list"][] = [
-                "title" => $item->getTranslation("title", $locate),
-                "content" => $item->getTranslation("content", $locate),
+                "title" => $item->getTranslation("title", $locale),
+                "content" => $item->getTranslation("content", $locale),
                 "imgUrl" => $item->img_url_link,
-                "alt" => $item->getTranslation("img_alt", $locate)
+                "alt" => $item->getTranslation("img_alt", $locale)
             ];
         }
         return Response::ok($result);

app/Http/Controllers/Api/ProjectController.php

@@ -25,10 +25,10 @@ class ProjectController extends Controller
     {
     }
 
-    public function list(Request $request, $locate = 'tw')
+    public function list(Request $request, $locale = 'tw')
     {
         $categoryId = $request->input("categoryId") ?? "";
-        $locate = $locate == "tw" ? "zh_TW" : $locate;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $result = [];
 
         //年份清單
@@ -55,10 +55,10 @@ class ProjectController extends Controller
             $result["list"][] = [
                 "id" => $project->id,
                 "region_id" => $project->region_id,
-                "region" => $project->region->getTranslation("name", $locate),
-                "address" => $project->getTranslation("address", $locate),
+                "region" => $project->region->getTranslation("name", $locale),
+                "address" => $project->getTranslation("address", $locale),
                 "tags" => $project->tags->pluck('name', 'id')->all(),
-                "name" => $project->getTranslation("name", $locate),
+                "name" => $project->getTranslation("name", $locale),
                 "imgUrl" => $project->first_list_img_url
             ];
         }
@@ -67,7 +67,7 @@ class ProjectController extends Controller
 
     public function detail($locale = 'tw', $id){
 
-        $locate = $locale == "tw" ? "zh_TW" : $locale;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
         $project = Project::find($id);
 
         $projectHistories = [];
@@ -84,9 +84,9 @@ class ProjectController extends Controller
             "subName" => $project->getTranslation("sub_name", $locale),
             "description" => $project->getTranslation("description", $locale),
             "images" => $project->img_list,
-            "metaTitle" => $project->getTranslation("meta_title", $locate),
-            "metaKeyword" => $project->getTranslation("meta_keyword", $locate),
-            "metaDesc" => $project->getTranslation("meta_description", $locate),
+            "metaTitle" => $project->getTranslation("meta_title", $locale),
+            "metaKeyword" => $project->getTranslation("meta_keyword", $locale),
+            "metaDesc" => $project->getTranslation("meta_description", $locale),
             "metaImg" => $project->meta_img,
             "region_id" => $project->region_id,
             "region" => $project->region->getTranslation("name", $locale),
@@ -108,18 +108,18 @@ class ProjectController extends Controller
     }
 
     public function badges($locale = 'tw') {
-        $locate = $locale == "tw" ? "zh_TW" : $locale;
+        $locale = $locale == "tw" ? "zh_TW" : $locale;
 
         $projects = Project::where("badge_type", 2)->get();
         $result = [];
 
         foreach($projects as $project){
-            $badgesData = $project->awardBadges();
+            $badgesData = $project->awardBadges;
             $badges = [];
             foreach($badgesData as $badge){
                 $badges[] = [
                     "imgUrl" => $badge->imgUrlLink,
-                    "name" => $badge->getTranslation("name", $locale),
+                    "name" => $badge->getTranslation("title", $locale),
                     "rewardYear" => "取得時間 : " . date("Y.m", strtotime($badge->award_date))
                 ];
             }

app/Models/Project.php

@@ -33,7 +33,7 @@ class Project extends Model
     public function badges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-        ->withPivot('award_date')  // ✅ 關鍵
+        ->withPivot('award_date', 'award_type')  // ✅ 關鍵
         ->withTimestamps();
     }
 
@@ -43,9 +43,8 @@ class Project extends Model
     public function targetBadges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-            ->using(Badgeable::class)
-            ->wherePivot('award_type', 1)
             ->withPivot('award_type')
+            ->wherePivot('award_type', 1)
             ->withTimestamps();
     }
 
@@ -55,9 +54,8 @@ class Project extends Model
     public function awardBadges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-            ->using(Badgeable::class)
-            ->wherePivot('award_type', 2)
             ->withPivot('award_type', 'award_date')
+            ->wherePivot('award_type', 2)
             ->withTimestamps();
     }