@@ -77,13 +77,13 @@  | 
                                                    ||
| 77 | 77 | parent::install();  | 
                                                        
| 78 | 78 | return "INSERT INTO rd_ncftipoanulacion (codigo, descripcion, estado) VALUES " .  | 
                                                        
| 79 | 79 |              "('01','Deterioro de Factura Pre-Imprensa',true), " . | 
                                                        
| 80 | -             "('02','Errores de Impresión (Factura Pre-Impresa)',true), " . | 
                                                        |
| 81 | -             "('03','Impresión defectuosa',true), " . | 
                                                        |
| 82 | -             "('04','Duplicidad de Factura',true), " . | 
                                                        |
| 83 | -             "('05','Corrección de la Información',true), " . | 
                                                        |
| 84 | -             "('06','Cambio de Productos',true), " . | 
                                                        |
| 85 | -             "('07','Devolución de Productos',true), " . | 
                                                        |
| 86 | -             "('08','Omisión de Productos',true);"; | 
                                                        |
| 80 | +                "('02','Errores de Impresión (Factura Pre-Impresa)',true), " . | 
                                                        |
| 81 | +                "('03','Impresión defectuosa',true), " . | 
                                                        |
| 82 | +                "('04','Duplicidad de Factura',true), " . | 
                                                        |
| 83 | +                "('05','Corrección de la Información',true), " . | 
                                                        |
| 84 | +                "('06','Cambio de Productos',true), " . | 
                                                        |
| 85 | +                "('07','Devolución de Productos',true), " . | 
                                                        |
| 86 | +                "('08','Omisión de Productos',true);"; | 
                                                        |
| 87 | 87 | }  | 
                                                        
| 88 | 88 | |
| 89 | 89 | public function restoreData()  | 
                                                        
@@ -75,21 +75,21 @@  | 
                                                    ||
| 75 | 75 | public function install()  | 
                                                        
| 76 | 76 |      { | 
                                                        
| 77 | 77 | parent::install();  | 
                                                        
| 78 | - return "INSERT INTO rd_ncftipoanulacion (codigo, descripcion, estado) VALUES " .  | 
                                                        |
| 79 | -            "('01','Deterioro de Factura Pre-Imprensa',true), " . | 
                                                        |
| 80 | -             "('02','Errores de Impresión (Factura Pre-Impresa)',true), " . | 
                                                        |
| 81 | -             "('03','Impresión defectuosa',true), " . | 
                                                        |
| 82 | -             "('04','Duplicidad de Factura',true), " . | 
                                                        |
| 83 | -             "('05','Corrección de la Información',true), " . | 
                                                        |
| 84 | -             "('06','Cambio de Productos',true), " . | 
                                                        |
| 85 | -             "('07','Devolución de Productos',true), " . | 
                                                        |
| 78 | + return "INSERT INTO rd_ncftipoanulacion (codigo, descripcion, estado) VALUES ".  | 
                                                        |
| 79 | +            "('01','Deterioro de Factura Pre-Imprensa',true), ". | 
                                                        |
| 80 | +             "('02','Errores de Impresión (Factura Pre-Impresa)',true), ". | 
                                                        |
| 81 | +             "('03','Impresión defectuosa',true), ". | 
                                                        |
| 82 | +             "('04','Duplicidad de Factura',true), ". | 
                                                        |
| 83 | +             "('05','Corrección de la Información',true), ". | 
                                                        |
| 84 | +             "('06','Cambio de Productos',true), ". | 
                                                        |
| 85 | +             "('07','Devolución de Productos',true), ". | 
                                                        |
| 86 | 86 |               "('08','Omisión de Productos',true);"; | 
                                                        
| 87 | 87 | }  | 
                                                        
| 88 | 88 | |
| 89 | 89 | public function restoreData()  | 
                                                        
