add new post on Wiki

classic/src/view/trunkSipCodes/List.js

@@ -32,7 +32,7 @@ Ext.define('MBilling.view.trunkSipCodes.List', {
         me.allowUpdate = false;
         me.textDelete = t('Reset');
         me.columns = me.columns || [{
-            header: t('Ip'),
+            header: t('IP'),
             dataIndex: 'ip',
             flex: 3
         }, {

resources/help/help_en.js

@@ -785,6 +785,10 @@ MagnusBilling will try to send the calls to the next trunk of the group as long
 
 `,
     'trunkgroup.id_trunk': `Select the trunks that belongs to this group. If selected the type, order, then select the trunks in the desired order.`,
+    //TRUNK ERROS
+    'trunksipcodes.ip': ``,
+    'trunksipcodes.code': ``,
+    'trunksipcodes.total': ``,
     //USERS
     'user.username': `Username used to login into the panel.`,
     'user.password': `Password used to login into the panel.`,

resources/help/help_pt_BR.js

@@ -874,6 +874,10 @@ O MagnusBilling tentará enviar a chamada para o próximo tronco do grupo desde
 
 .`,
     'trunkgroup.id_trunk': `Selecionar os troncos que pertenceram a este grupo. Se for selecionado o tipo, em ordem, então selecione os troncos na ordem desejada.`,
+    //ERROS DOS TRONCOS
+    'trunksipcodes.ip': ``,
+    'trunksipcodes.code': ``,
+    'trunksipcodes.total': ``,
     //USUáRIOS
     'user.username': `Usuário para logar no painel de cliente.`,
     'user.password': `Senha para logar no painel de cliente.`,

resources/locale/en.js

@@ -11,7 +11,7 @@
  * ###################################
  * =======================================
  * MagnusSolution.com <[email protected]>
- * 2021-03-12
+ * 2021-04-08
  */
 Locale.load({
     '': '',
@@ -95,7 +95,6 @@ Locale.load({
     'Before answer': '',
     'Bigger than': '',
     'Bill Date:': '',
-    'Bill amount': '',
     'Billing': '',
     'Billing block': '',
     'Billing type': '',
@@ -218,6 +217,8 @@ Locale.load({
     'Contains': '',
     'Context': '',
     'Continue': '',
+    'Contract is required': '',
+    'Contract no': '',
     'Count votes': '',
     'Country': '',
     'Country code': '',
@@ -283,6 +284,8 @@ Locale.load({
     'Disallowed action': '',
     'Discount fee': '',
     'Disk space': '',
+    'Distribution code': '',
+    'Distribution code required': '',
     'Do you already have a SMTP': '',
     'Do you confirm buy this DID?': '',
     'Do you really want to leave the system?': '',
@@ -435,7 +438,6 @@ Locale.load({
     'Invalid call reference value': '',
     'Invalid format': '',
     'Invalid message unspecified': '',
-    'Invalid number': '',
     'Invalid number format': '',
     'Invalid plan used to signup': '',
     'Invalid register string': '',
@@ -508,6 +510,7 @@ Locale.load({
     'Minutes': '',
     'Misdialled trunk prefix': '',
     'Mobile': '',
+    'Mobile number': '',
     'Module': '',
     'Modules': '',
     'Mon-Fri': '',
@@ -621,13 +624,16 @@ Locale.load({
     'Penalty, Paused, Invalid, Unavailable': '',
     'Pending': '',
     'Per': '',
+    'Percentage': '',
     'Period': '',
     'Periodic announce': '',
     'Perm ban': '',
     'Permissions': '',
     'Permit': '',
     'Personal data': '',
     'Phone': '',
+    'Phone Number': '',
+    'Phone is required': '',
     'Phonebook': '',
     'Phonebooks': '',
     'Phonenumber': '',
@@ -750,6 +756,7 @@ Locale.load({
     'Resend': '',
     'Reservation date': '',
     'Reserved': '',
+    'Reset': '',
     'Reset queue stats': '',
     'Response to STATUS ENQUIRY': '',
     'Restore': '',
@@ -779,6 +786,7 @@ Locale.load({
     'SELECT GROUP FOR AGENT USERS': '',
     'SIP': '',
     'SIP Call': '',
+    'SIP Code': '',
     'SIP To': '',
     'SIP Users': '',
     'SIP account limit': '',
@@ -950,7 +958,6 @@ Locale.load({
     'Time for another call': '',
     'Time used': '',
     'Title': '',
-    'To date': '',
     'To day': '',
     'Today': '',
     'Today peak': '',
@@ -978,6 +985,7 @@ Locale.load({
     'Trunk': '',
     'Trunk Groups': '',
     'Trunk chart': '',
+    'Trunk erros': '',
     'Trunk groups': '',
     'Trunks': '',
     'Tuesday': '',

resources/locale/es.js

@@ -14,9 +14,19 @@
  * 2020-08-10
  */
 Locale.load({
-
-    'Dial Tone' : 'Dial Tone',
-    'Offer balance' :'Saldo del paquete',
+    'Contract is required': 'Contracto es obligatorio',
+    'Contract no': 'Numero del contracto',
+    'Distribution code': 'Código de distribuicion',
+    'Distribution code required': 'Código de distribuicion es obligatorio',
+    'Mobile number': 'Celular',
+    'Percentage': 'Porcentaje',
+    'Phone Number': 'Telefono fijo',
+    'Phone is required': 'Telefono fijo es obligatorio',
+    'Reset': 'Reiniciar',
+    'SIP Code': 'Código SIP',
+    'Trunk erros': 'Troncales errores',
+    'Dial Tone': 'Dial Tone',
+    'Offer balance': 'Saldo del paquete',
     'Alarm': 'Alarme',
     'Alarms': 'Alarmes',
     'Bigger than': 'Mayor que',

resources/locale/php/en/csv-translate.php

@@ -57,6 +57,7 @@
     'description'=> ['Description_or_SMS_Text', 'Descrição_ou_texto_do_SMS' , 'Descripción_o_texto_SMS'],
     'destination'=> ['Destination', 'Destino' , 'Destino'],
     'dial_timeout'=> ['Dial_timeout', 'Tocar_por_quantos_seg.' , 'Dial_timeout'],
+    'Dial_Tone'=> ['Dial_Tone', 'Dial_Tone' , 'Dial_Tone'],
     'did'=> ['DID', 'DID' , 'DID'],
     'direct_extension'=> ['Enable_known_SIP_user', 'Discar_direto_conta_SIP' , 'Habilitar_cuenta_SIP_conocida'],
     'direction'=> ['Direction', 'Direção' , 'Dirección'],

resources/locale/php/es/zii.php

@@ -21,7 +21,20 @@
  * Edit /resources/locale/es.js
           */
 return array(
-            'Alarm' => 'Alarme',
+            'Contract is required' => 'Contracto es obligatorio',
+    'Contract no' => 'Numero del contracto',
+    'Distribution code' => 'Código de distribuicion',
+    'Distribution code required' => 'Código de distribuicion es obligatorio',
+    'Mobile number' => 'Celular',
+    'Percentage' => 'Porcentaje',
+    'Phone Number' => 'Telefono fijo',
+    'Phone is required' => 'Telefono fijo es obligatorio',
+    'Reset' => 'Reiniciar',
+    'SIP Code' => 'Código SIP',
+    'Trunk erros' => 'Troncales errores',
+    'Dial Tone' => 'Dial Tone',
+    'Offer balance' => 'Saldo del paquete',
+    'Alarm' => 'Alarme',
     'Alarms' => 'Alarmes',
     'Bigger than' => 'Mayor que',
     'Calls per minute' => 'Llamadas por minuto',

resources/locale/php/pt_BR/zii.php

@@ -21,7 +21,20 @@
  * Edit /resources/locale/pt_BR.js
           */
 return array(
-            'Alarm' => 'Alarme',
+            'Contract is required' => 'Contrato é obrigatório',
+    'Contract no' => 'Número do contrato',
+    'Distribution code' => 'Código de distribuição',
+    'Distribution code required' => 'Código de distribuição é obrigatório',
+    'Mobile number' => 'Celular',
+    'Percentage' => 'Porcentage',
+    'Phone Number' => 'Telefone fixo',
+    'Phone is required' => 'Telefone fixo é obrigatório',
+    'Reset' => 'Reiniciar',
+    'SIP Code' => 'Código SIP',
+    'Trunk erros' => 'Erros dos troncos',
+    'Dial Tone' => 'Dial Tone',
+    'Offer balance' => 'Saldo do pacote',
+    'Alarm' => 'Alarme',
     'Alarms' => 'Alarmes',
     'Bigger than' => 'Maior que',
     'Calls per minute' => 'Chamadas por minuto',

resources/locale/pt_BR.js

@@ -14,8 +14,19 @@
  * 2020-08-07
  */
 Locale.load({
-    'Dial Tone' : 'Dial Tone',
-    'Offer balance' :'Saldo do pacote',
+    'Contract is required': 'Contrato é obrigatório',
+    'Contract no': 'Número do contrato',
+    'Distribution code': 'Código de distribuição',
+    'Distribution code required': 'Código de distribuição é obrigatório',
+    'Mobile number': 'Celular',
+    'Percentage': 'Porcentage',
+    'Phone Number': 'Telefone fixo',
+    'Phone is required': 'Telefone fixo é obrigatório',
+    'Reset': 'Reiniciar',
+    'SIP Code': 'Código SIP',
+    'Trunk erros': 'Erros dos troncos',
+    'Dial Tone': 'Dial Tone',
+    'Offer balance': 'Saldo do pacote',
     'Alarm': 'Alarme',
     'Alarms': 'Alarmes',
     'Bigger than': 'Maior que',

wiki/en/conf.py

@@ -32,7 +32,7 @@
 
 # General information about the project
 project = 'MagnusBilling Wiki'
-copyright = '2005-2020, MagnusSolution'
+copyright = '2005-2021, MagnusSolution'
 author = 'Adilson Magnus and the MagnusBilling community'
 
 # Version info for the project, acts as replacement for |version| and |release|

wiki/en/find_rate.rst

@@ -0,0 +1,88 @@
+.. _find-rate:
+
+Tariff Search
+==============
+
+How does MagnusBilling select the rate to be used?
+--------------------------------------------------
+
+When a customer makes an external call, to a landline or cell phone, a verification routine is triggered which consists of:
+
+1 - Check the username and password.
+2 - Checks whether the client is active.
+3 - Checks if the number dialed is a DID.
+4 - Check if the dialed number is a SIP Account.
+5 - Check the customer's plan.
+6 - Search within the plan's tariffs which fare best fits the number dialed.
+7 - Search for the trunks that belong to the trunk group of the tariff found.
+8 - Sends the call to the first trunk, and if it fails it sends to the next.
+9 - When the call is finished, the purchase and sale price is calculated
+10 - Added the call in the CDR report
+11 - Discounting the value of the call in the customer's credit.
+
+
+Rather, how does step 6 work?
+
+It is carried out as follows. Let's say customer XXXXX called 551140045678
+
+In step 5, the system takes the customer's plan, and then in step 6 a "SELECT" is made on the tariff table like this.
+
+
+::
+
+ $ sql = "SELECT * FROM pkg_plan LEFT JOIN pkg_rate ON pkg_plan.id = pkg_rate.id_plan
+ LEFT JOIN pkg_prefix ON pkg_rate.id_prefix = pkg_prefix.id
+ LEFT JOIN pkg_trunk_group ON pkg_trunk_group.id = pkg_rate.id_trunk_group
+ WHERE pkg_plan.id = $ MAGNUS-> id_plan AND pkg_rate.status = 1
+ AND $ MAGNUS-> prefixclause ORDER BY LENGTH (prefix) DESC LIMIT 1 ";
+
+
+The $ MAGNUS-> id_plan variable is the customer's plan id, and the $ MAGNUS-> prefixclause variable is the filter used to find the tariff.
+
+To facilitate understanding we will explain it in another way.
+
+As the customer called 551140045678, the system will search as follows.
+
+Is there a tariff for the prefix 551140045678?
+
+* If yes, we use this rate
+
+* If not, we will search again by removing the last number, in this case 55114004567 and so on until we reach only number 5. If we do not find any rate, the system will return an error and will not continue the call.
+
+
+
+Going back to "SELECT" it would look like this.
+
+::
+
+ $ sql = "SELECT * FROM pkg_plan LEFT JOIN pkg_rate ON pkg_plan.id = pkg_rate.id_plan
+ LEFT JOIN pkg_prefix ON pkg_rate.id_prefix = pkg_prefix.id
+ LEFT JOIN pkg_trunk_group ON pkg_trunk_group.id = pkg_rate.id_trunk_group
+ WHERE pkg_plan.id = 1 AND pkg_rate.status = 1 AND
+ (prefix = '551140045678' OR
+ prefix = '55114004567' OR
+ prefix = '5511400456' OR
+ prefix = '551140045' OR
+ prefix = '55114004' OR
+ prefix = '5511400' OR
+ prefix = '551140' OR
+ prefix = '55114' OR
+ prefix = '5511' OR
+ prefix = '551' OR
+ prefix = '55' OR
+ prefix = '5')
+ ORDER BY LENGTH (prefix) DESC LIMIT 1 ";
+
+
+Let’s say you have the following 3 tariffs in your customer’s plan
+
+55, Brasil Fixo Geral
+55119, Brazil SP Celular
+5511, Brazil SP Fixed
+
+
+In this example, "SELECT" would return tariff 5511, Brasil SP Fixo.
+
+
+
+But you may be wondering if the customer calls 5511988551234, the "SELECT" would find the prefix 55119 and 5511 and then which one would use? I would use 55119, because in "SELECT" there is the parameter ORDER BY LENGTH (prefix) DESC and also the parameter LIMIT 1. That is, it will order the results by placing first the prefix that has the largest number of digits.

wiki/en/get_started/quick_install.rst

@@ -2,7 +2,7 @@
 Installation
 *************
 
-In order to install MagnusBilling you'll need a server with CentOS 7 or Debian 8, minimal install. Keep in mind that all testing and development of MagnusBilling occurs in CentOS 7, so we highly recommend using CentOS 7.
+In order to install MagnusBilling you'll need a server with CentOS 7 or Debian 10, minimal install.
 
 
 **1.** Execute the following commands as root to run the script that will install MagnusBilling, Asterisk and all dependencies needed like: IPTables, Fail2ban, Apache, PHP and MySQL.

wiki/en/get_started/update.rst

@@ -0,0 +1,16 @@
+********************
+Update MagnusBilling
+********************
+
+Our team works daily to add new functions and solve problems. You can see the changes made in the link https://github.com/magnussolution/magnusbilling7/commits/source.
+
+Therefore, our team recommends that you keep your server up to date.
+
+To update run the following command.
+
+
+::
+
+ /var/www/html/mbilling/protected/commands/update.sh
+
+

wiki/en/index.rst

@@ -24,12 +24,14 @@ Welcome to MagnusBilling 7 wiki.
    get_started/quick_install.rst
    get_started/interface.rst
    get_started/backup.rst
+   get_started/update.rst
 
 .. toctree::
    :caption: Technical Information
    :maxdepth: 1
 
    price_calculation.rst
+   find_rate.rst
    tts.rst
    offer.rst
    how_to_use_voucher.rst

wiki/en/intro.rst

@@ -6,7 +6,7 @@ Introduction
 
 `MagnusBilling`_ is an open source tool written in PHP and JAVASCRIPT, using the EXTJS 6 and YII FRAMEWORK frameworks, aimed at IP telephony providers. MagnusBilling provides a complete and powerful system for anyone to start an IP telephony provider in a matter of minutes. MagnusBilling uses `Asterisk`_ for connection between customers and providers.
 
-* MagnusBilling can be installed on Linux Centos or Debian. The team of developers does all the development and testing only on Centos 7, so we recommend using it.
+* MagnusBilling can be installed on Linux, Centos 7 or Debian 10.
 
 * MagnusBilling has a modern and robust interface that makes the administration of all functions very easy to understand.
 

wiki/en/modules/did/did.rst

@@ -146,10 +146,10 @@ Regular expression
 | 
 | 
 |     Regular expression for mobile
-|     ^[1-9][0-9]9\d{8}$|^0[1-9][0-9]9\d{8}$|^55[1-9][0-9]9\d{8}$
+|     ^[1-9][0-9]9\\d{8}$|^0[1-9][0-9]9\\d{8}$|^55[1-9][0-9]9\\d{8}$
 | 
 |     Regular expression for landline
-|     ^[1-9][0-9]\d{8}$|^0[1-9][0-9]\d{8}$|^55[1-9][0-9]\d{8}$
+|     ^[1-9][0-9]\\d{8}$|^0[1-9][0-9]\\d{8}$|^55[1-9][0-9]\\d{8}$
 | 
 | 
 |