Support for "inline codes" provided by the R&OS pdf class

ole1986 · Apr 10, 2021 · 1dad12c · 1dad12c
1 parent 5ffb39c
commit 1dad12c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/menu/invoice-menu.php b/menu/invoice-menu.php
@@ -237,7 +237,7 @@ public function DisplaySettings()
                     WCInvoicePdf::addField('wc_pdf_logo', 'Logo', 'media');
                     WCInvoicePdf::addField('wc_pdf_addressline', __('Address line', 'wc-invoice-pdf'));
                     WCInvoicePdf::addField('wc_pdf_condition', __('Payment terms', 'wc-invoice-pdf'), 'textarea');
-                    WCInvoicePdf::addField('wc_pdf_info', 'Info Block', 'textarea');
+                    WCInvoicePdf::addField('wc_pdf_info', '<strong>Info Block</strong><br />' . 'Supports "Inline codes" provided by the <a href="https://github.com/rospdf/pdf-php/blob/master/README.md" target="_blank">R&amp;OS pdf class</a>', 'textarea', ['input_attr' => ['style' => 'width: 340px; height: 100px']]);
                     WCInvoicePdf::addField('wc_pdf_keeprows', '<strong>' . __('Protect rows from splitting', 'wc-invoice-pdf') . '</strong><br />' . __('Keep rows together when page breaks', 'wc-invoice-pdf'), 'checkbox');
 
                     WCInvoicePdf::addField('wc_pdf_block1', 'Block #1', 'rte', ['container' => 'div', 'input_attr' => ['style'=>'width: 350px;display:inline-block;'] ]);

diff --git a/model/invoice-pdf.php b/model/invoice-pdf.php
@@ -197,7 +197,7 @@ public function BuildInvoice($invoice, $isOffer = false, $stream = false)
 
         $pdf->ezSetDy(-30);
 
-        $pdf->ezTable($data, $cols, '', ['width' => '500','splitRows' => !boolval(\WCInvoicePdf\WCInvoicePdf::$OPTIONS['wc_pdf_keeprows']),'gridlines' => EZ_GRIDLINE_HEADERONLY, 'cols' => $colOptions]);
+        $pdf->ezTable($data, $cols, '', ['width' => '500','splitRows' => !boolval(\WCInvoicePdf\WCInvoicePdf::$OPTIONS['wc_pdf_keeprows'] ?? 0),'gridlines' => EZ_GRIDLINE_HEADERONLY, 'cols' => $colOptions]);
 
         $colOptions = [
             ['justification' => 'right'],

diff --git a/wc-invoice-pdf.php b/wc-invoice-pdf.php
@@ -222,7 +222,7 @@ public static function addField($name, $title, $type = 'text', $args = [])
         } elseif ($type == 'email') {
             echo '<input type="'.$type.'" class="regular-text" name="'.$name.'" value="'.$optValue.'"'.$attrStr.' />';
         } elseif ($type == 'textarea') {
-            echo '<textarea name="'.$name.'" '.$attrStr.'>'  . strip_tags($optValue) . '</textarea>';
+            echo '<textarea name="'.$name.'" '.$attrStr.'>'  . esc_attr($optValue) . '</textarea>';
         } elseif ($type == 'checkbox') {
             echo '<input type="'.$type.'" name="'.$name.'" value="1"' . (($optValue == '1')?'checked':'') .' />';
         } elseif ($type == 'rte') {