From 7ce27aa33b5501ab40c9c7989c7aecb2c3024edc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 31 Dec 2020 17:58:20 +0300 Subject: [PATCH 01/16] getcfo completed mizan --- .../advs-module/src/AdvsModulePlugin.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 947630c53..2005dd80e 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -120,4 +120,22 @@ class AdvsModulePlugin extends Plugin ), ]; } + + /** + * Get the filters. + * + * @return array + */ + public function getFilters() + { + return [ + new \Twig_SimpleFilter( + 'ksort', + function (array $array) { + ksort($array); + return $array; + } + ), + ]; + } } From 4d64d281eaa69b8465ddb81ecddedaec93c05faa Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 4 Jan 2021 10:39:11 +0300 Subject: [PATCH 02/16] move seeder --- .../profile-module/src/ProfileModuleSeeder.php | 16 ---------------- database/seeds/DatabaseSeeder.php | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index 158ad05c8..50e69cfe6 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -43,21 +43,5 @@ class ProfileModuleSeeder extends Seeder { // Users Fields Seeder $this->call(UsersFieldsSeeder::class); - - if (is_null($this->folders->findBy('slug', 'favicon'))) { - $disk = $this->disks->findBySlug('local'); - - $this->folders->create([ - 'en' => [ - 'name' => 'Favicon', - 'description' => 'A folder for Favicon.', - ], - 'slug' => 'favicon', - 'disk' => $disk, - 'allowed_types' => [ - 'ico','png', - ], - ]); - }; } } \ No newline at end of file diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b90ff0f09..f9a9d30db 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -156,5 +156,23 @@ class DatabaseSeeder extends Seeder ], ]); } + + + //Favicon Folder + if (is_null($this->folders->findBy('slug', 'favicon'))) { + $disk = $this->disks->findBySlug('local'); + + $this->folders->create([ + 'en' => [ + 'name' => 'Favicon', + 'description' => 'A folder for Favicon.', + ], + 'slug' => 'favicon', + 'disk' => $disk, + 'allowed_types' => [ + 'ico','png', + ], + ]); + }; } } From fdb162fdc787940c7105dccfbff22627065c394e Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 4 Jan 2021 17:10:03 +0300 Subject: [PATCH 03/16] fixed convert currency response message --- .../advs-module/src/Adv/AdvModel.php | 22 +++++++++----- .../advs-module/src/Adv/AdvRepository.php | 30 +++++++++++-------- .../src/Adv/Table/Handler/ConvertCurrency.php | 4 ++- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index d6bbfe168..b501e7c76 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -1,9 +1,9 @@ value('visiosoft.module.advs::free_currencyconverterapi_key'); - $response = $client->get('http://free.currencyconverterapi.com/api/v6/convert?q=' - . $url . '&compact=y&apiKey=' . $freeCurrencyKey); + + $client = new \GuzzleHttp\Client(); + $response = $client->request('GET', 'http://free.currencyconverterapi.com/api/v6/convert', ['query' => [ + 'q' => $url, + 'compact' => 'y', + 'apiKey' => $freeCurrencyKey + ]]); + if ($response->getStatusCode() == '200') { $response = (array)\GuzzleHttp\json_decode($response->getBody()->getContents()); if (!empty($response)) { @@ -132,8 +137,11 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $foreign_currency[$currencyIn] = $price * $rate; } } - } catch (\Exception $e) { - $this->messages->error((!is_null($e->getMessage())) ? $e->getMessage() : trans('streams::error.500.message')); + } catch (\GuzzleHttp\Exception\ClientException $e) { + $response = $e->getResponse(); + $responseBodyAsString = $response->getBody()->getContents(); + $response = json_decode($responseBodyAsString, true); + $messages->error($response['error']); } } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index b39827ea4..0970d1336 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -102,20 +102,26 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['user'])) { $query = $query->where('advs_advs.created_by_id', $param['user']); } + $currency = setting_value('streams::currency'); + if (!empty($param['currency'])) { - if (!empty($param['min_price'])) { - $num = $param['min_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') >=" . $int; - $query = $query->whereRaw($column); - } - if (!empty($param['max_price'])) { - $num = $param['max_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; - $query = $query->whereRaw($column); - } + $currency = $param['currency']; } + + if (!empty($param['min_price'])) { + $num = $param['min_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') >= " . $int; + $query = $query->whereRaw($column); + } + + if (!empty($param['max_price'])) { + $num = $param['max_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') <= " . $int; + $query = $query->whereRaw($column); + } + if (!empty($param['date'])) { if ($param['date'] === 'day') { $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subDay()); diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php index 6c0e47ff3..c9fc56ce5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php @@ -13,7 +13,9 @@ class ConvertCurrency extends ActionHandler foreach ($selected as $id) { $entry = $model->newQuery()->find($id); - $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + if ($entry) { + $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + } } if ($selected) { $this->messages->success(trans('visiosoft.module.advs::message.currency_converted')); From 9265b47a6ec468d06582ec4c7c7d372ba2df4b4d Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 5 Jan 2021 11:17:31 +0300 Subject: [PATCH 04/16] GET feature enhancements --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 8 ++++++++ .../visiosoft/advs-module/resources/lang/en/setting.php | 4 ++++ .../visiosoft/advs-module/resources/lang/tr/setting.php | 4 ++++ .../advs-module/src/Http/Controller/advsController.php | 3 ++- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 2ee3b9126..b54f66702 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -31,6 +31,7 @@ return [ 'estimated_pending_time', 'default_published_time', 'default_GET', + 'get_categories', 'listing_page_image', 'show_ads_count', ], diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index dad9311c7..e5bca4a16 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -373,4 +373,12 @@ return [ 'bind' => 'advs.lang_switcher_for_browser', 'env' => 'LANG_SWITCHER_FOR_BROWSER', ], + 'get_categories' => [ + 'type' => 'anomaly.field_type.checkboxes', + 'config' => [ + 'options' => function (\Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface $categoryRepository) { + return $categoryRepository->mainCats()->pluck('name', 'id')->all(); + }, + ], + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 8db143069..28be23772 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -223,4 +223,8 @@ return [ 'name' => 'Lang Switcher For Browser', 'instructions' => 'Allows you to choose browser language as active language' ], + 'get_categories' => [ + 'name' => 'GET Categories', + 'instructions' => 'It represents the categories in which the GET property will be valid.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 53d647cdd..c4201db02 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -223,4 +223,8 @@ return [ 'name' => 'Tarayıcı Diline Geç', 'instructions' => 'Seçili aktif bir dil olmadığında tarayıcı dilini aktif dil olarak seçmenize izin verir' ], + 'get_categories' => [ + 'name' => 'GET Kategorileri', + 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 89fad88d1..71cf0e237 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -781,7 +781,8 @@ class AdvsController extends PublicController } } - $adv->is_get_adv = $request->is_get_adv; + $get_categories = in_array($adv->cat1, setting_value('visiosoft.module.advs::get_categories')); + $adv->is_get_adv = ($request->is_get_adv and $get_categories) ? true : false; $adv->save(); //algolia Search Module From 92b54219186d5796c38b9680f2b1d3e267ba6806 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 5 Jan 2021 13:48:14 +0300 Subject: [PATCH 05/16] ax --- .../profile-module/resources/images/location.svg | 11 +++++++++-- .../resources/images/social-media.svg | 14 ++++++++++++-- .../profile-module/resources/images/website.svg | 16 ++++++++++++++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/images/location.svg b/addons/default/visiosoft/profile-module/resources/images/location.svg index 74fcde598..0b5a83c2a 100644 --- a/addons/default/visiosoft/profile-module/resources/images/location.svg +++ b/addons/default/visiosoft/profile-module/resources/images/location.svg @@ -1,2 +1,9 @@ - - + + + + + + + + + diff --git a/addons/default/visiosoft/profile-module/resources/images/social-media.svg b/addons/default/visiosoft/profile-module/resources/images/social-media.svg index e948e1bfc..90ea51fba 100644 --- a/addons/default/visiosoft/profile-module/resources/images/social-media.svg +++ b/addons/default/visiosoft/profile-module/resources/images/social-media.svg @@ -1,2 +1,12 @@ - - + + + + + + + + + + + + diff --git a/addons/default/visiosoft/profile-module/resources/images/website.svg b/addons/default/visiosoft/profile-module/resources/images/website.svg index babe27185..2a7d601fe 100644 --- a/addons/default/visiosoft/profile-module/resources/images/website.svg +++ b/addons/default/visiosoft/profile-module/resources/images/website.svg @@ -1,2 +1,14 @@ - - + + + + + + + + + + + + + + From d8d2869339f205e34eb8e83c8dbbf435bc3ccee4 Mon Sep 17 00:00:00 2001 From: samed Date: Thu, 7 Jan 2021 11:53:13 +0300 Subject: [PATCH 06/16] account freez --- .../profile-module/resources/views/profile/detail.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index 9694864cf..9d20e64b4 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -92,7 +92,7 @@

{{ trans('visiosoft.module.profile::message.disable_account') }}

- + From ec008183d8a415e3f05219e8929cd57109ae53c4 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 7 Jan 2021 15:05:05 +0300 Subject: [PATCH 07/16] =?UTF-8?q?#3002=20maabir=20pdf.rar=20geli=C5=9Ftirm?= =?UTF-8?q?e=20talebi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...osoft.module.advs__add_doc-files_field.php | 26 +++ .../advs-module/resources/lang/en/field.php | 1 + .../resources/views/ad-detail/detail.twig | 6 + .../resources/views/new-ad/new-create.twig | 1 + .../src/Adv/Form/AdvFormBuilder.php | 3 +- .../src/Http/Controller/advsController.php | 1 + .../media-field_type/resources/js/upload.js | 32 ++-- .../src/Http/Controller/UploadController.php | 172 +++++++++--------- database/seeds/DatabaseSeeder.php | 18 ++ 9 files changed, 165 insertions(+), 95 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php diff --git a/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php b/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php new file mode 100644 index 000000000..72343feed --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php @@ -0,0 +1,26 @@ + 'advs', + ]; + + protected $fields = [ + 'doc_files' => [ + 'type' => 'visiosoft.field_type.media', + 'config' => [ + 'folders' => ["ads_documents"], + 'mode' => 'upload', + ], + ], + ]; + + protected $assignments = [ + 'doc_files' + ]; +} diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index cb6b0ae4b..4f8860df0 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -319,6 +319,7 @@ return [ 'congratulations' => 'Congratulations', 'ad_desc' => 'Ad Description', 'upload_photos' => 'Upload Photos', + 'upload_files' => 'Upload Files', 'additional_fields' => 'Additional Fields', 'ad_location' => 'Ad Location', diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index 3c1678bf9..f7335e0c4 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -36,6 +36,12 @@ + + {% if setting_value('visiosoft.theme.base::ad_details_tab') %} {% if blocks('ad-item-content-block-area') is null %} diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 2b71af7c6..51b205a21 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -178,6 +178,7 @@
{{ form.fields.files.input |raw }} +
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php index 02b855771..ef1e7e90e 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php @@ -53,7 +53,8 @@ class AdvFormBuilder extends FormBuilder 'class' => 'hidden d-none mapVal' ], 'files', - 'popular_adv', + 'doc_files', + 'popular_adv', 'adv_day', 'product_options_value' ]; diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 89fad88d1..e7100af2a 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -1,5 +1,6 @@ uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); + $doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documents')->id; + $mimes = explode('/', $this->request->file('upload')->getMimeType()); + + if ($mimes[0] == 'image'){ + $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); + } else { + $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($doc_folder)); + } + if ($file) { + if ($mimes[0] == 'image'){ - $settings_key = [ - 'image_resize_backend', - 'full_image_width', - 'full_image_height', - 'medium_image_width', - 'medium_image_height', - 'thumbnail_width', - 'thumbnail_height', - 'add_canvas', - 'image_canvas_width', - 'image_canvas_height', - 'watermark_type', - 'watermark_text', - 'watermark_image', - 'watermark_position' - ]; + $settings_key = [ + 'image_resize_backend', + 'full_image_width', + 'full_image_height', + 'medium_image_width', + 'medium_image_height', + 'thumbnail_width', + 'thumbnail_height', + 'add_canvas', + 'image_canvas_width', + 'image_canvas_height', + 'watermark_type', + 'watermark_text', + 'watermark_image', + 'watermark_position' + ]; - $settings_value = array(); + $settings_value = array(); - foreach ($settings_key as $key) { - $settings_value[$key] = setting_value('visiosoft.module.advs::' . $key); - } + foreach ($settings_key as $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']) { - $fullImg = $fullImg->resize(null, $settings_value['full_image_height'], - function ($constraint) { - $constraint->aspectRatio(); - }); - } + if ($settings_value['image_resize_backend']) { + $fullImg = $fullImg->resize(null, $settings_value['full_image_height'], + function ($constraint) { + $constraint->aspectRatio(); + }); + } - $mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) - ->resize(null, $settings_value['medium_image_height'], function ($constraint) { - $constraint->aspectRatio(); - }); + $mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) + ->resize(null, $settings_value['medium_image_height'], function ($constraint) { + $constraint->aspectRatio(); + }); - if ($settings_value['add_canvas']) { + if ($settings_value['add_canvas']) { - $fullImg->resizeCanvas( - $settings_value['image_canvas_width'], $settings_value['image_canvas_height'], - 'center', false, 'fff' - ); + $fullImg->resizeCanvas( + $settings_value['image_canvas_width'], $settings_value['image_canvas_height'], + 'center', false, 'fff' + ); - $mdImg->resizeCanvas( - $settings_value['medium_image_width'], $settings_value['medium_image_height'], - 'center', false, 'fff' - ); - } + $mdImg->resizeCanvas( + $settings_value['medium_image_width'], $settings_value['medium_image_height'], + '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'])) { - $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); - $image->insert($watermark, $settings_value['watermark_position']); - } + if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { + $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); + $image->insert($watermark, $settings_value['watermark_position']); + } - } else { - $v = "top"; - $h = "center"; - $w = $image->width() / 2; - $h1 = $image->height() / 2; - $font_size = $w / 20; - $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) { - $font->file(public_path('Antonio-Bold.ttf')); - $font->size($font_size); - $font->align($h); - $font->valign($v); - }); - } - if ($key === "full") { - $fileName = $file->getAttributes()['name']; - } else { - $fileName = 'md-' . $file->getAttributes()['name']; + } else { + $v = "top"; + $h = "center"; + $w = $image->width() / 2; + $h1 = $image->height() / 2; + $font_size = $w / 20; + $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) { + $font->file(public_path('Antonio-Bold.ttf')); + $font->size($font_size); + $font->align($h); + $font->valign($v); + }); + } + if ($key === "full") { + $fileName = $file->getAttributes()['name']; + } else { + $fileName = 'md-' . $file->getAttributes()['name']; - $this->createFile($this->request->get('folder'),$fileName,$image); - } - $image->save(app_storage_path() . '/files-module/local/images/' . $fileName); - } + $this->createFile($this->request->get('folder'),$fileName,$image); + } + $image->save(app_storage_path() . '/files-module/local/images/' . $fileName); + } + } return $this->response->json($file->getAttributes()); } @@ -173,15 +183,15 @@ class UploadController extends AdminController return response()->json(['status' => 'error']); } - public function createFile($folder, $filename, $image) - { - $this->files->create([ - 'folder_id' => $folder, - 'name' => $filename, - 'disk_id' => 1, - 'size' => $image->filesize(), - 'mime_type' => $image->mime, - 'extension' => $image->extension, - ]); - } + public function createFile($folder, $filename, $image = null) + { + $this->files->create([ + 'folder_id' => $folder, + 'name' => $filename, + 'disk_id' => 1, + 'size' => $image->filesize(), + 'mime_type' => $image->mime, + 'extension' => $image->extension, + ]); + } } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index f9a9d30db..680ca7d31 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -174,5 +174,23 @@ class DatabaseSeeder extends Seeder ], ]); }; + + + //Create Ads Documents Folder + if (!$this->folders->findBySlug('ads_documents')) { + $disk = $this->disks->findBySlug('local'); + + $this->folders->create([ + 'en' => [ + 'name' => 'Ads Documents', + 'description' => 'A folder for Ads Documents.', + ], + 'slug' => 'ads_documents', + 'disk' => $disk, + 'allowed_types' => [ + 'pdf', 'doc', 'docx', 'xls', 'xlsx', + ], + ]); + }; } } From 80abc3459683638ca89e00f314324575e8767432 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 7 Jan 2021 15:24:47 +0300 Subject: [PATCH 08/16] =?UTF-8?q?#3002=20maabir=20pdf.rar=20geli=C5=9Ftirm?= =?UTF-8?q?e=20talebi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advs-module/resources/views/new-ad/new-create.twig | 10 +++++++++- .../visiosoft/media-field_type/resources/js/upload.js | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 51b205a21..99dfcc9f1 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -178,7 +178,15 @@
{{ form.fields.files.input |raw }} - + + {% for docs in form.fields.doc_files.value %} +
+ {{ docs.name }} + + +
+
+ {% endfor %}
diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js index 1acfadf92..60a15d064 100644 --- a/addons/default/visiosoft/media-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js @@ -115,6 +115,13 @@ function deleteImage(e, id) { $('.imageList').find('div[data-id="' + id + '"]').remove() } +function deleteDocs(id) { + var key_item = $.inArray(id, docsUploaded); + docsUploaded.splice(key_item, 1); + $('input[name="doc_files"]').val(docsUploaded.join(',')) + $('.doc_list').find('#' + id).remove() +} + function rotateImage(e, id) { e.preventDefault() From 932d40fb162bea50597d63915a1ba79dc218066f Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Thu, 7 Jan 2021 18:30:59 +0300 Subject: [PATCH 09/16] Update DatabaseSeeder.php --- database/seeds/DatabaseSeeder.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 680ca7d31..b1aff1662 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -109,8 +109,6 @@ class DatabaseSeeder extends Seeder ] ); - DB::table('files_files')->truncate(); - $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r')); file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r')); From c808b073da5ed9f38b00de5d93a14d6c8aca234c Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Thu, 7 Jan 2021 18:34:36 +0300 Subject: [PATCH 10/16] Update CategorySeeder.php --- .../visiosoft/cats-module/src/Category/CategorySeeder.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategorySeeder.php b/addons/default/visiosoft/cats-module/src/Category/CategorySeeder.php index bae2c1d20..4ff746aef 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategorySeeder.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategorySeeder.php @@ -11,7 +11,6 @@ class CategorySeeder extends Seeder */ public function run() { - DB::table('cats_category')->truncate(); - DB::table('cats_category_translations')->truncate(); + } } From 017360f22bc689c68be6a4fe29ff64685c0e5af9 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 8 Jan 2021 12:00:59 +0300 Subject: [PATCH 11/16] maabir file upload error fixed --- .../resources/views/ad-detail/detail.twig | 2 +- .../resources/views/new-ad/new-create.twig | 2 +- .../media-field_type/resources/js/upload.js | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index f7335e0c4..68354d50a 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -38,7 +38,7 @@ diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 99dfcc9f1..529b7da0c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -183,7 +183,7 @@
{{ docs.name }} - +
{% endfor %} diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js index 60a15d064..2dc1d8617 100644 --- a/addons/default/visiosoft/media-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js @@ -89,6 +89,19 @@ $(function () { } else { docsUploaded.push(response.id); $('input[name="doc_files"]').val(docsUploaded.join(',')) + + $('.doc_list').append(` + ${ response.name } + + +
+ `) + + setTimeout(function () { + + addAppendByData(docsUploaded[0]) + file.previewElement.remove(); + }, 500); } }); From b0fbb3cf68efbbfe817fac82d7ccf13295434c50 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 8 Jan 2021 12:37:39 +0300 Subject: [PATCH 12/16] maabir file upload error fixed --- .../resources/views/new-ad/new-create.twig | 16 ++++++++-------- .../media-field_type/resources/js/upload.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 529b7da0c..b8e835785 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -179,14 +179,14 @@
{{ form.fields.files.input |raw }} - {% for docs in form.fields.doc_files.value %} -
- {{ docs.name }} - - -
-
- {% endfor %} +
+ {% for docs in form.fields.doc_files.value %} + + {{ docs.name }} + +
+ {% endfor %} +
diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js index 2dc1d8617..778d1a9eb 100644 --- a/addons/default/visiosoft/media-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js @@ -91,8 +91,8 @@ $(function () { $('input[name="doc_files"]').val(docsUploaded.join(',')) $('.doc_list').append(` - ${ response.name } + ${ response.name }
`) From 36756b046ff9ff0d901d2e1932aaba1090390e0e Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 9 Jan 2021 12:04:41 +0300 Subject: [PATCH 13/16] added sahibinden check icon and show features for web view && fixed get categories --- .../src/Http/Controller/advsController.php | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 0ceb41a2f..508db78c5 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -47,8 +47,8 @@ class AdvsController extends PublicController private $adv_repository; private $optionConfigurationRepository; - private $productOptionRepository; - private $productOptionsValueRepository; + private $productOptionRepository; + private $productOptionsValueRepository; private $country_repository; @@ -77,8 +77,8 @@ class AdvsController extends PublicController AdvRepositoryInterface $advRepository, OptionConfigurationRepositoryInterface $optionConfigurationRepository, - ProductoptionRepositoryInterface $productOptionRepository, - ProductoptionsValueRepositoryInterface $productOptionsValueRepository, + ProductoptionRepositoryInterface $productOptionRepository, + ProductoptionsValueRepositoryInterface $productOptionsValueRepository, CountryRepositoryInterface $country_repository, @@ -110,7 +110,7 @@ class AdvsController extends PublicController $this->optionConfigurationRepository = $optionConfigurationRepository; $this->productOptionRepository = $productOptionRepository; - $this->productOptionsValueRepository = $productOptionsValueRepository; + $this->productOptionsValueRepository = $productOptionsValueRepository; $this->country_repository = $country_repository; @@ -582,15 +582,15 @@ class AdvsController extends PublicController $this->template->set('showTitle', false); $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") { - return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', - 'recommended_advs', 'categories', 'features', 'options', 'configurations')); - } else { - return back(); - } + 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', + 'recommended_advs', 'categories', 'features', 'options', 'configurations')); + } else { + return back(); + } } else { $this->messages->error(trans('visiosoft.module.advs::message.ad_doesnt_exist')); return redirect()->route('visiosoft.module.advs::list'); @@ -782,8 +782,14 @@ class AdvsController extends PublicController } } - $get_categories = in_array($adv->cat1, setting_value('visiosoft.module.advs::get_categories')); - $adv->is_get_adv = ($request->is_get_adv and $get_categories) ? true : false; + $get_categories_status = 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(); //algolia Search Module @@ -803,7 +809,9 @@ class AdvsController extends PublicController $CloudinaryModel = new VideoModel(); $CloudinaryModel->updateRequest($request); - if ($request->url != "") { $adv->save(); } + if ($request->url != "") { + $adv->save(); + } } if ($this->adv_model->is_enabled('customfields')) { app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request); @@ -864,7 +872,7 @@ class AdvsController extends PublicController return redirect(route('advs_preview', [$request->update_id])); } - /* New Create Adv */ + /* New Create Adv */ $request->publish_at = date('Y-m-d H:i:s'); $all = $request->all(); @@ -983,13 +991,13 @@ class AdvsController extends PublicController $this->adv_model->statusAds($id, $type); event(new ChangedStatusAd($ad));//Create Notify - if ($type === 'approved') { - $message = trans('visiosoft.module.advs::message.approve_status_change'); - } elseif ($type === 'sold') { - $message = trans('visiosoft.module.advs::message.sold_status_change'); - } else { - trans('visiosoft.module.advs::message.passive_status_change'); - } + if ($type === 'approved') { + $message = trans('visiosoft.module.advs::message.approve_status_change'); + } elseif ($type === 'sold') { + $message = trans('visiosoft.module.advs::message.sold_status_change'); + } else { + trans('visiosoft.module.advs::message.passive_status_change'); + } $this->messages->success($message); return back(); } @@ -1271,12 +1279,12 @@ class AdvsController extends PublicController return $this->redirect->back(); } - public function sold($id, Request $request, AdvModel $advModel) - { - if ($request->sold == 'sold') { - $advModel->find($id)->update(['status' => 'sold']); - } elseif ($request->sold = 'not-sold') { - $advModel->find($id)->update(['status' => 'approved']); - } - } + public function sold($id, Request $request, AdvModel $advModel) + { + if ($request->sold == 'sold') { + $advModel->find($id)->update(['status' => 'sold']); + } elseif ($request->sold = 'not-sold') { + $advModel->find($id)->update(['status' => 'approved']); + } + } } \ No newline at end of file From 853f629ffb2419d2864766e96ee077e3a9c58343 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 9 Jan 2021 12:07:01 +0300 Subject: [PATCH 14/16] remove spaces --- .../advs-module/src/Http/Controller/advsController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 508db78c5..dfd670fb5 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -788,8 +788,6 @@ class AdvsController extends PublicController } $adv->is_get_adv = ($request->is_get_adv and $get_categories_status) ? true : false; - - $adv->save(); //algolia Search Module From 76b515a1b3cf7c62b2993838c4d3aa40637720e3 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 9 Jan 2021 12:58:16 +0300 Subject: [PATCH 15/16] fixed media field --- .../resources/lang/en/message.php | 1 + .../resources/lang/tr/message.php | 1 + .../src/Http/Controller/UploadController.php | 179 +++++++++--------- 3 files changed, 92 insertions(+), 89 deletions(-) diff --git a/addons/default/visiosoft/media-field_type/resources/lang/en/message.php b/addons/default/visiosoft/media-field_type/resources/lang/en/message.php index 17c0638c8..4bf1e3c10 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/en/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/en/message.php @@ -10,4 +10,5 @@ return [ 'uploading' => 'Uploading', 'loading' => 'Loading', 'error_upload' => 'There was a problem uploading the file.', + 'error_upload_docs' => 'There is no document upload support. Please contact your system administrator!', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php b/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php index 06ac1b1b2..572e6754b 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php @@ -10,4 +10,5 @@ return [ 'uploading' => 'Yükleme', 'loading' => 'Yükleniyor', '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!', ]; diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 9145a891a..e8fbbdd0b 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -50,104 +50,105 @@ class UploadController extends AdminController 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'){ - $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); - } else { - $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($doc_folder)); - } + if ($mimes[0] == 'image') { + $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); + } else if ($doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documentsssssss')) { + $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 ($mimes[0] == 'image'){ + if ($mimes[0] == 'image') { - $settings_key = [ - 'image_resize_backend', - 'full_image_width', - 'full_image_height', - 'medium_image_width', - 'medium_image_height', - 'thumbnail_width', - 'thumbnail_height', - 'add_canvas', - 'image_canvas_width', - 'image_canvas_height', - 'watermark_type', - 'watermark_text', - 'watermark_image', - 'watermark_position' - ]; + $settings_key = [ + 'image_resize_backend', + 'full_image_width', + 'full_image_height', + 'medium_image_width', + 'medium_image_height', + 'thumbnail_width', + 'thumbnail_height', + 'add_canvas', + 'image_canvas_width', + 'image_canvas_height', + 'watermark_type', + 'watermark_text', + 'watermark_image', + 'watermark_position' + ]; - $settings_value = array(); + $settings_value = array(); - foreach ($settings_key as $key) { - $settings_value[$key] = setting_value('visiosoft.module.advs::' . $key); - } + foreach ($settings_key as $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']) { - $fullImg = $fullImg->resize(null, $settings_value['full_image_height'], - function ($constraint) { - $constraint->aspectRatio(); - }); - } + if ($settings_value['image_resize_backend']) { + $fullImg = $fullImg->resize(null, $settings_value['full_image_height'], + function ($constraint) { + $constraint->aspectRatio(); + }); + } - $mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) - ->resize(null, $settings_value['medium_image_height'], function ($constraint) { - $constraint->aspectRatio(); - }); + $mdImg = WaterMark::make($this->request->file('upload')->getRealPath()) + ->resize(null, $settings_value['medium_image_height'], function ($constraint) { + $constraint->aspectRatio(); + }); - if ($settings_value['add_canvas']) { + if ($settings_value['add_canvas']) { - $fullImg->resizeCanvas( - $settings_value['image_canvas_width'], $settings_value['image_canvas_height'], - 'center', false, 'fff' - ); + $fullImg->resizeCanvas( + $settings_value['image_canvas_width'], $settings_value['image_canvas_height'], + 'center', false, 'fff' + ); - $mdImg->resizeCanvas( - $settings_value['medium_image_width'], $settings_value['medium_image_height'], - 'center', false, 'fff' - ); - } + $mdImg->resizeCanvas( + $settings_value['medium_image_width'], $settings_value['medium_image_height'], + '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'])) { - $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); - $image->insert($watermark, $settings_value['watermark_position']); - } + if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { + $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); + $image->insert($watermark, $settings_value['watermark_position']); + } - } else { - $v = "top"; - $h = "center"; - $w = $image->width() / 2; - $h1 = $image->height() / 2; - $font_size = $w / 20; - $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) { - $font->file(public_path('Antonio-Bold.ttf')); - $font->size($font_size); - $font->align($h); - $font->valign($v); - }); - } - if ($key === "full") { - $fileName = $file->getAttributes()['name']; - } else { - $fileName = 'md-' . $file->getAttributes()['name']; + } else { + $v = "top"; + $h = "center"; + $w = $image->width() / 2; + $h1 = $image->height() / 2; + $font_size = $w / 20; + $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) { + $font->file(public_path('Antonio-Bold.ttf')); + $font->size($font_size); + $font->align($h); + $font->valign($v); + }); + } + if ($key === "full") { + $fileName = $file->getAttributes()['name']; + } else { + $fileName = 'md-' . $file->getAttributes()['name']; - $this->createFile($this->request->get('folder'),$fileName,$image); - } - $image->save(app_storage_path() . '/files-module/local/images/' . $fileName); - } - } + $this->createFile($this->request->get('folder'), $fileName, $image); + } + $image->save(app_storage_path() . '/files-module/local/images/' . $fileName); + } + } return $this->response->json($file->getAttributes()); } @@ -183,15 +184,15 @@ class UploadController extends AdminController return response()->json(['status' => 'error']); } - public function createFile($folder, $filename, $image = null) - { - $this->files->create([ - 'folder_id' => $folder, - 'name' => $filename, - 'disk_id' => 1, - 'size' => $image->filesize(), - 'mime_type' => $image->mime, - 'extension' => $image->extension, - ]); - } + public function createFile($folder, $filename, $image = null) + { + $this->files->create([ + 'folder_id' => $folder, + 'name' => $filename, + 'disk_id' => 1, + 'size' => $image->filesize(), + 'mime_type' => $image->mime, + 'extension' => $image->extension, + ]); + } } From 7be51d9cd8029d6ed127a70680f027d8b2ecf7d1 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 9 Jan 2021 13:06:30 +0300 Subject: [PATCH 16/16] fixed folder name --- .../media-field_type/src/Http/Controller/UploadController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index e8fbbdd0b..92046f66b 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -54,7 +54,7 @@ class UploadController extends AdminController if ($mimes[0] == 'image') { $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder'))); - } else if ($doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documentsssssss')) { + } else if ($doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documents')) { $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);