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 +