diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php index eae3c91..6c1a7b0 100644 --- a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php +++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php @@ -42,7 +42,7 @@ class Wiaas_Admin_Order_Process_Flow { if ($delivery_process && wp_verify_nonce($_POST['wiaas_delivery_process_navigation_nonce'], 'wiaas_delivery_process_navigation') && - GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { + GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) { self::_maybe_process_admin_step_change_action($delivery_process); diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php index fea8937..0c6e8ae 100644 --- a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php +++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php @@ -64,7 +64,7 @@ if ( ! empty($delivery_process)) {
@@ -106,7 +106,7 @@ if ( ! empty($delivery_process)) { if (! empty($delivery_process)) { - if ($current_step && GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { + if ($current_step && GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) { require 'html-delivery-process-navigation.php'; } diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php index a4d2ee5..f016d57 100644 --- a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php +++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php @@ -52,7 +52,7 @@ if ($is_current_step) { $action_entry_step = $action_workflow->get_current_step($action_entry); - $show_entry = GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' ) || + $show_entry = GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' ) || ($action_entry_step && $action_entry_step->is_assignee($current_assignee_key)); diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php index 94bfa13..9c753d1 100644 --- a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php +++ b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php @@ -29,7 +29,8 @@ class Wiaas_DB_Update { '20181106133553' => 'wiaas_db_update_add_installation_date_delivery_action_form', '20181125133553' => 'wiaas_db_update_add_country_settings_ui_fields', '20181125143553' => 'wiaas_db_migration_fix_user_profile_addresses', // remove after migration - '20181125153553' => 'wiaas_db_migration_fix_countries' // remove after migration + '20181125153553' => 'wiaas_db_migration_fix_countries', // remove after migration, + '20181203115826' => 'wiaas_db_update_add_administrator_delivery_process_capabilities' ); public static function execute() { diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php b/backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php index 1513cd0..947fb54 100644 --- a/backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php +++ b/backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php @@ -107,7 +107,7 @@ class Wiaas_Delivery_Process { $delivery_process_entry = self::get_order_delivery_process_entry($order_id); } - if (empty($delivery_process_entry) || ! GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' )) { + if (empty($delivery_process_entry) || ! GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) { return false; } diff --git a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php index b39cb5e..bea6ecf 100644 --- a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php +++ b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php @@ -323,4 +323,9 @@ function wiaas_db_update_enable_workflow_inbox_for_roles() { // add workflow inbox for commercial lead wp_roles()->add_cap( 'commercial_lead', 'gravityflow_inbox' ); +} + +function wiaas_db_update_add_administrator_delivery_process_capabilities() { + + wp_roles()->add_cap('administrator', 'manage_wiaas_order_delivery_process'); } \ No newline at end of file