Merge branch 'saas-623' into saas
Conflicts: airtime_mvc/application/common/Billing.php
This commit is contained in:
commit
e9adf1a7ed
|
@ -18,8 +18,11 @@ class Billing
|
|||
return $currentProduct["id"];
|
||||
//XXX: Major hack attack. Since this function gets called often, rather than querying WHMCS
|
||||
// we're just going to extract it from airtime.conf since it's the same as the rabbitmq username.
|
||||
//$CC_CONFIG = Config::getConfig();
|
||||
//$instanceId = $CC_CONFIG['rabbitmq']['username'];
|
||||
$CC_CONFIG = Config::getConfig();
|
||||
$instanceId = $CC_CONFIG['rabbitmq']['user'];
|
||||
if (!is_numeric($instanceId)) {
|
||||
throw new Exception("Invalid instance id in " . __FUNCTION__ . ": " . $instanceId);
|
||||
}
|
||||
return $instanceId;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue