From 4e2875793d5e724363737e6ca40db87b8d43f0b5 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 1 Oct 2026 14:22:01 +0200 Subject: - Modul "Auftragsbestätigung" aufgeräumt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auftragsbestaetigung.phtml | 268 +++++++++------------ .../auftragsbestaetigung_html.phtml | 61 ++--- .../mods/mod_auftragsbestaetigung/order_view.phtml | 74 +++--- .../mod_auftragsbestaetigung/settings_edit.phtml | 8 + 4 files changed, 194 insertions(+), 217 deletions(-) create mode 100644 views/mods/mod_auftragsbestaetigung/settings_edit.phtml (limited to 'views') diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml index 486d43a..b954bfb 100644 --- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml +++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml @@ -1,151 +1,117 @@ - - - - ----------------------------------------------------------------------------- - -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']))) { ?> - - -view['basket']['checkout']['firma']; ?> -view['basket']['checkout']['vname']; ?> view['basket']['checkout']['name']; ?> -view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr'])); ?> -db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> -view['basket']['checkout']['ustidnr']) != "") { ?> -view['basket']['checkout']['ustidnr']; ?> - - -view['basket']['checkout']['plz']; ?> view['basket']['checkout']['ort']; ?> -view['basket']['checkout']['tel']; ?> -view['basket']['checkout']['fax']; ?> -view['basket']['checkout']['email']; ?> - - - -view['basket']['checkout']['shipping_firma']; ?> -view['basket']['checkout']['shipping_vname']; ?> view['basket']['checkout']['name']; ?> -view['basket']['checkout']['shipping_strasse']; ?> -view['basket']['checkout']['shipping_plz']; ?> view['basket']['checkout']['shipping_ort']; ?> - -view['basket']['checkout']['shipping_land']; ?> - - - - -view['basket']['checkout']['firma']; ?> -view['basket']['checkout']['vname']; ?> view['basket']['checkout']['name']; ?> -view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr'])); ?> -db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> -view['basket']['checkout']['ustidnr']) != "") { ?> -view['basket']['checkout']['ustidnr']; ?> - - -view['basket']['checkout']['plz']; ?> view['basket']['checkout']['ort']; ?> -view['basket']['checkout']['tel']; ?> -view['basket']['checkout']['fax']; ?> -view['basket']['checkout']['email']; ?> - - -view['customer']['knr']; ?> -view['order']['onr']; ?> -view['order']['cdate'])); ?> -view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> -get_option('wpsg_kleinunternehmer')) { ?> -get_option('wpsg_kleinunternehmer_text'); ?> - -view['basket']['sum']['mwst'], $this->get_option('wpsg_currency')); ?> - - -arShipping[$this->view['basket']['checkout']['shipping']]['name']; ?> -arPayment[$this->view['basket']['checkout']['payment']]['name']; ?> -callMods('mail_payment'); ?> - -view['auftrag_note'] != '') { ?> - -view['auftrag_note'] ?> - - - -: -view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { $prod_col = 25; } else { $prod_col = 35; } ?> - - - - -view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - ----------------------------------------------------------------------------- -view['basket']['produkte'] as $p) { $i ++; ?> - - -get_option('wpsg_currency')).' ', 15); ?> -view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - -get_option('wpsg_currency')), 15); ?> -callMods('mail_row', array($i, $p)); ?> - -view['basket']['gs'])) { ?> - -view['basket']['gs']['code']), $prod_col); ?> -view['basket']['gs']['value'], (($this->view['basket']['gs']['calc'] == 'w')?$this->get_option('wpsg_currency'):'%')).' ', 15); ?> -view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - -view['basket']['gs']['value'], $this->get_option('wpsg_currency')), 15); ?> - - -view['basket']['sum']['preis'], $this->get_option('wpsg_currency')), 31); ?> -view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?> - -arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value']??0,'% '), 10); ?> -view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')), 21); ?> - -view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?> - -arPayment[$this->view['basket']['checkout']['payment']]['mwst_value']??0,'% '), 10); ?> -view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')), 21); ?> - -view['basket']['mwst']) ?> -get_option('wpsg_kleinunternehmer') == '1') { ?> -get_option('wpsg_kleinunternehmer_text'); ?> - -view['basket']['mwst'] as $mwst_id => $mwst) { ?> -getFrontendTaxview() == WPSG_NETTO) { ?> - - - - -get_option('wpsg_currency')), 24); ?> - - ---------------- - -view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?> - -callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?> - - - - - -getURL(wpsg_ShopController::URL_AGB); ?> - - -- -- - -get_option("wpsg_ps_mailwiderruf")) != "") { ?> -get_option("wpsg_ps_mailwiderruf"); ?> - - - - --- -- - - - -get_option('wpsg_shopdata_name'), 'wpsg'); ?> - \ No newline at end of file +htmlMail = false; + + /** @var wpsg_order $oOrder */ + $oOrder = $this->view['oOrder']; + $oCustomer = $oOrder->getCustomer(); + + $arCheckout = $this->view['basket']['checkout']; + $strCurrency = $this->get_option('wpsg_currency'); + $strNote = (string)($this->view['auftrag_note']??''); + $strComment = (string)($arCheckout['comment']??''); + $strRevocation = trim((string)$this->get_option('wpsg_ps_mailwiderruf')); + + $bShippingAdress = ($this->hasMod('wpsg_mod_shippingadress') && $this->callMod('wpsg_mod_shippingadress', 'check_different_shippingadress', [$oOrder->k_id, $oOrder->getId()])); + + /** + * Eine Zeile "Bezeichnung: Wert" + */ + $line = function($strLabel, $strValue) { + + return wpsg_pad_right($strLabel.':', 35).$strValue."\n"; + + }; + + echo __('Auftragsbestätigung', 'wpsg')."\n\n"; + echo __('Vielen Dank für Ihre Bestellung. Sie erhalten hiermit die Auftragsbestätigung mit allen wichtigen Informationen zu Ihrer Bestellung.', 'wpsg')."\n\n"; + echo str_repeat('-', 76)."\n\n"; + + echo (($bShippingAdress)?__('Rechnungsadresse:', 'wpsg'):__('Rechnungs- /Lieferadresse:', 'wpsg'))."\n\n"; + + echo $line(__('Firma', 'wpsg'), $oOrder->getInvoiceCompany()); + echo $line(__('Name', 'wpsg'), trim($oOrder->getInvoiceFirstName().' '.$oOrder->getInvoiceName())); + echo $line(__('Straße', 'wpsg'), $oOrder->getInvoiceStreet()); + echo $line(__('Ort', 'wpsg'), trim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity())); + echo $line(__('Land', 'wpsg'), $oOrder->getInvoiceCountryName()); + + if (trim((string)($arCheckout['ustidnr']??'')) !== '') echo $line(__('USt.IdNr.', 'wpsg'), $arCheckout['ustidnr']); + + echo $line(__('Telefon', 'wpsg'), $oOrder->getInvoicePhone()); + echo $line(__('Fax', 'wpsg'), $oOrder->getInvoiceFax()); + echo $line(__('E-Mail Adresse', 'wpsg'), $oCustomer->getEMail()); + + if ($bShippingAdress) { + + echo "\n".__('Lieferadresse:', 'wpsg')."\n\n"; + + echo $line(__('Firma', 'wpsg'), $oOrder->getShippingCompany()); + echo $line(__('Name', 'wpsg'), trim($oOrder->getShippingFirstName().' '.$oOrder->getShippingName())); + echo $line(__('Straße', 'wpsg'), trim($oOrder->getShippingStreet())); + echo $line(__('Ort', 'wpsg'), trim($oOrder->getShippingZip().' '.$oOrder->getShippingCity())); + echo $line(__('Land', 'wpsg'), $oOrder->getShippingCountryName()); + + } + + echo "\n"; + echo $line(__('Kundennummer', 'wpsg'), $oCustomer->knr); + echo $line(__('Bestellnummer', 'wpsg'), $oOrder->getNr()); + echo $line(__('Bestelldatum', 'wpsg'), date('d.m.Y H:i:s', strtotime((string)$oOrder->cdate))); + echo $line(__('Rechnungsbetrag', 'wpsg'), wpsg_ff($this->view['basket']['arCalculation']['sum']['topay_brutto']??0, $strCurrency)); + + if ($this->get_option('wpsg_kleinunternehmer') == '1') { + + echo $this->get_option('wpsg_kleinunternehmer_text')."\n"; + + } else { + + echo $line(__('Steueranteil', 'wpsg'), wpsg_ff($this->view['basket']['sum']['mwst']??0, $strCurrency)); + + } + + echo "\n"; + echo $line(__('Versandart', 'wpsg'), $oOrder->getShippingLabel()); + + $this->callMods('mail_shipping'); + + echo $line(__('Zahlungsart', 'wpsg'), $oOrder->getPaymentLabel()); + + $this->callMods('mail_payment'); + + if ($strNote !== '') { + + echo "\n".__('Kommentar Auftragsbestätigung', 'wpsg').":\n"; + echo $strNote."\n"; + + } + + echo "\n".__('Bestellung', 'wpsg').":\n"; + + // Positionen, Versand, Zahlungsart, Steuern, Gesamtpreis und mail_aftercalculation der Module + $this->render(WPSG_PATH_VIEW.'/mailtemplates/order.phtml'); + + if ($strComment !== '') { + + echo "\n".__('Bestellkommentar', 'wpsg').': '.$strComment."\n"; + + } + + echo "\n".__('Wir bedanken uns für Ihre Bestellung.', 'wpsg')."\n\n"; + echo __('Es gelten unsere Allgemeinen Geschäftsbedingungen (AGB).', 'wpsg')."\n\n"; + echo $this->getURL(wpsg_ShopController::URL_AGB)."\n\n"; + + echo '-- '.__('Widerrufsbelehrung', 'wpsg')." --\n\n"; + echo (($strRevocation !== '')?$strRevocation:__('...hier steht der Text zum Widerrufsrecht...', 'wpsg'))."\n\n"; + echo '-- '.__('Ende der Widerrufsbelehrung', 'wpsg')." --\n\n"; + + echo __('Mit freundlichen Grüßen', 'wpsg')."\n\n"; + echo __($this->get_option('wpsg_shopdata_name'), 'wpsg').' - '.__('Team', 'wpsg'); diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml index 5983aec..22b7b76 100644 --- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml +++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung_html.phtml @@ -1,51 +1,58 @@ -htmlMail = true; - include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml'); + include(WPSG_PATH_VIEW.'mailtemplates/html/logo.phtml'); + + $strNote = (string)($this->view['auftrag_note']??''); + $strComment = (string)($this->view['basket']['checkout']['comment']??''); + $strRevocation = (string)$this->get_option('wpsg_ps_mailwiderruf'); ?>render(WPSG_PATH_VIEW.'/mailtemplates/html/html_head.phtml'); ?> -

