joenilson / fsRepublicaDominicana

Mod/PurchasesFooterMod.php

Spacing +28 added lines, -32 removed lines

@@ -31,21 +31,21 @@ 
 
 class PurchasesFooterMod implements PurchasesModInterface
 {
-    public function apply(PurchaseDocument &$model, array $formData): void
+    public function apply(PurchaseDocument & $model, array $formData): void
     {
     }
 
-    public function applyBefore(PurchaseDocument &$model, array $formData): void
+    public function applyBefore(PurchaseDocument & $model, array $formData): void
     {
         if ($model->modelClassName() === 'FacturaProveedor') {
-            $model->numeroncf = isset($formData['numeroncf']) ? (string)$formData['numeroncf'] : $model->numeroncf;
-            $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string)$formData['tipocomprobante'] : $model->tipocomprobante;
-            $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string)$formData['ncffechavencimiento'] : $model->ncffechavencimiento;
-            $model->ncftipopago = isset($formData['ncftipopago']) ? (string)$formData['ncftipopago'] : $model->ncftipopago;
-            $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string)$formData['ncftipomovimiento'] : $model->ncftipomovimiento;
-            $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string)$formData['ncftipoanulacion'] : $model->ncftipoanulacion;
-            $model->ecf_fecha_firma = isset($formData['ecf_fecha_firma']) ? (string)$formData['ecf_fecha_firma'] : $model->ecf_fecha_firma;
-            $model->ecf_codigo_seguridad = isset($formData['ecf_codigo_seguridad']) ? (string)$formData['ecf_codigo_seguridad'] : $model->ecf_codigo_seguridad;
+            $model->numeroncf = isset($formData['numeroncf']) ? (string) $formData['numeroncf'] : $model->numeroncf;
+            $model->tipocomprobante = isset($formData['tipocomprobante']) ? (string) $formData['tipocomprobante'] : $model->tipocomprobante;
+            $model->ncffechavencimiento = isset($formData['ncffechavencimiento']) ? (string) $formData['ncffechavencimiento'] : $model->ncffechavencimiento;
+            $model->ncftipopago = isset($formData['ncftipopago']) ? (string) $formData['ncftipopago'] : $model->ncftipopago;
+            $model->ncftipomovimiento = isset($formData['ncftipomovimiento']) ? (string) $formData['ncftipomovimiento'] : $model->ncftipomovimiento;
+            $model->ncftipoanulacion = isset($formData['ncftipoanulacion']) ? (string) $formData['ncftipoanulacion'] : $model->ncftipoanulacion;
+            $model->ecf_fecha_firma = isset($formData['ecf_fecha_firma']) ? (string) $formData['ecf_fecha_firma'] : $model->ecf_fecha_firma;
+            $model->ecf_codigo_seguridad = isset($formData['ecf_codigo_seguridad']) ? (string) $formData['ecf_codigo_seguridad'] : $model->ecf_codigo_seguridad;
         }
     }
 
@@ -55,12 +55,12 @@ 
 
     public function newBtnFields(): array
     {
-        return ['btnLoadXmlEcf','btnLoadXmlAck','btnLoadPdfEcf'];
+        return ['btnLoadXmlEcf', 'btnLoadXmlAck', 'btnLoadPdfEcf'];
     }
 
     public function newFields(): array
     {
-        return ['numeroncf', 'tipocomprobante', 'ncffechavencimiento', 'ncftipopago', 'ncftipomovimiento', 'ncftipoanulacion', 'ecf_xml_firmado','ecf_fecha_firma','ecf_codigo_seguridad'];
+        return ['numeroncf', 'tipocomprobante', 'ncffechavencimiento', 'ncftipopago', 'ncftipomovimiento', 'ncftipoanulacion', 'ecf_xml_firmado', 'ecf_fecha_firma', 'ecf_codigo_seguridad'];
     }
 
     public function newModalFields(): array
@@ -143,15 +143,14 @@ 
         $options = ['<option value="">------</option>'];
         foreach ($tipoComprobante as $row) {
             $options[] = ($row->tipocomprobante === $invoiceTipoComprobante) ?
-                '<option value="' . $row->tipocomprobante . '" selected="">' . $row->descripcion . '</option>' :
-                '<option value="' . $row->tipocomprobante . '">' . $row->descripcion . '</option>';
+                '<option value="'.$row->tipocomprobante.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->tipocomprobante.'">'.$row->descripcion.'</option>';
         }
 
         $attributes = ($model->editable || $model->numeroncf === '') ? 'name="tipocomprobante" required=""' : 'disabled=""';
         return '<div class="col-sm-3">'
             . '<div class="mb-3">'
             . $i18n->trans('tipocomprobante')
