From bcc352f6101fa8e9705417403a857a5dd7194a7b Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 5 Aug 2020 13:41:35 +0300 Subject: [PATCH 1/4] add type --- addons/default/visiosoft/site-module | 1 + 1 file changed, 1 insertion(+) create mode 160000 addons/default/visiosoft/site-module diff --git a/addons/default/visiosoft/site-module b/addons/default/visiosoft/site-module new file mode 160000 index 000000000..106560f51 --- /dev/null +++ b/addons/default/visiosoft/site-module @@ -0,0 +1 @@ +Subproject commit 106560f5126d8a7340d40105d309cbb6f30c2843 From 84a071a82b92ad0d64129bab93556c743d8d205d Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 6 Aug 2020 12:42:13 +0300 Subject: [PATCH 2/4] add SetLang params --- .../src/AdvsModuleServiceProvider.php | 3 +- .../src/Http/Middleware/SetLang.php | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 addons/default/visiosoft/advs-module/src/Http/Middleware/SetLang.php diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 3c2eb285e..a9ca7f186 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/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, ]; /** diff --git a/addons/default/visiosoft/advs-module/src/Http/Middleware/SetLang.php b/addons/default/visiosoft/advs-module/src/Http/Middleware/SetLang.php new file mode 100644 index 000000000..211b6cf6d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Middleware/SetLang.php @@ -0,0 +1,47 @@ +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); + } +} From dcd8401bc1573945b32c72ed1cce80d443277c1f Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 6 Aug 2020 12:43:59 +0300 Subject: [PATCH 3/4] remove site --- addons/default/visiosoft/site-module | 1 - 1 file changed, 1 deletion(-) delete mode 160000 addons/default/visiosoft/site-module diff --git a/addons/default/visiosoft/site-module b/addons/default/visiosoft/site-module deleted file mode 160000 index 106560f51..000000000 --- a/addons/default/visiosoft/site-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 106560f5126d8a7340d40105d309cbb6f30c2843 From 23b2e09f8ef57a7da1703a5443fcaead30d28d18 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 6 Aug 2020 17:30:59 +0300 Subject: [PATCH 4/4] add unfinished tab for admin panel --- .../advs-module/resources/lang/en/view.php | 5 ++++ .../src/Adv/Table/AdvTableBuilder.php | 18 +++++++++---- .../advs-module/src/Adv/Table/Views/All.php | 22 +++++++++++++++ .../src/Adv/Table/Views/unfinished.php | 27 +++++++++++++++++++ .../Http/Controller/Admin/AdvsController.php | 4 +-- 5 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/lang/en/view.php create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Table/Views/All.php create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Table/Views/unfinished.php diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/view.php b/addons/default/visiosoft/advs-module/resources/lang/en/view.php new file mode 100644 index 000000000..0a174882a --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/lang/en/view.php @@ -0,0 +1,5 @@ + 'Unfinished', +]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php index d9912e9fd..98b5d1ca8 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php +++ b/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. diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Views/All.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/All.php new file mode 100644 index 000000000..35f2ccdde --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/All.php @@ -0,0 +1,22 @@ +where('slug', "!=", ""); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Views/unfinished.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/unfinished.php new file mode 100644 index 000000000..80ff05c68 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/unfinished.php @@ -0,0 +1,27 @@ +where('slug', ""); + } + +} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index f0ff6217e..10fb2e2da 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/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 " " . $entry->name . " "; + return (!is_null($entry->name)) ? " " . $entry->name . " " : "" . trans("visiosoft.module.advs::view.unfinished") . ""; }, ], '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')