From b14fd0152c513c8aaad45867f5091de0a21a93d3 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 26 Feb 2020 10:30:26 +0300 Subject: [PATCH 1/6] =?UTF-8?q?#858=20ilanlar=20toplu=20s=C3=BCre=20uzatma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visiosoft/advs-module/src/AdvsModule.php | 2 +- .../src/AdvsModuleServiceProvider.php | 8 +++++-- .../Http/Controller/Admin/AdvsController.php | 9 -------- .../src/Http/Controller/advsController.php | 23 ++++++++++++++++++- .../profile-module/resources/assets/js/ads.js | 7 +++++- .../resources/lang/en/button.php | 1 + .../resources/views/profile/ads.twig | 4 ++++ 7 files changed, 40 insertions(+), 14 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php index 41888e22c..0eda5defc 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModule.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php @@ -31,7 +31,7 @@ class AdvsModule extends Module 'href' => "/advs/create_adv", ], 'extend_all' => [ - 'href' => "/admin/advs/extendAll", + 'href' => "/advs/extendAll/admin", 'icon' => 'fa fa-calendar', 'type' => 'info' ], diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index f416601eb..d0f3880cd 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -212,9 +212,13 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'ajax::getAds', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds' ], - 'admin/advs/extendAll' => [ + 'advs/extendAll/{isAdmin?}' => [ 'as' => 'advs::extendAll', - 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@extendAll', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@extendAll', + ], + 'advs/extend/{adId}' => [ + 'as' => 'advs::extendSingle', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@extendSingle', ], ]; 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 a53c20951..311e6b30c 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 @@ -257,13 +257,4 @@ class AdvsController extends AdminController Return Back"; echo "
Return Admin Panel"; } - - public function extendAll() - { - $advs = $this->model->get(); - $new_date = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); - $advs->update(['finish_at' => $new_date]); - $this->messages->success(trans('visiosoft.module.advs::field.extended')); - return $this->redirect->to('admin/advs/advs'); - } } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 9e77ca05c..21b31bd11 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -974,4 +974,25 @@ class AdvsController extends PublicController return "success"; } -} + public function extendAll($isAdmin = null) + { + if ($isAdmin && auth()->user()->hasRole('admin')) { + $advs = $this->adv_model->newQuery(); + } else { + $advs = $this->adv_model->newQuery()->where('created_by_id', auth()->id()); + } + $newDate = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); + $advs->update(['finish_at' => $newDate]); + $this->messages->success(trans('visiosoft.module.advs::field.extended')); + return $this->redirect->back(); + } + + public function extendSingle($adId) + { + $advs = $this->adv_model->newQuery()->where('id', $adId); + $newDate = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); + $advs->update(['finish_at' => $newDate]); + $this->messages->success(trans('visiosoft.module.advs::field.extended')); + return $this->redirect->back(); + } +} \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js index 3179970df..9e7350eef 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js +++ b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js @@ -22,7 +22,7 @@ function getMyAds(type) { $('.profile-ads-tab a').on('click', function () { getMyAds($(this).attr('data-type')) -}) +}); getMyAds('approved'); @@ -85,6 +85,11 @@ function dropdownRow(id, type) { delete_ad + "\n"; + dropdown += "" + + " " + + extend_ad + + "\n"; + dropdown += ""; return dropdown; diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/button.php b/addons/default/visiosoft/profile-module/resources/lang/en/button.php index ff749c361..f37642094 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/button.php @@ -7,5 +7,6 @@ return [ 'update_password' => 'Update Password', 'update_profile' => 'Update Profile', 'delete' => 'Delete', + 'extend' => 'Extend', 'edit' => 'Edit', ]; diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig b/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig index f706fb006..47927823d 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/ads.twig @@ -33,6 +33,9 @@ +
+ Extend All +
- Extend All + + {{ trans('visiosoft.module.profile::button.extend_all') }} +
@@ -59,6 +71,7 @@ var delete_ad = "{{ trans('visiosoft.module.profile::button.delete') }}"; var extend_ad = "{{ trans('visiosoft.module.profile::button.extend') }}"; var edit_ad = "{{ trans('visiosoft.module.profile::button.edit') }}"; + var ads_per_page = "{{ setting_value('streams::per_page') }}"; {{ asset_add('scripts.js','visiosoft.module.profile::assets/js/ads.js') }} {% endblock %} \ No newline at end of file From e3d552219ac1dfee84329c6f10eff6a345c11908 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 28 Feb 2020 10:30:13 +0300 Subject: [PATCH 6/6] #360 merge two extend functions --- .../advs-module/resources/lang/en/message.php | 1 + .../advs-module/src/Adv/AdvRepository.php | 15 ++++++++++++++- .../src/Adv/Contract/AdvRepositoryInterface.php | 1 + .../src/Http/Controller/advsController.php | 16 ++++------------ 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php index b4f5f28c2..d7cb4c7de 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -26,4 +26,5 @@ return [ 'delete_author_error' => 'You cannot delete a post that does not belong to you', 'success_delete' => 'Ad Deleted', 'pending_ad_status' => 'Your ad is pending approval by the Editor.', + 'extended' => ':number ad(s) has been extended successfully.', ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index a473d7472..c9eb75ade 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -363,5 +363,18 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface return null; } - + public function extendAds($allAds, $isAdmin = false) + { + if (!is_numeric($allAds)) { + if ($isAdmin && auth()->user()->hasRole('admin')) { + $advs = $this->newQuery(); + } else { + $advs = $this->newQuery()->where('created_by_id', auth()->id()); + } + } else { + $advs = $this->newQuery()->where('id', $allAds); + } + $newDate = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); + return $advs->update(['finish_at' => $newDate]); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php index 31e038bca..a3b32d0ad 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php @@ -36,4 +36,5 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface public function getCategoriesWithAdID($id); + public function extendAds($allAds, $isAdmin = false); } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index acb0c21d8..57d64ae85 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -976,23 +976,15 @@ class AdvsController extends PublicController public function extendAll($isAdmin = null) { - if ($isAdmin && auth()->user()->hasRole('admin')) { - $advs = $this->adv_model->newQuery(); - } else { - $advs = $this->adv_model->newQuery()->where('created_by_id', auth()->id()); - } - $newDate = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); - $advs->update(['finish_at' => $newDate]); - $this->messages->success(trans('visiosoft.module.advs::field.extended')); + $adsExtended = $this->adv_repository->extendAds(true, $isAdmin); + $this->messages->success(trans('visiosoft.module.advs::message.extended', ['number' => $adsExtended])); return $this->redirect->back(); } public function extendSingle($adId) { - $advs = $this->adv_model->newQuery()->where('id', $adId); - $newDate = date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . setting_value('visiosoft.module.advs::default_published_time') . ' day')); - $advs->update(['finish_at' => $newDate]); - $this->messages->success(trans('visiosoft.module.advs::field.extended')); + $adsExtended = $this->adv_repository->extendAds($adId); + $this->messages->success(trans('visiosoft.module.advs::message.extended', ['number' => $adsExtended])); return $this->redirect->back(); } } \ No newline at end of file