-            . '<select ' . $attributes . ' class="form-select">' . implode('', $options) . '</select>'
+            . '<select '.$attributes.' class="form-select">'.implode('', $options).'</select>'
             . '</div>'
             . '</div>';
     }
@@ -175,15 +174,14 @@ 
         $options = ['<option value="">------</option>'];
         foreach ($tipoPago as $row) {
             $options[] = ($row->codigo === $invoiceTipoPago) ?
-                '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' :
-                '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>';
+                '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>';
         }
 
         $attributes = $model->editable ? 'name="ncftipopago" required=""' : 'disabled=""';
         return '<div class="col-sm-2">'
             . '<div class="mb-3">'
             . $i18n->trans('ncf-payment-type')
-            . '<select ' . $attributes . ' class="form-select">' . implode('', $options) . '</select>'
+            . '<select '.$attributes.' class="form-select">'.implode('', $options).'</select>'
             . '</div>'
             . '</div>';
     }
@@ -201,15 +199,14 @@ 
         $options = ['<option value="">------</option>'];
         foreach ($tipoMovimiento as $row) {
             $options[] = ($row->codigo === $invoiceTipoMovimiento) ?
-                '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' :
-                '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>';
+                '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>';
         }
 
         $attributes = $model->editable ? 'name="ncftipomovimiento" required=""' : 'disabled=""';
         return '<div class="col-sm-3">'
             . '<div class="mb-3">'
             . $i18n->trans('ncf-movement-type')
-            . '<select ' . $attributes . ' class="form-select">' . implode('', $options) . '</select>'
+            . '<select '.$attributes.' class="form-select">'.implode('', $options).'</select>'
             . '</div>'
             . '</div>';
     }
@@ -227,15 +224,14 @@ 
         $options = ['<option value="">------</option>'];
         foreach ($tipoAnulacion as $row) {
             $options[] = ($row->codigo === $invoiceTipoAnulacion) ?
-                '<option value="' . $row->codigo . '" selected="">' . $row->descripcion . '</option>' :
-                '<option value="' . $row->codigo . '">' . $row->descripcion . '</option>';
+                '<option value="'.$row->codigo.'" selected="">'.$row->descripcion.'</option>' : '<option value="'.$row->codigo.'">'.$row->descripcion.'</option>';
         }
 
         $attributes = $model->editable ? 'name="ncftipoanulacion"' : 'name="ncftipoanulacion" readonly=""';
         return '<div class="col-sm-2">'
             . '<div class="mb-3">'
             . $i18n->trans('ncf-cancellation-type')
-            . '<select ' . $attributes . ' class="form-select">' . implode('', $options) . '</select>'
+            . '<select '.$attributes.' class="form-select">'.implode('', $options).'</select>'
             . '</div>'
             . '</div>';
     }
@@ -247,9 +243,9 @@ 
             ? date('Y-m-d', strtotime($model->ncffechavencimiento))
             : '';
         return '<div class="col-sm-2">'
-            . '<div class="mb-3">' . $i18n->trans('due-date')
-            . '<input type="date" ' . $attributes . ' value="'
-            . $ncfFechaVencimiento . '" class="form-control"/>'
+            . '<div class="mb-3">'.$i18n->trans('due-date')
+            . '<input type="date" '.$attributes.' value="'
+            . $ncfFechaVencimiento.'" class="form-control"/>'
             . '</div>'
             . '</div>';
     }
@@ -262,10 +258,10 @@ 
             . '<div class="mb-3">'
             . $i18n->trans('desc-numeroncf-purchases')
             . '<div class="input-group">'
-            . '<input type="text" ' . $attributes . ' value="' . $model->numeroncf . '" class="form-control"/>'
-            . '<button class="btn ' . $btnColor . ' btn-spin-action" id="btnVerifyNCF"'
+            . '<input type="text" '.$attributes.' value="'.$model->numeroncf.'" class="form-control"/>'
+            . '<button class="btn '.$btnColor.' btn-spin-action" id="btnVerifyNCF"'
             . 'onclick="purchasesNCFVerify()" '
