Merge branch 'master' into resseler-to-customer

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

@@ -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": [