@@ -148,17 +148,17 @@ discard block |
||
148 | 148 | parent::install(); |
149 | 149 | $sql = "INSERT INTO rd_ncftipo (". |
150 | 150 | "tipocomprobante, descripcion, estado, clasemovimiento, ventas, compras, contribuyente". |
151 | - " ) VALUES " . |
|
152 | - "('01','FACTURA DE CREDITO FISCAL',true, 'suma','Y','Y','Y')," . |
|
153 | - "('02','FACTURA DE CONSUMO',true, 'suma','Y','Y','Y')," . |
|
154 | - "('03','NOTA DE DEBITO',true, 'suma','Y','Y','N')," . |
|
155 | - "('04','NOTA DE CREDITO',true, 'resta','Y','Y','N')," . |
|
156 | - "('11','COMPROBANTE DE COMPRAS',true, 'suma','N','Y','Y')," . |
|
157 | - "('12','REGISTRO UNICO DE INGRESOS',true, 'suma','Y','N','N')," . |
|
158 | - "('13','COMPROBANTE PARA GASTOS MENORES',true, 'suma','N','Y','N')," . |
|
159 | - "('14','COMPROBANTE DE REGIMENES ESPECIALES',true, 'suma','Y','Y','Y')," . |
|
160 | - "('15','COMPROBANTE GUBERNAMENTAL',true, 'suma','Y','Y','Y')," . |
|
161 | - "('16','COMPROBANTE PARA EXPORTACIONES',true, 'suma','Y','N','Y')," . |
|
151 | + " ) VALUES ". |
|
152 | + "('01','FACTURA DE CREDITO FISCAL',true, 'suma','Y','Y','Y'),". |
|
153 | + "('02','FACTURA DE CONSUMO',true, 'suma','Y','Y','Y'),". |
|
154 | + "('03','NOTA DE DEBITO',true, 'suma','Y','Y','N'),". |
|
155 | + "('04','NOTA DE CREDITO',true, 'resta','Y','Y','N'),". |
|
156 | + "('11','COMPROBANTE DE COMPRAS',true, 'suma','N','Y','Y'),". |
|
157 | + "('12','REGISTRO UNICO DE INGRESOS',true, 'suma','Y','N','N'),". |
|
158 | + "('13','COMPROBANTE PARA GASTOS MENORES',true, 'suma','N','Y','N'),". |
|
159 | + "('14','COMPROBANTE DE REGIMENES ESPECIALES',true, 'suma','Y','Y','Y'),". |
|
160 | + "('15','COMPROBANTE GUBERNAMENTAL',true, 'suma','Y','Y','Y'),". |
|
161 | + "('16','COMPROBANTE PARA EXPORTACIONES',true, 'suma','Y','N','Y'),". |
|
162 | 162 | "('17','COMPROBANTE PARA PAGOS AL EXTERIOR',true, 'suma','N', 'Y','Y');"; |
163 | 163 | return($sql); |
164 | 164 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | public function restoreData() |
167 | 167 | { |
168 | 168 | $dataBase = new DataBase(); |
169 | - $sqlClean = "DELETE FROM " . $this->tableName() . ";"; |
|
169 | + $sqlClean = "DELETE FROM ".$this->tableName().";"; |
|
170 | 170 | $dataBase->exec($sqlClean); |
171 | 171 | foreach ($this->arrayComprobantes as $arrayItem) { |
172 | 172 | $initialData = new NCFTipo($arrayItem); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | public function allFor($type = "ventas", $movimiento = "suma") |
179 | 179 | { |
180 | - $where = [new DataBaseWhere($type, 'Y'),new DataBaseWhere('clasemovimiento', $movimiento)]; |
|
180 | + $where = [new DataBaseWhere($type, 'Y'), new DataBaseWhere('clasemovimiento', $movimiento)]; |
|
181 | 181 | return $this->all($where, ['tipocomprobante' => 'ASC'], 0, 50); |
182 | 182 | } |
183 | 183 | |
@@ -188,14 +188,14 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | public function tipoCliente($codcliente) { |
191 | - $where = [new DatabaseWhere( 'codcliente', $_REQUEST['codcliente'])]; |
|
191 | + $where = [new DatabaseWhere('codcliente', $_REQUEST['codcliente'])]; |
|
192 | 192 | $clientes = new Cliente(); |
193 | 193 | $cliente = $clientes->get($codcliente); |
194 | 194 | return ['tipocomprobante' => $cliente->tipocomprobante, 'ncftipopago' => $cliente->ncftipopago]; |
195 | 195 | } |
196 | 196 | |
197 | 197 | public function tipoProveedor($codproveedor) { |
198 | - $where = [new DatabaseWhere( 'codproveedor', $_REQUEST['codproveedor'])]; |
|
198 | + $where = [new DatabaseWhere('codproveedor', $_REQUEST['codproveedor'])]; |
|
199 | 199 | $proveedores = new Proveedor(); |
200 | 200 | $proveedor = $proveedores->get($codproveedor); |
201 | 201 | return ['ncftipopago' => $proveedor->ncftipopago]; |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | 'idempresa' => static::MAIN_TABLE.'.idempresa', |
37 | 37 | 'codalmacen' => static::MAIN_TABLE.'.codalmacen', |
38 | 38 | 'ncf' => static::MAIN_TABLE.'.numero2', |
39 | - 'tipoanulacion' => 'CASE WHEN ' . |
|
40 | - static::ESTADOSDOC_TABLE . '.nombre = \'Anulada\' AND ' . |
|
41 | - static::MAIN_TABLE.'.ncftipoanulacion is null ' . |
|
42 | - 'THEN CONCAT(\'05\',\' - \',\'Corrección de la Información\') ELSE ' . |
|
43 | - 'concat(' . static::MAIN_TABLE.'.ncftipoanulacion, \' - \', ' . |
|
39 | + 'tipoanulacion' => 'CASE WHEN '. |
|
40 | + static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\' AND '. |
|
41 | + static::MAIN_TABLE.'.ncftipoanulacion is null '. |
|
42 | + 'THEN CONCAT(\'05\',\' - \',\'Corrección de la Información\') ELSE '. |
|
43 | + 'concat('.static::MAIN_TABLE.'.ncftipoanulacion, \' - \', '. |
|
44 | 44 | static::NCFCANCELTYPE_TABLE.'.descripcion) END', |
45 | 45 | 'fecha' => 'to_char('.static::MAIN_TABLE.'.fecha,\'YYYYMMDD\')', |
46 | - 'estado' => 'CASE WHEN ' . static::ESTADOSDOC_TABLE . |
|
46 | + 'estado' => 'CASE WHEN '.static::ESTADOSDOC_TABLE. |
|
47 | 47 | '.nombre = \'Emitida\' THEN \'Activo\' ELSE \'Anulado\' END', |
48 | 48 | ]; |
49 | 49 | return $data; |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | protected function getSQLFrom(): string |
57 | 57 | { |
58 | 58 | return static::MAIN_TABLE |
59 | - . ' JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
60 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado AND '.static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\')' |
|
61 | - . ' LEFT JOIN ' . static::NCFCANCELTYPE_TABLE . ' ON (' |
|
62 | - . static::MAIN_TABLE . '.ncftipoanulacion = ' . static::NCFCANCELTYPE_TABLE . '.codigo)'; |
|
59 | + . ' JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
60 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado AND '.static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\')' |
|
61 | + . ' LEFT JOIN '.static::NCFCANCELTYPE_TABLE.' ON (' |
|
62 | + . static::MAIN_TABLE.'.ncftipoanulacion = '.static::NCFCANCELTYPE_TABLE.'.codigo)'; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -71,10 +71,10 @@ |
||
71 | 71 | protected function getSQLFrom(): string |
72 | 72 | { |
73 | 73 | return static::MAIN_TABLE |
74 | - . ' LEFT JOIN '. static::SECONDARY_TABLE . ' ON (' |
|
75 | - . static::MAIN_TABLE . '.idfacturarect = ' . static::SECONDARY_TABLE_ALIAS . '.idfactura)' |
|
76 | - . ' LEFT JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
77 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado)'; |
|
74 | + . ' LEFT JOIN '.static::SECONDARY_TABLE.' ON (' |
|
75 | + . static::MAIN_TABLE.'.idfacturarect = '.static::SECONDARY_TABLE_ALIAS.'.idfactura)' |
|
76 | + . ' LEFT JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
77 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado)'; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -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 | /** |
@@ -52,7 +52,7 @@ |
||
52 | 52 | $this->loadExtension(new Extension\Controller\EditProveedor()); |
53 | 53 | $this->loadExtension(new Extension\Controller\EditFacturaCliente()); |
54 | 54 | $this->loadExtension(new Extension\Controller\EditFacturaProveedor()); |
55 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
55 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | private function ActualizarEstados() |
@@ -26,10 +26,10 @@ |
||
26 | 26 | |
27 | 27 | public function createViews() |
28 | 28 | { |
29 | - return function () { |
|
30 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
31 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
32 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
29 | + return function() { |
|
30 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
31 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
32 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
33 | 33 | $ncfTipoPago = new NCFTipoPago(); |
34 | 34 | $ncfTiposPago = $ncfTipoPago->findAllByTipopago('02'); |
35 | 35 | $customValuesNTP = []; |
@@ -27,10 +27,10 @@ |
||
27 | 27 | { |
28 | 28 | public function createViews() |
29 | 29 | { |
30 | - return function () { |
|
31 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
32 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
33 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
30 | + return function() { |
|
31 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
32 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
33 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
34 | 34 | $ncfTipo = new NCFTipo(); |
35 | 35 | $ncfTipos = $ncfTipo->allFor('ventas', 'suma'); |
36 | 36 | $customValues = []; |
@@ -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 | } |
@@ -47,8 +47,8 @@ |
||
47 | 47 | |
48 | 48 | public function saveInsert() |
49 | 49 | { |
50 | - return function () { |
|
51 | - $ArrayTipoNCFCompras = ['11','12','16','17']; |
|
50 | + return function() { |
|
51 | + $ArrayTipoNCFCompras = ['11', '12', '16', '17']; |
|
52 | 52 | $ncfrango = new NCFRango(); |
53 | 53 | $cliente = new Proveedor(); |
54 | 54 | $appSettings = new AppSettings; |