Changeset 1223

Timestamp:

12/18/06 09:40:49 (6 years ago)

Author:

ijm1

Message:

Added functionality for adding and editing plans. editCustoemr also updated so that it updates the customer_state table when a customers plan changes.

File:

• ccsd/trunk/crcnetd/modules/ccs_billing.py (modified) (11 diffs)

ccsd/trunk/crcnetd/modules/ccs_billing.py

@@ -22 +22 @@
     Plan stuff
     """
-    def addPlan(details):
+    @exportViaXMLRPC(SESSION_RW, AUTH_ADMINISTRATOR, True)
+    def addPlan(self,details):
         """
         Adds a plan into the database.
@@ -30 +31 @@
         Returns true on success
         """
-        props = ["plan_name", "description", "price", "raduis_plan", \
+
+        session = getSessionE(self._session_id)
+        props = ["plan_name", "description", "price", "radius_plan", \
                 "included_mb", "cap_period", "cap_action", "cap_param", \
                 "cap_price"]
@@ -38 +41 @@
 
         session.execute(sql,(values))
-        
-
-    def updatePlan(plan_id, newDetails):
+        return True
+        
+    @exportViaXMLRPC(SESSION_RW, AUTH_ADMINISTRATOR, True)
+    def editPlan(self, newDetails):
         """
         Updates the plan with the id of plan_id with the details in 
@@ -48 +52 @@
         returns true on success.
         """
-        
+        session = getSessionE(self._session_id)
         props = ["plan_name","description","price","radius_plan", \
                 "included_mb", "cap_period", "cap_action", "cap_param", \
                 "cap_price"]
         (sql, values) = buildUpdateFromDict("billing_plan", props, 
-                newDetails, "plan_id", plan_id)
+                newDetails, "plan_id", newDetails["plan_id"])
 
         if values == None:
@@ -59 +63 @@
 
         session.execute(sql, values)
-        
-        
+        return True
+
     @exportViaXMLRPC(SESSION_RW, AUTH_ADMINISTRATOR, True)
     def removePlan(self, plan_id):
@@ -78 +82 @@
     @exportViaXMLRPC(SESSION_RO, AUTH_ADMINISTRATOR, True)
     def listPlans(self):
+        """
+        Returns a list of all plans.
+        """
         session = getSessionE(self._session_id)
         
@@ -84 +91 @@
         return session.query(sql,())
 
-        
-    
     
     @exportViaXMLRPC(SESSION_RO, AUTH_ADMINISTRATOR, True)
@@ -100 +105 @@
         return res[0]
     
+    @exportViaXMLRPC(SESSION_RO, AUTH_ADMINISTRATOR, True)
+    def getRadiusPlans(self):
+        """
+        Gets a list of all radius plans and returns it.
+        """
+        session = getSessionE(self._session_id)
+
+        sql = "SELECT * FROM radius_plan"
+
+        return session.query(sql, ())
+
     """
     Customer stuff, includes user name and password.
     """
-    def updateCustomer(contact_id, newDetails):
-        """
-        Updates a customer. newDetails is a dictionary containing only the
-        fields that need updating
-        """
-
-    def removeCustomer(contact_id):
-        """
-        Removes a customer from the database with the id of contact_id.
-        """
-    
     @exportViaXMLRPC(SESSION_RO, AUTH_ADMINISTRATOR, True)
     def getCustomerList(self):
@@ -126 +131 @@
 def editCustomer(session_id, details):
     session = getSessionE(session_id)
-    
+    tim
     editContact(session_id, details)
     if not details.has_key("plan_id"):
@@ -141 +146 @@
         details["billing_address"], details["contact_id"]))
     
+    sql = "SELECT included_mb, radius_plan FROM plans WHERE plan_id=%s"
+
+    res = session.query(sql, (details["plan_id"]))
+
+    sql = "UPDATE customer_state SET plan_start=CURRENT_TIMESTAMP, " \
+        "radius_plan=%s, plan_id=%s, cap_at_mb=%s"
+
+    session.execute(sql, (res[0]["radius_plan"], details["plan_id"], res[0]["included_mb"]))
     return details["contact_id"]
     
@@ -173 +186 @@
     res = session.query(sql, (details["plan_id"]))
     
+    #Set up the customer state table.
     sql = "INSERT INTO customer_state VALUES(%s,%s,CURRENT_TIMESTAMP, "\
         "%s,%s,CURRENT_TIMESTAMP,%s)"