Merge remote-tracking branch 'origin/master' into akun

@@ -166,7 +166,8 @@ class VideoTask extends Command
                 ],
                 ],
                 'task_id' => $task_id,
                 'task_id' => $task_id,
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',
-                'is_ytb'=>false
+                'is_ytb'=>false,
+                'other_language_subtitle'=>false
             ];
             ];
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $res_json = json_decode($result,true);
             $res_json = json_decode($result,true);

@@ -608,6 +608,9 @@ class ProjectController extends BaseController
      */
      */
     public function getManagerList(){
     public function getManagerList(){
         $hrManagerModel = new ManageHr();
         $hrManagerModel = new ManageHr();
+        if(!isset($this->map['status'])){
+            $this->map['status'] = $hrManagerModel::STATUS_ONE;
+        }
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
         if(isset($this->map['entry_position']) && !empty($this->map['entry_position'])){
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
             $this->map['entry_position'] = ['in',$this->map['entry_position']];
         }
         }

@@ -111,7 +111,7 @@ class RenewProjectController extends BaseController
         if(!empty($this->map['title'])){
         if(!empty($this->map['title'])){
             $this->map['title'] = ['like', '%'.$this->map['title'].'%'];
             $this->map['title'] = ['like', '%'.$this->map['title'].'%'];
         }
         }
-        $lists = $project->where($this->map)->with('payment')->with('deploy_build')
+        $lists = $project->formatQuery($this->map)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')
             ->with('deploy_optimize')->with('online_check')
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){

@@ -162,7 +162,8 @@ class RenewLogic extends BaseLogic
         $project = new Project();
         $project = new Project();
         return $project->edit([
         return $project->edit([
             'extend_type'=>0,
             'extend_type'=>0,
-            'type'=>$type
+            'type'=>$type,
+            'site_status'=>0
         ],[
         ],[
             'id'=>$id
             'id'=>$id
         ]);
         ]);