| 90 | 90 |      { | 
                                                        
| 91 | 91 | $dataBase = new DataBase();  | 
                                                        
| 92 | - $sqlClean = "DELETE FROM " . $this->tableName() . ";";  | 
                                                        |
| 92 | + $sqlClean = "DELETE FROM ".$this->tableName().";";  | 
                                                        |
| 93 | 93 | $dataBase->exec($sqlClean);  | 
                                                        
| 94 | 94 |          foreach ($this->arrayTipoAnulacion as $arrayItem) { | 
                                                        
| 95 | 95 | $initialData = new NCFTipoAnulacion($arrayItem);  | 
                                                        
@@ -48,7 +48,7 @@ discard block  | 
                                                    ||
| 48 | 48 |      { | 
                                                        
| 49 | 49 |          $this->addView('ListNCFRango', 'NCFRango'); | 
                                                        
| 50 | 50 |          $this->addSearchFields('ListNCFRango', ['tipocomprobante']); | 
                                                        
| 51 | -        $this->addOrderBy('ListNCFRango', ['tipocomprobante','correlativo'], 'tipocomprobante'); | 
                                                        |
| 51 | +        $this->addOrderBy('ListNCFRango', ['tipocomprobante', 'correlativo'], 'tipocomprobante'); | 
                                                        |
| 52 | 52 | |
| 53 | 53 |          $this->setSettings('ListNCFRango', 'modalInsert', 'ncf-rango-insert'); | 
                                                        
| 54 | 54 |          $this->setCustomWidgetValues('ListNCFRango'); | 
                                                        
@@ -79,14 +79,14 @@ discard block  | 
                                                    ||
| 79 | 79 |                  $valueUsuarioCreacion = $this->request->request->get('usuariocreacion'); | 
                                                        
| 80 | 80 |                  $valueFechaCreacion = $this->request->request->get('fechacreacion'); | 
                                                        
| 81 | 81 | $data = $this->request->request->all();  | 
                                                        
| 82 | - $data['serie']=($this->inputExists($valueSerie))?$valueSerie:$data['serie'];  | 
                                                        |
| 83 | - $data['idempresa']=($this->inputExists($valueIdEmpresa))?$valueIdEmpresa:$this->empresa->idempresa;  | 
                                                        |
| 84 | - $data['usuariomodificacion']=($this->inputExists($valueFechaCreacion))?$this->user->nick:null;  | 
                                                        |
| 85 | - $data['usuariocreacion']=($this->inputExists($valueUsuarioCreacion))  | 
                                                        |
| 86 | - ?$valueUsuarioCreacion  | 
                                                        |
| 82 | + $data['serie'] = ($this->inputExists($valueSerie)) ? $valueSerie : $data['serie'];  | 
                                                        |
| 83 | + $data['idempresa'] = ($this->inputExists($valueIdEmpresa)) ? $valueIdEmpresa : $this->empresa->idempresa;  | 
                                                        |
| 84 | + $data['usuariomodificacion'] = ($this->inputExists($valueFechaCreacion)) ? $this->user->nick : null;  | 
                                                        |
| 85 | + $data['usuariocreacion'] = ($this->inputExists($valueUsuarioCreacion))  | 
                                                        |
| 86 | + ? $valueUsuarioCreacion  | 
                                                        |
| 87 | 87 | :$this->user->nick;  | 
                                                        
| 88 | - $data['fechacreacion']=($this->inputExists($valueFechaCreacion))  | 
                                                        |
| 89 | - ?$valueFechaCreacion  | 
                                                        |
| 88 | + $data['fechacreacion'] = ($this->inputExists($valueFechaCreacion))  | 
                                                        |
| 89 | + ? $valueFechaCreacion  | 
                                                        |
| 90 | 90 |                                          :\date('Y-m-d'); | 
                                                        
| 91 | 91 | $rangoNuevo = new NCFRango();  | 
                                                        
| 92 | 92 | $rangoNuevo->loadFromData($data);  | 
                                                        
@@ -61,13 +61,13 @@  | 
                                                    ||
| 61 | 61 | protected function createViews()  | 
                                                        
| 62 | 62 |      { | 
                                                        
| 63 | 63 |          $this->addView('ListNCFTipoPago-1', 'NCFTipoPago', 'sales', 'fas fa-store'); | 
                                                        
| 64 | -        $this->addSearchFields('ListNCFTipoPago-1', ['tipopago','codigo','descripcion']); | 
                                                        |
| 64 | +        $this->addSearchFields('ListNCFTipoPago-1', ['tipopago', 'codigo', 'descripcion']); | 
                                                        |
| 65 | 65 |          $this->addOrderBy('ListNCFTipoPago-1', ['codigo'], 'code'); | 
                                                        
| 66 | 66 |          $this->addOrderBy('ListNCFTipoPago-1', ['descripcion'], 'description'); | 
                                                        
| 67 | 67 |          $this->addRestoreButton('ListNCFTipoPago-1'); | 
                                                        
| 68 | 68 | |
| 69 | 69 |          $this->addView('ListNCFTipoPago-2', 'NCFTipoPago', 'purchases', 'fas fa-credit-card'); | 
                                                        
| 70 | -        $this->addSearchFields('ListNCFTipoPago-2', ['tipopago','codigo','descripcion']); | 
                                                        |
| 70 | +        $this->addSearchFields('ListNCFTipoPago-2', ['tipopago', 'codigo', 'descripcion']); | 
                                                        |
| 71 | 71 |          $this->addOrderBy('ListNCFTipoPago-2', ['codigo'], 'code'); | 
                                                        
| 72 | 72 |          $this->addOrderBy('ListNCFTipoPago-2', ['descripcion'], 'description'); | 
                                                        
| 73 | 73 |          $this->addRestoreButton('ListNCFTipoPago-2'); | 
                                                        
@@ -67,13 +67,13 @@  | 
                                                    ||
| 67 | 67 | 'sales',  | 
                                                        
| 68 | 68 | 'fas fa-store'  | 
                                                        
| 69 | 69 | );  | 
                                                        
| 70 | -        $this->addSearchFields('ListNCFTipoMovimiento-1', ['tipomovimiento','codigo','descripcion']); | 
                                                        |
| 70 | +        $this->addSearchFields('ListNCFTipoMovimiento-1', ['tipomovimiento', 'codigo', 'descripcion']); | 
                                                        |
| 71 | 71 |          $this->addOrderBy('ListNCFTipoMovimiento-1', ['id'], 'code'); | 
                                                        
| 72 | 72 |          $this->addOrderBy('ListNCFTipoMovimiento-1', ['descripcion'], 'description'); | 
                                                        
| 73 | 73 |          $this->addRestoreButton('ListNCFTipoMovimiento-1'); | 
                                                        
| 74 | 74 | |
| 75 | 75 |          $this->addView('ListNCFTipoMovimiento-2', 'NCFTipoMovimiento', 'purchases', 'fas fa-credit-card'); | 
                                                        
| 76 | -        $this->addSearchFields('ListNCFTipoMovimiento-2', ['tipomovimiento','codigo','descripcion']); | 
                                                        |
| 76 | +        $this->addSearchFields('ListNCFTipoMovimiento-2', ['tipomovimiento', 'codigo', 'descripcion']); | 
                                                        |
| 77 | 77 |          $this->addOrderBy('ListNCFTipoMovimiento-2', ['id'], 'code'); | 
                                                        
| 78 | 78 |          $this->addOrderBy('ListNCFTipoMovimiento-2', ['descripcion'], 'description'); | 
                                                        
| 79 | 79 |          $this->addRestoreButton('ListNCFTipoMovimiento-2'); | 
                                                        
@@ -94,22 +94,22 @@  | 
                                                    ||
| 94 | 94 | protected function getSQLFrom(): string  | 
                                                        
| 95 | 95 |      { | 
                                                        
| 96 | 96 | return static::MAIN_TABLE  | 
                                                        
| 97 | -            . ' LEFT JOIN ' . static::LINES_TABLE . ' ON (' | 
                                                        |
| 98 | - . static::MAIN_TABLE . '.idfactura = ' . static::LINES_TABLE . '.idfactura)'  | 
                                                        |
| 99 | -            . ' LEFT JOIN '. static::SECONDARY_TABLE . ' ON (' | 
                                                        |
| 100 | - . static::MAIN_TABLE . '.idfacturarect = ' . static::SECONDARY_TABLE_ALIAS . '.idfactura)'  | 
                                                        |
| 101 | -            . ' LEFT JOIN '. static::ALMACENES_TABLE . ' ON (' | 
                                                        |
| 102 | - . static::MAIN_TABLE . '.codalmacen = ' . static::ALMACENES_TABLE . '.codalmacen)'  | 
                                                        |
| 103 | -            . ' LEFT JOIN '. static::NCFTIPO_TABLE . ' ON (' | 
                                                        |
| 104 | - . static::MAIN_TABLE . '.tipocomprobante = ' . static::NCFTIPO_TABLE . '.tipocomprobante)'  | 
                                                        |
| 105 | -            . ' LEFT JOIN ' . static::NCFTIPOPAGO_TABLE . ' ON (' | 
                                                        |
| 106 | - . static::MAIN_TABLE . '.ncftipopago = ' . static::NCFTIPOPAGO_TABLE . '.codigo)'  | 
                                                        |
| 107 | -            . ' LEFT JOIN ' . static::NCFTIPOMOV_TABLE . ' ON (' | 
                                                        |
| 108 | - . static::MAIN_TABLE . '.ncftipomovimiento = ' . static::NCFTIPOMOV_TABLE . '.codigo)'  | 
                                                        |
| 109 | -            . ' LEFT JOIN ' . static::NCFTIPOANUL_TABLE . ' ON (' | 
                                                        |
| 110 | - . static::MAIN_TABLE . '.ncftipoanulacion = ' . static::NCFTIPOANUL_TABLE . '.codigo)'  | 
                                                        |
| 111 | -            . ' LEFT JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' | 
                                                        |
| 112 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado)';  | 
                                                        |
| 97 | +            . ' LEFT JOIN '.static::LINES_TABLE.' ON (' | 
                                                        |
| 98 | + . static::MAIN_TABLE.'.idfactura = '.static::LINES_TABLE.'.idfactura)'  | 
                                                        |
| 99 | +            . ' LEFT JOIN '.static::SECONDARY_TABLE.' ON (' | 
                                                        |
| 100 | + . static::MAIN_TABLE.'.idfacturarect = '.static::SECONDARY_TABLE_ALIAS.'.idfactura)'  | 
                                                        |
| 101 | +            . ' LEFT JOIN '.static::ALMACENES_TABLE.' ON (' | 
                                                        |
| 102 | + . static::MAIN_TABLE.'.codalmacen = '.static::ALMACENES_TABLE.'.codalmacen)'  | 
                                                        |
| 103 | +            . ' LEFT JOIN '.static::NCFTIPO_TABLE.' ON (' | 
                                                        |
| 104 | + . static::MAIN_TABLE.'.tipocomprobante = '.static::NCFTIPO_TABLE.'.tipocomprobante)'  | 
                                                        |
| 105 | +            . ' LEFT JOIN '.static::NCFTIPOPAGO_TABLE.' ON (' | 
                                                        |
| 106 | + . static::MAIN_TABLE.'.ncftipopago = '.static::NCFTIPOPAGO_TABLE.'.codigo)'  | 
                                                        |
| 107 | +            . ' LEFT JOIN '.static::NCFTIPOMOV_TABLE.' ON (' | 
                                                        |
| 108 | + . static::MAIN_TABLE.'.ncftipomovimiento = '.static::NCFTIPOMOV_TABLE.'.codigo)'  | 
                                                        |
| 109 | +            . ' LEFT JOIN '.static::NCFTIPOANUL_TABLE.' ON (' | 
                                                        |
| 110 | + . static::MAIN_TABLE.'.ncftipoanulacion = '.static::NCFTIPOANUL_TABLE.'.codigo)'  | 
                                                        |
| 111 | +            . ' LEFT JOIN '.static::ESTADOSDOC_TABLE.' ON (' | 
                                                        |
| 112 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado)';  | 
                                                        |
| 113 | 113 | }  | 
                                                        
| 114 | 114 | |
| 115 | 115 | /**  | 
                                                        
@@ -21,13 +21,13 @@  | 
                                                    ||
| 21 | 21 | class Cliente  | 
                                                        
| 22 | 22 |  { | 
                                                        
| 23 | 23 | /**  | 
                                                        
| 24 | - * Payment type based on DGII table  | 
                                                        |
| 25 | - * @var string  | 
                                                        |
| 26 | - */  | 
                                                        |
| 24 | + * Payment type based on DGII table  | 
                                                        |
| 25 | + * @var string  | 
                                                        |
| 26 | + */  | 
                                                        |
| 27 | 27 | public $ncftipopago;  | 
                                                        
| 28 | 28 | /**  | 
                                                        
| 29 | - * Type of NCF to generate to the customer  | 
                                                        |
| 30 | - * @var string  | 
                                                        |
| 31 | - */  | 
                                                        |
| 29 | + * Type of NCF to generate to the customer  | 
                                                        |
| 30 | + * @var string  | 
                                                        |
| 31 | + */  | 
                                                        |
| 32 | 32 | public $tipocomprobante;  | 
                                                        
| 33 | 33 | }  | 
                                                        
