Changeset 1090

Timestamp:

10/03/08 03:40:21 (2 months ago)

Author:

areski

Message:

fix CDR view on Customer

Files:

• trunk/admin/Public/call-log-customers.php (modified) (3 diffs)
• trunk/admin/Public/form_data/FG_var_card.inc (modified) (1 diff)
• trunk/common/lib/interface/constants.php (modified) (2 diffs)
• trunk/customer/call-history.php (modified) (6 diffs)

trunk/admin/Public/call-log-customers.php

@@ -68 +68 @@
-$list_calltype ["4"] = array ("CALLBACK", "4" );
-$list_calltype ["5"] = array ("PREDICT", "5" );
+
+$FG_TABLE_DEFAULT_ORDER = "t1.starttime";
+$FG_TABLE_DEFAULT_SENS = "DESC";
+
-
-$DBHandle = DbConnect ();
@@ -93 +97 @@
-}
-
-$FG_TABLE_DEFAULT_ORDER = "t1.starttime";
-$FG_TABLE_DEFAULT_SENS = "DESC";
-
-// This Variable store the argument for the SQL query
-$FG_COL_QUERY = 't1.starttime, t1.src, t1.dnid ,t1.calledstation, t1.id_cc_prefix, t4.buyrate ,t4.rateinitial ,t1.sessiontime, t1.card_id, t3.trunkcode, t1.terminatecauseid, t1.sipiax, t1.buycost, t1.sessionbill, case when t1.sessionbill!=0 then ((t1.sessionbill-t1.buycost)/t1.sessionbill)*100 else NULL end as margin,case when t1.buycost!=0 then ((t1.sessionbill-t1.buycost)/t1.buycost)*100 else NULL end as markup';
@@ -101 +102 @@
-        $FG_COL_QUERY .= ', t1.uniqueid';
-}
-
-$FG_COL_QUERY_GRAPH = 't1.callstart, t1.duration';
-
-// The variable LIMITE_DISPLAY define the limit of record to display by page
-$FG_LIMITE_DISPLAY = 25;
-
-// Number of column in the html table
-$FG_NB_TABLE_COL = count ( $FG_TABLE_COL );
-
-// The variable $FG_EDITION define if you want process to the edition of the database record
-$FG_EDITION = true;
-
-//This variable will store the total number of column
-$FG_TOTAL_TABLE_COL = $FG_NB_TABLE_COL;
-if ($FG_DELETION || $FG_EDITION)
-        $FG_TOTAL_TABLE_COL ++;
-
-
+
-$FG_HTML_TABLE_TITLE = gettext ( " - Call Logs - " );
-
-//This variable define the width of the HTML table
-$FG_HTML_TABLE_WIDTH = '98%';
-
-
-
+
-$instance_table = new Table ( $FG_TABLE_NAME, $FG_COL_QUERY );
-$instance_table_graph = new Table ( $FG_TABLE_NAME, $FG_COL_QUERY_GRAPH );

trunk/admin/Public/form_data/FG_var_card.inc

@@ -76 +76 @@
-
-$cardstatus_list = Constants::getCardStatus_List();
-
-$cardstatus_list_r = Constants::getCardStatus_Revert_List();
-
-$cardstatus_list_acronym = Constants::getCardStatus_Acronym_List();
-
-$typepaid_list = Constants::getPaidTypeList();
-

trunk/common/lib/interface/constants.php

