From 73724bdd042f2fe9c4be2f90c36f6a4292c86054 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Tue, 24 Jun 2014 12:46:11 -0400
Subject: [PATCH] Custom fields were not saving

---
 .../application/controllers/BillingController.php      |  7 +++++--
 airtime_mvc/application/forms/BillingClient.php        | 10 ++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
index 34590a3e1..92592ccab 100644
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@@ -125,13 +125,16 @@ class BillingController extends Zend_Controller_Action {
         if ($request->isPost()) {
             $formData = $request->getPost();
             if ($form->isValid($formData)) {
-            
+
                 $credentials = self::getAPICredentials();
                 
                 $postfields = array();
                 $postfields["username"] = $credentials["username"];
                 $postfields["password"] = md5($credentials["password"]);
                 $postfields["action"] = "updateclient";
+
+                $postfields["customfields"] = base64_encode(serialize($formData["customfields"]));
+                unset($formData["customfields"]);
                 
                 //$postfields["clientid"] = Application_Model_Preference::GetClientId();
                 $postfields["clientid"] = 1846;
@@ -140,7 +143,7 @@ class BillingController extends Zend_Controller_Action {
                 $postfields = array_merge($postfields, $formData);
                 unset($postfields["password2verify"]);
                 unset($postfields["submit"]);
-                
+
                 $query_string = "";
                 foreach ($postfields as $k=>$v) $query_string .= "$k=".urlencode($v)."&";
                 
diff --git a/airtime_mvc/application/forms/BillingClient.php b/airtime_mvc/application/forms/BillingClient.php
index 2b889a52e..d0cb60729 100644
--- a/airtime_mvc/application/forms/BillingClient.php
+++ b/airtime_mvc/application/forms/BillingClient.php
@@ -140,15 +140,16 @@ class Application_Form_BillingClient extends Zend_Form
         $this->addElement($securityqans);
 
         foreach ($client["customfields"] as $field) {
-            if ($field["id"] == 7) {
+            if ($field["id"] == "7") {
                 $vatvalue = $field["value"];
-            } elseif ($field["id"] == 71) {
+            } elseif ($field["id"] == "71") {
                 $subscribevalue = $field["value"];
             }
         }
 
-        $vat = new Zend_Form_Element_Text('customfield7');
+        $vat = new Zend_Form_Element_Text("7");
         $vat->setLabel(_('VAT/Tax ID (EU only)'))
+            ->setBelongsTo('customfields')
             ->setValue($vatvalue)
             ->setAttrib('class', 'input_text')
             //->setRequired(true)
@@ -156,9 +157,10 @@ class Application_Form_BillingClient extends Zend_Form
             ->addFilter('StringTrim');
         $this->addElement($vat);
 
-        $subscribe = new Zend_Form_Element_Checkbox('customfield71');
+        $subscribe = new Zend_Form_Element_Checkbox('71');
         $subscribe->setLabel(_('Subscribe to Sourcefabric newsletter'))
             ->setValue($subscribevalue)
+            ->setBelongsTo('customfields')
             ->setAttrib('class', 'input_text')
             ->setRequired(true)
             ->addValidator($notEmptyValidator)