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 --- views/admin/emailconf.phtml | 165 +++-- views/admin/presentation.phtml | 55 +- views/css/admin.css | 42 +- views/mailtemplates/html/adminmail.phtml | 2 + views/mailtemplates/html/kundenmail.phtml | 2 + views/mailtemplates/html/logo.phtml | 33 + views/mailtemplates/html/status.phtml | 2 + .../mods/mod_abo/mail_admin_stoprenewal_html.phtml | 4 +- views/mods/mod_abo/mail_expiration_html.phtml | 2 + views/mods/mod_abo/mail_firstbuy_html.phtml | 2 + views/mods/mod_abo/mail_rebuy_html.phtml | 2 + views/mods/mod_abo/mail_row_html.phtml | 2 + views/mods/mod_abo/mail_storno_html.phtml | 2 + .../auftragsbestaetigung_html.phtml | 1 + .../mods/mod_deliverynote/deliverymail_html.phtml | 2 + views/mods/mod_deliverynote/deliverynote_pdf.phtml | 37 +- views/mods/mod_deliverynote/settings_edit.phtml | 288 +++++---- views/mods/mod_downloadplus/cronmail_html.phtml | 2 + .../mod_downloadplus/pdfdownloadmail_html.phtml | 2 + .../zahlung_downloadprodukt_html.phtml | 4 +- .../templates/zahlungsaufforderung_html.phtml | 2 + .../templates/zahlungserinnerung_html.phtml | 2 + .../mods/mod_rechnungen/accountingmail_html.phtml | 2 + views/mods/mod_rechnungen/invoice_pdf.phtml | 671 +++++++++++---------- views/mods/mod_rechnungen/invoicemail_html.phtml | 2 + views/mods/mod_rechnungen/settings_edit.phtml | 321 ++++++---- views/mods/mod_surfaceproduct/mail_row.html.phtml | 2 + views/order/view_alternativeDesign.phtml | 491 +++++++++++++++ views/produkt/addedit_alternativeDesign.phtml | 362 +++++++++++ views/produkt/addedit_templateV3.phtml | 362 ----------- 30 files changed, 1869 insertions(+), 999 deletions(-) create mode 100644 views/mailtemplates/html/logo.phtml create mode 100644 views/order/view_alternativeDesign.phtml create mode 100644 views/produkt/addedit_alternativeDesign.phtml delete mode 100644 views/produkt/addedit_templateV3.phtml diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml index 4e2d9e7..fb2c857 100644 --- a/views/admin/emailconf.phtml +++ b/views/admin/emailconf.phtml @@ -8,51 +8,124 @@
- - view['arSubAction'] as $k => $v) { ?> - + + view['arSubAction'] as $k => $v) { ?> + -
- -
+ +
- + - get_option('wpsg_htmlmail')); ?> + + + get_option('wpsg_htmlmail') + ); ?> + + + - + - + - + - + - + callMods('admin_emailconf'); ?>
- +

- +
@@ -65,25 +138,25 @@ { var wpsg_mail_open = Array(); - + jQuery('.wpsg_email_box .panel-body:visible').each(function() { wpsg_mail_open.push(jQuery(this).prev().attr("id")); - + } ); jQuery.cookie('wpsg_mail', wpsg_mail_open.join(',')); - + } // function wpsg_mail_save_cookie() jQuery(document).ready(function() { jQuery('.wpsg_email_box .panel-heading').bind('click', function() { - - jQuery(this).next().toggle(); - + + jQuery(this).next().toggle(); + wpsg_mail_save_cookie(); - + } ).css( { 'cursor': 'pointer' } ).disableSelection().next().hide(); if (jQuery.cookie('wpsg_mail') != null) @@ -93,14 +166,30 @@ for (var i = 0; i < arOpen.length; i ++) { - + jQuery('#' + arOpen[i]).next().show(); - jQuery('#' + arOpen[i]).css('border-bottom', '0px'); - + jQuery('#' + arOpen[i]).css('border-bottom', '0px'); + } - - } - + + } + + jQuery("#wpsg_htmlmail").click(function() { + + if(jQuery("#wpsg_htmlmail")[0].checked == false) jQuery(".col-emaillogo").css("display", "none"); + else $(".col-emaillogo").css("display", "block"); + + }); + if(jQuery("#wpsg_htmlmail")[0].checked == false) jQuery(".col-emaillogo").css("display", "none"); + + jQuery("#wpsg_email_logo_watermark").click(function() { + + if(jQuery("#wpsg_email_logo_watermark")[0].checked == true) jQuery(".col-logo-alignment").hide(); + else jQuery(".col-logo-alignment").show() + + }); + if(jQuery("#wpsg_email_logo_watermark")[0].checked == true) jQuery(".col-logo-alignment").hide(); + } ); -/* ]]> */ \ No newline at end of file + /* ]]> */ \ No newline at end of file diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml index 859ce0c..b3f3a03 100644 --- a/views/admin/presentation.phtml +++ b/views/admin/presentation.phtml @@ -8,45 +8,46 @@
- - view['arSubAction'] as $k => $v) { ?> - + + view['arSubAction'] as $k => $v) { ?> + -
- +
+ - +
- -
-
-

-
-
- - __('Serverseitig', 'wpsg'), - '1' => __('Serverseitig + Javascript V1', 'wpsg'), - '2' => __('Serverseitig + Javascript V2', 'wpsg') - ), $this->get_option('wpsg_form_validation')); ?> - + +
+
+

+
+
+ + __('Serverseitig', 'wpsg'), + '1' => __('Serverseitig + Javascript V1', 'wpsg'), + '2' => __('Serverseitig + Javascript V2', 'wpsg') + ), $this->get_option('wpsg_form_validation')); ?> + get_option('wpsg_imagehandler_basketimage')); ?> get_option('wpsg_imagehandler_overviewimage')); ?> - + callMods('admin_presentation'); ?> - + get_option('wpsg_showMwstAlways')); ?> - get_option('wpsg_showArticelnumber')); ?> - get_option('wpsg_hideBasketCountrySelect')); ?> + get_option('wpsg_showArticelnumber')); ?> + get_option('wpsg_hideBasketCountrySelect')); ?> -
+
- get_option('wpsg_v3DesignMode'), array('help' => 'wpsg_v3DesignMode')); ?> + get_option('wpsg_alternativeProductDetailDesign'), array('help' => 'alternativeProductDetailDesign')); ?> + get_option('wpsg_alternativeOrderDesign'), array('help' => 'alternativeOrderDesign')); ?> -
+
- +

