Merge branch 'master' into kerim

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 {

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',

addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php

@@ -1,6 +1,7 @@
 <?php namespace Visiosoft\AdvsModule\Adv;
 
 use Anomaly\Streams\Platform\Entry\EntryCollection;
+use Carbon\Carbon;
 use Illuminate\Container\Container;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
@@ -26,4 +27,13 @@ class AdvCollection extends EntryCollection
             'items', 'total', 'perPage', 'currentPage', 'options'
         ));
     }
+
+    public function nonExpired()
+    {
+        return $this->filter(
+            function ($ad) {
+                return $ad->finish_at->gt(Carbon::now());
+            }
+        );
+    }
 }

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)
+            ->whereIn('advs_advs.created_by_id', $usersIDs);
-            ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
 
         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;

addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php

@@ -1,12 +1,13 @@
 <?php namespace Visiosoft\AdvsModule\Adv\Form;
 
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Anomaly\UsersModule\User\UserModel;
 use Visiosoft\AdvsModule\Adv\AdvModel;
 
 class SimpleAdvFormBuilder extends FormBuilder
 {
     protected $model = AdvModel::class;
-
+  
     protected $assets = [
         'scripts.js' => [
             'visiosoft.module.advs::js/simple.js'

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());

addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php

@@ -131,9 +131,12 @@ class AdvsModulePlugin extends Plugin
         return [
             new \Twig_SimpleFilter(
                 'ksort',
-                function (array $array) {
+                function ($array) {
-                    ksort($array);
+                    if ($array) {
-                    return $array;
+                        ksort($array);
+                        return $array;
+                    }
+                    return null;
                 }
             ),
         ];

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();

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";
 }
 

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%}

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);
+            if (doc_input.length) {
-            $('input[name="doc_files"]').val(docsUploaded.join(','))
+                docsUploaded.push(response.id);
+                $('input[name="doc_files"]').val(docsUploaded.join(','))
 
-            $('.doc_list').append(`
+                $('.doc_list').append(`
-                <a id="${ response.id }" href="javascript:void(0)" onclick="deleteDocs(${ response.id })" class="text-dark">
+                <a id="${response.id}" href="javascript:void(0)" onclick="deleteDocs(${response.id})" class="text-dark">
-                                ${ response.name }
+                                ${response.name}
                     <i class="fa fa-trash text-danger"></i>
                 </a><br>
             `)
 
-            setTimeout(function () {
+                setTimeout(function () {
 
-                addAppendByData(docsUploaded[0])
+                    addAppendByData(docsUploaded[0])
-                file.previewElement.remove();
+                    file.previewElement.remove();
-            }, 500);
+                }, 500);
+            }
         }
     });
 

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 {

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',

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;
     }
 }

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;
             }
         }

resources/streams/config/locales.php

@@ -391,7 +391,7 @@ return [
             'direction' => 'ltr',
         ],
         'ku' => [
-            'direction' => 'ltr',
+            'direction' => 'rtl',
         ],
         'kv' => [
             'direction' => 'ltr',