@@ -24 +24 @@
-                $yesno["0"] = array( gettext("No"), "0");
-                return $yesno;
-
-
-
-
-
+
-
-        public static function getPeriodsList(){
@@ -223 +219 @@
-                $cardstatus_list_acronym = array();
-                $cardstatus_list_acronym["0"]  = array( gettext("<acronym title=\"CANCELLED\">".gettext("CANCEL")."</acronym>"), "0");
-\">".gettext("ACTIVE
+D\">".gettext("ACTIVED
-                $cardstatus_list_acronym["2"]  = array( gettext("<acronym title=\"NEW\">".gettext("NEW")."</acronym>"), "2");
-
+ING
-                $cardstatus_list_acronym["4"]  = array( gettext("<acronym title=\"RESERVED\">".gettext("RESERV")."</acronym>"), "4");
-
-
-
+
+
+
+
-        }
-        

trunk/customer/call-history.php

@@ -60 +60 @@
-$DBHandle  = DbConnect();
-
-
-
+
+
+
-$FG_TABLE_COL = array();
-
-
-$FG_TABLE_COL[]=array (gettext("Calldate"), "starttime", "14%", "center", "SORT", "19", "", "", "", "", "", "display_dateformat");
-$FG_TABLE_COL[]=array (gettext("Source"), "source", "12%", "center", "SORT", "30");
-$FG_TABLE_COL[]=array (gettext("PhoneNumber"), "calledstation", "12%", "center", "SORT", "30", "", "", "", "", "", "remove_prefix");
-[]=array (gettext("Destination"), "id_cc_prefix", "12%", "center", "SORT", "30", "", "", "", "", "", "remove_prefix"
+ [] = array (gettext ( "Destination" ), "id_cc_prefix", "10%", "center", "SORT", "15", "lie", "cc_prefix", "destination", "id='%id'", "%1" 
-$FG_TABLE_COL[]=array (gettext("Duration"), "sessiontime", "7%", "center", "SORT", "30", "", "", "", "", "", "display_minute");
-$FG_TABLE_COL[]=array ('<acronym title="'.gettext("Terminate Cause").'">'.gettext("TC").'</acronym>', "terminatecauseid", "7%", "center", "SORT", "", "list", $dialstatus_list);
@@ -75 +74 @@
-$FG_TABLE_COL[]=array (gettext("Cost"), "sessionbill", "10%", "center", "SORT", "30", "", "", "", "", "", "display_2bill");
-
-
-
-
-
-
-
-
-
+
-$FG_COL_QUERY_GRAPH='t1.callstart, t1.duration';
-
-// The variable LIMITE_DISPLAY define the limit of record to display by page
-$FG_LIMITE_DISPLAY=25;
-
-// Number of column in the html table
-$FG_NB_TABLE_COL=count($FG_TABLE_COL);
-
-// The variable $FG_EDITION define if you want process to the edition of the database record
-$FG_EDITION=true;
-
-//This variable will store the total number of column
-$FG_TOTAL_TABLE_COL = $FG_NB_TABLE_COL;
-if ($FG_DELETION || $FG_EDITION) $FG_TOTAL_TABLE_COL++;
-
-//This variable define the Title of the HTML table
-$FG_HTML_TABLE_TITLE=" - ".gettext("Call Logs")." - ";
-
-//This variable define the width of the HTML table
-$FG_HTML_TABLE_WIDTH="98%";
-
-       
-       
-       
+
+
+
-
-
@@ -114 +95 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-if (DB_TYPE == "postgres"){             
-                $UNIX_TIMESTAMP = "";
@@ -141 +117 @@
-}
-
-//echo "<br>$date_clause<br>";
-/*
-Month
-fromday today
-frommonth tomonth (true)
-fromstatsmonth tostatsmonth
-
-fromstatsday_sday
-fromstatsmonth_sday
-tostatsday_sday
-tostatsmonth_sday
-*/
-
-
-  
-if (strpos($SQLcmd, 'WHERE') > 0) { 
@@ -199 +161 @@
-
-if (!$nodisplay){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $nb_record_max=1;
-else
-
+ else 
+ 
-                $nb_record_max=(intval($nb_record/$FG_LIMITE_DISPLAY));
-else
+ else 
-                $nb_record_max=(intval($nb_record/$FG_LIMITE_DISPLAY)+1);
-        }       
-}
-
-
-if ($FG_DEBUG == 3) echo "<br>Nb_record : $nb_record";
-if ($FG_DEBUG == 3) echo "<br>Nb_record_max : $nb_record_max";
-
-
-/*************************************************************/
@@ -243 +199 @@
-
-<?php
-
-
-
-
+
+
+
-// #### HELP SECTION
-echo $CC_help_balance_customer;