diff --git a/views/css/admin.css b/views/css/admin.css index 84313d9..fbce4f8 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -11,7 +11,7 @@ #wpsg-bs .notice { margin-left:0px; margin-right:0px; width:auto; margin-bottom:1.5rem; } #wpsg-bs .flex { display:flex; } #wpsg-bs .flex-100 { width:100%; justify-content:space-between; } -#wpsg-bs nav.navbar { margin-right:20px; } +#wpsg-bs nav.navbar { margin-right:20px; } #wpsg-bs nav.navbar li { margin-bottom:0px; } #wpsg-bs nav.navbar .active { margin-right:2px; } #wpsg-bs nav.navbar .glyphicon { margin-right:10px; } @@ -23,7 +23,7 @@ #wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; } #wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; } #wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; } -#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; } +#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; } #wpsg-bs .popover { max-width:400px; margin-right:20px; } #wpsg-bs .arrow { margin-left:0px !important; } #wpsg-bs .popover.left > .arrow { left:auto; } @@ -108,7 +108,7 @@ table.wpsgitrecht_table { width:100%; } #ui-datepicker-div { z-index:3 !important; } /* Kundenkontakt */ -.wpsg_kundenkontakt_template, +.wpsg_kundenkontakt_template, .wpsg_kundenkontakt_betreff { width:80%; float:right; margin-bottom:20px; } .wpsg_kundenkontakt_textarea { width:100%; float:right; height:150px; } @@ -133,13 +133,13 @@ table.wpsgitrecht_table { width:100%; } /* Formulare NEU */ #wpsg-bs .has-feedback .wpsg_field_wrap { width:100%; position:relative; padding-right:25px; } #wpsg-bs .wpsg_field_wrap .form-control-feedback { right:0px; width:20px; cursor:pointer; pointer-events:all; } -#wpsg-bs .form-checkbox .wpsg_field_wrap .form-control-feedback { line-height:25px; } +#wpsg-bs .form-checkbox .wpsg_field_wrap .form-control-feedback { line-height:25px; } #wpsg-bs .wpsg_field_wrap .form-control-feedback:focus, #wpsg-bs .wpsg_field_wrap .form-control-feedback:hover { text-decoration:none; } #wpsg-bs .form-control-static input[type="file"] { margin-top:-5px; } /* Bootstrap Formulare im alten Teil */ -.wpsg_old_forms .form-group { margin-left:-15px; margin-right:-15px; margin-bottom:5px; } +.wpsg_old_forms .form-group { margin-left:-15px; margin-right:-15px; margin-bottom:5px; } .wpsg_old_forms .form-checkbox > div:first-child { width:100%; margin-left:0px; } /* Auswahl der Versand-/Zahlungsarten */ @@ -174,6 +174,9 @@ table.wpsgitrecht_table { width:100%; } .wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_1 { } /* Notice Meldungen */ .wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_2 { } /* Warnungen Meldungen */ .wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_3 { } /* Error Meldungen */ +.email-logo-alignment, .email-logo-alignment input[type="radio"] { font-family: FontAwesome; margin: 0; outline: 0; } +.email-logo { padding-bottom: 10px; } +.email-logo-watermark { position:absolute; top:10%; left:0; right:0; display:flex; justify-content:center; align-items:center; } /* Produktverwaltung */ .wpsg_pic_col { width:50px; } @@ -211,9 +214,10 @@ table.wpsgitrecht_table { width:100%; } .addedit_templateV3 #wpsg_images br, .addedit_templateV3 #wpsg_mods br:first-child{ display: block !important; } + /* Bild allgemein */ .box_img_wrap { position:relative; padding-top:100%; border:1px solid #000000; background:transparent; } -.box_img_wrap img {border:0px !important; position:absolute; left:50%; top:50%; max-height:100% !important; max-width:100%!important; height:auto!important; width:auto!important; margin:0px !important; +.box_img_wrap img {border:0px !important; position:absolute; left:50%; top:50%; max-height:100% !important; max-width:100%!important; height:auto!important; width:auto!important; margin:0px !important; transform:translateY(-50%) translateX(-50%); -ms-transform:translateY(-50%) translateX(-50%); -webkit-transform:translateY(-50%) translateX(-50%); @@ -229,7 +233,7 @@ table.wpsgitrecht_table { width:100%; } /* Bewertung */ .wpsg_rating { background-color:#29556E; } -.sto_comment_form .comment_list, +.sto_comment_form .comment_list, .sto_comment_form .comment_form { width:55rem; } .wpsg_comment_form .comment { background-color:#ececec; padding:20px; margin-bottom:30px; } .wpsg_comment_form .wpsg_star_wrap { float:right; } @@ -296,7 +300,7 @@ table.wpsgitrecht_table { width:100%; } .wpsg_mod_produktbilder_admin_bild a { position:relative; display:inline-block; float:left; margin-right:5px; margin-bottom:5px; } .wpsg_mod_produktbilder_admin_bild a > span { left:0px; top:0px; display:none; position:absolute; width:100%; height:100%; text-align:center; background-color:rgba(255, 0, 0, 0.3); } .wpsg_mod_produktbilder_admin_bild a > span > span { font-size:30px; top:50%; margin-top:-15px; } -.wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; } +.wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; } /* Modul Produktartikel (wpsg_mod_produktartikel) */ .wpsg-mod_produktartikel_categorydiv .tabs-panel { padding-top:8px !important; } @@ -354,13 +358,17 @@ table.wpsgitrecht_table { width:100%; } .wpsg_mod_deliverynote_fieldtable .col_color { width:80px; } .wpsg_mod_deliverynote_fieldtable .col_groesse { width:60px; } .wpsg_foottextlist .col_standard { text-align:center; } +.align-buttons input, .align-buttons input:hover { font-family: FontAwesome !important; cursor: pointer; outline: 0; border: 1px solid #ddd; background: #f9f9f9; color: #666; padding: 3px 7px; width: 30%; } +.align-buttons-active { background: #f1f1f1 !important; border-color: #ccc !important; box-shadow: 0 1px 0 #ccc; color: #555 !important; } +.logo-transparency * { text-align:center; } +.logo-transparency input { width: 30%; margin-left: -20px; margin-right: 5px; } #rechnungen_order_backend label, #wpsg_rechnungen_email, #wpsg_rechnungen_faelligkeitsdatum, #wpsg_rechnungen_status_neu, #wpsg_rechnungen_datum, -#wpsg_rechnungen_select, +#wpsg_rechnungen_select, #wpsg_rechnungen_fusstext { font-size:12px; font-family:"Helvetica Neue", Helvetica, Arial, sans-serif; color:#333; } #deliverynote_order_backend label, @@ -383,7 +391,7 @@ table.wpsgitrecht_table { width:100%; } .wpsg_mod_downloadplus_fieldtable .col_x, .wpsg_mod_downloadplus_fieldtable .col_y { width:50px; } -/* Produktvariablen */ +/* Produktvariablen */ .wpsg_pv_table { width:100%; } .wpsg_pv_table tr td { vertical-align:top; } .wpsg_pv_table .wpsg_id { width:20px; text-align:left; cursor:move; } @@ -392,7 +400,7 @@ table.wpsgitrecht_table { width:100%; } .wpsg_pv_table .wpsg_pflicht { width:100px; text-align:center; } .wpsg_pv_table .wpsg_label { text-align:left; } -/* Produktattribute */ +/* Produktattribute */ .wpsg_pa_table { width:100%; } .wpsg_pa_table tr td { vertical-align:top; } .wpsg_pa_table .wpsg_id { width:20px; text-align:left; cursor:move; } @@ -437,17 +445,17 @@ table.wpsgitrecht_table { width:100%; } .valid { padding-left:22px; line-height:24px; color:#3a7d34; } @media (min-width:1024px) and (max-width:1640px) { - - + + } @media (min-width:768px) and (max-width:1023px) { - - + + } @media (min-width:375px) and (max-width:767px) { - - + + } diff --git a/views/mailtemplates/html/adminmail.phtml b/views/mailtemplates/html/adminmail.phtml index 4def92f..c7dbf5f 100644 --- a/views/mailtemplates/html/adminmail.phtml +++ b/views/mailtemplates/html/adminmail.phtml @@ -3,6 +3,8 @@ /* Wichtig, da die Module sonst kein HTML zurückgeben */ $this->htmlMail = true; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml index 30fe9af..4288984 100644 --- a/views/mailtemplates/html/kundenmail.phtml +++ b/views/mailtemplates/html/kundenmail.phtml @@ -3,6 +3,8 @@ /* Wichtig, da die Module sonst kein HTML zurückgeben */ $this->htmlMail = true; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

