hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 14:56:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #908 from openclassify/vedat

Browse Source 
added sahibinden check icon and show features for web view && fixed g…
This commit is contained in:
Fatih Alp 2021-01-09 13:01:48 +03:00 committed by GitHub
commit 03298c6d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 129 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -47,8 +47,8 @@ class AdvsController extends PublicController
private $adv_repository; private $adv_repository;
private $optionConfigurationRepository; private $optionConfigurationRepository;
private $productOptionRepository; private $productOptionRepository;
private $productOptionsValueRepository; private $productOptionsValueRepository;
private $country_repository; private $country_repository;
@ -77,8 +77,8 @@ class AdvsController extends PublicController
AdvRepositoryInterface $advRepository, AdvRepositoryInterface $advRepository,
OptionConfigurationRepositoryInterface $optionConfigurationRepository, OptionConfigurationRepositoryInterface $optionConfigurationRepository,
ProductoptionRepositoryInterface $productOptionRepository, ProductoptionRepositoryInterface $productOptionRepository,
ProductoptionsValueRepositoryInterface $productOptionsValueRepository, ProductoptionsValueRepositoryInterface $productOptionsValueRepository,
CountryRepositoryInterface $country_repository, CountryRepositoryInterface $country_repository,
@ -110,7 +110,7 @@ class AdvsController extends PublicController
$this->optionConfigurationRepository = $optionConfigurationRepository; $this->optionConfigurationRepository = $optionConfigurationRepository;
$this->productOptionRepository = $productOptionRepository; $this->productOptionRepository = $productOptionRepository;
$this->productOptionsValueRepository = $productOptionsValueRepository; $this->productOptionsValueRepository = $productOptionsValueRepository;
$this->country_repository = $country_repository; $this->country_repository = $country_repository;
@ -582,15 +582,15 @@ class AdvsController extends PublicController
$this->template->set('showTitle', false); $this->template->set('showTitle', false);
$this->template->set('meta_title', $metaTitle); $this->template->set('meta_title', $metaTitle);
$configurations = $this->optionConfigurationRepository->getConf($adv->id); $configurations = $this->optionConfigurationRepository->getConf($adv->id);
if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") { if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") {
return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints',
'recommended_advs', 'categories', 'features', 'options', 'configurations')); 'recommended_advs', 'categories', 'features', 'options', 'configurations'));
} else { } else {
return back(); return back();
} }
} else { } else {
$this->messages->error(trans('visiosoft.module.advs::message.ad_doesnt_exist')); $this->messages->error(trans('visiosoft.module.advs::message.ad_doesnt_exist'));
return redirect()->route('visiosoft.module.advs::list'); return redirect()->route('visiosoft.module.advs::list');
@ -782,8 +782,12 @@ class AdvsController extends PublicController
} }
} }
$get_categories = in_array($adv->cat1, setting_value('visiosoft.module.advs::get_categories')); $get_categories_status = false;
$adv->is_get_adv = ($request->is_get_adv and $get_categories) ? true : false; if ($get_categories = setting_value('visiosoft.module.advs::get_categories') and $get_categories = in_array($adv->cat1, $get_categories)) {
$get_categories_status = true;
}
$adv->is_get_adv = ($request->is_get_adv and $get_categories_status) ? true : false;
$adv->save(); $adv->save();
//algolia Search Module //algolia Search Module
@ -803,7 +807,9 @@ class AdvsController extends PublicController
$CloudinaryModel = new VideoModel(); $CloudinaryModel = new VideoModel();
$CloudinaryModel->updateRequest($request); $CloudinaryModel->updateRequest($request);
if ($request->url != "") { $adv->save(); } if ($request->url != "") {
$adv->save();
}
} }
if ($this->adv_model->is_enabled('customfields')) { if ($this->adv_model->is_enabled('customfields')) {
app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request); app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request);
@ -864,7 +870,7 @@ class AdvsController extends PublicController
return redirect(route('advs_preview', [$request->update_id])); return redirect(route('advs_preview', [$request->update_id]));
} }
/* New Create Adv */ /* New Create Adv */
$request->publish_at = date('Y-m-d H:i:s'); $request->publish_at = date('Y-m-d H:i:s');
$all = $request->all(); $all = $request->all();
@ -983,13 +989,13 @@ class AdvsController extends PublicController
$this->adv_model->statusAds($id, $type); $this->adv_model->statusAds($id, $type);
event(new ChangedStatusAd($ad));//Create Notify event(new ChangedStatusAd($ad));//Create Notify
if ($type === 'approved') { if ($type === 'approved') {
$message = trans('visiosoft.module.advs::message.approve_status_change'); $message = trans('visiosoft.module.advs::message.approve_status_change');
} elseif ($type === 'sold') { } elseif ($type === 'sold') {
$message = trans('visiosoft.module.advs::message.sold_status_change'); $message = trans('visiosoft.module.advs::message.sold_status_change');
} else { } else {
trans('visiosoft.module.advs::message.passive_status_change'); trans('visiosoft.module.advs::message.passive_status_change');
} }
$this->messages->success($message); $this->messages->success($message);
return back(); return back();
} }
@ -1271,12 +1277,12 @@ class AdvsController extends PublicController
return $this->redirect->back(); return $this->redirect->back();
} }
public function sold($id, Request $request, AdvModel $advModel) public function sold($id, Request $request, AdvModel $advModel)
{ {
if ($request->sold == 'sold') { if ($request->sold == 'sold') {
$advModel->find($id)->update(['status' => 'sold']); $advModel->find($id)->update(['status' => 'sold']);
} elseif ($request->sold = 'not-sold') { } elseif ($request->sold = 'not-sold') {
$advModel->find($id)->update(['status' => 'approved']); $advModel->find($id)->update(['status' => 'approved']);
} }
} }
} }

1
addons/default/visiosoft/media-field_type/resources/lang/en/message.php
View File

@ -10,4 +10,5 @@ return [
'uploading' => 'Uploading', 'uploading' => 'Uploading',
'loading' => 'Loading', 'loading' => 'Loading',
'error_upload' => 'There was a problem uploading the file.', 'error_upload' => 'There was a problem uploading the file.',
'error_upload_docs' => 'There is no document upload support. Please contact your system administrator!',
]; ];

1
addons/default/visiosoft/media-field_type/resources/lang/tr/message.php
View File

@ -10,4 +10,5 @@ return [
'uploading' => 'Yükleme', 'uploading' => 'Yükleme',
'loading' => 'Yükleniyor', 'loading' => 'Yükleniyor',
'error_upload' => 'Dosyayı yüklerken bir sorun oluştu.', 'error_upload' => 'Dosyayı yüklerken bir sorun oluştu.',
'error_upload_docs' => 'Döküman yükleme desteği bulunmamaktadır.Lütfen sistem yöneticiniz ile iletişim kurunuz!',
]; ];

179
addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
View File

@ -50,104 +50,105 @@ class UploadController extends AdminController
public function upload() public function upload()
{ {
$doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documents')->id; $mimes = explode('/', $this->request->file('upload')->getMimeType());
$mimes = explode('/', $this->request->file('upload')->getMimeType());
if ($mimes[0] == 'image'){ if ($mimes[0] == 'image') {
$file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder')));
} else { } else if ($doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documentsssssss')) {
$file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($doc_folder)); $file = $this->uploader->upload($this->request->file('upload'), $doc_folder);
} } else {
return $this->response->json(['error' => trans('visiosoft.field_type.media::message.error_upload_docs')], 500);
}
if ($file) { if ($file) {
if ($mimes[0] == 'image'){ if ($mimes[0] == 'image') {
$settings_key = [ $settings_key = [
'image_resize_backend', 'image_resize_backend',
'full_image_width', 'full_image_width',
'full_image_height', 'full_image_height',
'medium_image_width', 'medium_image_width',
'medium_image_height', 'medium_image_height',
'thumbnail_width', 'thumbnail_width',
'thumbnail_height', 'thumbnail_height',
'add_canvas', 'add_canvas',
'image_canvas_width', 'image_canvas_width',
'image_canvas_height', 'image_canvas_height',
'watermark_type', 'watermark_type',
'watermark_text', 'watermark_text',
'watermark_image', 'watermark_image',
'watermark_position' 'watermark_position'
]; ];
$settings_value = array(); $settings_value = array();
foreach ($settings_key as $key) { foreach ($settings_key as $key) {
$settings_value[$key] = setting_value('visiosoft.module.advs::' . $key); $settings_value[$key] = setting_value('visiosoft.module.advs::' . $key);
} }
$fullImg = WaterMark::make($this->request->file('upload')->getRealPath()); $fullImg = WaterMark::make($this->request->file('upload')->getRealPath());
if ($settings_value['image_resize_backend']) { if ($settings_value['image_resize_backend']) {
$fullImg = $fullImg->resize(null, $settings_value['full_image_height'], $fullImg = $fullImg->resize(null, $settings_value['full_image_height'],
function ($constraint) { function ($constraint) {
$constraint->aspectRatio(); $constraint->aspectRatio();
}); });
} }
$mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) $mdImg = WaterMark::make($this->request->file('upload')->getRealPath())
->resize(null, $settings_value['medium_image_height'], function ($constraint) { ->resize(null, $settings_value['medium_image_height'], function ($constraint) {
$constraint->aspectRatio(); $constraint->aspectRatio();
}); });
if ($settings_value['add_canvas']) { if ($settings_value['add_canvas']) {
$fullImg->resizeCanvas( $fullImg->resizeCanvas(
$settings_value['image_canvas_width'], $settings_value['image_canvas_height'], $settings_value['image_canvas_width'], $settings_value['image_canvas_height'],
'center', false, 'fff' 'center', false, 'fff'
); );
$mdImg->resizeCanvas( $mdImg->resizeCanvas(
$settings_value['medium_image_width'], $settings_value['medium_image_height'], $settings_value['medium_image_width'], $settings_value['medium_image_height'],
'center', false, 'fff' 'center', false, 'fff'
); );
} }
$image_types = array('full' => $fullImg, 'medium' => $mdImg); $image_types = array('full' => $fullImg, 'medium' => $mdImg);
foreach ($image_types as $key => $image) { foreach ($image_types as $key => $image) {
if ($settings_value['watermark_type'] == 'image') { if ($settings_value['watermark_type'] == 'image') {
if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) {
$watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path());
$image->insert($watermark, $settings_value['watermark_position']); $image->insert($watermark, $settings_value['watermark_position']);
} }
} else { } else {
$v = "top"; $v = "top";
$h = "center"; $h = "center";
$w = $image->width() / 2; $w = $image->width() / 2;
$h1 = $image->height() / 2; $h1 = $image->height() / 2;
$font_size = $w / 20; $font_size = $w / 20;
$image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) { $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) {
$font->file(public_path('Antonio-Bold.ttf')); $font->file(public_path('Antonio-Bold.ttf'));
$font->size($font_size); $font->size($font_size);
$font->align($h); $font->align($h);
$font->valign($v); $font->valign($v);
}); });
} }
if ($key === "full") { if ($key === "full") {
$fileName = $file->getAttributes()['name']; $fileName = $file->getAttributes()['name'];
} else { } else {
$fileName = 'md-' . $file->getAttributes()['name']; $fileName = 'md-' . $file->getAttributes()['name'];
$this->createFile($this->request->get('folder'),$fileName,$image); $this->createFile($this->request->get('folder'), $fileName, $image);
} }
$image->save(app_storage_path() . '/files-module/local/images/' . $fileName); $image->save(app_storage_path() . '/files-module/local/images/' . $fileName);
} }
} }
return $this->response->json($file->getAttributes()); return $this->response->json($file->getAttributes());
} }
@ -183,15 +184,15 @@ class UploadController extends AdminController
return response()->json(['status' => 'error']); return response()->json(['status' => 'error']);
} }
public function createFile($folder, $filename, $image = null) public function createFile($folder, $filename, $image = null)
{ {
$this->files->create([ $this->files->create([
'folder_id' => $folder, 'folder_id' => $folder,
'name' => $filename, 'name' => $filename,
'disk_id' => 1, 'disk_id' => 1,
'size' => $image->filesize(), 'size' => $image->filesize(),
'mime_type' => $image->mime, 'mime_type' => $image->mime,
'extension' => $image->extension, 'extension' => $image->extension,
]); ]);
} }
} }