@@ -26,7 +26,7 @@ discard block  | 
                                                    ||
| 26 | 26 | protected function insertBusinessDocHeader($model): void  | 
                                                        
| 27 | 27 |      { | 
                                                        
| 28 | 28 | $headerData = [  | 
                                                        
| 29 | - 'title' => $this->i18n->trans($model->modelClassName() . '-min'),  | 
                                                        |
| 29 | + 'title' => $this->i18n->trans($model->modelClassName().'-min'),  | 
                                                        |
| 30 | 30 |              'subject' => $this->i18n->trans('customer'), | 
                                                        
| 31 | 31 | 'fieldName' => 'nombrecliente'  | 
                                                        
| 32 | 32 | ];  | 
                                                        
@@ -40,7 +40,7 @@ discard block  | 
                                                    ||
| 40 | 40 | $headerData['title'] = Utils::fixHtml($this->format->titulo);  | 
                                                        
| 41 | 41 | }  | 
                                                        
| 42 | 42 | |
| 43 | -        $this->pdf->ezText("\n" . $headerData['title'] . ': ' . $model->codigo . "\n", self::FONT_SIZE + 6); | 
                                                        |
| 43 | +        $this->pdf->ezText("\n".$headerData['title'].': '.$model->codigo."\n", self::FONT_SIZE + 6); | 
                                                        |
| 44 | 44 | $this->newLine();  | 
                                                        
| 45 | 45 | |
| 46 | 46 | $subject = $model->getSubject();  | 
                                                        
@@ -28,16 +28,16 @@ discard block  | 
                                                    ||
| 28 | 28 |  { | 
                                                        
| 29 | 29 | public function createViews(): Closure  | 
                                                        
| 30 | 30 |      { | 
                                                        
| 31 | -        return function () { | 
                                                        |
| 31 | +        return function() { | 
                                                        |
| 32 | 32 | parent::createViews();  | 
                                                        
| 33 | -            AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); | 
                                                        |
| 34 | -            AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); | 
                                                        |
| 33 | +            AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); | 
                                                        |
| 34 | +            AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); | 
                                                        |
| 35 | 35 | };  | 
                                                        
| 36 | 36 | }  | 
                                                        
| 37 | 37 | |
| 38 | 38 | public function execPreviousAction()  | 
                                                        
| 39 | 39 |      { | 
                                                        
| 40 | -        return function ($action) { | 
                                                        |
| 40 | +        return function($action) { | 
                                                        |
| 41 | 41 |              switch ($action) { | 
                                                        
| 42 | 42 | case 'busca_infocliente':  | 
                                                        
| 43 | 43 | $this->setTemplate(false);  | 
                                                        
@@ -71,14 +71,14 @@ discard block  | 
                                                    ||
| 71 | 71 | |
| 72 | 72 | public function ncftipo()  | 
                                                        
| 73 | 73 |      { | 
                                                        
| 74 | -        return function () { | 
                                                        |
| 74 | +        return function() { | 
                                                        |
| 75 | 75 | return NCFTipo::allVentas();  | 
                                                        
| 76 | 76 | };  | 
                                                        
| 77 | 77 | }  | 
                                                        
| 78 | 78 | |
| 79 | 79 | public function ncftipoanulacion()  | 
                                                        
| 80 | 80 |      { | 
                                                        
| 81 | -        return function () { | 
                                                        |
| 81 | +        return function() { | 
                                                        |
| 82 | 82 | $tiposAnulacion = new NCFTipoAnulacion();  | 
                                                        
| 83 | 83 | return $tiposAnulacion->all();  | 
                                                        
| 84 | 84 | };  | 
                                                        
@@ -53,7 +53,7 @@  | 
                                                    ||
| 53 | 53 | |
| 54 | 54 | public function saveBefore(): Closure  | 
                                                        
| 55 | 55 |      { | 
                                                        
| 56 | -        return function () { | 
                                                        |
| 56 | +        return function() { | 
                                                        |
| 57 | 57 | $ArrayTipoNCFCompras = ['11', '12', '16', '17'];  | 
                                                        
| 58 | 58 | $ncfrango = new NCFRango();  | 
                                                        
| 59 | 59 | $cliente = new Proveedor();  |