@@ -39,14 +39,14 @@ discard block |
||
39 | 39 | 'idempresa' => static::MAIN_TABLE.'.idempresa', |
40 | 40 | 'codalmacen' => static::MAIN_TABLE.'.codalmacen', |
41 | 41 | 'ncf' => static::MAIN_TABLE.'.numeroncf', |
42 | - 'tipoanulacion' => 'CASE WHEN ' . |
|
43 | - static::ESTADOSDOC_TABLE . '.nombre = \'Anulada\' AND ' . |
|
44 | - static::MAIN_TABLE.'.ncftipoanulacion is null ' . |
|
45 | - 'THEN CONCAT(\'05\',\' - \',\'Corrección de la Información\') ELSE ' . |
|
46 | - 'concat(' . static::MAIN_TABLE.'.ncftipoanulacion, \' - \', ' . |
|
42 | + 'tipoanulacion' => 'CASE WHEN '. |
|
43 | + static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\' AND '. |
|
44 | + static::MAIN_TABLE.'.ncftipoanulacion is null '. |
|
45 | + 'THEN CONCAT(\'05\',\' - \',\'Corrección de la Información\') ELSE '. |
|
46 | + 'concat('.static::MAIN_TABLE.'.ncftipoanulacion, \' - \', '. |
|
47 | 47 | static::NCFCANCELTYPE_TABLE.'.descripcion) END', |
48 | 48 | 'fecha' => $dateFormat.'('.static::MAIN_TABLE.'.fecha,\''.$dateFormatString.'\')', |
49 | - 'estado' => 'CASE WHEN ' . static::ESTADOSDOC_TABLE . |
|
49 | + 'estado' => 'CASE WHEN '.static::ESTADOSDOC_TABLE. |
|
50 | 50 | '.nombre = \'Emitida\' THEN \'Activo\' ELSE \'Anulado\' END', |
51 | 51 | ]; |
52 | 52 | return $data; |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | protected function getSQLFrom(): string |
60 | 60 | { |
61 | 61 | return static::MAIN_TABLE |
62 | - . ' JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
63 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado AND '.static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\')' |
|
64 | - . ' LEFT JOIN ' . static::NCFCANCELTYPE_TABLE . ' ON (' |
|
65 | - . static::MAIN_TABLE . '.ncftipoanulacion = ' . static::NCFCANCELTYPE_TABLE . '.codigo)'; |
|
62 | + . ' JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
63 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado AND '.static::ESTADOSDOC_TABLE.'.nombre = \'Anulada\')' |
|
64 | + . ' LEFT JOIN '.static::NCFCANCELTYPE_TABLE.' ON (' |
|
65 | + . static::MAIN_TABLE.'.ncftipoanulacion = '.static::NCFCANCELTYPE_TABLE.'.codigo)'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -28,21 +28,21 @@ discard block |
||
28 | 28 | |
29 | 29 | class SalesFooterMod implements SalesModInterface |
30 | 30 | { |
31 | - public function apply(SalesDocument &$model, array $formData, User $user) |
|
31 | + public function apply(SalesDocument & $model, array $formData, User $user) |
|
32 | 32 | { |
33 | 33 | // TODO: Implement apply() method. |
34 | 34 | } |
35 | 35 | |
36 | - public function applyBefore(SalesDocument &$model, array $formData, User $user) |
|
36 | + public function applyBefore(SalesDocument & $model, array $formData, User $user) |
|
37 | 37 | { |
38 | 38 | // TODO: Implement applyBefore() method. |
39 | 39 | if ($model->modelClassName() === 'FacturaCliente') { |
40 | - $model->numeroncf = isset($formData['numeroncf']) ? (string)$formData['numeroncf'] : $model->numeroncf; |
|
41 | - $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string)$formData['tipocomprobante'] : $model->tipocomprobante; |
|
42 | - $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string)$formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
43 | - $model->ncftipopago = isset($formData['ncftipopago']) ? (string)$formData['ncftipopago'] : $model->ncftipopago; |
|
44 | - $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string)$formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
45 | - $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string)$formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
40 | + $model->numeroncf = isset($formData['numeroncf']) ? (string) $formData['numeroncf'] : $model->numeroncf; |
|
41 | + $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string) $formData['tipocomprobante'] : $model->tipocomprobante; |
|
42 | + $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string) $formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
43 | + $model->ncftipopago = isset($formData['ncftipopago']) ? (string) $formData['ncftipopago'] : $model->ncftipopago; |
|
44 | + $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string) $formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
45 | + $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string) $formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | if (!$model->editable) { |
106 | 106 | $invoiceTipoComprobante = $model->tipocomprobante; |
107 | 107 | } elseif ($model->editable === true && ($cliente->tipocomprobante !== $model->tipocomprobante) && $model->tipocomprobante !== null) { |
108 | - $invoiceTipoComprobante = $model->tipocomprobante; |
|
108 | + $invoiceTipoComprobante = $model->tipocomprobante; |
|
109 | 109 | } elseif ($model->editable === true && ($cliente->tipocomprobante === $model->tipocomprobante) && $model->tipocomprobante !== null) { |
110 | 110 | $invoiceTipoComprobante = $cliente->tipocomprobante; |
111 | 111 | } |
@@ -113,15 +113,14 @@ discard block |
||
113 | 113 | $options = ['<option value="">------</option>']; |
114 | 114 | foreach ($tipoComprobante as $row) { |
115 | 115 | $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ? |
116 | - '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' : |
|
117 | - '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>'; |
|
116 | + '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>'; |
|
118 | 117 | } |
119 | 118 | |
120 | 119 | $attributes = ($model->editable || $model->numeroncf === '') ? 'id="tipocomprobante" name="tipocomprobante" required="" onChange="verificarCorrelativoNCF(this.value,\'Ventas\')"' : 'disabled=""'; |
121 | 120 | return '<div class="col-sm-3">' |
122 | 121 | . '<div class="form-group">' |
123 | 122 | . $i18n->trans('tipocomprobante') |
124 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
123 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
125 | 124 | . '</div>' |
126 | 125 | . '</div>'; |
127 | 126 | } |
@@ -145,15 +144,14 @@ discard block |
||
145 | 144 | $options = ['<option value="">------</option>']; |
146 | 145 | foreach ($tipoPago as $row) { |
147 | 146 | $options[] = ($row->codigo === $invoiceTipoPago) ? |
148 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
149 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
147 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
150 | 148 | } |
151 | 149 | |
152 | 150 | $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""'; |
153 | 151 | return '<div class="col-sm-2">' |
154 | 152 | . '<div class="form-group">' |
155 | 153 | . $i18n->trans('ncf-payment-type') |
156 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
154 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
157 | 155 | . '</div>' |
158 | 156 | . '</div>'; |
159 | 157 | } |
@@ -173,15 +171,14 @@ discard block |
||
173 | 171 | $options = ['<option value="">------</option>']; |
174 | 172 | foreach ($tipoMovimiento as $row) { |
175 | 173 | $options[] = ($row->codigo === $invoiceTipoMovimiento) ? |
176 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
177 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
174 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
178 | 175 | } |
179 | 176 | |
180 | 177 | $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""'; |
181 | 178 | return '<div class="col-sm-3">' |
182 | 179 | . '<div class="form-group">' |
183 | 180 | . $i18n->trans('ncf-movement-type') |
184 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
181 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
185 | 182 | . '</div>' |
186 | 183 | . '</div>'; |
187 | 184 | } |
@@ -199,15 +196,14 @@ discard block |
||
199 | 196 | $options = ['<option value="">------</option>']; |
200 | 197 | foreach ($tipoAnulacion as $row) { |
201 | 198 | $options[] = ($row->codigo === $invoiceTipoAnulacion) ? |
202 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
203 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
199 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
204 | 200 | } |
205 | 201 | |
206 | 202 | $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'disabled=""'; |
207 | 203 | return '<div class="col-sm-2">' |
208 | 204 | . '<div class="form-group">' |
209 | 205 | . $i18n->trans('ncf-cancellation-type') |
210 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
206 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
211 | 207 | . '</div>' |
212 | 208 | . '</div>'; |
213 | 209 | } |
@@ -216,8 +212,8 @@ discard block |
||
216 | 212 | { |
217 | 213 | $attributes = ($model->editable && $model->numero2 === '') ? 'name="ncffechavencimiento"' : 'name="ncffechavencimiento" disabled=""'; |
218 | 214 | return '<div class="col-sm-2">' |
219 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
220 | - . '<input type="date" ' . $attributes . ' value="' . date('Y-m-d', strtotime($model->ncffechavencimiento)) . '" class="form-control"/>' |
|
215 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
216 | + . '<input type="date" '.$attributes.' value="'.date('Y-m-d', strtotime($model->ncffechavencimiento)).'" class="form-control"/>' |
|
221 | 217 | . '</div>' |
222 | 218 | . '</div>'; |
223 | 219 | } |
@@ -236,7 +232,7 @@ discard block |
||
236 | 232 | . '<div class="form-group">' |
237 | 233 | . $i18n->trans('desc-numeroncf-sales') |
238 | 234 | //. '<div class="input-group">' |
239 | - . '<input type="text" ' . $attributes . ' value="' . $model->numeroncf . '" class="form-control"/>' |
|
235 | + . '<input type="text" '.$attributes.' value="'.$model->numeroncf.'" class="form-control"/>' |
|
240 | 236 | // . '<div class="input-group-append">' |
241 | 237 | // . '<button class="btn ' . $btnColor .' btn-spin-action" id="btnVerifyNCF"' |
242 | 238 | // . 'onclick="purchasesNCFVerify()" ' |
@@ -82,10 +82,10 @@ |
||
82 | 82 | /** |
83 | 83 | * @inheritDoc |
84 | 84 | */ |
85 | - public function show(Response &$response) |
|
85 | + public function show(Response & $response) |
|
86 | 86 | { |
87 | 87 | $response->headers->set('Content-Type', 'text/text; charset=utf-8'); |
88 | - $response->headers->set('Content-Disposition', 'attachment;filename=' . $this->getFileName() . '.txt'); |
|
88 | + $response->headers->set('Content-Disposition', 'attachment;filename='.$this->getFileName().'.txt'); |
|
89 | 89 | $response->setContent($this->getDoc()); |
90 | 90 | } |
91 | 91 | } |
92 | 92 | \ No newline at end of file |
@@ -92,10 +92,10 @@ |
||
92 | 92 | protected function getSQLFrom(): string |
93 | 93 | { |
94 | 94 | return static::MAIN_TABLE |
95 | - . ' LEFT JOIN '. static::SECONDARY_TABLE . ' ON (' |
|
96 | - . static::MAIN_TABLE . '.idfacturarect = ' . static::SECONDARY_TABLE_ALIAS . '.idfactura)' |
|
97 | - . ' LEFT JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
98 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado AND ' |
|
95 | + . ' LEFT JOIN '.static::SECONDARY_TABLE.' ON (' |
|
96 | + . static::MAIN_TABLE.'.idfacturarect = '.static::SECONDARY_TABLE_ALIAS.'.idfactura)' |
|
97 | + . ' LEFT JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
98 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado AND ' |
|
99 | 99 | . static::ESTADOSDOC_TABLE.'.nombre != \'Anulada\')'; |
100 | 100 | } |
101 | 101 |
@@ -115,8 +115,8 @@ discard block |
||
115 | 115 | $fileName = 'DGII_'.$reportCode.'_'.$this->empresa->cifnif.'_'.$year.'_'.$month.'.txt'; |
116 | 116 | $commonFunctions->exportTXT($reportCode, $fileName, $this->empresa->cifnif, $year, $month, $whereReport); |
117 | 117 | $this->response->headers->set('Content-type', 'text/plain'); |
118 | - $this->response->headers->set('Content-Disposition', 'attachment;filename=' . $fileName); |
|
119 | - $this->response->setContent(file_get_contents(\FS_FOLDER . DIRECTORY_SEPARATOR . $fileName)); |
|
118 | + $this->response->headers->set('Content-Disposition', 'attachment;filename='.$fileName); |
|
119 | + $this->response->setContent(file_get_contents(\FS_FOLDER.DIRECTORY_SEPARATOR.$fileName)); |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | $periodStartDate = \date('Y-m-01'); |
211 | 211 | $periodEndDate = \date('Y-m-d'); |
212 | 212 | PeriodTools::applyPeriod('last-month', $periodStartDate, $periodEndDate); |
213 | - if (in_array($this->request->request->get('filterfecha'), ['',null], true) === false) { |
|
213 | + if (in_array($this->request->request->get('filterfecha'), ['', null], true) === false) { |
|
214 | 214 | PeriodTools::applyPeriod($this->request->request->get('filterfecha'), $periodStartDate, $periodEndDate); |
215 | 215 | } else { |
216 | 216 | $periodStartDate = $this->request->request->get('filterstartfecha') ?? $periodStartDate; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | public function saveBefore(): Closure |
67 | 67 | { |
68 | - return function () { |
|
68 | + return function() { |
|
69 | 69 | |
70 | 70 | $ncfrango = new NCFRango(); |
71 | 71 | $cliente = new Cliente(); |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | |
104 | 104 | public function all(): Closure |
105 | 105 | { |
106 | - return function () { |
|
106 | + return function() { |
|
107 | 107 | $this->facturarectnumero2 = ''; |
108 | 108 | if ($this->idfacturarect !== '') { |
109 | 109 | $facturaRectificativa = $this->get($this->idfacturarect); |
110 | - $this->loadFromData(['facturarectnumero2' => 'SI' ]); |
|
110 | + $this->loadFromData(['facturarectnumero2' => 'SI']); |
|
111 | 111 | $this->facturarectnumero2 = $facturaRectificativa->numero2; |
112 | 112 | } else { |
113 | 113 | $this->loadFromData(['facturarectnumero2' => 'NO HAY']); |