view['basket']['checkout']['vname'], $this->view['basket']['checkout']['name']); ?>

diff --git a/views/mailtemplates/html/logo.phtml b/views/mailtemplates/html/logo.phtml new file mode 100644 index 0000000..a080084 --- /dev/null +++ b/views/mailtemplates/html/logo.phtml @@ -0,0 +1,33 @@ + + +get_option('wpsg_email_logo_activated')) + { + + $logoWatermark = $this->get_option('wpsg_email_logo_watermark') ? "email-logo-watermark" : ""; + + $logoTransparency = str_replace("#", "", get_option('wpsg_email_logo_transparency')); + if($logoTransparency !== "100") $logoTransparency = str_replace(array("0", "00"), "", $logoTransparency); + if($logoTransparency !== "100") $logoTransparency = "0." . $logoTransparency; + + $logoAlignment = $this->get_option('wpsg_email_logo_alignment'); + $logoPath = WPSG_PATH_CONTENT . 'uploads/wpsg/wpsg_mailconf/wpsg_email_logo.jpg'; + + if(file_exists($logoPath)) + { + $logoType = pathinfo($logoPath); + $logoData = file_get_contents($logoPath); + $logoBase64 = 'data:image/' . $logoType . ';base64,' . base64_encode($logoData); + } + + } +?> + +get_option('wpsg_email_logo_activated')) { ?> + " ?> + "; ?> + "; ?> + diff --git a/views/mailtemplates/html/status.phtml b/views/mailtemplates/html/status.phtml index 84567e6..f6c412c 100644 --- a/views/mailtemplates/html/status.phtml +++ b/views/mailtemplates/html/status.phtml @@ -7,6 +7,8 @@ /* Wichtig, da die Module sonst kein HTML zurückgeben */ $this->htmlMail = true; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

view['kunde']['vname'], $this->view['kunde']['name']); ?>

