diff options
| author | karl <noreply@maennchen1.de> | 2023-04-04 08:58:24 +0000 |
|---|---|---|
| committer | karl <noreply@maennchen1.de> | 2023-04-04 08:58:24 +0000 |
| commit | dac3af0cc638758a328fa358d1afef8aa957a697 (patch) | |
| tree | c5ac1948a7eac3103bcd419d717a602752865e00 | |
| parent | a38ad887405ca225dc107ba689ace16e91bf51a2 (diff) | |
- Bugfix: Rechnungsmodul: Umleitung nach invoiceAction/stornoAction behoben4.4.3
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8267 0d5edaf7-2b12-4e95-93f4-047927463d4b
| -rwxr-xr-x | views/mods/mod_rechnungen/order_view_orderdata_after.phtml | 4 | ||||
| -rw-r--r-- | views/order/product_table.phtml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/views/mods/mod_rechnungen/order_view_orderdata_after.phtml b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml index da518dc..1ba5e00 100755 --- a/views/mods/mod_rechnungen/order_view_orderdata_after.phtml +++ b/views/mods/mod_rechnungen/order_view_orderdata_after.phtml @@ -207,7 +207,7 @@ window.setTimeout(function() { location.href = '<?php - echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()]); + echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()], [], true); ?>'; }, 1000); @@ -337,7 +337,7 @@ window.setTimeout(function() { location.href = '<?php - echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()]); + echo wpsg_admin_url('Order', 'view', ['edit_id' => $oOrder->getId()], [], true); ?>'; }, 1000); diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index f0f7117..39ef05d 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -178,7 +178,6 @@ </td>
<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <!-- <td><?php // echo $arTaxShort[$arCalculation['shipping'][0]['tax_key']]; ?></td> -->
<td><?php echo (($arCalculation['shipping'][0]['brutto'] === $arCalculation['shipping'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['shipping'][0]['tax_key']]); ?></td>
<?php } ?>
@@ -207,7 +206,6 @@ </td>
<?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <!-- <td><?php // echo $arTaxShort[$arCalculation['payment'][0]['tax_key']]; ?></td> -->
<td><?php echo (($arCalculation['payment'][0]['brutto'] === $arCalculation['payment'][0]['netto'])?wpsg_ff(0, '%'):$arTaxShort[$arCalculation['payment'][0]['tax_key']]); ?></td>
<?php } ?>
|