-            . 'title="' . $i18n->trans('verify-numproveedor')
+            . 'title="'.$i18n->trans('verify-numproveedor')
             . '" type="button">'
             . '<i id="iconBtnVerify" class="fa-solid fa-search fa-fw"></i>'
             . '</button>'
@@ -282,7 +278,7 @@ 
             . '<div class="mb-4">'
             . $i18n->trans('desc-ecf_fecha_firma')
             . '<div class="input-group">'
-            . '<input type="datetime-local" ' . $attributes . ' value="' . $model->ecf_fecha_firma . '" class="form-control"/>'
+            . '<input type="datetime-local" '.$attributes.' value="'.$model->ecf_fecha_firma.'" class="form-control"/>'
             . '</div>'
             . '</div>'
             . '</div>';
@@ -296,7 +292,7 @@ 
             . '<div class="mb-4">'
             . $i18n->trans('desc-ecf_codigo_seguridad')
             . '<div class="input-group">'
-            . '<input type="text" ' . $attributes . ' value="' . $model->ecf_codigo_seguridad . '" class="form-control"/>'
+            . '<input type="text" '.$attributes.' value="'.$model->ecf_codigo_seguridad.'" class="form-control"/>'
             . '</div>'
             . '</div>'
             . '</div>';

Init.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $this->loadExtension(new Extension\Controller\EditSettings());
 
         $route = Tools::config('route');
-        AssetManager::addJs($route . '/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js');
+        AssetManager::addJs($route.'/Plugins/fsRepublicaDominicana/Assets/JS/CommonDomFunctions.js');
 
         SalesLineHTML::addMod(new Mod\SalesLineMod());
         SalesFooterHTML::addMod(new Mod\SalesFooterMod());

Lib/PDF/PDFDocument.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     protected function insertBusinessDocHeader($model): void
     {
         $headerData = [
-            'title' => $this->i18n->trans($model->modelClassName() . '-min'),
+            'title' => $this->i18n->trans($model->modelClassName().'-min'),
             'subject' => $this->i18n->trans('customer'),
             'fieldName' => 'nombrecliente'
         ];
@@ -41,7 +41,7 @@ 
             $headerData['title'] = Tools::fixHtml($this->format->titulo);
         }
 
-        $this->pdf->ezText("\n" . $headerData['title'] . ': ' . $model->numeroncf . "\n", self::FONT_SIZE + 6);
+        $this->pdf->ezText("\n".$headerData['title'].': '.$model->numeroncf."\n", self::FONT_SIZE + 6);
         $this->newLine();
 
         $subject = $model->getSubject();

Lib/PlantillasPDF/PlantillaDOM.php

Spacing +87 added lines, -88 removed lines

@@ -41,7 +41,7 @@ 
         // TODO: Implement addInvoiceHeader() method.
         $html = $this->getInvoiceHeaderBilling($model)
             . $this->getInvoiceHeaderShipping($model);
-        $this->writeHTML('<table class="table-big table-border"><tr>' . $html . '</tr></table><br/>');
+        $this->writeHTML('<table class="table-big table-border"><tr>'.$html.'</tr></table><br/>');
     }
 
     public function addInvoiceLines($model): void
@@ -51,7 +51,7 @@ 
 
         $tHead = '<thead><tr>';
         foreach ($this->getInvoiceLineFields() as $field) {
-            $tHead .= '<th class="' . $field['css'] . '" align="' . $field['align'] . '">' . $field['title'] . '</th>';
+            $tHead .= '<th class="'.$field['css'].'" align="'.$field['align'].'">'.$field['title'].'</th>';
         }
         $tHead .= '</tr></thead>';
 
@@ -63,20 +63,20 @@ 
             $line->numlinea = $numLinea;
             $tBody .= '<tr>';
             foreach ($this->getInvoiceLineFields() as $field) {
-                $tBody .= '<td class="' . $field['css'] . '" align="' . $field['align'] . '" valign="top">' . $this->getInvoiceLineValue($model, $line, $field) . '</td>';
+                $tBody .= '<td class="'.$field['css'].'" align="'.$field['align'].'" valign="top">'.$this->getInvoiceLineValue($model, $line, $field).'</td>';
             }
             $tBody .= '</tr>';
             $numLinea++;
 
             if (property_exists($line, 'salto_pagina') && $line->salto_pagina) {
-                $this->writeHTML('<div class="table-lines"><table class="table-big table-list">' . $tHead . $tBody . '</table></div>');
+                $this->writeHTML('<div class="table-lines"><table class="table-big table-list">'.$tHead.$tBody.'</table></div>');
                 $this->writeHTML($this->getInvoiceTotalsPartial($model, $tLines, 'mt-20'));
                 $this->mpdf->AddPage();
                 $tBody = '';
             }
         }
 
-        $this->writeHTML('<div class="table-lines"><table class="table-big table-list">' . $tHead . $tBody . '</table></div>');
+        $this->writeHTML('<div class="table-lines"><table class="table-big table-list">'.$tHead.$tBody.'</table></div>');
 
         // clonamos el documento y añadimos los totales para ver si salta de página
         $copier = new DeepCopy();
@@ -95,28 +95,28 @@ 
     protected function css(): string
     {
         return parent::css()
-            . '.title {border-bottom: 2px solid ' . $this->get('color1') . ';}'
-            . '.table-border {border-top: 1px solid ' . $this->get('color1') . '; border-bottom: 1px solid ' . $this->get('color1') . ';}'
-            . '.table-dual {border-top: 1px solid ' . $this->get('color1') . '; border-bottom: 1px solid ' . $this->get('color1') . ';}'
-            . '.table-list {border-spacing: 0px; border-top: 1px solid ' . $this->get('color1') . '; border-bottom: 1px solid ' . $this->get('color1') . ';}'
-            . '.table-list tr:nth-child(even) {background-color: ' . $this->get('color3') . ';}'
-            . '.table-list th {background-color: ' . $this->get('color1') . '; color: ' . $this->get('color2') . '; padding: 5px; text-transform: uppercase;}'
+            . '.title {border-bottom: 2px solid '.$this->get('color1').';}'
+            . '.table-border {border-top: 1px solid '.$this->get('color1').'; border-bottom: 1px solid '.$this->get('color1').';}'
+            . '.table-dual {border-top: 1px solid '.$this->get('color1').'; border-bottom: 1px solid '.$this->get('color1').';}'
+            . '.table-list {border-spacing: 0px; border-top: 1px solid '.$this->get('color1').'; border-bottom: 1px solid '.$this->get('color1').';}'
+            . '.table-list tr:nth-child(even) {background-color: '.$this->get('color3').';}'
+            . '.table-list th {background-color: '.$this->get('color1').'; color: '.$this->get('color2').'; padding: 5px; text-transform: uppercase;}'
             . '.table-list td {padding: 5px;}'
             . '.thanks-title {'
-            . 'font-size: ' . $this->get('titlefontsize') . 'px; font-weight: bold; color: ' . $this->get('color1') . '; '
-            . 'text-align: right; width: 50%; padding: 15px; border-end: 1px solid ' . $this->get('color1') . ';'
+            . 'font-size: '.$this->get('titlefontsize').'px; font-weight: bold; color: '.$this->get('color1').'; '
+            . 'text-align: right; width: 50%; padding: 15px; border-end: 1px solid '.$this->get('color1').';'
             . '}'
             . '.color-navy {color: navy;}'
             . '.color-blue {color: blue;}'
-            . '.color-template {color: ' . $this->get('color1') .';}'
+            . '.color-template {color: '.$this->get('color1').';}'
             . '.thanks-text {padding: 15px;}'
-            . '.imagetext {margin-top: 15px; text-align: ' . $this->get('endalign') . ';}'
-            . '.imagefooter {text-align: ' . $this->get('footeralign') . ';}';
+            . '.imagetext {margin-top: 15px; text-align: '.$this->get('endalign').';}'
+            . '.imagefooter {text-align: '.$this->get('footeralign').';}';
     }
 
     protected function getSubjectIdFiscalStr($model): string
     {
-        return empty($model->cifnif) ? '' : '<b>' . $model->getSubject()->tipoidfiscal . '</b>: ' . $model->cifnif;
+        return empty($model->cifnif) ? '' : '<b>'.$model->getSubject()->tipoidfiscal.'</b>: '.$model->cifnif;
     }
 
     protected function getInvoiceHeaderBilling($model): string
@@ -128,13 +128,13 @@ 
         $subject = $model->getSubject();
         $address = isset($model->codproveedor) && !isset($model->direccion) ? $subject->getDefaultAddress() : $model;
         $customerCode = $this->get('showcustomercode') ? $model->subjectColumnValue() : '';
