From 963ae4f30555359dbf256da8ab02f841fe9aa61a Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Wed, 5 Sep 2018 13:24:21 +0000 Subject: - Korrektur Rechnungsbriefbogen git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7138 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/mods/mod_rechnungen/invoice_pdf.phtml | 15 +++++++-------- views/mods/mod_rechnungen/settings_edit.phtml | 7 ++++--- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'views') diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 8dd3a64..713b189 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -47,17 +47,16 @@ $pdf->AddPage(); - if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf")) - { + if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf")) { - $pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf"); + $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf"); $tplidx = $pdf->importPage(1, '/MediaBox'); $pdf->useTemplate($tplidx, 0, 0, 210); - } - if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg")) - { - //$pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg'); + } else if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg")) { + + $pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg'); + } @@ -172,7 +171,7 @@ } } - //wpsg_debug($this->view); die(); + $pdf = new wpsg_fpdf(); $pdf->SetAutoPageBreak(true, 5); AddRechnungPage($this, $pdf); diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml index 16b30b9..1feae04 100644 --- a/views/mods/mod_rechnungen/settings_edit.phtml +++ b/views/mods/mod_rechnungen/settings_edit.phtml @@ -56,7 +56,7 @@ - get_option("wpsg_rechnungen_logo_transparency") ?: "0%"; ?> + get_option("wpsg_rechnungen_logo_transparency") ?: "100%"; ?> view['logo'] !== false) { $strSuffix = '
@@ -234,7 +234,8 @@ } } ); - let onloadActiveBtn = $(".align-buttons-active")[0]; + var onloadActiveBtn = $(".align-buttons-active")[0]; + if(onloadActiveBtn) { if(!onloadActiveBtn.value.includes("selected")) @@ -284,7 +285,7 @@ function wpsg_rechnungen_preview() { - let url = "wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=orderAjax&noheader=1&wpsg_rechnungen_preview=1"; + var url = "wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=orderAjax&noheader=1&wpsg_rechnungen_preview=1"; window.open(url, '_blank'); -- cgit v1.2.3