Changeset 956

Timestamp:

08/19/08 15:09:35 (3 years ago)

Author:

rach

Message:

Feature
Add in CDR search buy rate and sell rate.
Add in Brows Rates result – RATECARD
Add PAYMENT BUTTON to list callerid
Search CDR's using time

Files:

• trunk/admin/Public/call-log-customers.php (modified) (6 diffs)
• trunk/admin/Public/form_data/FG_var_callerid.inc (modified) (1 diff)
• trunk/admin/Public/form_data/FG_var_def_ratecard.inc (modified) (1 diff)

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

@@ -11 +11 @@
-}
-
- 'entercustomer', 'enterprovider', 'entertariffgroup', 'entertrunk', 'enterratecard', 'posted', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday', 'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday'
+'sellrate','buyrate','entercustomer', 'enterprovider', 'entertariffgroup', 'entertrunk', 'enterratecard', 'posted', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday', 'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday','fromtime','totime','fromstatsday_hour', 'tostatsday_hour' ,'fromstatsday_min', 'tostatsday_min' 
-
-
@@ -150 +150 @@
-        if ($tomonth && isset($tostatsmonth)) $date_clause.=" AND $UNIX_TIMESTAMP(t1.starttime) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')"; 
-} else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -196 +209 @@
-                $FG_TABLE_CLAUSE .= "t1.id_ratecard = '$enterratecard'";
-        }
+        if (isset($buyrate)&&!empty($buyrate))
+        {       if (strlen($FG_TABLE_CLAUSE) > 0) $FG_TABLE_CLAUSE .= " AND ";
+                $FG_TABLE_CLAUSE .= "t1.buyrate = '$buyrate'";
+        }
+        if (isset($sellrate)&&!empty($sellrate))
+        {       if (strlen($FG_TABLE_CLAUSE) > 0) $FG_TABLE_CLAUSE .= " AND ";
+                $FG_TABLE_CLAUSE .= "t1.calledrate = '$sellrate'";
+        }
+        
-}
-
@@ -347 +369 @@
-                                                </tr>
-                                        </table>
+                              </td>
+                                </tr>
+                                <tr>
+                                        <td>
+                                        &nbsp;
+                                        </td>
+                                        <td>
+                                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                                                <tr>
+                                                        <td align="left" class="fontstyle_searchoptions"><?php echo gettext("Buy Rate");?> :</td>
+                                                        <td align="left" class="fontstyle_searchoptions"><INPUT TYPE="text" NAME="buyrate" value="<?php echo $buyrate?>" size="8" class="form_input_text"></td>
+                                                        <td align="left" class="fontstyle_searchoptions"><?php echo gettext("Sell Rate");?> :
+                                                        <td align="left" class="fontstyle_searchoptions"><INPUT TYPE="text" NAME="sellrate" value="<?php echo $sellrate?>" size="8" class="form_input_text"></td>
+                                                </tr>
+                                                
+                                        </table>
+                                                                
+                                        </td>
-                                </tr>
-                        </table>
@@ -442 +482 @@
-                                ?>
-                                </select>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                <input type="checkbox" name="today" value="true" <?php  if ($today){ ?>checked<?php }?>> 
-                                <?php echo gettext("To");?>  :
@@ -470 +530 @@
-                                        }
-                                ?>
+                                </select>
+                                <br/>
+                                <input type="checkbox" name="totime" value="true" <?php  if ($totime){ ?>checked<?php }?>> 
+                                <?php echo gettext("Time :") ?>
+                                <select name="tostatsday_hour" class="form_input_select">
+                                <?php  
+                                        for ($i=0;$i<=23;$i++){
+                                                if ($tostatsday_hour==sprintf("%02d",$i)){$selected="selected";}else{$selected="";}
+                                                echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                                        }
+                                ?>                                              
+                                </select>
+                                :
+                                <select name="tostatsday_min" class="form_input_select">
+                                <?php  
+                                        for ($i=0;$i<60;$i=$i+5){
+                                                if ($tostatsday_min==sprintf("%02d",$i)){$selected="selected";}else{$selected="";}
+                                                echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                                        }
+                                ?>                                              
-                                </select>
-                                </td></tr></table>

trunk/admin/Public/form_data/FG_var_callerid.inc

@@ -74 +74 @@
-$HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path . "/icon-card.png";
-
+$HD_Form -> FG_OTHER_BUTTON2 = true;
+$HD_Form -> FG_OTHER_BUTTON2_LINK="A2B_entity_payment.php?stitle=Payment_add&form_action=ask-add&card_id=|col_orig1|";
+$HD_Form -> FG_OTHER_BUTTON2_IMG = Images_Path . "/money.png";
+$HD_Form -> FG_OTHER_BUTTON2_ALT = gettext('ADD PAYMENT');
+
-
-

trunk/admin/Public/form_data/FG_var_def_ratecard.inc

@@ -89 +89 @@
-$HD_Form -> AddViewElement("<acronym title=\"BUYING RATE\">".gettext("BR")."</acronym>", "buyrate", "4%", "center", "sort");
-$HD_Form -> AddViewElement("<acronym title=\"SELLING RATE\">".gettext("SR")."</acronym>", "rateinitial", "4%", "center", "sort");
-5
-5
+3
+3
-if (!$popup_select) $HD_Form -> AddViewElement("<acronym title=\"INITBLOCK\">".gettext("INITB")."</acronym>", "initblock", "4%", "center", "sort");
-if (!$popup_select) $HD_Form -> AddViewElement("<acronym title=\"CONNECT CHARGE\">".gettext("CC")."</acronym>", "connectcharge", "4%", "center", "sort");
-
+
+
-//$HD_Form -> AddViewElement(gettext("CIDGroup"), "id_outbound_cidgroup", "12%", "center", "sort", "15", "lie", "cc_outbound_cid_group", "group_name", "id='%id'", "%1");
-
-
-if (!$popup_select) {
-
+ , cc_ratecard.idtariffplan 
-} else {
-        $HD_Form -> FieldViewElement ('cc_ratecard.id, cc_ratecard.destination, cc_ratecard.dialprefix, cc_ratecard.buyrate, cc_ratecard.rateinitial');