- -

+

+ +

-view['auftrag_note'])) { ?> -

-

view['auftrag_note'] ?>

- + +

+

+ render(WPSG_PATH_VIEW.'/mailtemplates/html/customer.phtml'); ?> -

:

+

:

-render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?> +render(WPSG_PATH_VIEW.'/mailtemplates/html/order.phtml'); ?> -callMods('mail_aftercalculation', array(&$this->view['order']['id'])); ?> +callMods('mail_aftercalculation', [&$this->view['order']['id']]); ?> -view['basket']['checkout']['comment'])) { ?> -

-

view['basket']['checkout']['comment'] ?>

+ +

+


-

+

+ +

Allgemeinen Geschäftsbedingungen (AGB).', 'wpsg'), esc_url($this->getURL(wpsg_ShopController::URL_AGB)))); ?>

-

Allgemeinen Geschäftsbedingungen (AGB).', 'wpsg'), $this->getURL(wpsg_ShopController::URL_AGB)); ?>

- -

+

-get_option("wpsg_ps_mailwiderruf"))) { ?> -

get_option("wpsg_ps_mailwiderruf"); ?>

+ +

- + - -

-

-

get_option('wpsg_shopdata_name'), 'wpsg'); ?> -

+

+ +

+

get_option('wpsg_shopdata_name'), 'wpsg')); ?> -

