Skip to content

Commit 29dd2f1

Browse files
author
magnussolution
committed
fix small BUG. Export refill, call online menu, and payment methods
1 parent e296aad commit 29dd2f1

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

build/MagnusBilling-current.tar.gz

2.2 KB
Binary file not shown.

protected/commands/CallChartCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function run($args)
3333
$this->isDid();
3434
$this->isSIPCall();
3535
for (;;) {
36-
if (date('s') > 58) {
36+
if (date('i') == 59) {
3737
break;
3838
}
3939
try {

protected/commands/UpdateMysqlCommand.php

+10
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,16 @@ public function run($args)
16791679
Yii::app()->db->createCommand($sql)->execute();
16801680
}
16811681

1682+
//2022-05-13
1683+
if ($version == '7.8.1.1') {
1684+
$sql = "ALTER TABLE `pkg_method_pay` CHANGE `boleto_convenio` `boleto_convenio` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_banco` `boleto_banco` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_agencia` `boleto_agencia` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_conta_corrente` `boleto_conta_corrente` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_inicio_nosso_numeroa` `boleto_inicio_nosso_numeroa` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_carteira` `boleto_carteira` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_taxa` `boleto_taxa` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_instrucoes` `boleto_instrucoes` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_nome_emp` `boleto_nome_emp` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_end_emp` `boleto_end_emp` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_cidade_emp` `boleto_cidade_emp` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_estado_emp` `boleto_estado_emp` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, CHANGE `boleto_cpf_emp` `boleto_cpf_emp` VARCHAR(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;";
1685+
$this->executeDB($sql);
1686+
1687+
$version = '7.8.1.2';
1688+
$sql = "UPDATE pkg_configuration SET config_value = '" . $version . "' WHERE config_key = 'version' ";
1689+
Yii::app()->db->createCommand($sql)->execute();
1690+
}
1691+
16821692
}
16831693

16841694
public function executeDB($sql)

protected/controllers/RefillController.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,14 @@ public function releaseSendCreditBDService($values, $modelRefill)
252252

253253
public function subscribeColunms($columns = '')
254254
{
255-
for ($i = 0; $i < count($columns); $i++) {
255+
if ($this->config['global']['base_country'] != 'BRL') {
256+
for ($i = 0; $i < count($columns); $i++) {
256257

257-
if ($columns[$i]['dataIndex'] == 'credit') {
258-
$columns[$i]['dataIndex'] = 't.credit';
259-
}
258+
if ($columns[$i]['dataIndex'] == 'credit') {
259+
$columns[$i]['dataIndex'] = 't.credit';
260+
}
260261

262+
}
261263
}
262264
return $columns;
263265
}

script/installOpenSips-3.1.sh

-8
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,6 @@ backend = auto
272272
usedns = warn
273273
274274
275-
[ssh-iptables]
276-
enabled = true
277-
filter = sshd
278-
action = iptables-allports[name=SSH, port=all, protocol=all]
279-
logpath = /var/log/secure
280-
maxretry = 3
281-
bantime = 600
282-
283275
[opensips-iptables]
284276
enabled = true
285277
filter = opensips

0 commit comments

Comments
 (0)