-        $customerEmail = $this->get('showcustomeremail') && !empty($subject->email) ? '<br>' . Tools::lang()->trans('email') . ': ' . $subject->email : '';
+        $customerEmail = $this->get('showcustomeremail') && !empty($subject->email) ? '<br>'.Tools::lang()->trans('email').': '.$subject->email : '';
         $break = empty($model->cifnif) ? '' : '<br/>';
         return '<td align="left" valign="top">'
-            . '<br/><b> ' . $this->getSubjectTitle($model) . ':</b> ' . $customerCode
-            . $this->getSubjectName($model) . $break . $this->getSubjectIdFiscalStr($model)
-            . '<br/><b>' . Tools::lang()->trans('address'). ':</b> ' .$this->combineAddress($address) . $this->getInvoiceHeaderBillingPhones($subject)
-            . '<br/><b>' . Tools::lang()->trans('email'). ':</b> ' .$customerEmail
+            . '<br/><b> '.$this->getSubjectTitle($model).':</b> '.$customerCode
+            . $this->getSubjectName($model).$break.$this->getSubjectIdFiscalStr($model)
+            . '<br/><b>'.Tools::lang()->trans('address').':</b> '.$this->combineAddress($address).$this->getInvoiceHeaderBillingPhones($subject)
+            . '<br/><b>'.Tools::lang()->trans('email').':</b> '.$customerEmail
             . '<br/>'
             . '</td>';
     }
@@ -154,8 +154,8 @@ 
             return '';
         }
 
-        return '<td><b>' . Tools::lang()->trans('shipping-address') . '</b>'
-            . '<br/>' . $this->combineAddress($contacto, true) . '</td>';
+        return '<td><b>'.Tools::lang()->trans('shipping-address').'</b>'
+            . '<br/>'.$this->combineAddress($contacto, true).'</td>';
     }
 
     protected function getInvoiceHeaderBillingPhones($subject): string
@@ -169,7 +169,7 @@ 
             return '';
         }
 
-        return '<br/>' . $strPhones;
+        return '<br/>'.$strPhones;
     }
 
     protected function headerLeft(): string
@@ -182,34 +182,34 @@ 
             }
         }
 
-        $title = $this->showHeaderTitle ? '<h1 class="title">' . $this->get('headertitle') . '</h1>' . $this->spacer() : '';
+        $title = $this->showHeaderTitle ? '<h1 class="title">'.$this->get('headertitle').'</h1>'.$this->spacer() : '';
         if ($this->isSketchInvoice()) {
-            $title .= '<div class="color-red font-big font-bold">' . Tools::lang()->trans('invoice-is-sketch') . '</div>';
+            $title .= '<div class="color-red font-big font-bold">'.Tools::lang()->trans('invoice-is-sketch').'</div>';
         }
 
         $descTC = ($this->headerModel->tipocomprobante < 30) ? "<b>NCF:</b> " : "<b>e-NCF:</b> ";
-        $fechaVencimiento = ($this->headerModel->ncffechavencimiento !== null) ? '<b>Fecha Vencimiento:</b> ' . $this->headerModel->ncffechavencimiento : '';
-        $fechaEmision = '<b>Fecha Emisi&oacute;n:</b> ' . $this->headerModel->fecha;
+        $fechaVencimiento = ($this->headerModel->ncffechavencimiento !== null) ? '<b>Fecha Vencimiento:</b> '.$this->headerModel->ncffechavencimiento : '';
+        $fechaEmision = '<b>Fecha Emisi&oacute;n:</b> '.$this->headerModel->fecha;
 
         return '<table class="table-big">'
             . '<tr>'
-                . '<td valign="top"><img src="' . $this->logoPath . '" height="' . $this->get('logosize') . '"/>' . '</td>'
-                . '<td align="right" valign="top">' . $title . '</td>'
+                . '<td valign="top"><img src="'.$this->logoPath.'" height="'.$this->get('logosize').'"/>'.'</td>'
+                . '<td align="right" valign="top">'.$title.'</td>'
             . '</tr>'
             . '<tr>'
                 . '<td align="left" valign="top">'
