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

Merge branch 'organisation-bug' into 'master'

Browse Source 
Add supplier for organisation only if it has supplier role

See merge request saburly/wiaas/new-wiaas!44
This commit was merged in pull request #44.
This commit is contained in:
Almira
2018-10-26 07:50:32 +00:00
parent 42c9f07195 06e7461245
commit 45090fa05f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,8 @@ class Wiaas_Product_Supplier {
public static function init() { public static function init() {
add_action('init', array(__CLASS__, 'register_supplier_taxonomy')); add_action('init', array(__CLASS__, 'register_supplier_taxonomy'));
add_action('created_' . 'wiaas-user-organization', array(__CLASS__, 'on_organization_added')); add_action('wiaas_organization_created', array(__CLASS__, 'on_organization_added'),20, 2);
add_action('wiaas_organization_roles_updated' , array(__CLASS__, 'on_organization_added'),20, 2);
} }
/** /**
@@ -46,13 +47,15 @@ class Wiaas_Product_Supplier {
* Create corresponding supplier term for organization * Create corresponding supplier term for organization
* *
* @param $organization_id * @param $organization_id
* @param $roles
*/ */
public static function on_organization_added($organization_id) { public static function on_organization_added($organization_id, $roles) {
$organization = get_term_by('id', $organization_id, 'wiaas-user-organization'); $organization = get_term_by('id', $organization_id, 'wiaas-user-organization');
$supplier = term_exists($organization->slug, 'supplier'); $supplier = term_exists($organization->slug, 'supplier');
if (! $supplier) { if (! $supplier && in_array('supplier', $roles) ) {
$supplier = wp_insert_term($organization->name, 'supplier', array( $supplier = wp_insert_term($organization->name, 'supplier', array(
'slug' => $organization->slug 'slug' => $organization->slug
)); ));

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

@@ -65,10 +65,9 @@ class Wiaas_User_Organization extends WP_User_Taxonomy {
*/ */
public static function on_organization_added($organization_id) { public static function on_organization_added($organization_id) {
self::_create_organization_access_group($organization_id); self::_create_organization_access_group($organization_id);
do_action('wiaas_organization_created', $organization_id);
$roles = wiaas_get_organization_roles($organization_id); $roles = wiaas_get_organization_roles($organization_id);
do_action('wiaas_organization_created', $organization_id, $roles);
self::_assign_organization_roles_capabilities($organization_id, $roles); self::_assign_organization_roles_capabilities($organization_id, $roles);
} }