diff options
Diffstat (limited to 'views/order')
| -rw-r--r-- | views/order/backendEdit/editPayShipping.phtml | 10 | ||||
| -rw-r--r-- | views/order/view_orderdata.phtml | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml index 04392cc..06dafc5 100644 --- a/views/order/backendEdit/editPayShipping.phtml +++ b/views/order/backendEdit/editPayShipping.phtml @@ -34,15 +34,15 @@ if ($this->getBackendTaxview() === WPSG_BRUTTO) {
- $price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['brutto_single']), $this->get_option('wpsg_currency'));
- $price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['brutto_single']), $this->get_option('wpsg_currency'));
+ $price_shipping = wpsg_ff($arCalculation['shipping'][0]['brutto_calculated_single']??0, $this->get_option('wpsg_currency'));
+ $price_payment = wpsg_ff($arCalculation['payment'][0]['brutto_single_calculated']??0, $this->get_option('wpsg_currency'));
$price_suffix = ' ('.__('Brutto', 'wpsg').')';
} else {
- $price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['netto_single']), $this->get_option('wpsg_currency'));
- $price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['netto_single']), $this->get_option('wpsg_currency'));
+ $price_shipping = wpsg_ff($arCalculation['shipping'][0]['netto_calculated_single']??0, $this->get_option('wpsg_currency'));
+ $price_payment = wpsg_ff($arCalculation['payment'][0]['netto_calculated_single']??0, $this->get_option('wpsg_currency'));
$price_suffix = ' ('.__('Netto', 'wpsg').')';
@@ -51,7 +51,7 @@ ?>
<div id="editPayShipping">
-
+ <?php wpsg_debug($price_shipping); ?>
<?php echo wpsg_drawForm_Select('edit_shipping_type', __('Versandart', 'wpsg'), $arShippingSelect,$this->view['data']['type_shipping']); ?>
<?php echo wpsg_drawForm_Input('edit_shipping_price', __('Kosten', 'wpsg').$price_suffix, $price_shipping); ?>
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index d40ce6a..851175f 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -8,7 +8,17 @@ ?>
<div id="wpsg_produkte_table">
+
+ <?php
+ // $oCalculation = new \wpsg\wpsg_calculation();
+ // $oCalculation->fromDB(525);
+ // $oCalculation->addProduct($_REQUEST['add_price'], $this->shop->getBackendTaxview(), $oProduct->mwst_key, $_REQUEST['add_amount'], $product_key, $product_index, $order_product_id, $eu);
+ // wpsg_debug($oCalculation->getCalculationArray()['product']);
+ // die();
+
+ ?>
+
<?php echo wpsg_drawForm_AdminboxStart(__('Bestelldaten', 'wpsg')); ?>
<div id="wpsg_product_table_wrap">
|