diff --git a/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml index e30f72b..3ab6a50 100644 --- a/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml +++ b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml @@ -3,7 +3,9 @@ /** * Template für die Mail, die der Admin bekommt wenn ein Kunde ein Abo im Frontend anhalten möchte (HTML) */ - + + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');7 + ?>
diff --git a/views/mods/mod_abo/mail_expiration_html.phtml b/views/mods/mod_abo/mail_expiration_html.phtml index 33d7f7e..f64e364 100644 --- a/views/mods/mod_abo/mail_expiration_html.phtml +++ b/views/mods/mod_abo/mail_expiration_html.phtml @@ -4,6 +4,8 @@ * Mail die beim Auslauf eines Abos versendet wird (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

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

diff --git a/views/mods/mod_abo/mail_firstbuy_html.phtml b/views/mods/mod_abo/mail_firstbuy_html.phtml index ff365ad..20c807b 100644 --- a/views/mods/mod_abo/mail_firstbuy_html.phtml +++ b/views/mods/mod_abo/mail_firstbuy_html.phtml @@ -4,6 +4,8 @@ * Mailtemplate, welches beim erstmaligen Kauf eines Abos versendet wird (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

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

diff --git a/views/mods/mod_abo/mail_rebuy_html.phtml b/views/mods/mod_abo/mail_rebuy_html.phtml index 722c1a1..773b114 100644 --- a/views/mods/mod_abo/mail_rebuy_html.phtml +++ b/views/mods/mod_abo/mail_rebuy_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail an den Kunden wenn ein Abo verlängert wurde (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

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

diff --git a/views/mods/mod_abo/mail_row_html.phtml b/views/mods/mod_abo/mail_row_html.phtml index 4da00c9..3409b71 100644 --- a/views/mods/mod_abo/mail_row_html.phtml +++ b/views/mods/mod_abo/mail_row_html.phtml @@ -4,6 +4,8 @@ * Template für die Zeile eines Abo Produktes im HTML Template */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>   diff --git a/views/mods/mod_abo/mail_storno_html.phtml b/views/mods/mod_abo/mail_storno_html.phtml index e50d26e..06cea78 100644 --- a/views/mods/mod_abo/mail_storno_html.phtml +++ b/views/mods/mod_abo/mail_storno_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail an den Kunden wenn ein Abo storniert wurde (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

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

view['cancel_storno']) { ?> diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml index a7f3ea1..c3f135d 100644 --- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml +++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml @@ -2,6 +2,7 @@ /* Wichtig, da die Module sonst kein HTML zurückgeben */ $this->htmlMail = true; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); ?>render(WPSG_PATH_VIEW.'/mailtemplates/html/html_head.phtml'); ?> 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 diff --git a/views/mods/mod_downloadplus/cronmail_html.phtml b/views/mods/mod_downloadplus/cronmail_html.phtml index bddc9d0..d38a7c8 100644 --- a/views/mods/mod_downloadplus/cronmail_html.phtml +++ b/views/mods/mod_downloadplus/cronmail_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail, die bei erfolgreicher Individualisierung an den Admin gesendet wird (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

diff --git a/views/mods/mod_downloadplus/pdfdownloadmail_html.phtml b/views/mods/mod_downloadplus/pdfdownloadmail_html.phtml index e089454..ee840b0 100644 --- a/views/mods/mod_downloadplus/pdfdownloadmail_html.phtml +++ b/views/mods/mod_downloadplus/pdfdownloadmail_html.phtml @@ -4,6 +4,8 @@ * Mail, die die PDF Downloads an den Kunden sendet (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>

view['kunde']['vname'], $this->view['kunde']['name']); ?>

diff --git a/views/mods/mod_downloadprodukte/zahlung_downloadprodukt_html.phtml b/views/mods/mod_downloadprodukte/zahlung_downloadprodukt_html.phtml index 9a87ffc..9da2986 100644 --- a/views/mods/mod_downloadprodukte/zahlung_downloadprodukt_html.phtml +++ b/views/mods/mod_downloadprodukte/zahlung_downloadprodukt_html.phtml @@ -1,4 +1,6 @@ -

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

+ + +

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

view['order']['onr'] ?>

diff --git a/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml b/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml index df12be0..10af5f1 100644 --- a/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml +++ b/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml @@ -2,6 +2,8 @@ global $template_name, $template_betreff, $absender_name, $absender_email; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + /** * Betreff des Templates */ diff --git a/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml b/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml index eb78a7c..e101c74 100644 --- a/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml +++ b/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml @@ -2,6 +2,8 @@ global $template_name, $template_betreff, $absender_name, $absender_email; + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + /** * Betreff des Templates */ diff --git a/views/mods/mod_rechnungen/accountingmail_html.phtml b/views/mods/mod_rechnungen/accountingmail_html.phtml index cc3e23e..3208f4e 100644 --- a/views/mods/mod_rechnungen/accountingmail_html.phtml +++ b/views/mods/mod_rechnungen/accountingmail_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail, die beim Schreiben einer Rechnungskorrektur optional an den Kunden versendet werden kann (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + //wpsg_debug($this->view); ?>

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

diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 11c682e..8dd3a64 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -1,5 +1,5 @@ get_option('wpsg_rechnungen_pdfperpage'); - + // Damit die Steuer bei der Kleinunternehmerregelung nicht angezeigt wird leer ich den Array sicherheitshalber if ($this->get_option('wpsg_kleinunternehmer') == '1') { - + unset($this->view['basket']['mwst']); - + } - + if (!function_exists('AddRechnungPage')) { - + function AddRechnungPage($shop, $pdf) { - + global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top; - + $pdf->AddPage(); - + 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"); - $tplidx = $pdf->importPage(1, '/MediaBox'); - $pdf->useTemplate($tplidx, 0, 0, 210); - + + $pagecount = $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'); + //$pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg'); } - - + + if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg")) { - + list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg"); - - //wpsg_debug($width.":".$height); - - $wPix = (25.4 * $width) / 96; - $hPix = (25.4 * $height) / 96; - - $pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg", 210 - $wPix, 0, $wPix, $hPix); - + + // Umrechnung von Inch zu Pixel + $wPix = (25.4 * (int)$width) / 96; + $hPix = (25.4 * (int)$height) / 96; + + $leftPos = 110 - $wPix; + $midPos = $wPix * 2.6 - $width / 2; + $rightPos = 210 - $wPix; + + $abscissa = $rightPos; + $ordinate = 0; + + $transparency = str_replace("%", "", $shop->get_option('wpsg_rechnungen_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_rechnungen_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_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg", $abscissa, $ordinate, $wPix, $hPix); + $pdf->SetAlpha(1); + } - + // Absenderadresszeile (Wird in der Konfiguration hinterlegt) $pdf->SetFont('Arial', '', 6); - $pdf->Text($absender_left, $absender_top, $shop->replaceUniversalPlatzhalter(__($shop->get_option("wpsg_rechnungen_adresszeile"), 'wpsg'), $shop->view['data']['id'])); - + $pdf->Text($absender_left, $absender_top, $shop->replaceUniversalPlatzhalter(__($shop->get_option("wpsg_rechnungen_adresszeile"), 'wpsg'), $shop->view['data']['id'])); + if (wpsg_getStr($shop->view['kunde']['kuerzel']) != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-'; - + // Adresse des Kunden - $pdf->SetFont('Arial', '', 12); + $pdf->SetFont('Arial', '', 12); $pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']); $pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']); $pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr'])); $pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']); if ($shop->get_option("wpsg_mod_rechnungen_hideCountry") == '0') - $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName())); - - // Rechnungsdaten + $pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName())); + + // Rechnungsdaten $pdf->SetFont('Arial', 'B', 16); $pdf->Text($rdata_left, $rdata_top, $shop->view['title']); $pdf->SetFont('Arial', 'B', 9); $pdf->Text($rdata_left, $rdata_top + 6, $shop->view['rnr']); $pdf->SetFont('Arial', '', 9); - + if (isset($shop->view['faelligkeitdatum'])) { - + $pdf->Text($rdata_left + 35, $rdata_top, __("Fällig am", "wpsg")); - $pdf->Text($rdata_left + 35, $rdata_top + 6, $shop->view['faelligkeitdatum']); - + $pdf->Text($rdata_left + 35, $rdata_top + 6, (int)$shop->view['faelligkeitdatum']); + } - + if (isset($shop->view['payment'])) { - + $pdf->Text($rdata_left + 58, $rdata_top, __("Zahlungsbedingungen", "wpsg")); $pdf->Text($rdata_left + 58, $rdata_top + 6, $shop->view['payment']); - + } - + $pdf->Text($rdata_left + 105, $rdata_top, __("Kunden-Nr", "wpsg")); $pdf->Text($rdata_left + 105, $rdata_top + 6, (($shop->view['kunde']['knr'] != '')?$shop->view['kunde']['knr']:$shop->view['kunde']['id'])); - + $pdf->Text($rdata_left + 135, $rdata_top, __("Best. Nr.", "wpsg")); $pdf->Text($rdata_left + 135, $rdata_top + 6, ((trim($shop->view['data']['onr']) != '')?$shop->view['data']['onr']:$shop->view['data']['id'])); - - $pdf->Text($rdata_left + 155, $rdata_top, __("Datum", "wpsg")); + + $pdf->Text($rdata_left + 155, $rdata_top, __("Datum", "wpsg")); $pdf->Text($rdata_left + 155, $rdata_top + 6, $shop->view['rDatum']); - + if ($shop->view['oOrder']->isInnerEu()) { - - $pdf->SetFont('Arial', '', 9); + + $pdf->SetFont('Arial', '', 9); $pdf->Text($adress_left, $rdata_top + 11.5, __("Innergemeinschaftliche Lieferung.", "wpsg")); - + } - + // Benutzerdefinierte Felder $arTexte = $shop->callMod('wpsg_mod_rechnungen', 'getRechnungstexte', array($shop->view['data']['id'])); - + foreach ((array)$arTexte as $text) { - + if (isset($text['aktiv']) && $text['aktiv'] == 1) { - + $pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10)); $pdf->wpsg_SetTextColor($text['color']); - $pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']); + $pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']); $pdf->wpsg_SetTextColor("#000000"); - + } - + } - + } - + } //wpsg_debug($this->view); die(); - $pdf = new wpsg_fpdf(); + $pdf = new wpsg_fpdf(); $pdf->SetAutoPageBreak(true, 5); AddRechnungPage($this, $pdf); - + $summe = 0; - + $bKopf = false; $pnr = 1; $offset = 0; $count = 0; foreach ($this->view['basket']['produkte'] as $p) { - + if (!$bKopf) { @@ -171,145 +192,145 @@ $pdf->setXY($prod_left + 10, $prod_top); $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, "Name", 1, 0, 'L'); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + $pdf->setXY($prod_left + 97, $prod_top); $pdf->Cell(15, 8, __("MwSt.", "wpsg"), 1, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top); $pdf->Cell(15, 8, __("Menge", "wpsg"), 1, 0, 'C'); - + $pdf->setXY($prod_left + 127, $prod_top); $pdf->Cell(25, 8, __("Einzelpreis", "wpsg"), 1, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top); $pdf->Cell(25, 8, __("Gesamtpreis", "wpsg"), 1, 0, 'R'); - - $offset = 8; + + $offset = 8; $bKopf = true; - + } - + $pdf->SetFont('Arial', '', 9); $pdf->setXY($prod_left, $prod_top + $offset); - + if ($this->get_option('wpsg_mod_rechnungen_anr') == '1') { - + $pdf->Cell(10, 8, $p['anr'], 0, 0, 'C'); - + } else { - + $pdf->Cell(10, 8, $pnr.".", 0, 0, 'C'); - + } /* Wenn Detailname vorhanden, wird der Detailname auf Rechnung verwendet */ $produkt_text = $this->getProductName($this->getProduktID($p['id']), true); - + /* Falls Detailname vorhanden, wird jetzt der Produktname verwendet */ /* $produkt_text = $this->getProductName($this->getProduktID($p['id']), false); */ - + $produktBeschreibung = trim(strip_tags($p['beschreibung'])); - + if ($this->isOtherLang()) - { - + { + $trans_db = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `lang_parent` = '".wpsg_q($this->getProduktID($p['id']))."' AND `lang_code` = '".wpsg_q($this->getCurrentLanguageCode())."'"); - + if (is_array($trans_db) && sizeof($trans_db) > 0) { - + $produkt_text = $trans_db['name']; $produktBeschreibung = trim(strip_tags($trans_db['beschreibung'])); - + } - + } - + $height = 0; // Höhe der Zeile für den Rahmen - + $pdf->setXY($prod_left + 10, $prod_top + $offset); - + // Produktvariablen if ($this->hasMod('wpsg_mod_productvars') && $this->get_option("wpsg_mod_rechnungen_showpv") == "1") { - + $arPV = $this->callMod('wpsg_mod_productvars', 'getAllProductVarValues', array($this->view['data']['id'], $p['product_index'])); - + if (wpsg_isSizedArray($arPV)) { - - foreach ($arPV as $pv) + + foreach ($arPV as $pv) { - + $produkt_text .= "\r\n".$pv['name'].': '.$pv['value']; $height += 5; - + } - + } - + } - if ($this->get_option('wpsg_mod_rechnungen_anr') === '2') - { + if ($this->get_option('wpsg_mod_rechnungen_anr') === '2') + { - $anr = $this->getProductAnr($p['productkey']); - $produkt_text .= "\r\n".wpsg_translate(__('Artikelnummer: #1#', 'wpsg'), $anr); + $anr = $this->getProductAnr($p['productkey']); + $produkt_text .= "\r\n".wpsg_translate(__('Artikelnummer: #1#', 'wpsg'), $anr); - } + } $produkt_text_cell_width = 102; if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - $produkt_text_cell_width = 87; + $produkt_text_cell_width = 87; } - + $produkt_text_width = $pdf->GetStringWidth($produkt_text); //$produkt_text_cell_width = (($this->arMwSt == "-1")?87:102); - + $height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3; - + $height_y = $pdf->getY(); $height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width); - + //$height += 3 + 5 + $pdf->getY() - $height_y; //$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L'); if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - - $pdf->setXY($prod_left + 97, $prod_top + $offset); + + $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, (($this->view['basket']['noMwSt'] == '1')?'0.00 %':wpsg_ff($p['mwst_value'], '%')), 0, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top + $offset); $pdf->Cell(15, 8, $p['menge'], 0, 0, 'C'); - + if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO) { $preis = $p['preis_netto']; - + //TODO } else { $preis = $p['preis_brutto']; } - + $pdf->setXY($prod_left + 127, $prod_top + $offset); $pdf->Cell(25, 8, wpsg_ff($preis, $this->get_option('wpsg_currency')), 0, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top + $offset); - $pdf->Cell(25, 8, wpsg_ff($preis * $p['menge'], $this->get_option('wpsg_currency')), 0, 0, 'R'); + $pdf->Cell(25, 8, wpsg_ff($preis * $p['menge'], $this->get_option('wpsg_currency')), 0, 0, 'R'); /** * Produktbeschreibung anzeigen Ja/Nein @@ -317,23 +338,23 @@ $pBeschreibungHeight = 0; if ($this->get_option("wpsg_rechnungen_pbeschreibung") == "1" && trim(strip_tags($p['beschreibung'])) != '') { - - $produktBeschreibung = nl2br($produktBeschreibung); + + $produktBeschreibung = nl2br($produktBeschreibung); preg_match_all('/\
/', $produktBeschreibung, $treffer); $produktBeschreibung = strip_tags($produktBeschreibung); - - $pBeschreibungWidth = $pdf->getStringWidth($produktBeschreibung); + + $pBeschreibungWidth = $pdf->getStringWidth($produktBeschreibung); $pBeschreibungHeight = 5 * (ceil($pBeschreibungWidth / $produkt_text_cell_width) + @sizeof($treffer[0])); - + $pdf->SetFont('Arial', 'I', 9); - + $cellY = $pdf->getY(); - $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width); + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width); $pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1; $pdf->SetFont('Arial', '', 9); - - } - + + } + $height += $pBeschreibungHeight; /** @@ -341,110 +362,110 @@ */ if ($this->get_option('wpsg_rechnungen_produktattribute') == '1') { - + $attributeInfo = $this->callMod('wpsg_mod_produktattribute', 'getProductAttributeByProductId', array($this->getProduktId($p['id']))); - + foreach ($attributeInfo as $pa) { - + $pa_text = $pa['name'].': '.$pa['value']; $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, $pa_text, 0, 'L', 0, $produkt_text_cell_width); - + } - } - + } + /** - * Variante ? + * Variante ? */ if (preg_match('/pv_(.*)/', $p['productkey'])) { - + $variInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['productkey'])); - $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width); - + $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width); + //$height += 5; - + } - + if ($this->hasMod('wpsg_mod_deliverynote')) { - + $arDN_order = $this->callMod('wpsg_mod_deliverynote', 'loadDeliveryNotesFromOrder', array($this->view['data']['id'])); - + if (sizeof($arDN_order) > 1) { - - $deliveryTimeProduct = $this->callMod('wpsg_mod_deliverynote', 'getProductDeliveryTime', array($this->view['data']['id'], $p['product_index'])); - + + $deliveryTimeProduct = $this->callMod('wpsg_mod_deliverynote', 'getProductDeliveryTime', array($this->view['data']['id'], $p['product_index'])); + if ($deliveryTimeProduct !== false) { - + $height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct)), 0, 'L', 0, $produkt_text_cell_width); - + } - + } - + } - + // Jetzt die Rahmen zeichnen $pdf->Rect($prod_left, $prod_top + $offset, 10, $height); - + $pdf->Rect($prod_left + 10, $prod_top + $offset, ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), $height); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + $pdf->Rect($prod_left + 97, $prod_top + $offset, 15, $height); - + } - + $pdf->Rect($prod_left + 112, $prod_top + $offset, 15, $height); $pdf->Rect($prod_left + 127, $prod_top + $offset, 25, $height); $pdf->Rect($prod_left + 152, $prod_top + $offset, 25, $height); - + $offset += $height; - + $pnr ++; $count ++; - + $summe += $p['price'] * $p['menge']; - - if ($pdf->getY() > 220 || ($count >= $prod_break && sizeof($this->view['basket']['produkte']) > ($pnr - 1))) + + if ($pdf->getY() > 220 || ($count >= $prod_break && sizeof($this->view['basket']['produkte']) > ($pnr - 1))) { - + AddRechnungPage($this, $pdf); $bKopf = false; $offset = 0; $count = 0; - + } - + } // produkte - + // Gutschein if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs_value'] > 0)) { - + $pdf->SetFont('Arial', '', 9); $pdf->setXY($prod_left, $prod_top + $offset); $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; $pdf->setXY($prod_left + 10, $prod_top + $offset); $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $this->view['basket']['gs']['code']), 1, 0, 'L'); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + $mwst = __('anteilig', 'wpsg'); - + $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top + $offset); - $pdf->Cell(15, 8, '1', 1, 0, 'C'); - + $pdf->Cell(15, 8, '1', 1, 0, 'C'); + /* if ($this->view['basket']['gs']['calc'] == 'w') { @@ -461,57 +482,57 @@ } */ - + $gs_value_einzel = '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); $gs_value_gesamt = '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); - + $pdf->setXY($prod_left + 127, $prod_top + $offset); $pdf->Cell(25, 8, $gs_value_einzel, 1, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top + $offset); $pdf->Cell(25, 8, $gs_value_gesamt, 1, 0, 'R'); - - $offset += 8; - - } - + + $offset += 8; + + } + // Versandkosten if ($this->view['basket']['sum']['preis_shipping'] != '' && $this->view['basket']['sum']['preis_shipping'] != 0) { - + $pdf->SetFont('Arial', '', 9); $pdf->setXY($prod_left, $prod_top + $offset); $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; $pdf->setXY($prod_left + 10, $prod_top + $offset); $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingLabel()), 1, 0, 'L'); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + if ($this->arShipping[$this->view['data']['type_shipping']]['mwst_null'] == '1' && $this->view['basket']['noMwSt'] == '1') { - + $mwst = 0; - + } else { - + if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) { - + $mwst = __('anteilig', 'wpsg'); - + } else { - + $mwst = wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'); $mwst = wpsg_ff($this->view['basket']['shipping']['tax_value'], '%'); - + } - + /* if ($this->arShipping[$this->view['data']['type_shipping']]['mwst'] == '0') { @@ -526,23 +547,23 @@ } */ - + } - + $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top + $offset); - $pdf->Cell(15, 8, '1', 1, 0, 'C'); - + $pdf->Cell(15, 8, '1', 1, 0, 'C'); + $pdf->setXY($prod_left + 127, $prod_top + $offset); $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top + $offset); $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $offset += 8; // Zusammengesetzte Versandarten darstellen @@ -584,44 +605,44 @@ } */ - - + + } - + // Zahlungskosten if ($this->view['basket']['sum']['preis_payment'] != '' && $this->view['basket']['sum']['preis_payment'] != 0) { - + $pdf->SetFont('Arial', '', 9); $pdf->setXY($prod_left, $prod_top + $offset); $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; $pdf->setXY($prod_left + 10, $prod_top + $offset); $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, $this->arPayment[$this->view['data']['type_payment']]['name'], 1, 0, 'L'); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + if ($this->arPayment[$this->view['data']['type_payment']]['mwst_null'] == '1' && $this->view['basket']['noMwSt'] == '1') { $mwst = 0; } else - { - + { + if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) { - + $mwst = __('anteilig', 'wpsg'); - + } else { - + $mwst = wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%'); - + } - + /* if ($this->arPayment[$this->view['data']['type_payment']]['mwst'] == '0') { @@ -636,31 +657,31 @@ } */ - + } - + $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top + $offset); - $pdf->Cell(15, 8, '1', 1, 0, 'C'); - + $pdf->Cell(15, 8, '1', 1, 0, 'C'); + $pdf->setXY($prod_left + 127, $prod_top + $offset); $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top + $offset); $pdf->Cell(25, 8, wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $offset += 8; - + } - + // Gebühr if (wpsg_tf(wpsg_getStr($this->view['storno_fee'])) > 0) { - + $pdf->SetFont('Arial', '', 9); $pdf->setXY($prod_left, $prod_top + $offset); $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; @@ -668,45 +689,45 @@ $label = __('Bearbeitungsgebühr', 'wpsg'); if (strpos($this->view['storno_fee'], '%') !== false) $label .= ' ('.wpsg_ff($this->view['storno_fee'], '%').')'; - + $pdf->setXY($prod_left + 10, $prod_top + $offset); $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, $label, 1, 0, 'L'); - + if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { - + if ($this->view['basket']['noMwSt'] == '1') { $mwst = 0; } else - { - - + { + + $mwst = wpsg_ff($this->view['storno_fee_tax_value'], '%'); - + } - + $pdf->setXY($prod_left + 97, $prod_top + $offset); $pdf->Cell(15, 8, $mwst, 1, 0, 'C'); - + } - + $pdf->setXY($prod_left + 112, $prod_top + $offset); - $pdf->Cell(15, 8, '1', 1, 0, 'C'); - + $pdf->Cell(15, 8, '1', 1, 0, 'C'); + $pdf->setXY($prod_left + 127, $prod_top + $offset); $pdf->Cell(25, 8, '-'.wpsg_ff($this->view['storno_fee_value'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $pdf->setXY($prod_left + 152, $prod_top + $offset); $pdf->Cell(25, 8, '-'.wpsg_ff($this->view['storno_fee_value'], $this->get_option('wpsg_currency')), 1, 0, 'R'); - + $offset += 8; - + } - + $pdf->SetFont('Arial', '', 9); - + if ($this->view['kunde']['ustidnr'] != "") { $offset += 10; @@ -714,7 +735,7 @@ $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, $this->view['kunde']['ustidnr'], 0, 0, 'R'); } - + $offset += 10; if ($this->get_option('wpsg_kleinunternehmer')) { @@ -724,75 +745,75 @@ $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'] + $this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $offset += 5; - + } else { - + if ($this->view['basket']['noMwSt'] == '1') { - + $pdf->Text($prod_left, $prod_top + $offset, __("Es ergibt sich folgender Gesamtbetrag", "wpsg").':'); $pdf->Text($prod_left + 100, $prod_top + $offset, __("BRUTTOBETRAG", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); $offset += 5; - + $pdf->Text($prod_left + 100, $prod_top + $offset, __("MwSt. GESAMT", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff(0, $this->get_option('wpsg_currency')), 0, 0, 'R'); - + } - else + else { - + $pdf->Text($prod_left, $prod_top + $offset, __("Der Gesamtbetrag setzt sich wie folgt zusammen", "wpsg")); - + $pdf->Text($prod_left + 100, $prod_top + $offset, __("NETTOBETRAG", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - + if (sizeof($this->view['basket']['mwst']) >= 1) { - + foreach ($this->view['basket']['mwst'] as $mw) { - + $offset += 5; $pdf->Text($prod_left + 100, $prod_top + $offset, __("MwSt. ", "wpsg").wpsg_ff($mw['value'], '%')); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($mw['sum'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - + } - + } - + if (sizeof($this->view['basket']['mwst']) > 1) { - + $offset += 5; $pdf->Text($prod_left + 100, $prod_top + $offset, __("MwSt. GESAMT", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'] - $this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - + } - - } - + + } + } - + // Rabatt if ($this->view['basket']['sum']['preis_rabatt'] > 0) { - + $offset += 5; - + $pdf->Text($prod_left + 100, $prod_top + $offset, __("Rabatt", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); $pdf->Cell(37, 8, '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R'); - + } - + $offset += 5; $pdf->Text($prod_left + 100, $prod_top + $offset, __("SUMME", "wpsg")); $pdf->setXY($prod_left + 140, $prod_top + $offset - 5); @@ -800,55 +821,55 @@ if ($this->get_option('wpsg_kleinunternehmer') == '1') { - - $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, $this->get_option('wpsg_kleinunternehmer_text')); + + $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, $this->get_option('wpsg_kleinunternehmer_text')); $offset += 15; - + } - + if ($this->hasMod('wpsg_mod_deliverynote')) { - + $arDN_order = $this->callMod('wpsg_mod_deliverynote', 'loadDeliveryNotesFromOrder', array($this->view['data']['id'])); $delivery_date = $this->callMod('wpsg_mod_deliverynote', 'getDeliveryTime', array($this->view['data']['id'])); - + // Wenn es ein Gesamtlieferdatum gibt und nur einen Lieferschein, dann unter der Bestellung anzeigen if ($delivery_date !== false && sizeof($arDN_order) == 1) { - - $offset += 10; - + + $offset += 10; + $pdf->wpsg_MultiCell($prod_left, $prod_top + $offset, 5, wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date))); $offset += 5; - + } - + } - + $offset += 5; - + if ($this->view['fussText'] != "") { - + //$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText'])); $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']); $pdf->SetFont('Arial', 'B', 9); - $offset += 10; - + $offset += 10; + } - + $shipping_adress = false; if ($this->hasMod('wpsg_mod_shippingadress') && $this->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', array('k_id' => $this->view['data']['k_id'], 'o_id' => $this->view['data']['id']))) { - + $pdf->setFont('Arial', 'B', 9); $pdf->Text($prod_left, $prod_top + $offset, __("Lieferanschrift", "wpsg").":"); $offset += 5; - - $pdf->setFont('Arial', '', 9); - + + $pdf->setFont('Arial', '', 9); + $shipping_adress = ""; if ($this->view['data']['shipping_firma'] != "") { @@ -857,35 +878,35 @@ $shipping_adress .= $this->view['data']['shipping_vname'].' '.$this->view['data']['shipping_name']."\r\n"; $shipping_adress .= $this->view['data']['shipping_strasse']."\r\n"; //$shipping_adress .= $this->view['data']['shipping_land']['kuerzel'].'-'; - + $shipping_adress .= $this->view['data']['shipping_plz'].' '.$this->view['data']['shipping_ort']."\r\n"; $shipping_adress .= $this->view['data']['shipping_land']['name']; - - + + $start = $pdf->getY(); $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $shipping_adress, 0, 'L', 0, 100); $offset += $pdf->getY() - $start; - + $shipping_adress = true; - + } - - + + $offset += 5; - + // Bestellvariablen if ($this->hasMod('wpsg_mod_ordervars') && $this->get_option('wpsg_mod_rechnungen_showov') == '1') { - - $bvars = @unserialize($this->view['data']['bvars']); + + $bvars = @unserialize($this->view['data']['bvars']); if (!is_array($bvars)) $bvars = array(); - + $strBVars = ""; foreach ($bvars as $bvars_id => $bvars_value) { - + $bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."' ORDER BY `pos` ASC, `id` ASC "); - + if ($bvars['typ'] == "1") // Auswahl { if ($bvars_value <= 0) $bvars_value = __("Keine Angabe", "wpsg"); @@ -896,45 +917,45 @@ } else if ($bvars['typ'] == "3") // Checkbox { - if ($bvars_value <= 0) $bvars_value = __("Keine Angabe", "wpsg"); + if ($bvars_value <= 0) $bvars_value = __("Keine Angabe", "wpsg"); } - - $bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id)); - $strBVars .= "\r\n".$bvars_name.": ".$bvars_value; - + + $bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id)); + $strBVars .= "\r\n".$bvars_name.": ".$bvars_value; + } - - $pdf->SetFont('Arial', 'B', 9); + + $pdf->SetFont('Arial', 'B', 9); $pdf->Text($prod_left, $prod_top + $offset, __("Angaben während der Bestellung", "wpsg").":"); $pdf->SetFont('Arial', '', 9); $pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $strBVars); - - } - + + } + if (!file_exists($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'])))) { - + mkdir($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'])), 0777, true); - + } - + $this->callMods('wpsg_mod_rechnungen_pdf', array(&$pdf, &$this->view['data']['id'], &$this->view['preview'], &$this->view['invoice'])); - + $filename = $this->view['filename'].".pdf"; - ob_end_clean(); + ob_end_clean(); if ($this->view['preview']) { - + $pdf->Output($filename, 'I'); - + } else { - + $pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'])).$filename, 'F'); - + // Hier wird der Dateiname an FPD übergeben. Er soll sich aus der Rechnungsnummer ergeben, auch wenn das Dokument über die ID gespeichert ist. if ($this->view['output'] === true) $pdf->Output($this->view['filename_out'], 'I'); - - } - + + } + ?> \ No newline at end of file diff --git a/views/mods/mod_rechnungen/invoicemail_html.phtml b/views/mods/mod_rechnungen/invoicemail_html.phtml index 666035c..4a37f73 100644 --- a/views/mods/mod_rechnungen/invoicemail_html.phtml +++ b/views/mods/mod_rechnungen/invoicemail_html.phtml @@ -4,6 +4,8 @@ * Template für die Mail, die beim Schreiben einer Rechnung optional an den Kunden versendet werden kann (HTML) */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + /* Wichtig, da die Module sonst kein HTML zurückgeben */ $this->htmlMail = true; diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml index cbe4aa9..fb5b638 100644 --- a/views/mods/mod_rechnungen/settings_edit.phtml +++ b/views/mods/mod_rechnungen/settings_edit.phtml @@ -6,62 +6,94 @@ ?> -
-
    - -
    • -
    • -
