From b802be85d426149901e5cf684c26f275fd864ccc Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 25 Jan 2021 17:31:45 +0300 Subject: [PATCH 1/3] #3025 Making the announcement status flexible. --- .../Controller/Admin/StatusController.php | 43 ++++++++++++ .../src/Status/Contract/StatusInterface.php | 8 +++ .../Contract/StatusRepositoryInterface.php | 8 +++ .../src/Status/Form/StatusFormBuilder.php | 66 +++++++++++++++++++ .../src/Status/StatusCollection.php | 8 +++ .../advs-module/src/Status/StatusCriteria.php | 8 +++ .../advs-module/src/Status/StatusModel.php | 9 +++ .../advs-module/src/Status/StatusObserver.php | 8 +++ .../src/Status/StatusPresenter.php | 8 +++ .../src/Status/StatusRepository.php | 25 +++++++ .../advs-module/src/Status/StatusRouter.php | 8 +++ .../advs-module/src/Status/StatusSeeder.php | 15 +++++ .../src/Status/Table/StatusTableBuilder.php | 63 ++++++++++++++++++ 13 files changed, 277 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/src/Http/Controller/Admin/StatusController.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/Contract/StatusInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/Contract/StatusRepositoryInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/Form/StatusFormBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusCollection.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusCriteria.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusModel.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusObserver.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusPresenter.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusRepository.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusRouter.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/StatusSeeder.php create mode 100644 addons/default/visiosoft/advs-module/src/Status/Table/StatusTableBuilder.php diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/StatusController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/StatusController.php new file mode 100644 index 000000000..e61072dd4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/StatusController.php @@ -0,0 +1,43 @@ +render(); + } + + /** + * Create a new entry. + * + * @param StatusFormBuilder $form + * @return \Symfony\Component\HttpFoundation\Response + */ + public function create(StatusFormBuilder $form) + { + return $form->render(); + } + + /** + * Edit an existing entry. + * + * @param StatusFormBuilder $form + * @param $id + * @return \Symfony\Component\HttpFoundation\Response + */ + public function edit(StatusFormBuilder $form, $id) + { + return $form->render($id); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Status/Contract/StatusInterface.php b/addons/default/visiosoft/advs-module/src/Status/Contract/StatusInterface.php new file mode 100644 index 000000000..f0e95990e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Status/Contract/StatusInterface.php @@ -0,0 +1,8 @@ +model = $model; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Status/StatusRouter.php b/addons/default/visiosoft/advs-module/src/Status/StatusRouter.php new file mode 100644 index 000000000..7e5726d99 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Status/StatusRouter.php @@ -0,0 +1,8 @@ + Date: Mon, 25 Jan 2021 18:20:29 +0300 Subject: [PATCH 2/3] =?UTF-8?q?#3101=20emlak24=20ocak=20ay=C4=B1=20yap?= =?UTF-8?q?=C4=B1lacaklar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Http/Controller/UserAuthenticator.php | 7 ---- .../Profile/Profile/ProfileFormHandler.php | 34 +++++++++++++++++++ .../Contract/ValidatorExtensionInterface.php | 6 ++++ .../Profile/Validator/ValidatorExtension.php | 12 +++++++ 4 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 addons/default/visiosoft/profile-module/src/Profile/Validator/Contract/ValidatorExtensionInterface.php create mode 100644 addons/default/visiosoft/profile-module/src/Profile/Validator/ValidatorExtension.php diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php index d6df4e5d6..18f16a4e4 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php @@ -6,20 +6,13 @@ use Anomaly\UsersModule\User\Authenticator\Contract\AuthenticatorExtensionInterf use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Anomaly\UsersModule\User\Event\UserWasLoggedIn; -use Anomaly\UsersModule\User\User; -use Anomaly\UsersModule\User\UserPassword; -use http\Env\Response; use Visiosoft\AdvsModule\Adv\AdvModel; -use Visiosoft\AdvsModule\Http\Controller\AdvsController; -use Visiosoft\CartsModule\Saleitem\Command\ProcessSaleitem; -use Visiosoft\CartsModule\Saleitem\SaleitemModel; use Visiosoft\CloudsiteModule\Site\Event\CreateSite; use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Redirect; use Visiosoft\CloudsiteModule\Site\SiteModel; use Visiosoft\ProfileModule\Profile\ProfileRepository; 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 15e0e832c..d17c67562 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php @@ -1,11 +1,23 @@ extensions = $extensions; + } + public function handle( ProfileFormBuilder $builder, MessageBag $messages, @@ -27,6 +39,11 @@ class ProfileFormHandler 'google_address' => $builder->getPostValue('google_address') ?: null, ]; + if (($valid = $this->validate($parameters)) !== true) { + $messages->error($valid['msg']); + return; + } + if (setting_value('visiosoft.module.profile::show_education_profession')) { $parameters = array_merge($parameters, [ 'education' => $builder->getPostValue('education'), @@ -70,4 +87,21 @@ class ProfileFormHandler } return $changes; } + + public function validate(array $fields) + { + $validators = $this->extensions + ->search('visiosoft.module.profile::validation.*') + ->enabled(); + + foreach ($validators as $validator) { + $valid = $validator->validate($fields); + + if ($valid['error']) { + return $valid; + } + } + + return true; + } } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validator/Contract/ValidatorExtensionInterface.php b/addons/default/visiosoft/profile-module/src/Profile/Validator/Contract/ValidatorExtensionInterface.php new file mode 100644 index 000000000..d918ba98a --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Profile/Validator/Contract/ValidatorExtensionInterface.php @@ -0,0 +1,6 @@ + Date: Wed, 27 Jan 2021 15:41:55 +0300 Subject: [PATCH 3/3] 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',