Ticket #270: charge.diff

DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.4.0-mysql.sql

@@ -589 +589 @@
-ALTER TABLE cc_ratecard ADD COLUMN additional_block_charge DECIMAL(15,5) NOT NULL DEFAULT 0;
-ALTER TABLE cc_ratecard ADD COLUMN additional_block_charge_time INT NOT NULL DEFAULT 0;
-ALTER TABLE cc_ratecard ADD COLUMN tag CHAR(50);
+ALTER TABLE cc_ratecard ADD COLUMN disconnectcharge_after INT NOT default 0;
-
-ALTER TABLE cc_card ADD COLUMN template_invoice VARCHAR( 100 ) ;
-ALTER TABLE cc_card ADD COLUMN template_outstanding VARCHAR( 100 ) ;

admin/Public/CC_entity_sim_ratecard.php

@@ -170 +170 @@
-if ( (is_array($RateEngine->ratecard_obj)) && (!empty($RateEngine->ratecard_obj)) ){
-if ($FG_DEBUG == 1) print_r($RateEngine->ratecard_obj);
-
-
+'disconnectcharge_after',
-
-$FG_TABLE_ALTERNATE_ROW_COLOR[0]='#CDC9C9';
-$FG_TABLE_ALTERNATE_ROW_COLOR[1]='#EEE9E9';

admin/Public/form_data/FG_var_def_ratecard.inc

@@ -1 +1 @@
-<?php
-
-getpost_ifset(array('id', 'idtariffplan', 'dialprefix', 'destination', 'buyrate', 'buyrateinitblock',
-
+'disconnectcharge_after',
-'stepchargea', 'chargea', 'timechargea', 'billingblocka', 'stepchargeb', 'chargeb', 'timechargeb',
-'billingblockb', 'stepchargec', 'chargec', 'timechargec', 'billingblockc', 'startdate', 'stopdate',
-'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 'rounding_threshold', 'additional_block_charge', 'additional_block_charge_time', 'additional_grace','minimal_cost'));
@@ -271 +271 @@
-   "12",
-   gettext("Insert the disconnect charge"),
-   "" , "", "", "", "", "", "NO", gettext("Apply a disconnection charge" ));
-
+
+
+
+
+
+
+
+
+
+
-$HD_Form -> AddEditElement(gettext("MINIMUM CALL COST "),
-   "minimal_cost",
-   '$value',
@@ -532 +541 @@
-
-if (ADVANCED_MODE) {
-        // This Variable store the argument for the SQL query
-
+disconnectcharge_after,
-}else{
-        // This Variable store the argument for the SQL query
-
+disconnectcharge_after,
-}
-
-

admin/Public/CC_ratecard_import.php

@@ -262 +262 @@
-                                <option value="billingblock"><?php echo gettext("billingblock");?></option>
-                                <option value="connectcharge"><?php echo gettext("connectcharge");?></option>
-                                <option value="disconnectcharge"><?php echo gettext("disconnectcharge");?></option>
+                                <option value="disconnectcharge_after"><?php echo gettext("disconnectcharge_after");?></option>
-                                <option value="stepchargea"><?php echo gettext("stepchargea");?></option>
-                                <option value="chargea"><?php echo gettext("chargea");?></option>
-                                <option value="timechargea"><?php echo gettext("timechargea");?></option>

common/lib/Form/Class.SearchHandler.inc.php

@@ -612 +612 @@
-                                </font>
-                        </td>
-                </tr>
+<tr>
+          <td align="left" class="searchhandler_table4_td1">
+                                <input name="check[upd_disconnectcharge_after]" type="checkbox" <?php if ($check["upd_disconnectcharge_after"]=="on") echo "checked"?>>
+                                <input name="mode[upd_disconnectcharge_after]" type="hidden" value="2">
+                  </td>
+                  <td align="left" class="searchhandler_table4_td1">
+
+                                <strong>11)&nbsp;<?php echo gettext("DISCONNECTCHARGE_AFTER");?>&nbsp;:</strong>
+                                        <input class="form_input_text" name="upd_disconnectcharge_after" size="10" maxlength="10" style="border: 2px inset rgb(204, 51, 0);" value="<?php if (isset($upd_disconnectcharge_after)) echo $upd_disconnectcharge_after; else echo '0';?>" >
+                                <font class="version">
+                                <input type="radio" NAME="type[upd_disconnectcharge_after]" value="1" <?php if((!isset($type[upd_disconnectcharge_after]))|| ($type[upd_disconnectcharge_after]==1) ){?>checked<?php }?>> <?php echo gettext("Equal");?>
+
+                                <input type="radio" NAME="type[upd_disconnectcharge_after]" value="2" <?php if($type[upd_disconnectcharge_after]==2){?>checked<?php }?>> <?php echo gettext("Add");?>
+                                <input type="radio" NAME="type[upd_disconnectcharge_after]" value="3" <?php if($type[upd_disconnectcharge_after]==3){?>checked<?php }?>> <?php echo gettext("Substract");?>
+                                </font>
+                        </td>
+                </tr>
+
+
+
+
-                <tr>            
-                        <td align="right" class="searchhandler_table4_td1">
-                        </td>

common/lib/Class.RateEngine.php

@@ -180 +180 @@
-                tp_trunk.failover_trunk AS tp_failover_trunk, rt_trunk.failover_trunk AS rt_failover_trunk,tp_trunk.addparameter AS tp_addparameter_trunk, rt_trunk.addparameter AS rt_addparameter_trunk, id_outbound_cidgroup,
-        id_cc_package_offer,tp_trunk.status, rt_trunk.status, tp_trunk.inuse, rt_trunk.inuse, 
-        tp_trunk.maxuse,  rt_trunk.maxuse,tp_trunk.if_max_use, rt_trunk.if_max_use,cc_ratecard.rounding_calltime AS rounding_calltime,
-
+,disconnectcharge_after
-
-                FROM cc_tariffgroup
-                RIGHT JOIN cc_tariffgroup_plan ON cc_tariffgroup_plan.idtariffgroup=cc_tariffgroup.id
@@ -343 +343 @@
-                $billingblock                                   = $this -> ratecard_obj[$K][14];
-                $connectcharge                                  = a2b_round (abs($this -> ratecard_obj[$K][15]));
-                $disconnectcharge                               = a2b_round (abs($this -> ratecard_obj[$K][16]));
+                $disconnectcharge_after                         = $this->ratecard_obj[$K][60];
-                $stepchargea                                    = $this -> ratecard_obj[$K][17];
-                $chargea                                                = a2b_round (abs($this -> ratecard_obj[$K][18]));
-                $timechargea                                    = $this -> ratecard_obj[$K][19];
@@ -440 +441 @@
-                }
-
-                $credit -= $connectcharge;
-
+
+
+
+
-                //$credit -= ($initblock/60)*$rateinitial;
-
-                $callbackrate = array();
@@ -716 +720 @@
-                $billingblock                                   = $this -> ratecard_obj[$K][14];
-                $connectcharge                                  = a2b_round(abs($this -> ratecard_obj[$K][15]));
-                $disconnectcharge                               = a2b_round(abs($this -> ratecard_obj[$K][16]));
+                $disconnectcharge_after                         = $this->ratecard_obj[$K][60];
-                $stepchargea                                    = $this -> ratecard_obj[$K][17];
-                $chargea                                                = a2b_round(abs($this -> ratecard_obj[$K][18]));
-                $timechargea                                    = $this -> ratecard_obj[$K][19];
@@ -749 +754 @@
-
-                $cost = 0;
-                $cost -= $connectcharge;
-
+
+
+
-
-                $this -> real_answeredtime = $callduration;
-                $callduration =$callduration + $additional_grace_time;