diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index f90ae9fb3..e0ed36c0c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -11,7 +11,7 @@

- {% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') %} + {% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') and (auth_user().isAdmin or not auth_user().hasPermission('visiosoft.module.packages::packages.no_read')) %} {% set continueLink = url_route('visiosoft.module.packages::add_package', [adv.id]) %} {% elseif isActive('dopings') %} {% set continueLink = url_route('add_doping', [adv.id]) %} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php index 52fa90443..cb7f228ce 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableButtons.php @@ -1,13 +1,12 @@ setButtons([ + $buttons = [ 'status' => [ 'text' => function (EntryInterface $entry) { $text_type = ($entry->getStatus() == 'approved') ? 'decline' : 'approve'; @@ -50,9 +49,13 @@ class AdvTableButtons 'create_configration' => [ 'text' => trans('visiosoft.module.advs::button.create_configurations'), 'href' => route('visiosoft.module.advs::configrations.create') . "?ad={entry.id}"] - ] + ] ] - ]); + ]; + + $builder->setButtons($buttons); + + return $buttons; } } 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 82244905c..8491d6b38 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 @@ -43,15 +43,6 @@ class AdvsController extends AdminController $table->addAsset("styles.css", "visiosoft.module.advs::css/custom.css"); $table->addAsset('scripts.js', 'visiosoft.module.advs::js/list.js'); - if ($this->model->is_enabled('recommendedads')) { - $table->addButton('add_recommended', [ - 'type' => 'default', - 'icon' => 'fa fa-gg', - 'text' => 'Add Recommended', - 'href' => '/admin/recommendedads/create/{entry.id}', - ]); - } - return $table->render(); } diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 11f231931..17d9560e7 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -17,12 +17,6 @@ use Visiosoft\DefaultadminTheme\Listener\ApplySorting; */ class DefaultadminThemeServiceProvider extends AddonServiceProvider { - - /** - * The addon listeners. - * - * @var array - */ protected $listeners = [ SortNavigation::class => [ ApplySorting::class, @@ -33,9 +27,6 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ], ]; - /** - * Register the addon. - */ public function register() { AbstractPaginator::$defaultView = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4'; diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php index e0d4ed5ef..f5ea801fa 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php @@ -45,7 +45,7 @@ class ProfileModulePlugin extends Plugin return $ad; } - ) + ), ]; } }