Merge pull request #627 from openclassify/vedatakdogan

add SetLang params

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

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'unfinished' => 'Unfinished',
+];

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

@@ -6,6 +6,8 @@ use Anomaly\UsersModule\UsersModule;
 use Illuminate\Database\Eloquent\Builder;
 use Visiosoft\AdvsModule\Adv\Table\Filter\UserFilterQuery;
 use Visiosoft\AdvsModule\Adv\Table\Handler\AdvHandler;
+use Visiosoft\AdvsModule\Adv\Table\Views\All;
+use Visiosoft\AdvsModule\Adv\Table\Views\unfinished;
 use Visiosoft\AdvsModule\Category\CategoryModel;
 use Visiosoft\PackagesModule\User\UserModel;
 
@@ -18,12 +20,18 @@ class AdvTableBuilder extends TableBuilder
      * @var array|string
      */
 
-    public function onQuerying(Builder $query)
-    {
-        $query->where('slug', "!=", "");
-    }
+    protected $views = [
+        'all' => [
+            'view' => All::class,
+            'slug' => 'all',
+            'text' => 'streams::view.all',
+        ],
+        'trash',
+        'unfinished' => [
+            'view' => unfinished::class
+        ],
 
-    protected $views = [];
+    ];
 
     /**
      * The table filters.

addons/default/visiosoft/advs-module/src/Adv/Table/Views/All.php

@@ -0,0 +1,22 @@
+<?php namespace Visiosoft\AdvsModule\Adv\Table\Views;
+
+use Anomaly\Streams\Platform\Ui\Table\Component\View\Query\AllQuery;
+use Anomaly\Streams\Platform\Ui\Table\Component\View\View;
+use Illuminate\Database\Eloquent\Builder;
+
+
+class All extends View
+{
+
+    /**
+     * The view query.
+     *
+     * @var string
+     */
+    protected $query = AllQuery::class;
+
+    public function onQuerying(Builder $query)
+    {
+        $query->where('slug', "!=", "");
+    }
+}

addons/default/visiosoft/advs-module/src/Adv/Table/Views/unfinished.php

@@ -0,0 +1,27 @@
+<?php namespace Visiosoft\AdvsModule\Adv\Table\Views;
+
+use Anomaly\Streams\Platform\Ui\Table\Component\View\Query\AllQuery;
+use Anomaly\Streams\Platform\Ui\Table\Component\View\View;
+use Illuminate\Database\Eloquent\Builder;
+
+class unfinished extends View
+{
+
+
+    protected $slug = 'table';
+
+
+    protected $text = 'visiosoft.module.advs::view.unfinished';
+
+
+    protected $icon = 'fa fa-tasks';
+
+
+    protected $query = AllQuery::class;
+
+    public function onQuerying(Builder $query)
+    {
+        $query->where('slug', "");
+    }
+
+}

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

@@ -10,6 +10,7 @@ use Visiosoft\AdvsModule\Adv\AdvRepository;
 use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel;
 use Visiosoft\AdvsModule\Adv\AdvModel;
 use Visiosoft\AdvsModule\Adv\Form\AdvFormBuilder;
+use Visiosoft\AdvsModule\Http\Middleware\SetLang;
 use Visiosoft\AdvsModule\Listener\AddAdvsSettingsScript;
 use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
 use Visiosoft\AdvsModule\Option\OptionRepository;
@@ -231,7 +232,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
      * @type array|null
      */
     protected $middleware = [
-        //Visiosoft\AdvsModule\Http\Middleware\ExampleMiddleware::class
+        SetLang::class,
     ];
 
     /**

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

@@ -111,7 +111,7 @@ class AdvsController extends AdminController
                 'class' => 'advs-name',
                 'sort_column' => 'slug',
                 'value' => function (EntryInterface $entry) {
-                    return "<a href='" . $this->model->getAdvDetailLinkByModel($entry, 'list') . "' > " . $entry->name . "</a > ";
+                    return (!is_null($entry->name)) ? "<a href='" . $this->model->getAdvDetailLinkByModel($entry, 'list') . "' > " . $entry->name . "</a > " : "<font color='red'>" . trans("visiosoft.module.advs::view.unfinished") . "</font>";
                 },
             ],
             'price' => [
@@ -144,7 +144,7 @@ class AdvsController extends AdminController
         $cities = $cityModel->all()->pluck('name', 'id')->all();
         $users = $userModel->newQuery()
             ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', email, ')') AS display_name"), 'id')
-            ->pluck('display_name','id')
+            ->pluck('display_name', 'id')
             ->toArray();
         $categories = $categoryModel::query()->where('parent_category_id', null)
             ->leftJoin('cats_category_translations', 'cats_category.id', '=', 'cats_category_translations.entry_id')

addons/default/visiosoft/advs-module/src/Http/Middleware/SetLang.php

@@ -0,0 +1,47 @@
+<?php namespace Visiosoft\AdvsModule\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
+
+/**
+ * Class SetLang
+ */
+class SetLang
+{
+
+    /**
+     * The redirect utility.
+     *
+     * @var Redirector
+     */
+    protected $redirect;
+
+    /**
+     * Create a new SetLocale instance.
+     *
+     * @param Redirector $redirect
+     */
+    public function __construct(
+        Redirector $redirect
+    )
+    {
+        $this->redirect = $redirect;
+    }
+
+    public function handle(Request $request, Closure $next)
+    {
+
+        if ($locale = $request->get('_setLang')) {
+            if ($locale) {
+                $request->session()->put('_locale', $locale);
+            } else {
+                $request->session()->remove('_locale');
+            }
+
+            return ($request->has('redirect')) ? $this->redirect->to($request->get('redirect')) : $this->redirect->back();
+        }
+
+        return $next($request);
+    }
+}