Merge branch 'master' of https://github.com/openclassify/openclassify

addons/default/visiosoft/advs-module/resources/lang/en/field.php

@@ -85,8 +85,11 @@ return [
     'status' => [
         'name' => 'Status',
         'option' => [
+            'approved' => 'Approved',
             'expired' => 'Expired',
-            'unpublished' => 'Unpublished'
+            'unpublished' => 'Unpublished',
+            'pending_admin' => 'Pending Admin',
+            'pending_user' => 'Pending User'
         ]
     ],
     'pending_adv' => [

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

@@ -63,13 +63,17 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
         });
 
         if (!empty($param['keyword'])) {
-            $delimiter = '_';
+            if (is_numeric($param['keyword'])) {
-            $keyword = str_slug($param['keyword'], $delimiter);
+                $query = $query->where('advs_advs.id', $param['keyword']);
-            $query = $query->where(function ($query) use ($keyword) {
+            } else {
-                $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%')
+                $delimiter = '_';
-                    ->orWhere('slug', 'like', '%' . $keyword . '%')
+                $keyword = str_slug($param['keyword'], $delimiter);
-                    ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%');
+                $query = $query->where(function ($query) use ($keyword) {
-            });
+                    $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%')
+                        ->orWhere('slug', 'like', '%' . $keyword . '%')
+                        ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%');
+                });
+            }
         }
         if (!empty($param['country'])) {
             $query = $query->where('country_id', $param['country']);

addons/default/visiosoft/advs-module/src/Adv/Table/Filter/StatusFilterQuery.php

@@ -2,19 +2,41 @@
 
 use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Contract\FilterInterface;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Carbon;
 
 class StatusFilterQuery
 {
 
     public function handle(Builder $query, FilterInterface $filter)
     {
+        if ($filter->getValue() == 'approved') {
+            $query
+                ->where('advs_advs.status', 'approved')
+                ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
+        }
+
         if ($filter->getValue() == 'expired') {
-            $query->where('advs_advs.finish_at', '<=', Carbon::now());
+            $query
+                ->where('advs_advs.finish_at', '<', date('Y-m-d H:i:s'))
+                ->WhereNotNull('advs_advs.finish_at');
         }
 
         if ($filter->getValue() == 'unpublished') {
-            $query->where('advs_advs.status', '!=', 'approved');
+            $query
+                ->where('advs_advs.status', 'passive');
+        }
+
+        if ($filter->getValue() == 'pending_admin') {
+            $query
+                ->where('advs_advs.status', 'pending_admin')
+                ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'))
+                ->orWhereNull('advs_advs.finish_at');
+        }
+
+        if ($filter->getValue() == 'pending_user') {
+            $query
+                ->where('advs_advs.status', 'pending_user')
+                ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'))
+                ->orWhereNull('advs_advs.finish_at');
         }
     }
 }

addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php

@@ -157,8 +157,11 @@ class AdvsController extends AdminController
                         'filter'  => 'select',
                         'query'   => StatusFilterQuery::class,
                         'options' => [
+                            'approved'   => 'visiosoft.module.advs::field.status.option.approved',
                             'expired'   => 'visiosoft.module.advs::field.status.option.expired',
                             'unpublished' => 'visiosoft.module.advs::field.status.option.unpublished',
+                            'pending_admin' => 'visiosoft.module.advs::field.status.option.pending_admin',
+                            'pending_user' => 'visiosoft.module.advs::field.status.option.pending_user',
                         ],
                     ]
                 ])

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

@@ -65,8 +65,11 @@ class UploadController extends AdminController
                 $img = WaterMark::make($this->request->file('upload')->getRealPath());
                 $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image');
                 $watermarkimage = $files->find($watermarkimage_id);
+                $w = $img->width();
                 if ($watermarkimage != null) {
-                    $watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path())->opacity(50);
+                    $watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path())
+                        ->opacity($settings->value('visiosoft.module.advs::watermark_opacity'))
+                        ->resize($w);
                     $img->insert($watermark, $position);
                 }
 
@@ -77,7 +80,7 @@ class UploadController extends AdminController
                 $h = "center";
                 $w = $img->width() / 2;
                 $h1 = $img->height() / 2;
-                $font_size = $w/20;
+                $font_size = $w / 20;
                 $img->text($watermarktext, $w, $h1, function ($font) use ($v, $h, $font_size) {
                     $font->file(public_path('Antonio-Bold.ttf'));
                     $font->size($font_size);