@@ -29,20 +29,20 @@ 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->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; |
|
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 | |
@@ -101,15 +101,14 @@ discard block |
||
101 | 101 | $options = ['<option value="">------</option>']; |
102 | 102 | foreach ($tipoComprobante as $row) { |
103 | 103 | $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ? |
104 | - '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' : |
|
105 | - '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>'; |
|
104 | + '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>'; |
|
106 | 105 | } |
107 | 106 | |
108 | 107 | $attributes = ($model->editable || $model->numproveedor === '') ? 'name="tipocomprobante" required=""' : 'disabled=""'; |
109 | 108 | return '<div class="col-sm-3">' |
110 | 109 | . '<div class="form-group">' |
111 | 110 | . $i18n->trans('tipocomprobante') |
112 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
111 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
113 | 112 | . '</div>' |
114 | 113 | . '</div>'; |
115 | 114 | } |
@@ -133,15 +132,14 @@ discard block |
||
133 | 132 | $options = ['<option value="">------</option>']; |
134 | 133 | foreach ($tipoPago as $row) { |
135 | 134 | $options[] = ($row->codigo === $invoiceTipoPago) ? |
136 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
137 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
135 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
138 | 136 | } |
139 | 137 | |
140 | 138 | $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""'; |
141 | 139 | return '<div class="col-sm-2">' |
142 | 140 | . '<div class="form-group">' |
143 | 141 | . $i18n->trans('ncf-payment-type') |
144 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
142 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
145 | 143 | . '</div>' |
146 | 144 | . '</div>'; |
147 | 145 | } |
@@ -159,15 +157,14 @@ discard block |
||
159 | 157 | $options = ['<option value="">------</option>']; |
160 | 158 | foreach ($tipoMovimiento as $row) { |
161 | 159 | $options[] = ($row->codigo === $invoiceTipoMovimiento) ? |
162 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
163 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
160 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
164 | 161 | } |
165 | 162 | |
166 | 163 | $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""'; |
167 | 164 | return '<div class="col-sm-3">' |
168 | 165 | . '<div class="form-group">' |
169 | 166 | . $i18n->trans('ncf-movement-type') |
170 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
167 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
171 | 168 | . '</div>' |
172 | 169 | . '</div>'; |
173 | 170 | } |
@@ -185,15 +182,14 @@ discard block |
||
185 | 182 | $options = ['<option value="">------</option>']; |
186 | 183 | foreach ($tipoAnulacion as $row) { |
187 | 184 | $options[] = ($row->codigo === $invoiceTipoAnulacion) ? |
188 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
189 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
185 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
190 | 186 | } |
191 | 187 | |
192 | 188 | $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'disabled=""'; |
193 | 189 | return '<div class="col-sm-2">' |
194 | 190 | . '<div class="form-group">' |
195 | 191 | . $i18n->trans('ncf-cancellation-type') |
196 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
192 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
197 | 193 | . '</div>' |
198 | 194 | . '</div>'; |
199 | 195 | } |
@@ -202,8 +198,8 @@ discard block |
||
202 | 198 | { |
203 | 199 | $attributes = ($model->editable && $model->numproveedor === '') ? 'name="ncffechavencimiento"' : 'disabled=""'; |
204 | 200 | return '<div class="col-sm-2">' |
205 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
206 | - . '<input type="date" ' . $attributes . ' value="' . date('Y-m-d', strtotime($model->ncffechavencimiento)) . '" class="form-control"/>' |
|
201 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
202 | + . '<input type="date" '.$attributes.' value="'.date('Y-m-d', strtotime($model->ncffechavencimiento)).'" class="form-control"/>' |
|
207 | 203 | . '</div>' |
208 | 204 | . '</div>'; |
209 | 205 | } |
@@ -28,20 +28,20 @@ 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->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; |
|
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 | |
@@ -105,15 +105,14 @@ discard block |
||
105 | 105 | $options = ['<option value="">------</option>']; |
106 | 106 | foreach ($tipoComprobante as $row) { |
107 | 107 | $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ? |
108 | - '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' : |
|
109 | - '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>'; |
|
108 | + '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>'; |
|
110 | 109 | } |
111 | 110 | |
112 | 111 | $attributes = ($model->editable || $model->numero2 === '') ? 'name="tipocomprobante" required=""' : 'disabled=""'; |
113 | 112 | return '<div class="col-sm-3">' |
114 | 113 | . '<div class="form-group">' |
115 | 114 | . $i18n->trans('tipocomprobante') |
116 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
115 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
117 | 116 | . '</div>' |
118 | 117 | . '</div>'; |
119 | 118 | } |
@@ -137,15 +136,14 @@ discard block |
||
137 | 136 | $options = ['<option value="">------</option>']; |
138 | 137 | foreach ($tipoPago as $row) { |
139 | 138 | $options[] = ($row->codigo === $invoiceTipoPago) ? |
140 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
141 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
139 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
142 | 140 | } |
143 | 141 | |
144 | 142 | $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""'; |
145 | 143 | return '<div class="col-sm-2">' |
146 | 144 | . '<div class="form-group">' |
147 | 145 | . $i18n->trans('ncf-payment-type') |
148 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
146 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
149 | 147 | . '</div>' |
150 | 148 | . '</div>'; |
151 | 149 | } |
@@ -165,15 +163,14 @@ discard block |
||
165 | 163 | $options = ['<option value="">------</option>']; |
166 | 164 | foreach ($tipoMovimiento as $row) { |
167 | 165 | $options[] = ($row->codigo === $invoiceTipoMovimiento) ? |
168 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
169 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
166 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
170 | 167 | } |
171 | 168 | |
172 | 169 | $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""'; |
173 | 170 | return '<div class="col-sm-3">' |
174 | 171 | . '<div class="form-group">' |
175 | 172 | . $i18n->trans('ncf-movement-type') |
176 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
173 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
177 | 174 | . '</div>' |
178 | 175 | . '</div>'; |
179 | 176 | } |
@@ -191,15 +188,14 @@ discard block |
||
191 | 188 | $options = ['<option value="">------</option>']; |
192 | 189 | foreach ($tipoAnulacion as $row) { |
193 | 190 | $options[] = ($row->codigo === $invoiceTipoAnulacion) ? |
194 | - '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' : |
|
195 | - '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>'; |
|
191 | + '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>'; |
|
196 | 192 | } |
197 | 193 | |
198 | 194 | $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'disabled=""'; |
199 | 195 | return '<div class="col-sm-2">' |
200 | 196 | . '<div class="form-group">' |
201 | 197 | . $i18n->trans('ncf-cancellation-type') |
202 | - . '<select ' . $attributes . ' class="form-control">' . implode('', $options) . '</select>' |
|
198 | + . '<select '.$attributes.' class="form-control">'.implode('', $options).'</select>' |
|
203 | 199 | . '</div>' |
204 | 200 | . '</div>'; |
205 | 201 | } |
@@ -208,8 +204,8 @@ discard block |
||
208 | 204 | { |
209 | 205 | $attributes = ($model->editable && $model->numero2 === '') ? 'name="ncffechavencimiento"' : 'disabled=""'; |
210 | 206 | return '<div class="col-sm-2">' |
211 | - . '<div class="form-group">' . $i18n->trans('due-date') |
|
212 | - . '<input type="date" ' . $attributes . ' value="' . date('Y-m-d', strtotime($model->ncffechavencimiento)) . '" class="form-control"/>' |
|
207 | + . '<div class="form-group">'.$i18n->trans('due-date') |
|
208 | + . '<input type="date" '.$attributes.' value="'.date('Y-m-d', strtotime($model->ncffechavencimiento)).'" class="form-control"/>' |
|
213 | 209 | . '</div>' |
214 | 210 | . '</div>'; |
215 | 211 | } |
@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | |
25 | 25 | class SalesHeaderMod implements SalesModInterface |
26 | 26 | { |
27 | - public function apply(SalesDocument &$model, array $formData, User $user) |
|
27 | + public function apply(SalesDocument & $model, array $formData, User $user) |
|
28 | 28 | { |
29 | 29 | // TODO: Implement apply() method. |
30 | 30 | } |
31 | 31 | |
32 | - public function applyBefore(SalesDocument &$model, array $formData, User $user) |
|
32 | + public function applyBefore(SalesDocument & $model, array $formData, User $user) |
|
33 | 33 | { |
34 | 34 | // TODO: Implement applyBefore() method. |
35 | 35 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | return empty($model->codcliente) ? '' : '<div class="col-sm">' |
64 | 64 | . '<div class="form-group">' |
65 | 65 | . $i18n->trans('number2') |
66 | - . '<input type="text" ' . $attributes . ' value="' . $model->numero2 . '" class="form-control"/>' |
|
66 | + . '<input type="text" '.$attributes.' value="'.$model->numero2.'" class="form-control"/>' |
|
67 | 67 | . '</div>' |
68 | 68 | . '</div>'; |
69 | 69 | } |
@@ -28,10 +28,10 @@ |
||
28 | 28 | { |
29 | 29 | public function createViews(): Closure |
30 | 30 | { |
31 | - return function () { |
|
31 | + return function() { |
|
32 | 32 | parent::createViews(); |
33 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
34 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
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 | 35 | // |
36 | 36 | // $ncfTipo = new NCFTipo(); |
37 | 37 | // $ncfTipos = $ncfTipo->allByType('compras'); |
@@ -29,10 +29,10 @@ |
||
29 | 29 | { |
30 | 30 | public function createViews(): Closure |
31 | 31 | { |
32 | - return function () { |
|
32 | + return function() { |
|
33 | 33 | parent::createViews(); |
34 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
35 | - AssetManager::add('js', \FS_ROUTE . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
34 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonModals.js'); |
|
35 | + AssetManager::add('js', \FS_ROUTE.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js'); |
|
36 | 36 | }; |
37 | 37 | } |
38 | 38 | } |
39 | 39 | \ No newline at end of file |
@@ -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.'.numero2', |
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 | /** |