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

Add supplier for organisation only if it has supplier role #44

Merged
nedimu merged 3 commits from organisation-bug into master 2018-10-26 09:50:33 +02:00
Conversation 7 Commits 3 Files Changed 2 +3 -4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0926030133 - Show all commits

5
backend/app/plugins/wiaas/includes/product/class-wiaas-product-supplier.php
View File

@@ -6,8 +6,8 @@ class Wiaas_Product_Supplier {
public static function init() {
add_action('init', array(__CLASS__, 'register_supplier_taxonomy'));
add_action('created_' . 'wiaas-user-organization', array(__CLASS__, 'on_organization_added'));
add_action('edit_' . 'wiaas-user-organization', array(__CLASS__, 'on_organization_added'));
add_action('wiaas_organization_created', array(__CLASS__, 'on_organization_added'));
add_action('wiaas_organization_roles_updated' , array(__CLASS__, 'on_organization_added'));
}
/**
@@ -47,6 +47,7 @@ class Wiaas_Product_Supplier {
* Create corresponding supplier term for organization
*
* @param $organization_id
* @param $roles
*/
public static function on_organization_added($organization_id) {
$organization = get_term_by('id', $organization_id, 'wiaas-user-organization');

2
backend/app/plugins/wiaas/includes/user/class-wiaas-user-organization.php
View File

@@ -66,8 +66,6 @@ class Wiaas_User_Organization extends WP_User_Taxonomy {
public static function on_organization_added($organization_id) {
self::_create_organization_access_group($organization_id);
do_action('wiaas_organization_created', $organization_id);
$roles = wiaas_get_organization_roles($organization_id);
self::_assign_organization_roles_capabilities($organization_id, $roles);