diff options
Diffstat (limited to 'views/order')
| -rw-r--r-- | views/order/product_table.phtml | 35 | ||||
| -rw-r--r-- | views/order/view_dev.phtml | 18 |
2 files changed, 39 insertions, 14 deletions
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index 9bbbb3e..3d6cee5 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -303,20 +303,27 @@ <strong><?php echo wpsg_ff($arCalculation['sum']['brutto']); ?> <?php echo $this->get_option('wpsg_currency'); ?></strong>
</td>
</tr>
- <?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum'] > 0 && $tax['key'] != '0') { ?>
- <tr class="wpsg_row_mwst wpsg_row_small">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
- <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
- <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
- <?php } else { ?>
- <?php echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>
- <?php } ?>
- </td>
- <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
- <?php echo wpsg_ff($tax['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
- <?php } } ?>
+
+ <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
+ <tr class="wpsg_row_mwst wpsg_row_small">
+ <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis" colspan="<?php echo $this->view['colspan'] + 1; ?>">
+ <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
+ </td>
+ </tr>
+ <?php } else { ?>
+
+ <?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum'] > 0 && $tax['key'] != '0') { ?>
+ <tr class="wpsg_row_mwst wpsg_row_small">
+ <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+ <?php echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>
+ </td>
+ <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+ <?php echo wpsg_ff($tax['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+ </td>
+ </tr>
+ <?php } } ?>
+
+ <?php } ?>
<?php } ?>
diff --git a/views/order/view_dev.phtml b/views/order/view_dev.phtml index abf0e60..6a3c9f7 100644 --- a/views/order/view_dev.phtml +++ b/views/order/view_dev.phtml @@ -31,6 +31,24 @@ </div>
</div>
</div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading" data-toggle="collapse" href="#collapse_calculation" style="cursor:pointer;">
+ <h4 class="panel-title"><?php echo __('Kalkulation (live from Db)', 'wpsg'); ?></h4>
+ </div>
+ <div id="collapse_calculation" class="panel-collapse collapse">
+ <div class="panel-body">
+ <pre><?php
+
+ $oCalculaiton = \wpsg\wpsg_calculation::getOrderCalculation($_REQUEST['edit_id'], true);
+ $arCalculation = $oCalculaiton->getCalculationArray(true);
+
+ wpsg_debug($arCalculation);
+
+ ?></pre>
+ </div>
+ </div>
+ </div>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
|