configurações onlinecertificadora

Clientes/onlineCertificadora/config.php

@@ -40,7 +40,6 @@
     #####                  CREDENCIAIS DE ENVIO DE EMAIL                  #####
     ###########################################################################
 
-<<<<<<< HEAD
     define('CONF_EMAIL_TITLE_INVOICE', '[NO-REPLY] Envio de Fatura');
     define('CONF_EMAIL_SUBTITLE_INVOICE', 'Estamos enviando o pedido de Segunda Via da sua Fatura!');
     define('CONF_SENDER_EMAIL_USER', '');
@@ -81,42 +80,3 @@
     ###########################################################################
     
     define('CONF_PARADA_TECNICA_MSG', "PROBLEMA MASSIVO");
-=======
-    define('CONF_EMAIL_TITLE_INVOICE', '[NO-REPLY] NOVO CLIENTE');
-    define('CONF_EMAIL_SUBTITLE_INVOICE', 'CLIENTE IMPORTADO NO MOVIDESK!');
-    define('CONF_SENDER_EMAIL_USER', 'marketing@simplesip.com.br');
-    define('CONF_SENDER_EMAIL_PASSWORD', '$m@rk2t3ng_#');
-    define('CONF_SMTP_HOST', 'mail.simplesip.com.br');
-    define('CONF_SMTP_POST', '587');
-    
-    ###########################################################################
-    #####                         CONFIGURACAO PDO                        #####
-    ###########################################################################
-    
-    define('CONF_DB_DRIVER', "");
-    define('CONF_DB_HOST', "192.168.115.28");
-    define('CONF_DB_PORT', "");
-    define('CONF_DB_BASE', "VendaMaisDB_simplesip");
-    define('CONF_DB_USER', "integracao");
-    define('CONF_DB_PASSWD', "SimpleS_root");
-    define('CONF_DB_OPTIONS', "");   
-    
-    ###########################################################################
-    #####                 CONFIGURACAO GERAÇÃO DE FATURA                  #####
-    ###########################################################################
-    
-    define('CONF_FATURA_DIAS_ANTES', 30);
-    define('CONF_FATURA_DIAS_APOS', 0);
-    
-    ###########################################################################
-    #####                      CONFIGURACAO CITSMART                      #####
-    ###########################################################################
-    
-    define('CONF_CONTACT_NAME', 'Consultor');
-    define('CONF_CONTACT_PHONENUMBER', '6199999999');
-    define('CONF_CONTACT_EMAIL', 'abcd.efgh@centralit.com.br');
-    define('CONF_CONTACT_DEPARTAMENT', 'Portal');
-    define('CONF_CONTACT_ID', '1157');
-    define('CONF_SERVICE_CODE', '4423');
-    define('CONF_INTEGRACAO_PLATAFORM', 'Integracao Notas MT');
->>>>>>> 7556f0a318c4662c8be3672b63060628047a0a05

Clientes/onlineCertificadora/registraChamada.php

@@ -1,6 +1,5 @@
 <?php
 
-<<<<<<< HEAD
     require_once "Movidesk.php";   
 
     $movidesk = new Movidesk(); 
@@ -8,29 +7,3 @@
     $movidesk->agi()->set_variable('PROTOCOLO_REG', $protocolo);
     $movidesk->executarFluxo('ANUNCIO', 'MUDO');
    
-=======
-    require_once "Movidesk.php";
-
-    $registros = array(
-        "id" => '',
-        "reg_ura" => $ura,
-        "reg_tronco" => $tronco,
-        "reg_uniqueid" => $uid,
-        "reg_id_metodo" => $idMetodo,
-        "reg_uniqueid" => $uid,
-        "reg_uniqueid_old" => $uidOld,
-        "reg_fone" => $numero,
-        "reg_status_exec" => '1',
-        "reg_inicio" => date());
-
-    $movidesk = new Movidesk(CONF_TOKEN_API, CONF_URL_API);
-
-    $movidesk->db()->setRegistros($registros);
-
-    if (CONF_AUDIO_ERROR) {
-        $movidesk->db()->setIdAudioError(CONF_AUDIO_ERROR);
-    }
-    
-    $movidesk->agi()->exec_goto($movidesk->db()->getURA('URA ONLINE'));
-    $movidesk->db()->atualizaIntegracao();
->>>>>>> 7556f0a318c4662c8be3672b63060628047a0a05

Clientes/onlineCertificadora/transfereChamada.php

@@ -2,37 +2,11 @@
 
     require_once "Movidesk.php";
 
-<<<<<<< HEAD
     $movidesk = new Movidesk();
-=======
-    $registros = array(
-        "id" => '',
-        "reg_ura" => $ura,
-        "reg_tronco" => $tronco,
-        "reg_uniqueid" => $uid,
-        "reg_id_metodo" => $idMetodo,
-        "reg_uniqueid" => $uid,
-        "reg_uniqueid_old" => $uidOld,
-        "reg_fone" => $numero,
-        "reg_status_exec" => '1',
-        "reg_inicio" => date());
-
-    $movidesk = new Movidesk(CONF_TOKEN_API, CONF_URL_API);
-
-    $movidesk->db()->setRegistros($registros);
-    
-    if (CONF_AUDIO_ERROR) {
-        $movidesk->db()->setIdAudioError(CONF_AUDIO_ERROR);
-    }
->>>>>>> 7556f0a318c4662c8be3672b63060628047a0a05
 
     if (isset($argv[8]) && isset($argv[10])) {
         $movidesk->log()->debug("argv: " . $uid, explode('-', $argv[8])[0], $argv[5], $argv[4], $argv[10], date('Y-m-d H:i:s'));
         $resp = $movidesk->startTransferedCall($uid, explode('-', $argv[8])[0], $argv[5], $argv[4], $argv[10], date('Y-m-d H:i:s'));
         $movidesk->log()->debug("Response: " . print_r($resp, true));   
     }
-<<<<<<< HEAD
-=======
-    $movidesk->db()->atualizaIntegracao();
->>>>>>> 7556f0a318c4662c8be3672b63060628047a0a05