+
+
    + +
    • +
    • +
- + get_option('wpsg_rechnungen_adresszeile')); ?> - - -
- view['bp'] === false) { ?> -

- - - - - - view['bp'] !== false) { $strSuffix = ' +--> + +
+ view['bp'] === false) { ?> +

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

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

+ + + + + + + get_option("wpsg_rechnungen_logo_position"); ?> + + + + + - +--> - + @@ -71,75 +103,75 @@ - - + + view['fields'] as $f => $field_name) { ?> - - - - - - - - - + + + + + + + + + - +
- - - - - - - - - - - - -
+ + + + + + + + + + + + +
- +
- + - +
-

+


- +


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

+

-

+

- -
+ +
- - get_option('wpsg_rechnungen_url'), array('help' => 'wpsg_rechnung_url')); ?> + + get_option('wpsg_rechnungen_url'), array('help' => 'wpsg_rechnung_url')); ?> __('Manuell', 'wpsg'), '1' => __('Bei Bestellung', 'wpsg'), @@ -148,11 +180,11 @@ get_option('wpsg_rechnungen_faelligkeit'), array('help' => 'wpsg_rechnungen_faelligkeit')); ?> get_option('wpsg_rechnungen_pdfperpage'), array('help' => 'wpsg_rechnungen_pdfperpage')); ?> get_option('wpsg_rechnungen_pbeschreibung'), array('help' => 'wpsg_rechnungen_pbeschreibung')); ?> - + hasMod('wpsg_mod_produktattribute') == '1') {?> - get_option('wpsg_rechnungen_produktattribute'), array('help' => 'wpsg_rechnungen_produktattribute')); ?> + get_option('wpsg_rechnungen_produktattribute'), array('help' => 'wpsg_rechnungen_produktattribute')); ?> - + get_option('wpsg_mod_rechnungen_showgutschriftrechnung'), array('help' => 'wpsg_mod_rechnungen_showgutschriftrechnung')); ?> get_option('wpsg_mod_rechnungen_showpv'), array('help' => 'wpsg_mod_rechnungen_showpv')); ?> get_option('wpsg_mod_rechnungen_showov'), array('help' => 'wpsg_mod_rechnungen_showov')); ?> @@ -168,44 +200,101 @@ '1' => __('In Spalte "Nr." zeigen', 'wpsg'), '2' => __('Als extra Zeile anzeigen', 'wpsg') ), $this->get_option('wpsg_mod_rechnungen_anr'), array('help' => 'wpsg_mod_rechnungen_anr')); ?> - - -
-

