Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix account upgrade invoicing issue 

* Don't generate upgrade orders if the plan and the billing cycle didn't
  change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
This commit is contained in:
Albert Santoni 2014-07-09 13:49:25 -04:00
parent 20f55314b4
commit 0ab1eaa08c
2 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
airtime_mvc/application/controllers/BillingController.php
View File

@ -40,6 +40,21 @@ class BillingController extends Zend_Controller_Action {
$apply_vat = false; $apply_vat = false;
} }
$placeAnUpgradeOrder = true;
$currentPlanProduct = BillingController::getClientCurrentAirtimeProduct();
$currentPlanProductId = $currentPlanProduct["pid"];
$currentPlanProductBillingCycle = strtolower($currentPlanProduct["billingcycle"]);
//If there's been no change in the plan or the billing cycle, we should not
//place an upgrade order. WHMCS doesn't allow this in its web interface,
//and it freaks out and does the wrong thing if we do it via the API
//so we have to do avoid that.
if (($currentPlanProductId == $formData["newproductid"]) &&
($currentPlanProductBillingCycle == $formData["newproductbillingcycle"]))
{
$placeAnUpgradeOrder = false;
}
$postfields = array(); $postfields = array();
$postfields["username"] = $credentials["username"]; $postfields["username"] = $credentials["username"];
$postfields["password"] = md5($credentials["password"]); $postfields["password"] = md5($credentials["password"]);
@ -76,30 +91,39 @@ class BillingController extends Zend_Controller_Action {
$client_query_string = ""; $client_query_string = "";
foreach ($clientfields AS $k=>$v) $client_query_string .= "$k=".urlencode($v)."&"; foreach ($clientfields AS $k=>$v) $client_query_string .= "$k=".urlencode($v)."&";
//Update the client details in WHMCS first
$result = $this->makeRequest($credentials["url"], $client_query_string); $result = $this->makeRequest($credentials["url"], $client_query_string);
Logging::info($result); Logging::info($result);
if ($result["result"] == "error") { if ($result["result"] == "error") {
$this->setErrorMessage(); $this->setErrorMessage();
$this->view->form = $form; $this->view->form = $form;
return;
}
if (!$placeAnUpgradeOrder)
{
$this->_redirect('billing/invoices');
return;
}
//Then place an upgrade order in WHMCS
$result = $this->makeRequest($credentials["url"], $upgrade_query_string);
if ($result["result"] == "error") {
Logging::info($_SERVER['HTTP_HOST']." - Account upgrade failed. - ".$result["message"]);
$this->setErrorMessage();
$this->view->form = $form;
} else { } else {
$result = $this->makeRequest($credentials["url"], $upgrade_query_string); Logging::info($_SERVER['HTTP_HOST']. "Account plan upgrade request:");
if ($result["result"] == "error") { Logging::info($result);
Logging::info($_SERVER['HTTP_HOST']." - Account upgrade failed. - ".$result["message"]);
$this->setErrorMessage(); // Disable the view and the layout here, squashes an error.
$this->view->form = $form; $this->view->layout()->disableLayout();
} else { $this->_helper->viewRenderer->setNoRender(true);
Logging::info($_SERVER['HTTP_HOST']. "Account plan upgrade request:");
Logging::info($result); if ($apply_vat) {
$this->addVatToInvoice($result["invoiceid"]);
// Disable the view and the layout here, squashes an error.
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
if ($apply_vat) {
$this->addVatToInvoice($result["invoiceid"]);
}
self::viewInvoice($result["invoiceid"]);
} }
self::viewInvoice($result["invoiceid"]);
} }
} else { } else {
$this->view->form = $form; $this->view->form = $form;
@ -384,7 +408,11 @@ class BillingController extends Zend_Controller_Action {
$result = self::makeRequest($credentials["url"], $query_string); $result = self::makeRequest($credentials["url"], $query_string);
$this->view->invoices = $result["invoices"]["invoice"]; if ($result["invoices"]) {
$this->view->invoices = $result["invoices"]["invoice"];;
} else {
$this->view->invoices = array();
}
} }
public function invoiceAction() public function invoiceAction()

8
airtime_mvc/application/forms/BillingUpgradeDowngrade.php
View File

@ -6,13 +6,7 @@ class Application_Form_BillingUpgradeDowngrade extends Zend_Form
$productPrices = array(); $productPrices = array();
$productTypes = array(); $productTypes = array();
list($productPrices, $productTypes) = BillingController::getProductPricesAndTypes(); list($productPrices, $productTypes) = BillingController::getProductPricesAndTypes();
//$currentPlanType = ucfirst(Application_Model_Preference::GetPlanLevel());
$currentPlanType = "Hobbyist";
if (($key = array_search($currentPlanType, $productTypes)) !== false) {
//unset($productTypes[$key]);
}
$currentPlanProduct = BillingController::getClientCurrentAirtimeProduct(); $currentPlanProduct = BillingController::getClientCurrentAirtimeProduct();
$currentPlanProductId = $currentPlanProduct["pid"]; $currentPlanProductId = $currentPlanProduct["pid"];