render(WPSG_PATH_VIEW.'/mailtemplates/html/html_foot.phtml'); ?> - \ No newline at end of file diff --git a/views/mods/mod_auftragsbestaetigung/order_view.phtml b/views/mods/mod_auftragsbestaetigung/order_view.phtml index c792085..0069137 100644 --- a/views/mods/mod_auftragsbestaetigung/order_view.phtml +++ b/views/mods/mod_auftragsbestaetigung/order_view.phtml @@ -1,53 +1,49 @@ - +view['data']['id']??0); + $bCanSetStatus = (($this->view['wpsg_mod_auftragsbestaetigung']['canSetStatus']??false) === true); + $bSetStatus = (($this->view['wpsg_mod_auftragsbestaetigung']['setstatus']??true) === true); + +?> - -
+ +
- +

- - + + + +

- +
- -
+ + +
-
+ +
+ + +
+ + + +
- +
- + \ No newline at end of file diff --git a/views/mods/mod_auftragsbestaetigung/settings_edit.phtml b/views/mods/mod_auftragsbestaetigung/settings_edit.phtml new file mode 100644 index 0000000..f0c147c --- /dev/null +++ b/views/mods/mod_auftragsbestaetigung/settings_edit.phtml @@ -0,0 +1,8 @@ + +view['wpsg_mod_auftragsbestaetigung']['setstatus'], ['help' => 'wpsg_mod_auftragsbestaetigung_setstatus']); ?> \ No newline at end of file -- cgit v1.2.3