- %nr% -
- %Jahr% -
- %Monat% -
- %Tag% -
-

-
- -

- + + +
+

+ %nr% -
+ %Jahr% -
+ %Monat% -
+ %Tag% -
+

+
+ +

+ true)); ?> - +
- + \ No newline at end of file + /* ]]> */ \ No newline at end of file diff --git a/views/mods/mod_surfaceproduct/mail_row.html.phtml b/views/mods/mod_surfaceproduct/mail_row.html.phtml index ca2fbc2..a0f5963 100644 --- a/views/mods/mod_surfaceproduct/mail_row.html.phtml +++ b/views/mods/mod_surfaceproduct/mail_row.html.phtml @@ -4,6 +4,8 @@ * Template für die Intergration der FlächenProdukt-Daten in die HTML Kunden- und Adminmail */ + include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + ?>   diff --git a/views/order/view_alternativeDesign.phtml b/views/order/view_alternativeDesign.phtml new file mode 100644 index 0000000..37005bf --- /dev/null +++ b/views/order/view_alternativeDesign.phtml @@ -0,0 +1,491 @@ + + +view['arSubAction'])); ?> + + + +
+ + + +
+ + +
+
+
+
+ + view['arSubAction']['general']['content']; ?> + +
+
+
+
+ + view['arSubAction']['orderdata']['content']; ?> + +
+
+
+
+ + view['arSubAction']['950']['content']; ?> + +
+
+
+
+ + view['arSubAction']['1000']['content']; ?> + +
+
+
+
+ + view['arSubAction']['1400']['content']; ?> + +
+
+
+
+ + view['arSubAction']['2000']['content']; ?> + +
+
+
+ + + +
+
+
+ + view['arSubAction']['customerdata']['content']; ?> + +
+
+
+
+ + view['arSubAction']['shippay']['content']; ?> + +
+
+
+
+ + view['arSubAction']['70']['content']; ?> + +
+
+
+
+ + view['arSubAction']['5000']['content']; ?> + +
+
+
+
+ + view['arSubAction']['orderlog']['content']; ?> + +
+
+
+
+ + view['arSubAction']['dev']['content']; ?> + +
+
+
+
+ + +
+ + + + diff --git a/views/produkt/addedit_alternativeDesign.phtml b/views/produkt/addedit_alternativeDesign.phtml new file mode 100644 index 0000000..150b98d --- /dev/null +++ b/views/produkt/addedit_alternativeDesign.phtml @@ -0,0 +1,362 @@ + + + + +
+ +
+ +

