@@ -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 | /** |
@@ -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; |
@@ -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(); |
@@ -184,7 +184,7 @@ |
||
| 184 | 184 | . $idempresa |
| 185 | 185 | . ' AND tipocomprobante = ' |
| 186 | 186 | . $dataBase->var2str($tipocomprobante) |
| 187 | - . ' AND estado = ' . $dataBase->var2str(true) |
|
| 187 | + . ' AND estado = '.$dataBase->var2str(true) |
|
| 188 | 188 | . ';'; |
| 189 | 189 | $data = $dataBase->select($sql); |
| 190 | 190 | if (in_array($data[0], [null, ''], true)) { |
@@ -69,17 +69,17 @@ discard block |
||
| 69 | 69 | protected function getGroupFields(): string |
| 70 | 70 | { |
| 71 | 71 | //return parent::getGroupFields(); // TODO: Change the autogenerated stub |
| 72 | - return static::MAIN_TABLE.'.idfactura, ' . |
|
| 73 | - static::MAIN_TABLE.'.idempresa, ' . |
|
| 74 | - static::MAIN_TABLE.'.codalmacen, ' . |
|
| 75 | - static::MAIN_TABLE.'.cifnif, ' . |
|
| 76 | - static::MAIN_TABLE.'.ncftipomovimiento, ' . |
|
| 77 | - static::MAIN_TABLE.'.numproveedor, ' . |
|
| 78 | - static::SECONDARY_TABLE_ALIAS.'.numproveedor, ' . |
|
| 79 | - static::MAIN_TABLE.'.fecha, ' . |
|
| 80 | - static::ESTADOSDOC_TABLE.'.nombre, ' . |
|
| 81 | - static::MAIN_TABLE.'.neto, ' . |
|
| 82 | - static::MAIN_TABLE.'.totaliva' . |
|
| 72 | + return static::MAIN_TABLE.'.idfactura, '. |
|
| 73 | + static::MAIN_TABLE.'.idempresa, '. |
|
| 74 | + static::MAIN_TABLE.'.codalmacen, '. |
|
| 75 | + static::MAIN_TABLE.'.cifnif, '. |
|
| 76 | + static::MAIN_TABLE.'.ncftipomovimiento, '. |
|
| 77 | + static::MAIN_TABLE.'.numproveedor, '. |
|
| 78 | + static::SECONDARY_TABLE_ALIAS.'.numproveedor, '. |
|
| 79 | + static::MAIN_TABLE.'.fecha, '. |
|
| 80 | + static::ESTADOSDOC_TABLE.'.nombre, '. |
|
| 81 | + static::MAIN_TABLE.'.neto, '. |
|
| 82 | + static::MAIN_TABLE.'.totaliva'. |
|
| 83 | 83 | ' '; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | protected function getSQLFrom(): string |
| 91 | 91 | { |
| 92 | 92 | return static::MAIN_TABLE |
| 93 | - . ' LEFT JOIN '. static::SECONDARY_TABLE . ' ON (' |
|
| 94 | - . static::MAIN_TABLE . '.idfacturarect = ' . static::SECONDARY_TABLE_ALIAS . '.idfactura)' |
|
| 95 | - . ' LEFT JOIN '. static::LINES_TABLE . ' ON (' |
|
| 96 | - . static::MAIN_TABLE . '.idfactura = ' . static::LINES_TABLE . '.idfactura)' |
|
| 97 | - . ' LEFT JOIN '. static::PRODS_TABLE . ' ON (' |
|
| 98 | - . static::LINES_TABLE . '.referencia = ' . static::PRODS_TABLE . '.referencia)' |
|
| 99 | - . ' LEFT JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
| 100 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado)'; |
|
| 93 | + . ' LEFT JOIN '.static::SECONDARY_TABLE.' ON (' |
|
| 94 | + . static::MAIN_TABLE.'.idfacturarect = '.static::SECONDARY_TABLE_ALIAS.'.idfactura)' |
|
| 95 | + . ' LEFT JOIN '.static::LINES_TABLE.' ON (' |
|
| 96 | + . static::MAIN_TABLE.'.idfactura = '.static::LINES_TABLE.'.idfactura)' |
|
| 97 | + . ' LEFT JOIN '.static::PRODS_TABLE.' ON (' |
|
| 98 | + . static::LINES_TABLE.'.referencia = '.static::PRODS_TABLE.'.referencia)' |
|
| 99 | + . ' LEFT JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
| 100 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado)'; |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | private function slowParser() |
| 134 | 134 | { |
| 135 | 135 | $dataBase = new DataBase(); |
| 136 | - $sqlDelete = "DELETE FROM " . $this->tableName() . ";"; |
|
| 136 | + $sqlDelete = "DELETE FROM ".$this->tableName().";"; |
|
| 137 | 137 | $dataBase->exec($sqlDelete); |
| 138 | 138 | |
| 139 | 139 | [$handle, $totalLines] = $this->utf8FopenRead($this->fileNameTxt); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | while (($raw_string = fgets($handle)) !== false) { |
| 143 | 143 | $totalLines--; |
| 144 | 144 | if ($maxLine === 2000) { |
| 145 | - $query = 'INSERT INTO ' . $this->tableName() . |
|
| 145 | + $query = 'INSERT INTO '.$this->tableName(). |
|
| 146 | 146 | ' (rnc, nombre, razonsocial, categoria, inicioactividad, estado, regimenpagos) VALUES '; |
| 147 | 147 | } |
| 148 | 148 | $linea = str_getcsv($raw_string, "|"); |
@@ -172,14 +172,14 @@ discard block |
||
| 172 | 172 | $fecha = ($colArray[8] === '00/00/0000') |
| 173 | 173 | ? "2000-01-01" |
| 174 | 174 | : \date('Y-m-d', strtotime(str_replace("/", "-", $colArray[8]))); |
| 175 | - return "('" . |
|
| 176 | - $colArray[0] . "','" . |
|
| 177 | - str_replace('\\', '', str_replace('"', '', str_replace("'", "''", str_replace(" ", " ", $colArray[1])))) . "','" . |
|
| 178 | - str_replace('\\', '', str_replace('"', '', str_replace("'", "''", str_replace(" ", " ", $colArray[2])))) . "','" . |
|
| 179 | - $colArray[3] . "','" . |
|
| 180 | - $fecha . "','" . |
|
| 181 | - $colArray[9] . "','" . |
|
| 182 | - $colArray[10] . "')" . $semiColon; |
|
| 175 | + return "('". |
|
| 176 | + $colArray[0]."','". |
|
| 177 | + str_replace('\\', '', str_replace('"', '', str_replace("'", "''", str_replace(" ", " ", $colArray[1]))))."','". |
|
| 178 | + str_replace('\\', '', str_replace('"', '', str_replace("'", "''", str_replace(" ", " ", $colArray[2]))))."','". |
|
| 179 | + $colArray[3]."','". |
|
| 180 | + $fecha."','". |
|
| 181 | + $colArray[9]."','". |
|
| 182 | + $colArray[10]."')".$semiColon; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | private function utf8FopenRead($fileName) |