From c3cc0cd12aa23f84d9f4f416de596a1a509b0fb8 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 27 Jan 2021 12:07:34 +0300 Subject: [PATCH 1/7] #3133 fast add user select --- .../visiosoft/advs-module/resources/lang/en/field.php | 2 ++ .../advs-module/src/Adv/Form/SimpleAdvFormBuilder.php | 10 ++++++++++ .../advs-module/src/Adv/Form/SimpleAdvFormHandler.php | 4 ++++ 3 files changed, 16 insertions(+) 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 4f8860df0..ee3c61e7f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -322,6 +322,8 @@ return [ 'upload_files' => 'Upload Files', 'additional_fields' => 'Additional Fields', 'ad_location' => 'Ad Location', + 'owner' => 'Owner', + 'default_owner_instruction' => 'The owner will default to the current user if no user is selected', 'free' => 'Free', 'ad_date' => 'Ad Date', diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 0664685b5..ca1ee4662 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -1,6 +1,7 @@ [ + 'label' => 'visiosoft.module.advs::field.owner', + 'instructions' => 'visiosoft.module.advs::field.default_owner_instruction', + "type" => "anomaly.field_type.relationship", + "config" => [ + "related" => UserModel::class, + "mode" => "lookup", + ] + ], 'name', 'price', 'currency', diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php index 442af124e..c78c58c3f 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php @@ -11,6 +11,10 @@ class SimpleAdvFormHandler return; } + if (!$builder->getFormValue('created_by_id')) { + $builder->setFormValue('created_by_id', auth()->id()); + } + $builder->saveForm(); $ad = $advRepository->find($builder->getFormEntryId()); From 59323c0639fae302a9fa9e3c4edc56dd5353cc6e Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 27 Jan 2021 15:41:55 +0300 Subject: [PATCH 2/7] rtl to kurdish --- resources/streams/config/locales.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/streams/config/locales.php b/resources/streams/config/locales.php index b72562e7f..7b7c0b586 100644 --- a/resources/streams/config/locales.php +++ b/resources/streams/config/locales.php @@ -391,7 +391,7 @@ return [ 'direction' => 'ltr', ], 'ku' => [ - 'direction' => 'ltr', + 'direction' => 'rtl', ], 'kv' => [ 'direction' => 'ltr', From 9dab98718e3a9296083fc7eeee8dc19ae9df7b96 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 27 Jan 2021 16:35:45 +0300 Subject: [PATCH 3/7] #3189 emlak24 bugs --- addons/default/visiosoft/advs-module/resources/css/list.css | 1 + .../advs-module/src/Http/Controller/advsController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index 1362ec7e4..5ffc29d28 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -23,6 +23,7 @@ .upper-list-banner { min-height: 300px; + background-size: cover; } .upper-list-banner img { 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 e7d890c00..27849a7e3 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -991,7 +991,7 @@ class AdvsController extends PublicController } elseif ($type === 'sold') { $message = trans('visiosoft.module.advs::message.sold_status_change'); } else { - trans('visiosoft.module.advs::message.passive_status_change'); + $message = trans('visiosoft.module.advs::message.passive_status_change'); } $this->messages->success($message); return back(); From 34d8942aa8ee9125a34ae5d92453655ddaca078a Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 27 Jan 2021 17:50:28 +0300 Subject: [PATCH 4/7] fixed null --- .../visiosoft/advs-module/src/AdvsModulePlugin.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 2005dd80e..733c2d8c6 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -131,9 +131,12 @@ class AdvsModulePlugin extends Plugin return [ new \Twig_SimpleFilter( 'ksort', - function (array $array) { - ksort($array); - return $array; + function ($array) { + if ($array) { + ksort($array); + return $array; + } + return null; } ), ]; From cb0152bfd2b44a39898daa836cd3fe781049ab1f Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 28 Jan 2021 13:33:37 +0300 Subject: [PATCH 5/7] #3189 emlak24 bugs --- .../visiosoft/advs-module/src/Adv/AdvCollection.php | 10 ++++++++++ .../visiosoft/advs-module/src/Adv/AdvRepository.php | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php index 855fa19c0..6fd2e6614 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php @@ -1,6 +1,7 @@ filter( + function ($ad) { + return $ad->finish_at->gt(Carbon::now()); + } + ); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 0970d1336..8e220d258 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -475,15 +475,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface { $ads = $this ->newQuery() - ->whereIn('advs_advs.created_by_id', $usersIDs) - ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); + ->whereIn('advs_advs.created_by_id', $usersIDs); if ($status) { $ads = $ads->where('advs_advs.status', 'approved'); } if (!$withDraft) { - $ads = $ads->where('advs_advs.slug', '!=', ""); + $ads = $ads + ->where('advs_advs.slug', '!=', "") + ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); } return $ads; From cc23e547c623645e4a3f81b44da3dc576b9c711c Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 29 Jan 2021 15:58:07 +0300 Subject: [PATCH 6/7] #3189 emlak24 requirements --- .../visiosoft/profile-module/src/Events/UserUpdated.php | 4 +++- .../src/Profile/Profile/ProfileFormHandler.php | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Events/UserUpdated.php b/addons/default/visiosoft/profile-module/src/Events/UserUpdated.php index 74b6fdb4c..6b10ccb9d 100644 --- a/addons/default/visiosoft/profile-module/src/Events/UserUpdated.php +++ b/addons/default/visiosoft/profile-module/src/Events/UserUpdated.php @@ -4,10 +4,12 @@ class UserUpdated { public $oldCustomerInfo; public $changes; + public $builder; - public function __construct($oldCustomerInfo, $changes) + public function __construct($oldCustomerInfo, $changes, $builder = null) { $this->oldCustomerInfo = $oldCustomerInfo; $this->changes = $changes; + $this->builder = $builder; } } \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php index d17c67562..5ed2f8cf3 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php @@ -2,11 +2,7 @@ use Anomaly\Streams\Platform\Addon\Extension\ExtensionCollection; use Anomaly\Streams\Platform\Message\MessageBag; -use Anomaly\UsersModule\User\Authenticator\Contract\AuthenticatorExtensionInterface; -use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\UserModel; -use Illuminate\Http\RedirectResponse; -use Illuminate\Support\Facades\Redirect; use Visiosoft\ProfileModule\Events\UserUpdated; class ProfileFormHandler @@ -72,7 +68,7 @@ class ProfileFormHandler $changes = $this->change($user, $parameters); - event(new UserUpdated($oldCustomerInfo, $changes)); + event(new UserUpdated($oldCustomerInfo, $changes, $builder)); $messages->success(trans('visiosoft.module.profile::message.success_update')); } @@ -97,7 +93,7 @@ class ProfileFormHandler foreach ($validators as $validator) { $valid = $validator->validate($fields); - if ($valid['error']) { + if (isset($valid['error']) && $valid['error']) { return $valid; } } From e05fa21c7d2fd6c1496431e91ce768b93753c728 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Feb 2021 12:38:07 +0300 Subject: [PATCH 7/7] fixed media field type and upload errors --- .../resources/css/font-awesome.min.css | 2 +- .../resources/css/theme.css | 4 +++ .../media-field_type/resources/js/upload.js | 30 ++++++++++++------- .../src/Http/Controller/UploadController.php | 5 ++-- .../src/Table/ValueTableBuilder.php | 4 +-- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css b/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css index 8838f19c1..d5f8f222f 100644 --- a/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css +++ b/addons/default/visiosoft/base-theme/resources/css/font-awesome.min.css @@ -4076,7 +4076,7 @@ readers do not read off random characters that represent icons */ content: "\f7bc"; } -.fa-redo:before { +.fa-redo:before, .fa-repeat:before { content: "\f01e"; } diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css index d4f55f0c1..cbc0af57c 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css +++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css @@ -2761,3 +2761,7 @@ body { font-size: 2rem; } } + + +/** bootstrap 4.1 Column Fix**/ +.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%} \ No newline at end of file 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 778d1a9eb..1eabb537c 100644 --- a/addons/default/visiosoft/media-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js @@ -2,8 +2,14 @@ Dropzone.autoDiscover = false; $("div#myDrop").dropzone({url: "/file/post"}); +var doc_input = $('input[name="doc_files"]'); + + var uploaded = $('input[name="files"]').val().split(',').map(Number); -var docsUploaded = $('input[name="doc_files"]').val().split(',').map(Number); + +if (doc_input.length) { + var docsUploaded = doc_input.val().split(',').map(Number); +} $(function () { @@ -69,7 +75,7 @@ $(function () { var response = JSON.parse(file.xhr.response); var mimeType = response.mime_type.split('/') - if (mimeType[0] === 'image'){ + if (mimeType[0] === 'image') { uploaded.push(response.id); $('.media-selected-wrapper').load( @@ -87,21 +93,23 @@ $(function () { file.previewElement.remove(); }, 500); } else { - docsUploaded.push(response.id); - $('input[name="doc_files"]').val(docsUploaded.join(',')) + if (doc_input.length) { + docsUploaded.push(response.id); + $('input[name="doc_files"]').val(docsUploaded.join(',')) - $('.doc_list').append(` - - ${ response.name } + $('.doc_list').append(` + + ${response.name}
`) - setTimeout(function () { + setTimeout(function () { - addAppendByData(docsUploaded[0]) - file.previewElement.remove(); - }, 500); + addAppendByData(docsUploaded[0]) + file.previewElement.remove(); + }, 500); + } } }); 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 92046f66b..94df2818d 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 @@ -101,7 +101,6 @@ class UploadController extends AdminController $constraint->aspectRatio(); }); - if ($settings_value['add_canvas']) { $fullImg->resizeCanvas( @@ -132,13 +131,15 @@ class UploadController extends AdminController $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) { + $image->text(setting_value('visiosoft.module.advs::watermark_text','Openclassify'), $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 { diff --git a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php index 8d0f55333..7dc77212f 100644 --- a/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php +++ b/addons/default/visiosoft/media-field_type/src/Table/ValueTableBuilder.php @@ -65,7 +65,7 @@ class ValueTableBuilder extends TableBuilder ], 'rotate' => [ 'target' => '_blank', - 'icon' => 'fas fa-redo', + 'icon' => 'fa fa-repeat', 'type' => 'info', 'text' => '', 'class' => 'col-4', @@ -76,7 +76,7 @@ class ValueTableBuilder extends TableBuilder ], 'deleteImage' => [ 'target' => '_blank', - 'icon' => 'fas fa-trash', + 'icon' => 'fa fa-trash', 'type' => 'danger', 'text' => '', 'class' => 'col-4 deleteImage',