@@ -81,10 +81,10 @@ |
||
| 81 | 81 | /** |
| 82 | 82 | * @inheritDoc |
| 83 | 83 | */ |
| 84 | - public function show(Response &$response) |
|
| 84 | + public function show(Response & $response) |
|
| 85 | 85 | { |
| 86 | 86 | $response->headers->set('Content-Type', 'text/text; charset=utf-8'); |
| 87 | - $response->headers->set('Content-Disposition', 'attachment;filename=' . $this->getFileName() . '.TXT'); |
|
| 87 | + $response->headers->set('Content-Disposition', 'attachment;filename='.$this->getFileName().'.TXT'); |
|
| 88 | 88 | $response->setContent($this->getDoc()); |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | \ No newline at end of file |
@@ -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 | } |
@@ -219,8 +215,8 @@ discard block |
||
| 219 | 215 | ? date('Y-m-d', strtotime($model->ncffechavencimiento)) |
| 220 | 216 | : ''; |
| 221 | 217 | return '<div class="col-sm-2">' |
| 222 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
| 223 | - . '<input type="date" ' . $attributes . ' value="' . $ncfFechaVencimiento . '" class="form-control"/>' |
|
| 218 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
| 219 | + . '<input type="date" '.$attributes.' value="'.$ncfFechaVencimiento.'" class="form-control"/>' |
|
| 224 | 220 | . '</div>' |
| 225 | 221 | . '</div>'; |
| 226 | 222 | } |
@@ -239,7 +235,7 @@ discard block |
||
| 239 | 235 | . '<div class="form-group">' |
| 240 | 236 | . $i18n->trans('desc-numeroncf-sales') |
| 241 | 237 | //. '<div class="input-group">' |
| 242 | - . '<input type="text" ' . $attributes . ' value="' . $model->numeroncf . '" class="form-control"/>' |
|
| 238 | + . '<input type="text" '.$attributes.' value="'.$model->numeroncf.'" class="form-control"/>' |
|
| 243 | 239 | // . '<div class="input-group-append">' |
| 244 | 240 | // . '<button class="btn ' . $btnColor .' btn-spin-action" id="btnVerifyNCF"' |
| 245 | 241 | // . 'onclick="purchasesNCFVerify()" ' |
@@ -29,21 +29,21 @@ 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 | // TODO: Implement apply() method. |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function applyBefore(PurchaseDocument &$model, array $formData, User $user) |
|
| 37 | + public function applyBefore(PurchaseDocument & $model, array $formData, User $user) |
|
| 38 | 38 | { |
| 39 | 39 | // TODO: Implement applyBefore() method. |
| 40 | 40 | if ($model->modelClassName() === 'FacturaProveedor') { |
| 41 | - $model->numeroncf = isset($formData['numeroncf']) ? (string)$formData['numeroncf'] : $model->numeroncf; |
|
| 42 | - $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string)$formData['tipocomprobante'] : $model->tipocomprobante; |
|
| 43 | - $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string)$formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
| 44 | - $model->ncftipopago = isset($formData['ncftipopago']) ? (string)$formData['ncftipopago'] : $model->ncftipopago; |
|
| 45 | - $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string)$formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
| 46 | - $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string)$formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
| 41 | + $model->numeroncf = isset($formData['numeroncf']) ? (string) $formData['numeroncf'] : $model->numeroncf; |
|
| 42 | + $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string) $formData['tipocomprobante'] : $model->tipocomprobante; |
|
| 43 | + $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string) $formData['ncffechavencimiento'] : $model->ncffechavencimiento; |
|
| 44 | + $model->ncftipopago = isset($formData['ncftipopago']) ? (string) $formData['ncftipopago'] : $model->ncftipopago; |
|
| 45 | + $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string) $formData['ncftipomovimiento'] : $model->ncftipomovimiento; |
|
| 46 | + $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string) $formData['ncftipoanulacion'] : $model->ncftipoanulacion; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | public function newFields(): array |
| 56 | 56 | { |
| 57 | 57 | // TODO: Implement newFields() method. |
| 58 | - return ['numeroncf','tipocomprobante', 'ncffechavencimiento', 'ncftipopago', 'ncftipomovimiento', 'ncftipoanulacion']; |
|
| 58 | + return ['numeroncf', 'tipocomprobante', 'ncffechavencimiento', 'ncftipopago', 'ncftipomovimiento', 'ncftipoanulacion']; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function renderField(Translator $i18n, PurchaseDocument $model, string $field): ?string |
@@ -104,15 +104,14 @@ discard block |
||
| 104 | 104 | $options = ['<option value="">------</option>']; |
| 105 | 105 | foreach ($tipoComprobante as $row) { |
| 106 | 106 | $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ? |
| 107 | - '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' : |
|
| 108 | - '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>'; |
|
| 107 | + '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>'; |
|
| 109 | 108 | } |
| 110 | 109 | |
| 111 | 110 | $attributes = ($model->editable || $model->numeroncf === '') ? 'name="tipocomprobante" required=""' : 'disabled=""'; |
| 112 | 111 | return '<div class="col-sm-3">' |
| 113 | 112 | . '<div class="form-group">' |
| 114 | 113 | . $i18n->trans('tipocomprobante') |
| 115 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 114 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 116 | 115 | . '</div>' |
| 117 | 116 | . '</div>'; |
| 118 | 117 | } |
@@ -136,15 +135,14 @@ discard block |
||
| 136 | 135 | $options = ['<option value="">------</option>']; |
| 137 | 136 | foreach ($tipoPago as $row) { |
| 138 | 137 | $options[] = ($row->codigo === $invoiceTipoPago) ? |
| 139 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 140 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 138 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 141 | 139 | } |
| 142 | 140 | |
| 143 | 141 | $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""'; |
| 144 | 142 | return '<div class="col-sm-2">' |
| 145 | 143 | . '<div class="form-group">' |
| 146 | 144 | . $i18n->trans('ncf-payment-type') |
| 147 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 145 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 148 | 146 | . '</div>' |
| 149 | 147 | . '</div>'; |
| 150 | 148 | } |
@@ -162,15 +160,14 @@ discard block |
||
| 162 | 160 | $options = ['<option value="">------</option>']; |
| 163 | 161 | foreach ($tipoMovimiento as $row) { |
| 164 | 162 | $options[] = ($row->codigo === $invoiceTipoMovimiento) ? |
| 165 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 166 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 163 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 167 | 164 | } |
| 168 | 165 | |
| 169 | 166 | $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""'; |
| 170 | 167 | return '<div class="col-sm-3">' |
| 171 | 168 | . '<div class="form-group">' |
| 172 | 169 | . $i18n->trans('ncf-movement-type') |
| 173 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 170 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 174 | 171 | . '</div>' |
| 175 | 172 | . '</div>'; |
| 176 | 173 | } |
@@ -188,15 +185,14 @@ discard block |
||
| 188 | 185 | $options = ['<option value="">------</option>']; |
| 189 | 186 | foreach ($tipoAnulacion as $row) { |
| 190 | 187 | $options[] = ($row->codigo === $invoiceTipoAnulacion) ? |
| 191 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
| 192 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
| 188 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
| 193 | 189 | } |
| 194 | 190 | |
| 195 | 191 | $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'name="ncftipoanulacion" readonly=""'; |
| 196 | 192 | return '<div class="col-sm-2">' |
| 197 | 193 | . '<div class="form-group">' |
| 198 | 194 | . $i18n->trans('ncf-cancellation-type') |
| 199 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
| 195 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
| 200 | 196 | . '</div>' |
| 201 | 197 | . '</div>'; |
| 202 | 198 | } |
@@ -208,9 +204,9 @@ discard block |
||
| 208 | 204 | ? date('Y-m-d', strtotime($model->ncffechavencimiento)) |
| 209 | 205 | : ''; |
| 210 | 206 | return '<div class="col-sm-2">' |
| 211 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
| 212 | - . '<input type="date" ' . $attributes . ' value="' |
|
| 213 | - . $ncfFechaVencimiento . '" class="form-control"/>' |
|
| 207 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
| 208 | + . '<input type="date" '.$attributes.' value="' |
|
| 209 | + . $ncfFechaVencimiento.'" class="form-control"/>' |
|
| 214 | 210 | . '</div>' |
| 215 | 211 | . '</div>'; |
| 216 | 212 | } |
@@ -223,11 +219,11 @@ discard block |
||
| 223 | 219 | . '<div class="form-group">' |
| 224 | 220 | . $i18n->trans('desc-numeroncf-purchases') |
| 225 | 221 | . '<div class="input-group">' |
| 226 | - . '<input type="text" ' . $attributes . ' value="' . $model->numeroncf . '" class="form-control"/>' |
|
| 222 | + . '<input type="text" '.$attributes.' value="'.$model->numeroncf.'" class="form-control"/>' |
|
| 227 | 223 | . '<div class="input-group-append">' |
| 228 | - . '<button class="btn ' . $btnColor .' btn-spin-action" id="btnVerifyNCF"' |
|
| 224 | + . '<button class="btn '.$btnColor.' btn-spin-action" id="btnVerifyNCF"' |
|
| 229 | 225 | . 'onclick="purchasesNCFVerify()" ' |
| 230 | - . 'title="'. $i18n->trans('verify-numproveedor') |
|
| 226 | + . 'title="'.$i18n->trans('verify-numproveedor') |
|
| 231 | 227 | .'" type="button">' |
| 232 | 228 | . '<i id="iconBtnVerify" class="fas fa-search fa-fw"></i>' |
| 233 | 229 | . '</button>' |
@@ -74,18 +74,18 @@ discard block |
||
| 74 | 74 | protected function getGroupFields(): string |
| 75 | 75 | { |
| 76 | 76 | //return parent::getGroupFields(); // TODO: Change the autogenerated stub |
| 77 | - return static::MAIN_TABLE.'.idfactura, ' . |
|
| 78 | - static::MAIN_TABLE.'.idempresa, ' . |
|
| 79 | - static::MAIN_TABLE.'.codalmacen, ' . |
|
| 80 | - static::MAIN_TABLE.'.cifnif, ' . |
|
| 81 | - static::MAIN_TABLE.'.ncftipomovimiento, ' . |
|
| 82 | - static::MAIN_TABLE.'.numeroncf, ' . |
|
| 83 | - static::SECONDARY_TABLE_ALIAS.'.numeroncf, ' . |
|
| 84 | - static::MAIN_TABLE.'.fecha, ' . |
|
| 85 | - static::RECIBOSPROV_TABLE.'.fechapago, ' . |
|
| 86 | - static::ESTADOSDOC_TABLE.'.nombre, ' . |
|
| 87 | - static::MAIN_TABLE.'.neto, ' . |
|
| 88 | - static::MAIN_TABLE.'.totaliva' . |
|
| 77 | + return static::MAIN_TABLE.'.idfactura, '. |
|
| 78 | + static::MAIN_TABLE.'.idempresa, '. |
|
| 79 | + static::MAIN_TABLE.'.codalmacen, '. |
|
| 80 | + static::MAIN_TABLE.'.cifnif, '. |
|
| 81 | + static::MAIN_TABLE.'.ncftipomovimiento, '. |
|
| 82 | + static::MAIN_TABLE.'.numeroncf, '. |
|
| 83 | + static::SECONDARY_TABLE_ALIAS.'.numeroncf, '. |
|
| 84 | + static::MAIN_TABLE.'.fecha, '. |
|
| 85 | + static::RECIBOSPROV_TABLE.'.fechapago, '. |
|
| 86 | + static::ESTADOSDOC_TABLE.'.nombre, '. |
|
| 87 | + static::MAIN_TABLE.'.neto, '. |
|
| 88 | + static::MAIN_TABLE.'.totaliva'. |
|
| 89 | 89 | ' '; |
| 90 | 90 | } |
| 91 | 91 | |
@@ -96,16 +96,16 @@ discard block |
||
| 96 | 96 | protected function getSQLFrom(): string |
| 97 | 97 | { |
| 98 | 98 | return static::MAIN_TABLE |
| 99 | - . ' LEFT JOIN '. static::SECONDARY_TABLE . ' ON (' |
|
| 100 | - . static::MAIN_TABLE . '.idfacturarect = ' . static::SECONDARY_TABLE_ALIAS . '.idfactura)' |
|
| 101 | - . ' LEFT JOIN '. static::RECIBOSPROV_TABLE . ' ON (' |
|
| 102 | - . static::MAIN_TABLE . '.idfactura = ' . static::RECIBOSPROV_TABLE . '.idfactura)' |
|
| 103 | - . ' LEFT JOIN '. static::LINES_TABLE . ' ON (' |
|
| 104 | - . static::MAIN_TABLE . '.idfactura = ' . static::LINES_TABLE . '.idfactura)' |
|
| 105 | - . ' LEFT JOIN '. static::PRODS_TABLE . ' ON (' |
|
| 106 | - . static::LINES_TABLE . '.referencia = ' . static::PRODS_TABLE . '.referencia)' |
|
| 107 | - . ' LEFT JOIN ' . static::ESTADOSDOC_TABLE . ' ON (' |
|
| 108 | - . static::MAIN_TABLE . '.idestado = ' . static::ESTADOSDOC_TABLE . '.idestado)'; |
|
| 99 | + . ' LEFT JOIN '.static::SECONDARY_TABLE.' ON (' |
|
| 100 | + . static::MAIN_TABLE.'.idfacturarect = '.static::SECONDARY_TABLE_ALIAS.'.idfactura)' |
|
| 101 | + . ' LEFT JOIN '.static::RECIBOSPROV_TABLE.' ON (' |
|
| 102 | + . static::MAIN_TABLE.'.idfactura = '.static::RECIBOSPROV_TABLE.'.idfactura)' |
|
| 103 | + . ' LEFT JOIN '.static::LINES_TABLE.' ON (' |
|
| 104 | + . static::MAIN_TABLE.'.idfactura = '.static::LINES_TABLE.'.idfactura)' |
|
| 105 | + . ' LEFT JOIN '.static::PRODS_TABLE.' ON (' |
|
| 106 | + . static::LINES_TABLE.'.referencia = '.static::PRODS_TABLE.'.referencia)' |
|
| 107 | + . ' LEFT JOIN '.static::ESTADOSDOC_TABLE.' ON (' |
|
| 108 | + . static::MAIN_TABLE.'.idestado = '.static::ESTADOSDOC_TABLE.'.idestado)'; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | public function createViews(): Closure |
| 31 | 31 | { |
| 32 | - return function () { |
|
| 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 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
| 32 | + return function() { |
|
| 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 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
| 36 | 36 | $ncfTipo = new NCFTipo(); |
| 37 | 37 | $ncfTipos = $ncfTipo->allFor('ventas', 'suma'); |
| 38 | 38 | $customValues = []; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | public function execPreviousAction() |
| 63 | 63 | { |
| 64 | - return function ($action) { |
|
| 64 | + return function($action) { |
|
| 65 | 65 | switch ($action) { |
| 66 | 66 | case 'busca_rnc': |
| 67 | 67 | $this->setTemplate(false); |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function createViews(): Closure |
| 30 | 30 | { |
| 31 | - return function () { |
|
| 32 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
| 33 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
| 34 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
| 31 | + return function() { |
|
| 32 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
| 33 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
| 34 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/BusquedaRNCDGII.js'); |
|
| 35 | 35 | $ncfTipoPago = new NCFTipoPago(); |
| 36 | 36 | $ncfTiposPago = $ncfTipoPago->findAllByTipopago('02'); |
| 37 | 37 | $customValuesNTP = []; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | public function execPreviousAction() |
| 50 | 50 | { |
| 51 | - return function ($action) { |
|
| 51 | + return function($action) { |
|
| 52 | 52 | switch ($action) { |
| 53 | 53 | case 'busca_rnc': |
| 54 | 54 | $this->setTemplate(false); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $fileName = 'MyFiles/DGII_F_'.$reportCode.'_'.$this->empresa->cifnif.'_'.$year.'_'.$month.'.TXT'; |
| 117 | 117 | $commonFunctions->exportTXT($reportCode, $fileName, $this->empresa->cifnif, $year, $month, $whereReport); |
| 118 | 118 | $this->response->headers->set('Content-type', 'text/plain'); |
| 119 | - $this->response->headers->set('Content-Disposition', 'attachment;filename=' . $fileName); |
|
| 119 | + $this->response->headers->set('Content-Disposition', 'attachment;filename='.$fileName); |
|
| 120 | 120 | $this->response->setContent( |
| 121 | 121 | file_get_contents( |
| 122 | 122 | \FS_FOLDER |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $periodStartDate = \date('Y-m-01'); |
| 224 | 224 | $periodEndDate = \date('Y-m-d'); |
| 225 | 225 | PeriodTools::applyPeriod('last-month', $periodStartDate, $periodEndDate); |
| 226 | - if (in_array($this->request->request->get('filterfecha'), ['',null], true) === false) { |
|
| 226 | + if (in_array($this->request->request->get('filterfecha'), ['', null], true) === false) { |
|
| 227 | 227 | PeriodTools::applyPeriod($this->request->request->get('filterfecha'), $periodStartDate, $periodEndDate); |
| 228 | 228 | } else { |
| 229 | 229 | $periodStartDate = $this->request->request->get('filterstartfecha') ?? $periodStartDate; |