Changeset 884

Timestamp:

07/11/08 12:48:33 (2 months ago)

Author:

asiby

Message:

Fixing Redial to make it catch any dialed numbers and not only successfully called numbers.

Files:

• trunk/common/lib/Class.A2Billing.php (modified) (3 diffs)
• trunk/common/lib/Class.RateEngine.php (modified) (1 diff)

trunk/common/lib/Class.A2Billing.php

@@ -852 +852 @@
-                $this->destination = str_replace('*', '', $this->destination);
-
+                $this->save_redial_number($this->destination);
+
-                // LOOKUP RATE : FIND A RATE FOR THIS DESTINATION
-                $resfindrate = $RateEngine->rate_engine_findrates($this, $this->destination,$this->tariff);
@@ -967 +969 @@
-                        }
-                }
+
+                $this->save_redial_number($this->destination);
-
-                $this -> debug( VERBOSE | WRITELOG, $agi, __FILE__, __LINE__, "SIP o IAX DESTINATION : ".$this->destination);
@@ -2490 +2494 @@
-        }
-
+        function save_redial_number($number){
+                if(($this->mode == 'did') || ($this->mode == 'callback')){
+                    return;
+                }
+                $QUERY = "UPDATE cc_card SET redial = '{$number}' WHERE username='".$this->accountcode."'";
+                $result = $this->instance_table -> SQLExec ($this->DBHandle, $QUERY, 0);
+                $this -> debug( VERBOSE | WRITELOG, $agi, __FILE__, __LINE__, "[SAVING DESTINATION FOR REDIAL: SQL: {$QUERY}]:[result: {$result}]");
+        }
-
-};

trunk/common/lib/Class.RateEngine.php

@@ -1045 +1045 @@
-                        $A2B -> credit = $A2B -> credit + $cost;
-
-                        if ($didcall==0 && $callback==0) $myclause_nodidcall = " , redial='".$calledstation."' ";
-                        else $myclause_nodidcall='';
-
-
-                        if ($A2B->nbused>0){
-                                $QUERY = "UPDATE cc_card SET credit= credit$signe".a2b_round(abs($cost))." $myclause_nodidcall,  lastuse=now(), nbused=nbused+1 WHERE username='".$A2B->username."'";