@@ -29,19 +29,19 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | class PurchasesFooterMod implements PurchasesModInterface |
| 31 | 31 | { |
| 32 | - public function apply(PurchaseDocument &$model, array $formData, User $user) |
|
| 32 | + public function apply(PurchaseDocument & $model, array $formData, User $user) |
|
| 33 | 33 | { |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function applyBefore(PurchaseDocument &$model, array $formData, User $user) |
|
| 36 | + public function applyBefore(PurchaseDocument & $model, array $formData, User $user) |
|
| 37 | 37 | { |
| 38 | 38 | if ($model->modelClassName() === 'FacturaProveedor') { |
| 39 | - $model->numeroncf = isset($formData['numeroncf']) ? (string)$formData['numeroncf'] : $model->numeroncf; |
|
| 40 | - $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string)$formData['tipocomprobante'] : $model->tipocomprobante; |
|
| 41 | - $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string)$formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
| 42 | - $model->ncftipopago = isset($formData['ncftipopago']) ? (string)$formData['ncftipopago'] : $model->ncftipopago; |
|
| 43 | - $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string)$formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
| 44 | - $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string)$formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
| 39 | + $model->numeroncf = isset($formData['numeroncf']) ? (string) $formData['numeroncf'] : $model->numeroncf; |
|
| 40 | + $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string) $formData['tipocomprobante'] : $model->tipocomprobante; |
|
| 41 | + $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string) $formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
| 42 | + $model->ncftipopago = isset($formData['ncftipopago']) ? (string) $formData['ncftipopago'] : $model->ncftipopago; |
|
| 43 | + $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string) $formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
| 44 | + $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string) $formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
@@ -109,15 +109,14 @@ discard block |
||
| 109 | 109 | $options = ['<option value="">------</option>']; |
| 110 | 110 | foreach ($tipoComprobante as $row) { |
| 111 | 111 | $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ? |
| 112 | - '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' : |
|
| 113 | - '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>'; |
|
| 112 | + '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>'; |
|
| 114 | 113 | } |
| 115 | 114 | |
| 116 | 115 | $attributes = ($model->editable || $model->numeroncf === '') ? 'name="tipocomprobante" required=""' : 'disabled=""'; |
| 117 | 116 | return '<div class="col-sm-3">' |
| 118 | 117 | . '<div class="form-group">' |
| 119 | 118 | . $i18n->trans('tipocomprobante') |
| 120 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 119 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 121 | 120 | . '</div>' |
| 122 | 121 | . '</div>'; |
| 123 | 122 | } |
@@ -141,15 +140,14 @@ discard block |
||
| 141 | 140 | $options = ['<option value="">------</option>']; |
| 142 | 141 | foreach ($tipoPago as $row) { |
| 143 | 142 | $options[] = ($row->codigo === $invoiceTipoPago) ? |
| 144 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 145 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 143 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 146 | 144 | } |
| 147 | 145 | |
| 148 | 146 | $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""'; |
| 149 | 147 | return '<div class="col-sm-2">' |
| 150 | 148 | . '<div class="form-group">' |
| 151 | 149 | . $i18n->trans('ncf-payment-type') |
| 152 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 150 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 153 | 151 | . '</div>' |
| 154 | 152 | . '</div>'; |
| 155 | 153 | } |
@@ -167,15 +165,14 @@ discard block |
||
| 167 | 165 | $options = ['<option value="">------</option>']; |
| 168 | 166 | foreach ($tipoMovimiento as $row) { |
| 169 | 167 | $options[] = ($row->codigo === $invoiceTipoMovimiento) ? |
| 170 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 171 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 168 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 172 | 169 | } |
| 173 | 170 | |
| 174 | 171 | $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""'; |
| 175 | 172 | return '<div class="col-sm-3">' |
| 176 | 173 | . '<div class="form-group">' |
| 177 | 174 | . $i18n->trans('ncf-movement-type') |
| 178 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 175 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 179 | 176 | . '</div>' |
| 180 | 177 | . '</div>'; |
| 181 | 178 | } |
@@ -193,15 +190,14 @@ discard block |
||
| 193 | 190 | $options = ['<option value="">------</option>']; |
| 194 | 191 | foreach ($tipoAnulacion as $row) { |
| 195 | 192 | $options[] = ($row->codigo === $invoiceTipoAnulacion) ? |
| 196 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 197 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 193 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 198 | 194 | } |
| 199 | 195 | |
| 200 | 196 | $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'name="ncftipoanulacion" readonly=""'; |
| 201 | 197 | return '<div class="col-sm-2">' |
| 202 | 198 | . '<div class="form-group">' |
| 203 | 199 | . $i18n->trans('ncf-cancellation-type') |
| 204 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 200 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 205 | 201 | . '</div>' |
| 206 | 202 | . '</div>'; |
| 207 | 203 | } |
@@ -213,9 +209,9 @@ discard block |
||
| 213 | 209 | ? date('Y-m-d', strtotime($model->ncffechavencimiento)) |
| 214 | 210 | : ''; |
| 215 | 211 | return '<div class="col-sm-2">' |
| 216 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
| 217 | - . '<input type="date" ' . $attributes . ' value="' |
|
| 218 | - . $ncfFechaVencimiento . '" class="form-control"/>' |
|
| 212 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
| 213 | + . '<input type="date" '.$attributes.' value="' |
|
| 214 | + . $ncfFechaVencimiento.'" class="form-control"/>' |
|
| 219 | 215 | . '</div>' |
| 220 | 216 | . '</div>'; |
| 221 | 217 | } |
@@ -228,11 +224,11 @@ discard block |
||
| 228 | 224 | . '<div class="form-group">' |
| 229 | 225 | . $i18n->trans('desc-numeroncf-purchases') |
| 230 | 226 | . '<div class="input-group">' |
| 231 | - . '<input type="text" ' . $attributes . ' value="' . $model->numeroncf . '" class="form-control"/>' |
|
| 227 | + . '<input type="text" '.$attributes.' value="'.$model->numeroncf.'" class="form-control"/>' |
|
| 232 | 228 | . '<div class="input-group-append">' |
| 233 | - . '<button class="btn ' . $btnColor . ' btn-spin-action" id="btnVerifyNCF"' |
|
| 229 | + . '<button class="btn '.$btnColor.' btn-spin-action" id="btnVerifyNCF"' |
|
| 234 | 230 | . 'onclick="purchasesNCFVerify()" ' |
| 235 | - . 'title="' . $i18n->trans('verify-numproveedor') |
|
| 231 | + . 'title="'.$i18n->trans('verify-numproveedor') |
|
| 236 | 232 | . '" type="button">' |
| 237 | 233 | . '<i id="iconBtnVerify" class="fas fa-search fa-fw"></i>' |
| 238 | 234 | . '</button>' |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | $files = []; |
| 9 | 9 | $langs = 'ca_ES,cs_CZ,de_DE,en_EN,es_AR,es_CL,es_CO,es_CR,es_DO,es_EC,es_ES,es_GT,es_MX,es_PA,es_PE,es_UY,eu_ES,fr_FR,gl_ES,it_IT,pl_PL,pt_BR,pt_PT,va_ES'; |
| 10 | 10 | foreach (explode(',', $langs) as $lang) { |
| 11 | - $files[] = $lang . '.json'; |
|
| 11 | + $files[] = $lang.'.json'; |
|
| 12 | 12 | } |
| 13 | 13 | foreach (scandir(__DIR__, SCANDIR_SORT_ASCENDING) as $filename) { |
| 14 | 14 | if (is_file($filename) && substr($filename, -5) === '.json' && false === in_array($filename, $files)) { |
@@ -18,25 +18,25 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | // download json from facturascripts.com |
| 20 | 20 | foreach ($files as $filename) { |
| 21 | - $url = "https://facturascripts.com/EditLanguage?action=json&idproject=176&code=" . substr($filename, 0, -5); |
|
| 21 | + $url = "https://facturascripts.com/EditLanguage?action=json&idproject=176&code=".substr($filename, 0, -5); |
|
| 22 | 22 | $newContent = file_get_contents($url); |
| 23 | 23 | if (empty($newContent)) { |
| 24 | 24 | if (file_exists($filename)) { |
| 25 | 25 | unlink($filename); |
| 26 | - echo "Remove " . $filename . "\n"; |
|
| 26 | + echo "Remove ".$filename."\n"; |
|
| 27 | 27 | continue; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - echo "Empty " . $filename . "\n"; |
|
| 30 | + echo "Empty ".$filename."\n"; |
|
| 31 | 31 | continue; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | $oldContent = file_exists($filename) ? file_get_contents($filename) : ''; |
| 35 | 35 | if (strlen($newContent) > 10 && $newContent !== $oldContent) { |
| 36 | - echo "Download " . $filename . "\n"; |
|
| 36 | + echo "Download ".$filename."\n"; |
|
| 37 | 37 | file_put_contents($filename, $newContent); |
| 38 | 38 | continue; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - echo "Skip " . $filename . "\n"; |
|
| 41 | + echo "Skip ".$filename."\n"; |
|
| 42 | 42 | } |
| 43 | 43 | \ No newline at end of file |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | $this->loadExtension(new Extension\Controller\EditProducto()); |
| 65 | 65 | $this->loadExtension(new Extension\Controller\EditSettings()); |
| 66 | 66 | |
| 67 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
| 67 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
| 68 | 68 | SalesLineHTML::addMod(new Mod\SalesLineMod()); |
| 69 | 69 | SalesFooterHTML::addMod(new Mod\SalesFooterMod()); |
| 70 | 70 | PurchasesFooterHTML::addMod(new Mod\PurchasesFooterMod()); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $ticket = new Ticket(); |
| 35 | 35 | $ticket->idprinter = $printer->id; |
| 36 | 36 | $ticket->nick = $user->nick; |
| 37 | - $ticket->title = self::$i18n->trans($model->modelClassName() . '-min') . ' RepDominicana.php' . $model->codigo; |
|
| 37 | + $ticket->title = self::$i18n->trans($model->modelClassName().'-min').' RepDominicana.php'.$model->codigo; |
|
| 38 | 38 | |
| 39 | 39 | static::setHeader($model, $printer, $ticket->title); |
| 40 | 40 | static::setBody($model, $printer); |
@@ -67,54 +67,54 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | // imprimimos el nombre corto de la empresa |
| 69 | 69 | if ($printer->print_comp_shortname) { |
| 70 | - static::$escpos->text(static::sanitize($company->nombrecorto) . "\n"); |
|
| 70 | + static::$escpos->text(static::sanitize($company->nombrecorto)."\n"); |
|
| 71 | 71 | static::$escpos->setTextSize($printer->head_font_size, $printer->head_font_size); |
| 72 | 72 | |
| 73 | 73 | // imprimimos el nombre de la empresa |
| 74 | - static::$escpos->text(static::sanitize($company->nombre) . "\n"); |
|
| 74 | + static::$escpos->text(static::sanitize($company->nombre)."\n"); |
|
| 75 | 75 | } else { |
| 76 | 76 | // imprimimos el nombre de la empresa |
| 77 | - static::$escpos->text(static::sanitize($company->nombre) . "\n"); |
|
| 77 | + static::$escpos->text(static::sanitize($company->nombre)."\n"); |
|
| 78 | 78 | static::$escpos->setTextSize($printer->head_font_size, $printer->head_font_size); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | static::$escpos->setJustification(); |
| 82 | 82 | |
| 83 | 83 | // imprimimos la dirección de la empresa |
| 84 | - static::$escpos->text(static::sanitize($company->direccion) . "\n"); |
|
| 85 | - static::$escpos->text(static::sanitize("CP: " . $company->codpostal . ', ' . $company->ciudad) . "\n"); |
|
| 86 | - static::$escpos->text(static::sanitize($company->tipoidfiscal . ': ' . $company->cifnif) . "\n\n"); |
|
| 84 | + static::$escpos->text(static::sanitize($company->direccion)."\n"); |
|
| 85 | + static::$escpos->text(static::sanitize("CP: ".$company->codpostal.', '.$company->ciudad)."\n"); |
|
| 86 | + static::$escpos->text(static::sanitize($company->tipoidfiscal.': '.$company->cifnif)."\n\n"); |
|
| 87 | 87 | |
| 88 | 88 | if ($printer->print_comp_tlf) { |
| 89 | 89 | if (false === empty($company->telefono1) && false === empty($company->telefono2)) { |
| 90 | - static::$escpos->text(static::sanitize($company->telefono1 . ' / ' . $company->telefono2) . "\n"); |
|
| 90 | + static::$escpos->text(static::sanitize($company->telefono1.' / '.$company->telefono2)."\n"); |
|
| 91 | 91 | } elseif (false === empty($company->telefono1)) { |
| 92 | - static::$escpos->text(static::sanitize($company->telefono1) . "\n"); |
|
| 92 | + static::$escpos->text(static::sanitize($company->telefono1)."\n"); |
|
| 93 | 93 | } elseif (false === empty($company->telefono2)) { |
| 94 | - static::$escpos->text(static::sanitize($company->telefono2) . "\n"); |
|
| 94 | + static::$escpos->text(static::sanitize($company->telefono2)."\n"); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | // imprimimos el título del documento |
| 99 | - static::$escpos->text(static::sanitize($title) . "\n"); |
|
| 99 | + static::$escpos->text(static::sanitize($title)."\n"); |
|
| 100 | 100 | |
| 101 | 101 | static::setHeaderTPV($model, $printer); |
| 102 | 102 | |
| 103 | 103 | // si es un documento de venta |
| 104 | 104 | // imprimimos la fecha y el cliente |
| 105 | 105 | if (in_array($model->modelClassName(), ['PresupuestoCliente', 'PedidoCliente', 'AlbaranCliente', 'FacturaCliente'])) { |
| 106 | - static::$escpos->text(static::sanitize(static::$i18n->trans('date') . ': ' . $model->fecha . ' ' . $model->hora) . "\n"); |
|
| 107 | - static::$escpos->text(static::sanitize(static::$i18n->trans('customer') . ': ' . $model->nombrecliente) . "\n\n"); |
|
| 106 | + static::$escpos->text(static::sanitize(static::$i18n->trans('date').': '.$model->fecha.' '.$model->hora)."\n"); |
|
| 107 | + static::$escpos->text(static::sanitize(static::$i18n->trans('customer').': '.$model->nombrecliente)."\n\n"); |
|
| 108 | 108 | |
| 109 | 109 | if ($model->modelClassName() == 'FacturaCliente') { |
| 110 | 110 | if (property_exists($model, 'numeroncf') && $model->numeroncf) { |
| 111 | - static::$escpos->text(static::sanitize(static::$i18n->trans('ncf-number') . ': ' . $model->numeroncf)) . "\n"; |
|
| 111 | + static::$escpos->text(static::sanitize(static::$i18n->trans('ncf-number').': '.$model->numeroncf))."\n"; |
|
| 112 | 112 | } |
| 113 | 113 | if (property_exists($model, 'tipocomprobante') && $model->tipocomprobante) { |
| 114 | - static::$escpos->text(static::sanitize(static::$i18n->trans('tipo_comprobante') . ': ' . static::getTipoComprobanteRD($model->tipocomprobante))) . "\n"; |
|
| 114 | + static::$escpos->text(static::sanitize(static::$i18n->trans('tipo_comprobante').': '.static::getTipoComprobanteRD($model->tipocomprobante)))."\n"; |
|
| 115 | 115 | } |
| 116 | 116 | if (property_exists($model, 'ncffechavencimiento') && $model->ncffechavencimiento) { |
| 117 | - static::$escpos->text(static::sanitize(static::$i18n->trans('due-date') . ': ' . $model->ncffechavencimiento)) . "\n"; |
|
| 117 | + static::$escpos->text(static::sanitize(static::$i18n->trans('due-date').': '.$model->ncffechavencimiento))."\n"; |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | // añadimos la cabecera |
| 123 | 123 | if ($printer->head) { |
| 124 | 124 | static::$escpos->setJustification(Printer::JUSTIFY_CENTER); |
| 125 | - static::$escpos->text(static::sanitize($printer->head) . "\n\n"); |
|
| 125 | + static::$escpos->text(static::sanitize($printer->head)."\n\n"); |
|
| 126 | 126 | static::$escpos->setJustification(); |
| 127 | 127 | } |
| 128 | 128 | } |