Merge branch 'saas-dev' into saas-dev-publishing

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
Albert Santoni 2015-11-18 12:38:18 -05:00
commit 965a78c54a
16 changed files with 191 additions and 26 deletions

View file

@ -126,7 +126,8 @@ class Billing
}
else
{
if ($product["status"] === "Active") {
if ($product["status"] === "Active" ||
$product["status"] === "Suspended") {
$airtimeProduct = $product;
$subdomain = '';