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

@@ -559,7 +559,7 @@ class ProductController extends BaseController
         if(!empty($v['og_image'])){
         if(!empty($v['og_image'])){
             $v['og_image'] = getImageUrl($v['og_image'] ?? '',$this->user['storage_type'],$this->user['project_location']);
             $v['og_image'] = getImageUrl($v['og_image'] ?? '',$this->user['storage_type'],$this->user['project_location']);
         }else{
         }else{
-            $v['og_image'] = $v['thumb']['url'] ?? '';
+            $v['og_image'] =  '';
         }
         }
         if(!empty($v['icon'])){
         if(!empty($v['icon'])){
             foreach ($v['icon'] as $icon_k => $icon_v){
             foreach ($v['icon'] as $icon_k => $icon_v){

@@ -111,7 +111,7 @@ class RankDataLogic extends BaseLogic
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $data['langs'] = [];
         $data['langs'] = [];
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();
-        $languageList = $languageModel->list(['project_id'=>$project['id']]);
+        $languageList = $languageModel->list(['project_id'=>$project['id'], 'is_delete' => 0]);
         if(!empty($languageList) && is_array($languageList)){
         if(!empty($languageList) && is_array($languageList)){
             foreach($languageList as $lang){
             foreach($languageList as $lang){
                 if($lang['lang'] =='ja'){
                 if($lang['lang'] =='ja'){