diff options
| -rw-r--r-- | views/css/wpsg-theme.css | 8 | ||||
| -rw-r--r-- | views/warenkorb/checkout_summary.phtml | 32 |
2 files changed, 29 insertions, 11 deletions
diff --git a/views/css/wpsg-theme.css b/views/css/wpsg-theme.css index 7dd86e3..3cdfa58 100644 --- a/views/css/wpsg-theme.css +++ b/views/css/wpsg-theme.css @@ -182,10 +182,10 @@ .wpsg-checkout__summary { padding:calc(var(--wpsg-gap) * 1.5); border:var(--wpsg-field-border); border-radius:var(--wpsg-radius); background:var(--wpsg-color-surface); } .wpsg-checkout__summary-title { margin:0 0 0.75em; font-size:1.25em; } .wpsg-checkout__summary-items { margin:0; padding:0; list-style:none; } -.wpsg-checkout__summary-row { display:flex; justify-content:space-between; gap:var(--wpsg-gap); margin:0 0 0.5em; } -.wpsg-checkout__summary-row > span:last-child { white-space:nowrap; text-align:right; } -.wpsg-checkout__summary-row > span:first-child { overflow-wrap:break-word; hyphens:auto; } -.wpsg-checkout__summary-variant { display:block; font-size:var(--wpsg-font-size-small); opacity:var(--wpsg-muted-opacity); } +.wpsg-checkout__summary-row { display:flex; flex-wrap:wrap; justify-content:space-between; column-gap:var(--wpsg-gap); margin:0 0 0.5em; } +.wpsg-checkout__summary-row > span:last-child { margin-left:auto; white-space:nowrap; text-align:right; } +.wpsg-checkout__summary-row > span:first-child { flex:1 1 0; min-width:min-content; overflow-wrap:break-word; hyphens:manual; } +.wpsg-checkout__summary-variant, .wpsg-checkout__summary-detail { display:block; font-size:var(--wpsg-font-size-small); opacity:var(--wpsg-muted-opacity); } .wpsg-checkout__summary-row.is-muted, .wpsg-checkout__summary-tax { opacity:var(--wpsg-muted-opacity); } .wpsg-checkout__summary-total { margin-top:0.75em; padding-top:0.75em; border-top:var(--wpsg-field-border); font-weight:700; font-size:1.1em; } .wpsg-checkout__summary-tax { margin:0.25em 0 0; font-size:var(--wpsg-font-size-small); } diff --git a/views/warenkorb/checkout_summary.phtml b/views/warenkorb/checkout_summary.phtml index bbb3a4b..cd0979e 100644 --- a/views/warenkorb/checkout_summary.phtml +++ b/views/warenkorb/checkout_summary.phtml @@ -3,7 +3,7 @@ /** * „Ihre Bestellung“ neben dem Formular der Kasse, nur im Modus „neu“ (Punkt 8.10) * - * Posten, Versand, Zahlungsgebühr, Rabatt, Summe und die enthaltene MwSt. aus dem Warenkorb ($this->view['basket']). + * Posten, Versandkosten, Zahlungsart, Rabatt, Summe und die enthaltene MwSt. aus dem Warenkorb ($this->view['basket']). * @version 4.6.1 */ @@ -12,6 +12,11 @@ $arBasket = (array)($this->view['basket']??[]); $arSum = (array)($arBasket['sum']??[]); $currency = $this->get_option('wpsg_currency'); + $arCheckout = (array)($arBasket['checkout']??[]); + $shipping_name = (string)($this->arShipping[$arCheckout['shipping']??'']['name']??''); + $payment_name = (string)($this->arPayment[$arCheckout['payment']??'']['name']??''); + $bKU = (get_option('wpsg_kleinunternehmer') == '1'); + $bNetto = (!$bKU && $this->getFrontendTaxview() == WPSG_NETTO); ?> <aside class="wpsg-checkout__summary" aria-labelledby="wpsg-checkout-summary-title"> @@ -39,28 +44,41 @@ </div> <?php } ?> - <?php if (isset($arSum['preis_shipping'])) { ?> + <?php if (isset($arSum['preis_shipping']) && (wpsg_tf($arSum['preis_shipping']) != 0 || $this->get_option('wpsg_hideemptyshipping') != '1')) { ?> <div class="wpsg-checkout__summary-row is-muted"> - <span><?php echo esc_html__('Versand', 'wpsg'); ?></span> + <span><?php echo esc_html__('Versandkosten', 'wpsg'); ?><?php if ($shipping_name !== '') { ?> <span class="wpsg-checkout__summary-detail"><?php echo esc_html(__($shipping_name, 'wpsg')); ?></span><?php } ?></span> <span><?php echo esc_html(wpsg_ff($arSum['preis_shipping'], $currency)); ?></span> </div> <?php } ?> <?php if (wpsg_tf($arSum['preis_payment']??0) != 0) { ?> <div class="wpsg-checkout__summary-row is-muted"> - <span><?php echo esc_html__('Zahlungsart', 'wpsg'); ?></span> + <span><?php echo esc_html__('Zahlungsart', 'wpsg'); ?><?php if ($payment_name !== '') { ?> <span class="wpsg-checkout__summary-detail"><?php echo esc_html(__($payment_name, 'wpsg')); ?></span><?php } ?></span> <span><?php echo esc_html(wpsg_ff($arSum['preis_payment'], $currency)); ?></span> </div> <?php } ?> + <?php if ($bNetto) { /* wie der Warenkorb: netto, zzgl. MwSt., brutto */ ?> + <div class="wpsg-checkout__summary-row"> + <span><?php echo esc_html__('Gesamtpreis (Netto)', 'wpsg'); ?></span> + <span><?php echo esc_html(wpsg_ff($arSum['preis_gesamt_netto']??0, $currency)); ?></span> + </div> + <?php foreach ((array)($arBasket['mwst']??[]) as $mwst) { ?> + <div class="wpsg-checkout__summary-row is-muted"> + <span><?php /* translators: %s: Steuersatz */ echo esc_html(sprintf(__('zzgl. MwSt. (%s)', 'wpsg'), __($mwst['name'], 'wpsg'))); ?></span> + <span><?php echo esc_html(wpsg_ff($mwst['sum'], $currency)); ?></span> + </div> + <?php } ?> + <?php } ?> + <div class="wpsg-checkout__summary-row wpsg-checkout__summary-total"> - <span><?php echo esc_html__('Summe', 'wpsg'); ?></span> + <span><?php echo esc_html($bNetto?__('Gesamtpreis (Brutto)', 'wpsg'):__('Summe', 'wpsg')); ?></span> <span><?php echo esc_html(wpsg_ff($arSum['preis_gesamt_brutto']??0, $currency)); ?></span> </div> - <?php if (get_option('wpsg_kleinunternehmer') == '1') { ?> + <?php if ($bKU) { ?> <p class="wpsg-checkout__summary-tax"><?php echo wp_kses_post((string)get_option('wpsg_kleinunternehmer_text')); ?></p> - <?php } else { foreach ((array)($arBasket['mwst']??[]) as $mwst) { ?> + <?php } else if (!$bNetto) { foreach ((array)($arBasket['mwst']??[]) as $mwst) { ?> <p class="wpsg-checkout__summary-tax"><?php /* translators: 1: Steuersatz, 2: Betrag */ echo esc_html(sprintf(__('enthält MwSt. (%1$s): %2$s', 'wpsg'), __($mwst['name'], 'wpsg'), wpsg_ff($mwst['sum'], $currency))); ?></p> <?php } } ?> |