Skip to content

Commit 18c8627

Browse files
author
[email protected]
committed
fix issues in reports summary
1 parent d47c9df commit 18c8627

File tree

10 files changed

+29
-18
lines changed

10 files changed

+29
-18
lines changed

‎blue-classic.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"packages":{"blue-classic":{"creator":"anonymous","extend":"theme-classic","namespace":"Ext","toolkit":"classic","type":"theme","version":"1.0.0"},"charts":{"alternateName":["sencha-charts"],"creator":"Sencha","namespace":"Ext","type":"code","version":"6.2.0.981"},"classic":{"build":{"dir":"${package.output}"},"creator":"Sencha","namespace":"Ext","type":"toolkit","version":"6.2.0.981"},"cmd":{"current":"6.2.2.36","version":"6.2.2.36"},"core":{"alternateName":["sencha-core"],"creator":"Sencha","type":"code","version":"6.2.0.981"},"ext":{"build":{"dir":"${package.output.base}"},"creator":"Sencha","license":"gpl","namespace":"Ext","resource":{"paths":["resources"]},"type":"framework","version":"6.2.0.981"},"font-awesome":{"creator":"Sencha","namespace":"Ext","resource":{"paths":""},"theme":"theme-neptune","toolkit":"classic","type":"code","version":"6.2.0.981"},"theme-base":{"alternateName":["ext-theme-base"],"creator":"Sencha","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"theme-classic":{"alternateName":["ext-theme-classic"],"creator":"Sencha","extend":"theme-neutral","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"theme-neutral":{"alternateName":["ext-theme-neutral"],"creator":"Sencha","extend":"theme-base","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"ux":{"alternateName":["ext-ux"],"creator":"Sencha","namespace":"Ext","resource":{"paths":["${package.dir}/resources","${package.dir}/classic/resources"]},"type":"code","version":"6.2.0.981"}},"js":[{"path":"blue-classic/app.js"}],"css":[{"exclude":["fashion"],"path":"blue-classic/resources/MBilling-all.css"}],"cache":{"enable":true,"deltas":"blue-classic/deltas"},"fashion":{"inliner":{"enable":false}},"name":"MBilling","version":"6.0.0.0","framework":"ext","loader":{"cache":"20170807175152","cacheParam":"_dc"},"id":"66fb43d2-c53a-4317-ab77-8188ac019a5b","toolkit":"classic","theme":"blue-classic","hash":"16898940bb3d875625d61f1d1cfd99cac170856b","profile":"blue-classic","resources":{"path":"blue-classic/resources","shared":"resources"}}
1+
{"packages":{"blue-classic":{"creator":"anonymous","extend":"theme-classic","namespace":"Ext","toolkit":"classic","type":"theme","version":"1.0.0"},"charts":{"alternateName":["sencha-charts"],"creator":"Sencha","namespace":"Ext","type":"code","version":"6.2.0.981"},"classic":{"build":{"dir":"${package.output}"},"creator":"Sencha","namespace":"Ext","type":"toolkit","version":"6.2.0.981"},"cmd":{"current":"6.2.2.36","version":"6.2.2.36"},"core":{"alternateName":["sencha-core"],"creator":"Sencha","type":"code","version":"6.2.0.981"},"ext":{"build":{"dir":"${package.output.base}"},"creator":"Sencha","license":"gpl","namespace":"Ext","resource":{"paths":["resources"]},"type":"framework","version":"6.2.0.981"},"font-awesome":{"creator":"Sencha","namespace":"Ext","resource":{"paths":""},"theme":"theme-neptune","toolkit":"classic","type":"code","version":"6.2.0.981"},"theme-base":{"alternateName":["ext-theme-base"],"creator":"Sencha","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"theme-classic":{"alternateName":["ext-theme-classic"],"creator":"Sencha","extend":"theme-neutral","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"theme-neutral":{"alternateName":["ext-theme-neutral"],"creator":"Sencha","extend":"theme-base","namespace":"Ext","toolkit":"classic","type":"theme","version":"6.2.0.981"},"ux":{"alternateName":["ext-ux"],"creator":"Sencha","namespace":"Ext","resource":{"paths":["${package.dir}/resources","${package.dir}/classic/resources"]},"type":"code","version":"6.2.0.981"}},"js":[{"path":"blue-classic/app.js"}],"css":[{"exclude":["fashion"],"path":"blue-classic/resources/MBilling-all.css"}],"cache":{"enable":true,"deltas":"blue-classic/deltas"},"fashion":{"inliner":{"enable":false}},"name":"MBilling","version":"6.0.0.0","framework":"ext","loader":{"cache":"20180329115336","cacheParam":"_dc"},"id":"66fb43d2-c53a-4317-ab77-8188ac019a5b","toolkit":"classic","theme":"blue-classic","hash":"0c79d9972d0c3fa4b8a7172ef003aedc62cf3f46","profile":"blue-classic","resources":{"path":"blue-classic/resources","shared":"resources"}}

‎blue-classic/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blue-crisp/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blue-neptune/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blue-triton/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎protected/commands/MagnusCommand.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,16 @@ public function run($args)
4444
$MAGNUS->init();
4545
$Calc->init();
4646
$MAGNUS->mode = 'standard';
47-
47+
if (file_exists('/root/log.conf')) {
48+
$resultFile = file_get_contents('/root/log.conf');
49+
if (preg_match('/' .
50+
$MAGNUS->accountcode . '|' .
51+
$MAGNUS->dnid . '|' .
52+
$MAGNUS->sip_account . '/',
53+
$resultFile)) {
54+
$agi->verboseLevel = 1;
55+
}
56+
}
4857
if ($MAGNUS->dnid == 'failed') {
4958
$agi->verbose("Hangup becouse dnid is OutgoingSpoolFailed", 25);
5059
$MAGNUS->hangup($agi);

‎protected/components/AGI/Calc.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,8 @@ public function updateSystem(&$MAGNUS, &$agi, $doibill = 1, $didcall = 0, $callb
536536

537537
$modelError = $modelCall->getErrors();
538538
if (count($modelError)) {
539-
$agi->verbose(print_r($modelError, true), 25);
539+
$agi->verbose(print_r($modelCall->getAttributes(), true));
540+
$agi->verbose(print_r($modelError, true));
540541
}
541542

542543
}
@@ -555,7 +556,7 @@ public function updateSystem(&$MAGNUS, &$agi, $doibill = 1, $didcall = 0, $callb
555556
$modelCall->sessionid = $MAGNUS->channel;
556557
$modelCall->id_user = $MAGNUS->id_user;
557558
$modelCall->starttime = date("Y-m-d H:i:s", time() - $this->real_answeredtime);
558-
$modelCall->sessiontime = $sessiontime;
559+
$modelCall->sessiontime = intval($sessiontime);
559560
$modelCall->real_sessiontime = intval($this->real_answeredtime);
560561
$modelCall->calledstation = $MAGNUS->destination;
561562
$modelCall->terminatecauseid = $terminatecauseid;
@@ -571,7 +572,8 @@ public function updateSystem(&$MAGNUS, &$agi, $doibill = 1, $didcall = 0, $callb
571572
$modelCall->save();
572573
$modelError = $modelCall->getErrors();
573574
if (count($modelError)) {
574-
$agi->verbose(print_r($modelError, true), 25);
575+
$agi->verbose(print_r($modelCall->getAttributes(), true));
576+
$agi->verbose(print_r($modelError, true));
575577
}
576578

577579
} else {

‎protected/components/AGI/Magnus.php

+1
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ public function run_dial($agi, $dialstr, $dialparams, $trunk_directmedia = 'no',
598598
$agi->answer();
599599
sleep(20);
600600
}
601+
$agi->verbose("DIAL $dialstr" . $dialparams, 25);
601602
return $agi->execute("DIAL $dialstr" . $dialparams);
602603
}
603604

‎protected/controllers/CallSummaryPerAgentController.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
class CallSummaryPerAgentController extends Controller
1919
{
2020
public $config;
21-
public $attributeOrder = 't.id_user DESC';
21+
public $attributeOrder = 'c.id_user DESC';
2222
public $extraValues = array('idUser' => 'username', 'idTrunk' => 'trunkcode');
23+
public $limit = 7;
24+
public $group = 'c.id_user';
25+
public $select = 't.id, c.id_user,c.id_user AS idUserusername, sum(sessionbill) AS sessionbill, count(*) as nbcall,
26+
sum(buycost) AS buycost, starttime, sum(sessionbill) - sum(buycost) AS lucro, id_trunk';
2327

24-
public $limit = 7;
25-
public $group = 't.id_user';
26-
public $select = 't.id, t.id_user, sum(sessionbill) AS sessionbill, count(*) as nbcall,
27-
sum(buycost) AS buycost, starttime, sum(sessionbill) - sum(buycost) AS lucro';
28+
public $join = 'JOIN pkg_user c ON t.id_user = c.id';
2829

2930
public $fieldsInvisibleClient = array(
3031
'id',
@@ -166,8 +167,7 @@ public function extraFilterCustom($filter)
166167
}
167168
}
168169

169-
$filter .= " AND t.id_user > :dfby4 ";
170-
$this->paramsFilter[':dfby4'] = 1;
170+
$filter .= " AND c.id_user > 1 ";
171171

172172
return $filter;
173173
}

‎protected/controllers/RefillController.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ public function extraFilterCustomAgent($filter)
4949
$this->relationFilter['idUser'] = array(
5050
'condition' => "t.id_user = :idagent5334 OR idUser.id_user LIKE :agfby",
5151
);
52+
$this->paramsFilter[':idagent5334'] = Yii::app()->session['id_user'];
5253
}
5354
$this->paramsFilter[':agfby'] = Yii::app()->session['id_user'];
5455

55-
$this->paramsFilter[':idagent5334'] = Yii::app()->session['id_user'];
56-
5756
return $filter;
5857
}
5958

0 commit comments

Comments
 (0)