diff options
Diffstat (limited to 'views/order')
| -rw-r--r-- | views/order/product_table.phtml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index 37533bb..e568fd3 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -178,7 +178,8 @@ <tr class="wpsg_row_shipping">
<td class="wpsg_cell_shipping_label" colspan="2">
<?php echo __('Versandkosten', 'wpsg'); ?>
- <?php echo __(' ('.$this->arShipping[$arCalculation['shipping'][0]['shipping_key']]['name'].')', 'wpsg'); ?>
+ <?php /* Über getShippingName(), die Versandart der Bestellung kann inzwischen deaktiviert oder gelöscht sein */ ?>
+ (<?php echo esc_html($this->getShippingName((string)($arCalculation['shipping'][0]['shipping_key'] ?? ''), true)); ?>)
<a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Versandart ändern', 'wpsg'); ?>" onclick="return WPSG_BE_Pay_Ship.changeShippingPayment();"><span class="glyphicon glyphicon-pencil"></span></a>
</td>
<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
@@ -206,7 +207,16 @@ <tr class="wpsg_row_payment">
<td colspan="2" class="wpsg_cell_payment_label">
<?php echo __('Zahlungsart', 'wpsg'); ?>
- <?php echo __(' ('.$this->arPayment[$arCalculation['payment'][0]['payment_key']]['name'].')', 'wpsg'); ?>
+ <?php
+
+ // Die Zahlungsart der Bestellung kann inzwischen deaktiviert oder gelöscht sein
+ $payment_key = (string)($arCalculation['payment'][0]['payment_key'] ?? '');
+ $payment_name = (string)$this->getPaymentName($payment_key, intval($this->view['data']['id'] ?? 0));
+
+ if ($payment_name === '') $payment_name = wpsg_translate(__('Deaktivierte Zahlungsart (#1#)', 'wpsg'), $payment_key);
+
+ ?>
+ (<?php echo esc_html($payment_name); ?>)
<a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>" onclick="return WPSG_BE_Pay_Ship.changeShippingPayment();"><span class="glyphicon glyphicon-pencil"></span></a>
</td>
<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
|