From 6025e7638c2e7cb385a6feae0893c64a014a2d06 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 10 Aug 2018 07:40:47 +0000 Subject: git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7094 0d5edaf7-2b12-4e95-93f4-047927463d4b --- .../mods/mod_deliverynote/deliverymail_html.phtml | 2 + views/mods/mod_deliverynote/deliverynote_pdf.phtml | 37 ++- views/mods/mod_deliverynote/settings_edit.phtml | 288 +++++++++++++-------- 3 files changed, 215 insertions(+), 112 deletions(-) (limited to 'views/mods/mod_deliverynote') diff --git a/views/mods/mod_deliverynote/deliverymail_html.phtml b/views/mods/mod_deliverynote/deliverymail_html.phtml index 99573f8..2df62f1 100644 --- a/views/mods/mod_deliverynote/deliverymail_html.phtml +++ b/views/mods/mod_deliverynote/deliverymail_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail an den Kunden (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

view['customer']['vname']; ?> view['customer']['name']; ?>,

view['dn']->lnr); ?>

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml index a554553..379db1d 100644 --- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml +++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml @@ -35,18 +35,41 @@ $pdf->image($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_bp.jpg", 0, 0, 210, 297, 'jpg'); } - - + + if (file_exists($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg")) { - + list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg"); - + + // Umrechnung von Inch zu Pixel $wPix = (25.4 * $width) / 96; $hPix = (25.4 * $height) / 96; - - $pdf->image($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg", 210 - $wPix, 0, $wPix, $hPix); - + + $leftPos = 110 - $wPix; + $midPos = $wPix * 2.6 - $width / 2; + $rightPos = 210 - $wPix; + + $abscissa = $rightPos; + $ordinate = 0; + + $transparency = str_replace("%", "", $shop->get_option('wpsg_mod_deliverynote_logo_transparency')); + if($transparency !== "100") $transparency = str_replace(array("0", "00"), "", $transparency); + + $alpha = 1; + if(!is_null($transparency) && $transparency !== "100") $alpha = "0.$transparency"; + if(!is_null($transparency) && $transparency === "100") $alpha = $transparency; + + $logo_pos = $shop->get_option('wpsg_mod_deliverynote_logo_position'); + + if(isset($logo_pos) && $logo_pos === "left") { $abscissa = $leftPos; $ordinate = 20; } + if(isset($logo_pos) && $logo_pos === "center") { $abscissa = $midPos; $ordinate = 20; } + if(isset($logo_pos) && $logo_pos === "right") { $abscissa = $rightPos; } + + $pdf->SetAlpha($alpha); + $pdf->image($shop->callMod('wpsg_mod_deliverynote', 'getFilePath', array(''))."wpsg_deliverynote_logo.jpg", $abscissa, $ordinate, $wPix, $hPix); + $pdf->SetAlpha(1); + } // Absenderadresszeile (Wird in der Konfiguration hinterlegt) diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml index 515e4c1..b5dbda6 100644 --- a/views/mods/mod_deliverynote/settings_edit.phtml +++ b/views/mods/mod_deliverynote/settings_edit.phtml @@ -7,104 +7,134 @@ ?>
- -
-
- - get_option('wpsg_mod_deliverynote_adressrow'), array('help' => 'wpsg_mod_deliverynote_adressrow')); ?> - - -
- view['wpsg_mod_deliverynote']['bp'] === false) { ?> -

- - - - - - view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = ' +
    + +
    • +
    • +
+
+
+ + get_option('wpsg_mod_deliverynote_adressrow'), array('help' => 'wpsg_mod_deliverynote_adressrow')); ?> + + +
+ view['wpsg_mod_deliverynote']['bp'] === false) { ?> +

+ + + + + + view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = ' '; echo __($strSuffix); - } ?> + } ?>
- true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?> - - -
- view['wpsg_mod_deliverynote']['logo'] === false) { ?> -

- - - - - - view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = ' - '; + true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?> + + +
+ view['wpsg_mod_deliverynote']['logo'] === false) { ?> +

+ + + + + + get_option("wpsg_mod_deliverynote_logo_position"); ?> + + + + + + + get_option("wpsg_mod_deliverynote_logo_transparency") ?: "0%"; ?> + + view['logo'] !== false) { $strSuffix = ' +
+
+
+ + + +
+
+
+ +
+
+ +
+
'; echo __($strSuffix); } ?> -
- true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?> + + + +
+ true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
- - - - - - - - - - - - - view['wpsg_mod_deliverynote']['fields'] as $f => $field_name) { ?> - - - - - - - - - - - + + + + + + + + + + + + + view['wpsg_mod_deliverynote']['fields'] as $f => $field_name) { ?> + + + + + + + + + + +
- - - - - - - - - - - view['wpsg_mod_deliverynote']['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> /> -
+ + + + + + + + + + + view['wpsg_mod_deliverynote']['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> /> +
-

+

@@ -115,16 +145,16 @@
-

-
+
+
-
view['foottext_list']; ?>
+
view['foottext_list']; ?>
-
+
- + -

+

@@ -132,18 +162,18 @@

-
-
+
+
get_option('wpsg_mod_deliverynote_nrformat'), array('help' => 'wpsg_mod_deliverynote_nrformat')); ?> get_option('wpsg_mod_deliverynote_nr'), array('help' => 'wpsg_mod_deliverynote_nr')); ?> get_option('wpsg_mod_deliverynote_url'), array('help' => 'wpsg_mod_deliverynote_url')); ?> get_option('wpsg_mod_deliverynote_url_standard'), array('help' => 'wpsg_mod_deliverynote_url_standard')); ?> - + hasMod('wpsg_mod_produktattribute') == '1') {?> - get_option('wpsg_mod_deliverynote_produktattribute'), array('help' => 'wpsg_mod_deliverynote_produktattribute')); ?> + get_option('wpsg_mod_deliverynote_produktattribute'), array('help' => 'wpsg_mod_deliverynote_produktattribute')); ?> - + get_option('wpsg_mod_deliverynote_hideCountry'), array('help' => 'wpsg_mod_deliverynote_hideCountry')); ?> __('Nicht anzeigen', 'wpsg'), @@ -152,17 +182,61 @@ ), $this->get_option('wpsg_mod_deliverynote_anr'), array('help' => 'wpsg_mod_deliverynote_anr')); ?>
-
+
\ No newline at end of file + /* ]]> */ \ No newline at end of file -- cgit v1.2.3