-                . '<p><b>' . $this->empresa->nombre . '</b>'
-                . '<br/>' . $this->empresa->tipoidfiscal . ': ' . $this->empresa->cifnif
-                . '<br/>' . Tools::lang()->trans('address') . ': ' . $this->combineAddress($this->empresa) . '</p>'
-                . '<p>' . implode(' · ', $contactData) . '</p>'
+                . '<p><b>'.$this->empresa->nombre.'</b>'
+                . '<br/>'.$this->empresa->tipoidfiscal.': '.$this->empresa->cifnif
+                . '<br/>'.Tools::lang()->trans('address').': '.$this->combineAddress($this->empresa).'</p>'
+                . '<p>'.implode(' · ', $contactData).'</p>'
                 . $fechaEmision
                 . '</td>'
                 . '<td align="right" valign="top">'
-                .  '<div class="color-template font-big font-bold">' . $this->headerModel->descripcionTipoComprobante() . '</div>'
+                .  '<div class="color-template font-big font-bold">'.$this->headerModel->descripcionTipoComprobante().'</div>'
                 .  $descTC
-                .  $this->headerModel->numeroncf . '<br/>'
-                .  $fechaVencimiento . '<br/>'
-                .  '<b>' . $i18n->trans('payment-method') . ':</b> '
+                .  $this->headerModel->numeroncf.'<br/>'
+                .  $fechaVencimiento.'<br/>'
+                .  '<b>'.$i18n->trans('payment-method').':</b> '
                 .  PaymentMethodBankDataHelper::get($this->headerModel)
                 . '</td>'
             . '</tr>'
@@ -224,20 +224,20 @@ 
             }
         }
 
-        $title = $this->showHeaderTitle ? '<h1 class="title">' . $this->get('headertitle') . '</h1>' . $this->spacer() : '';
+        $title = $this->showHeaderTitle ? '<h1 class="title">'.$this->get('headertitle').'</h1>'.$this->spacer() : '';
         if ($this->isSketchInvoice()) {
-            $title .= '<div class="color-red font-big font-bold">' . Tools::lang()->trans('invoice-is-sketch') . '</div>';
+            $title .= '<div class="color-red font-big font-bold">'.Tools::lang()->trans('invoice-is-sketch').'</div>';
         }
 
         return '<table class="table-big">'
             . '<tr>'
-            . '<td> Titulo ' . $title
-            . '<p><b>' . $this->empresa->nombre . '</b>'
-            . '<br/>' . $this->empresa->tipoidfiscal . ': ' . $this->empresa->cifnif
-            . '<br/>' . $this->combineAddress($this->empresa) . '</p>' . $this->spacer()
-            . '<p>' . implode(' · ', $contactData) . '</p>'
+            . '<td> Titulo '.$title
+            . '<p><b>'.$this->empresa->nombre.'</b>'
+            . '<br/>'.$this->empresa->tipoidfiscal.': '.$this->empresa->cifnif
+            . '<br/>'.$this->combineAddress($this->empresa).'</p>'.$this->spacer()
+            . '<p>'.implode(' · ', $contactData).'</p>'
             . '</td>'
-            . '<td align="right"><img src="' . $this->logoPath . '" height="' . $this->get('logosize') . '"/></td>'
+            . '<td align="right"><img src="'.$this->logoPath.'" height="'.$this->get('logosize').'"/></td>'
             . '</tr>'
             . '</table>';
     }
@@ -246,13 +246,12 @@ 
     {
         $observations = '';
         if (!empty($this->getObservations($model))) {
-            $observations .= '<p><b>' . Tools::lang()->trans('observations') . '</b><br/>'
-                . $this->getObservations($model) . '</p>';
+            $observations .= '<p><b>'.Tools::lang()->trans('observations').'</b><br/>'
+                . $this->getObservations($model).'</p>';
         }
 
         return $this->format->hidetotals ?
-            $observations :
-            $this->getInvoiceTotalsPartial($model, [], $css) . $observations;
+            $observations : $this->getInvoiceTotalsPartial($model, [], $css).$observations;
     }
 
     protected function getInvoiceTotalsPartial($model, array $lines = [], string $css = ''): string
@@ -283,8 +282,8 @@ 
         // pintamos los irpfs
         foreach ($irpfs as $irpf) {
             $trs .= '<tr>'
-                . '<td align="right"><b>' . $irpf['name'] . '</b>:</td>'
-                . '<td class="nowrap" align="right">' . Tools::money($irpf['total'], $model->coddivisa) . '</td>'
+                . '<td align="right"><b>'.$irpf['name'].'</b>:</td>'
+                . '<td class="nowrap" align="right">'.Tools::money($irpf['total'], $model->coddivisa).'</td>'
                 . '</tr>';
         }
 