+

+ 0) { ?> + + +  [getStoreLanguages(); echo $arLang[$_REQUEST['wpsg_lang']]['name']; ?> ] + + + + +

+
+ + writeBackendMessage(); ?> + +
+ +
+ +
+
+ + +
+
+ + view['arSubAction']['price']['content']; ?> + +
+
+
+
+ + view['arSubAction']['payship']['content']; ?> + +
+
+ + + callMods('produkt_edit_sidebar_contentt', array(&$this->view['data'])); ?> + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ + view['arSubAction']['general']['content']; ?> + +
+
+ +
+

+
+ +

+
+ + view['arSubAction']['texte']['content']; ?> + +
+
+ +
+
+ + view['arSubAction']['images']['content']; ?> + +
+
+ +
+
+ + view['arSubAction']['stock']['content']; ?> + +
+
+ +
+

Aktivierte Mods

+ view['arSubAction'] as $index => $subArr) + { + if(strpos($index, 'wpsg_mod') !== false) + { + + $modtitle = $this->view['arSubAction'][$index]['title']; + + echo "
"; + echo $this->view['arSubAction'][$index]['content']; + echo '
'; + + } + } + + ?> +
+ + callMods('produkt_edit_content', array(&$this->view['data'])); ?> + +
+ + 0) { ?> + + + + + + + +

+ + +

+ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/views/produkt/addedit_templateV3.phtml b/views/produkt/addedit_templateV3.phtml deleted file mode 100644 index 150b98d..0000000 --- a/views/produkt/addedit_templateV3.phtml +++ /dev/null @@ -1,362 +0,0 @@ - - - - -
- -
- -

-

- 0) { ?> - - -  [getStoreLanguages(); echo $arLang[$_REQUEST['wpsg_lang']]['name']; ?> ] - - - - -

-
- - writeBackendMessage(); ?> - -
- -
- -
-
- - -
-
- - view['arSubAction']['price']['content']; ?> - -
-
-
-
- - view['arSubAction']['payship']['content']; ?> - -
-
- - - callMods('produkt_edit_sidebar_contentt', array(&$this->view['data'])); ?> - -
-
- -
- -
-
- -
-
- -
- -
- -
-
- - view['arSubAction']['general']['content']; ?> - -
-
- -
-

-
- -

-
- - view['arSubAction']['texte']['content']; ?> - -
-
- -
-
- - view['arSubAction']['images']['content']; ?> - -
-
- -
-
- - view['arSubAction']['stock']['content']; ?> - -
-
- -
-

Aktivierte Mods

- view['arSubAction'] as $index => $subArr) - { - if(strpos($index, 'wpsg_mod') !== false) - { - - $modtitle = $this->view['arSubAction'][$index]['title']; - - echo "
"; - echo $this->view['arSubAction'][$index]['content']; - echo '
'; - - } - } - - ?> -
- - callMods('produkt_edit_content', array(&$this->view['data'])); ?> - -
- - 0) { ?> - - - - - - - -

- - -

- -
- -
- -
- -
\ No newline at end of file -- cgit v1.2.3