senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into resseler-to-customer

Browse Source
This commit is contained in:
Almira Krdzic
2018-10-17 13:44:15 +02:00
parent 755fc75ae9 ecde654ae9
commit 6c27afabfc
17 changed files with 411 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-organization-info.json
View File

@@ -65,8 +65,38 @@
"multiple": 1,
"ui": 1,
"ajax": 1,
"return_format": "label",
"return_format": "value",
"placeholder": ""
},
{
"key": "field_5bc49631c35a4",
"label": "Linked Customers",
"name": "_wiaas_organization_customers",
"type": "taxonomy",
"instructions": "",
"required": 0,
"conditional_logic": [
[
{
"field": "field_5bbe559d66d17",
"operator": "==contains",
"value": "commercial_lead"
}
]
],
"wrapper": {
"width": "",
"class": "",
"id": ""
},
"taxonomy": "wiaas-user-organization",
"field_type": "multi_select",
"allow_null": 0,
"add_term": 0,
"save_terms": 0,
"load_terms": 1,
"return_format": "id",
"multiple": 0
}
],
"location": [

68
backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php
View File

@@ -34,27 +34,22 @@ function wiaas_db_update_create_default_roles() {
// Add wiaas roles
add_role(
'commercial_lead',
'Commercial Lead',
array(
'read',
'view_admin_dashboard',
'read' => true,
)
);
add_role(
'supplier',
'Supplier',
array(
'read',
'view_admin_dashboard'
'read' => true,
)
);
add_role(
'user',
'User',
array(
'read'
'read' => true
)
);
@@ -94,12 +89,11 @@ function wiaas_db_update_create_default_roles() {
}
foreach ( $capabilities as $cap_group ) {
foreach ( $cap_group as $cap ) {
wp_roles()->add_cap( 'administrator', $cap );
wp_roles()->add_cap( 'commercial_lead', $cap );
}
foreach ( $cap_group as $cap ) {
wp_roles()->add_cap( 'administrator', $cap );
wp_roles()->add_cap( 'commercial_lead', $cap );
}
}
}
@@ -140,7 +134,49 @@ function wiaas_db_import_aam_role_settings() {
function wiaas_db_update_update_commercial_lead_capabilities() {
// add commercial lead specific roles
wp_roles()->add_cap( 'commercial_lead', 'manage_wiaas_cl_products' ); // cl products screen
wp_roles()->add_cap( 'commercial_lead', 'view_admin_dashboard' ); // cl products screen
wp_roles()->add_cap( 'commercial_lead', 'manage_wiaas_cl_customers' ); // cl products screen
wp_roles()->add_cap( 'commercial_lead', 'view_admin_dashboard' );
wp_roles()->add_cap( 'commercial_lead', 'read' );
wp_roles()->add_cap( 'commercial_lead', 'upload_files' );
// enable commercial leads to see Products tab
wp_roles()->add_cap( 'commercial_lead', 'edit_products' );
wp_roles()->add_cap( 'commercial_lead', 'edit_others_products' );
// enable commercial leads to set extra prices on products
wp_roles()->add_cap( 'commercial_lead', 'manage_wiaas_cl_products' );
// enable commercial leads to see Orders tab
wp_roles()->add_cap( 'commercial_lead', 'edit_shop_orders' );
// enable commercial leads to se Customers tab
wp_roles()->add_cap( 'commercial_lead', 'manage_wiaas_cl_customers' );
}
function wiaas_db_update_update_supplier_capabilities() {
// add supplier specific roles
wp_roles()->add_cap( 'supplier', 'view_admin_dashboard' );
wp_roles()->add_cap( 'supplier', 'read' );
}
function wiaas_db_update_update_admin_capabilities() {
wp_roles()->add_cap( 'administrator', 'create_products' );
}
function wiaas_create_role_access_groups() {
Groups_Group::create(array(
'name' => 'admin',
));
Groups_Group::create(array(
'name' => 'commercial_lead',
));
Groups_Group::create(array(
'name' => 'supplier',
));
Groups_Group::create(array(
'name' => 'customer',
));
}