@@ -308,15 +307,15 @@ 
                 case 'dtopor1':
                 case 'dtopor2':
                     $trs .= '<tr>'
-                        . '<td align="right"><b>' . $title . '</b>:</td>'
-                        . '<td class="nowrap" align="right">' . Tools::number($model->{$key}) . '%</td>'
+                        . '<td align="right"><b>'.$title.'</b>:</td>'
+                        . '<td class="nowrap" align="right">'.Tools::number($model->{$key}).'%</td>'
                         . '</tr>';
                     break;
 
                 case 'total':
                     $trs .= '<tr>'
-                        . '<td class="text-end"><b>' . $title . '</b>:</td>'
-                        . '<td class="text-end nowrap">' . Tools::money($model->{$key}, $model->coddivisa) . '</td>'
+                        . '<td class="text-end"><b>'.$title.'</b>:</td>'
+                        . '<td class="text-end nowrap">'.Tools::money($model->{$key}, $model->coddivisa).'</td>'
                         . '</tr>';
                     break;
 
@@ -327,24 +326,24 @@ 
                 // no break
                 default:
                     $trs .= '<tr>'
-                        . '<td align="right"><b>' . $title . '</b>:</td>'
-                        . '<td class="nowrap" align="right">' . Tools::money($model->{$key}, $model->coddivisa) . '</td>'
+                        . '<td align="right"><b>'.$title.'</b>:</td>'
+                        . '<td class="nowrap" align="right">'.Tools::money($model->{$key}, $model->coddivisa).'</td>'
                         . '</tr>';
                     break;
             }
         }
 
-        return '<table class="table-big table-border ' . $css . '">'
+        return '<table class="table-big table-border '.$css.'">'
             . '<tr>'
-            . '<td> ' . $this->getInvoiceTaxes($model, $lines) . '</td>'
-            . '<td align="right" valign="top"><table>' . $trs . '</table></td>'
+            . '<td> '.$this->getInvoiceTaxes($model, $lines).'</td>'
+            . '<td align="right" valign="top"><table>'.$trs.'</table></td>'
             . '</tr>'
             . '<tr>'
             . '<td>'
             . '</td>'
             . '</tr>'
             . '</table>'
-            . '&nbsp;<b>Son:</b> ' .  $this->convert_to_words($model->total) . ' pesos dominicanos'
+            . '&nbsp;<b>Son:</b> '.$this->convert_to_words($model->total).' pesos dominicanos'
             . '<br/>';
     }
 
@@ -364,43 +363,43 @@ 
         $trs = '';
         foreach ($taxes['iva'] as $row) {
             $trs .= '<tr>'
-                . '<td class="nowrap" align="left">' . Impuestos::get($row['codimpuesto'])->descripcion . '</td>'
-                . '<td class="nowrap" align="center">' . Tools::money($row['neto'], $model->coddivisa) . '</td>'
-                . '<td class="nowrap" align="center">' . Tools::number($row['iva']) . '%</td>'
-                . '<td class="nowrap" align="center">' . Tools::money($row['totaliva'], $model->coddivisa) . '</td>';
+                . '<td class="nowrap" align="left">'.Impuestos::get($row['codimpuesto'])->descripcion.'</td>'
+                . '<td class="nowrap" align="center">'.Tools::money($row['neto'], $model->coddivisa).'</td>'
+                . '<td class="nowrap" align="center">'.Tools::number($row['iva']).'%</td>'
+                . '<td class="nowrap" align="center">'.Tools::money($row['totaliva'], $model->coddivisa).'</td>';
 
             if (empty($model->totalrecargo)) {
                 $trs .= '</tr>';
                 continue;
             }
 
-            $trs .= '<td class="nowrap" align="center">' . (empty($row['recargo']) ? '-' : Tools::number($row['recargo']) . '%') . '</td>'
-                . '<td class="nowrap" align="right">' . (empty($row['totalrecargo']) ? '-' : Tools::money($row['totalrecargo'])) . '</td>'
+            $trs .= '<td class="nowrap" align="center">'.(empty($row['recargo']) ? '-' : Tools::number($row['recargo']).'%').'</td>'
+                . '<td class="nowrap" align="right">'.(empty($row['totalrecargo']) ? '-' : Tools::money($row['totalrecargo'])).'</td>'
                 . '</tr>';
         }
 
         if (empty($model->totalrecargo)) {
-            return '<table class="' . $class . '">'
+            return '<table class="'.$class.'">'
                 . '<thead>'
                 . '<tr>'
-                . '<th align="left">' . $i18n->trans('tax') . '</th>'
-                . '<th align="center">' . $i18n->trans('tax-base') . '</th>'
-                . '<th align="center">' . $i18n->trans('percentage') . '</th>'
-                . '<th align="center">' . $i18n->trans('amount') . '</th>'
+                . '<th align="left">'.$i18n->trans('tax').'</th>'
+                . '<th align="center">'.$i18n->trans('tax-base').'</th>'
+                . '<th align="center">'.$i18n->trans('percentage').'</th>'
+                . '<th align="center">'.$i18n->trans('amount').'</th>'
                 . '</tr>'
                 . '</thead>'
                 . $trs
                 . '</table>';
         }
 
-        return '<table class="' . $class . '">'
+        return '<table class="'.$class.'">'
             . '<tr>'
-            . '<th align="left">' . $i18n->trans('tax') . '</th>'
-            . '<th align="center">' . $i18n->trans('tax-base') . '</th>'
-            . '<th align="center">' . $i18n->trans('tax') . '</th>'
-            . '<th align="center">' . $i18n->trans('amount') . '</th>'
-            . '<th align="center">' . $i18n->trans('re') . '</th>'
-            . '<th align="right">' . $i18n->trans('amount') . '</th>'
+            . '<th align="left">'.$i18n->trans('tax').'</th>'
+            . '<th align="center">'.$i18n->trans('tax-base').'</th>'
+            . '<th align="center">'.$i18n->trans('tax').'</th>'
+            . '<th align="center">'.$i18n->trans('amount').'</th>'
+            . '<th align="center">'.$i18n->trans('re').'</th>'
+            . '<th align="right">'.$i18n->trans('amount').'</th>'
             . '</tr>'
             . $trs
             . '</table>';
@@ -462,7 +461,7 @@ 
 
         if ($number < 100) {
             return ucfirst($words[10 * floor($number / 10)]
-                . ($number % 10 > 0 ? ' y ' . $words[$number % 10] : ''));
+                . ($number % 10 > 0 ? ' y '.$words[$number % 10] : ''));
         }
 
         if ($number < 1000) {
@@ -474,23 +473,23 @@ 
 
         if ($number < 1000000) {
             $thousands = floor($number / 1000);
-            return ucfirst(($thousands > 1 ? $this->convert_to_words($thousands) . ' ' : '')
+            return ucfirst(($thousands > 1 ? $this->convert_to_words($thousands).' ' : '')
                 . 'mil'
-                . ($number % 1000 > 0 ? ' ' . $this->convert_to_words($number % 1000) : ''));
+                . ($number % 1000 > 0 ? ' '.$this->convert_to_words($number % 1000) : ''));
         }
 
         if ($number < 1000000000) {
             $millions = floor($number / 1000000);
-            return ucfirst(($millions > 1 ? $this->convert_to_words($millions) . ' ' : 'un ')
+            return ucfirst(($millions > 1 ? $this->convert_to_words($millions).' ' : 'un ')
                 . 'millón'
                 . ($millions > 1 ? 'es' : '')
-                . ($number % 1000000 > 0 ? ' ' . $this->convert_to_words($number % 1000000) : ''));
+                . ($number % 1000000 > 0 ? ' '.$this->convert_to_words($number % 1000000) : ''));
         }
 
         $billions = floor($number / 1000000000);
-        return ucfirst(($billions > 1 ? $this->convert_to_words($billions) . ' ' : 'un ')
+        return ucfirst(($billions > 1 ? $this->convert_to_words($billions).' ' : 'un ')
             . 'billón'
             . ($billions > 1 ? 'es' : '')
-            . ($number % 1000000000 > 0 ? ' ' . $this->convert_to_words($number % 1000000000) : ''));
+            . ($number % 1000000000 > 0 ? ' '.$this->convert_to_words($number % 1000000000) : ''));
     }
 }
\ No newline at end of file