diff options
| -rw-r--r-- | views/admin/form/input.phtml | 6 | ||||
| -rw-r--r-- | views/css/admin.css | 10 | ||||
| -rw-r--r-- | views/js/admin.js | 26 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/add.phtml | 156 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/basket_row_end_coupon.phtml | 50 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/index.phtml | 124 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/overview_row_end_coupon.phtml | 52 | ||||
| -rw-r--r-- | views/order/backendEdit/addVoucher.phtml | 28 | ||||
| -rw-r--r-- | views/order/product_table.phtml | 81 | ||||
| -rw-r--r-- | views/order/view_orderdata.phtml | 8 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 53 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 44 |
12 files changed, 491 insertions, 147 deletions
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index 08278d2..a55e454 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -8,7 +8,7 @@ <input
type="<?php echo wpsg_getStr($this->view['field_config']['type'], 'text'); ?>"
class="form-control input-sm"
- name="<?php echo $this->view['field_name']; ?>"
+ name="<?php echo $this->view['field_name']; ?>"
tabindex="<?php
if (!isset($GLOBALS['wpsg']['tabindex']))
@@ -51,7 +51,7 @@ </div>
<?php if (wpsg_isTrue($this->view['field_config']['datepicker'])) { ?>
- <script type="text/javascript">/* <![CDATA[ */
+ <script>
jQuery(document).ready(function() {
@@ -59,7 +59,7 @@ } );
- /* ]]> */</script>
+ </script>
<?php } ?>
<div class="clearfix wpsg_clear"></div>
diff --git a/views/css/admin.css b/views/css/admin.css index 1d67d0c..27b8727 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -7,6 +7,8 @@ .wpsg_flex_justify_content_space_between { justify-content:space-between; }
.wpsg_flex_align_items_center { align-items:center; }
+.ajax_loading { position:absolute; display:flex; align-items:center; justify-content:center; left:0px; top:0px; width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); z-index:1000000; }
+
/* Bootstrap Teil */
#wpsg-bs { margin-top:20px; min-width:1000px; }
#wpsg-bs .updated,
@@ -123,7 +125,7 @@ .wphb_clear { clear:none !important; }
/* Datepicker */
-#ui-datepicker-div { z-index:3 !important; }
+#ui-datepicker-div { z-index:1151221 !important; }
/* Kundenkontakt */
.wpsg_kundenkontakt_template,
@@ -376,7 +378,13 @@ .wpsg_mod_voucher_fieldtable .col_color { width:80px; }
.wpsg_mod_voucher_fieldtable .col_groesse { width:60px; }
.wpsg_voucher .wpsg_status_link_wrap { min-height:50px; float:left; display:inline-block; }
+.wpsg_voucher td .actions { opacity:1; font-size: 0.9em; }
+.wpsg_voucher td:hover .actions { opacity:1; }
+
+@media (min-width: 768px) {
+ #wpsg_voucher_dialog > .modal-dialog { width:1000px; }
+}
/* Modul Lieferschein/Rechnung */
.wpsg_mod_deliverynote_fieldtable { font-size:12px; }
diff --git a/views/js/admin.js b/views/js/admin.js index c466f59..2e36305 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -1,3 +1,27 @@ +function wpsg_loading(selector) {
+
+ var jqSel = jQuery(selector);
+
+ jqSel.css( {
+ 'position': 'relative',
+ 'display': 'block',
+ 'width': jqSel.width(),
+ 'height': jqSel.height(true)
+ } );
+
+ jqSel.append('<div class="ajax_loading"><img class="loading" src="' + wpsg_ajax.img_ajaxloading + '" alt="Bitte warten" /></div>');
+
+}
+
+function wpsg_loading_done(selector) {
+
+ var jqSel = jQuery(selector);
+
+ jqSel.find('.ajax_loading').remove();
+
+}
+
+
wpsg_number_format = function (number, decimals, dec_point, thousands_sep) {
var n = !isFinite(+number) ? 0 : + number, prec = !isFinite(+decimals) ? 0 : Math.abs(decimals),
@@ -208,7 +232,7 @@ function wpsg_in_array(needle, haystack) return false;
- } );
+ } ).css('pointer-events', 'auto');
}
diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml index 2bd6fec..b6b4b6a 100644 --- a/views/mods/mod_gutschein/add.phtml +++ b/views/mods/mod_gutschein/add.phtml @@ -3,97 +3,93 @@ /**
* Template für die Maske eines neuen Gutscheins
*/
-
+
?>
-<div class="wpsg_voucher" id="wpsg-bs">
+<div class="content form-horizontal">
- <nav class="navbar navbar-default">
+ <form method="POST" id="wpsg_voucher_form" autocomplete="off">
- <div class="container-fluid">
- <div class="navbar-header">
- <a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
+ <?php wpsg_drawForm_AdminboxStart(); ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_value', __('Betrag', 'wpsg'), wpsg_ff($this->view['mod_gutschein']['value'])); ?>
+
+ <div style="margin-top:-15px;">
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_coupon', __('Als Wertgutschein behandeln', 'wpsg'), $this->view['mod_gutschein']['coupon']); ?>
</div>
- <div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">
- <ul class="nav navbar-nav">
- <li role="presentation" class="wpsg-voucher-tab-a active"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=index"><?php echo __("Gutscheinverwaltung", "wpsg"); ?></a></li>
- <li role="presentation" class="active"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Neuer Gutschein", "wpsg"); ?></a></li>
- </ul>
- <ul class="nav navbar-nav navbar-right">
-
- </ul>
+
+ <div class="wpsg_mod_gutschein_coupon wpsg_mod_gutschein_coupon_0">
+ <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_calc', __('Berechnung', 'wpsg'), array(
+ 'w' => __('Absoluter Betrag', 'wpsg'),
+ 'p' => __('Prozentual', 'wpsg')
+ ), $this->view['mod_gutschein']['calc']); ?>
</div>
- </div>
-
- </nav>
-
- <div class="wpsg_clear"></div>
-
- <div class="content form-horizontal">
-
- <form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=save&noheader=1" enctype="multipart/form-data">
-
- <?php wpsg_drawForm_AdminboxStart(); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_value', __('Wert', 'wpsg'), $this->view['mod_gutschein']['value']); ?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_calc', __('Berechnung', 'wpsg'), array(
- 'w' => __('Absoluter Betrag', 'wpsg'),
- 'p' => __('Prozentual', 'wpsg')
- ), $this->view['mod_gutschein']['calc']); ?>
-
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_start', __('Gültig ab', 'wpsg'), $this->view['mod_gutschein']['start'], array('datepicker' => true)); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_end', __('Gültig bis', 'wpsg'), $this->view['mod_gutschein']['end'], array('datepicker' => true)); ?>
-
- <?php if (!wpsg_isSizedInt($this->view['edit_id'])) { ?>
-
- <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_gen', __('Code Generierung', 'wpsg'), array(
- '0' => __('Automatisch', 'wpsg'),
- '1' => __('Manuell', 'wpsg')
- ), wpsg_getStr($this->view['mod_gutschein']['gen']), array('help' => 'wpsg_mod_gutschein_gen')); ?>
- <div id="wpsg_mod_gutschein_layercode">
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_code', __('Code', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?>
- </div>
-
- <?php } else { ?>
-
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_code', __('Code', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?>
-
- <?php } ?>
-
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_minvalue', __('Minimaler Warenwert', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['minvalue']), array('help' => 'wpsg_mod_gutschein_minvalue')); ?>
-
- <?php if (!wpsg_isSizedInt($this->view['edit_id'])) { ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_count', __('Menge', 'wpsg'), $this->view['mod_gutschein']['count']); ?>
- <?php } ?>
-
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_multi', __('Mehrfach verwendbar', 'wpsg'), $this->view['mod_gutschein']['multi']); ?>
- <?php echo wpsg_drawForm_Textarea('wpsg_mod_gutschein_comment', __('Kommentar', 'wpsg'), @$this->view['mod_gutschein']['comment']); ?>
- <?php if ($this->hasMod('wpsg_mod_productgroups') && wpsg_isSizedArray($this->view['wpsg_mod_gutschein']['arProductGroups'])) { ?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_productgroups', __('Beschränkung auf Produktgruppen', 'wpsg'), $this->view['wpsg_mod_gutschein']['arProductGroups'], $this->view['mod_gutschein']['productgroups'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?>
- <?php } ?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_products', __('Beschränkung auf Produkte', 'wpsg'), @$this->view['wpsg_mod_gutschein']['arProducts'], @$this->view['mod_gutschein']['products'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProducts']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProducts'])), 'help' => 'wpsg_mod_gutschein_products')); ?>
- <?php echo wpsg_drawForm_AdminboxEnd(); ?>
-
- <?php if (wpsg_isSizedInt($this->view['edit_id'])) { ?>
-
- <input type="hidden" name="edit_id" value="<?php echo $this->view['edit_id']; ?>" />
- <input type="submit" value="<?php echo __('Gutschein speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
-
- <?php } else { ?>
-
- <input type="submit" value="<?php echo __('Gutschein anlegen', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
-
- <?php } ?>
-
- </form>
-
- </div>
+
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_start', __('Gültig ab', 'wpsg'), $this->view['mod_gutschein']['start'], array('datepicker' => true)); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_end', __('Gültig bis', 'wpsg'), $this->view['mod_gutschein']['end'], array('datepicker' => true)); ?>
+
+ <?php if (!wpsg_isSizedInt($this->view['edit_id'])) { ?>
+
+ <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_gen', __('Code Generierung', 'wpsg'), array(
+ '0' => __('Automatisch', 'wpsg'),
+ '1' => __('Manuell', 'wpsg')
+ ), wpsg_getStr($this->view['mod_gutschein']['gen']), array('help' => 'wpsg_mod_gutschein_gen')); ?>
+ <div id="wpsg_mod_gutschein_layercode">
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_code', __('Code', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?>
+ </div>
+
+ <?php } else { ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_code', __('Code', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['code']), array('help' => 'wpsg_mod_gutschein_code')); ?>
+
+ <?php } ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_minvalue', __('Minimaler Warenwert', 'wpsg'), wpsg_getStr($this->view['mod_gutschein']['minvalue']), array('help' => 'wpsg_mod_gutschein_minvalue')); ?>
+
+ <?php if (!wpsg_isSizedInt($this->view['edit_id'])) { ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_count', __('Menge', 'wpsg'), $this->view['mod_gutschein']['count']); ?>
+ <?php } ?>
+
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_multi', __('Mehrfach verwendbar', 'wpsg'), $this->view['mod_gutschein']['multi']); ?>
+ <?php echo wpsg_drawForm_Textarea('wpsg_mod_gutschein_comment', __('Kommentar', 'wpsg'), @$this->view['mod_gutschein']['comment']); ?>
+ <?php if ($this->hasMod('wpsg_mod_productgroups') && wpsg_isSizedArray($this->view['wpsg_mod_gutschein']['arProductGroups'])) { ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_productgroups', __('Beschränkung auf Produktgruppen', 'wpsg'), $this->view['wpsg_mod_gutschein']['arProductGroups'], $this->view['mod_gutschein']['productgroups'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProductGroups']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProductGroups'])), 'help' => 'wpsg_mod_gutschein_productgroups')); ?>
+ <?php } ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_gutschein_products', __('Beschränkung auf Produkte', 'wpsg'), @$this->view['wpsg_mod_gutschein']['arProducts'], @$this->view['mod_gutschein']['products'], array('multiple' => ((sizeof($this->view['wpsg_mod_gutschein']['arProducts']) > 5)?5:sizeof($this->view['wpsg_mod_gutschein']['arProducts'])), 'help' => 'wpsg_mod_gutschein_products')); ?>
+ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+ <?php if (wpsg_isSizedInt($this->view['edit_id'])) { ?>
+
+ <input type="hidden" name="voucher_id" value="<?php echo $this->view['edit_id']; ?>" />
+
+ <?php } ?>
+
+ </form>
</div>
-<script type="text/javascript">/* <![CDATA[ */
+<script>
jQuery(document).ready(function() {
+ wpsg_ajaxBind();
+
+ jQuery('#wpsg_mod_gutschein_coupon').on('change', function() {
+
+ jQuery('.wpsg_mod_gutschein_coupon').hide();
+
+ if (jQuery(this).prop('checked')) {
+
+ jQuery('.wpsg_mod_gutschein_coupon_1').show();
+
+ } else {
+
+ jQuery('.wpsg_mod_gutschein_coupon_0').show();
+
+ }
+
+ }).change();
+
jQuery('#wpsg_mod_gutschein_gen').bind('change', function() {
if (jQuery(this).val() == '1')
@@ -113,4 +109,4 @@ } );
-/* ]]> */</script>
\ No newline at end of file +</script>
\ No newline at end of file diff --git a/views/mods/mod_gutschein/basket_row_end_coupon.phtml b/views/mods/mod_gutschein/basket_row_end_coupon.phtml new file mode 100644 index 0000000..95f8f43 --- /dev/null +++ b/views/mods/mod_gutschein/basket_row_end_coupon.phtml @@ -0,0 +1,50 @@ +<?php
+
+ /**
+ * User: Daschmi (daschmi@daschmi.de)
+ * Date: 20.07.2019
+ * Time: 15:47
+ */
+
+ $arCalculation = &$this->view['basket']['arCalculation'];
+
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
+
+?>
+
+<?php foreach ($arCalculation['coupon'] as $gs) { ?>
+
+ <div class="basket_sum_row">
+ <div class="title">
+ <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $this->getRemoveLinkURL('voucher_'.$gs['id'])); ?>" title="<?php echo __('Wertgutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Wertgutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
+ <?php echo __('Wertgutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>
+ </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
+ <?php } ?>
+ <div class="value"><?php
+
+ echo '-'.wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
+
+ if (strpos($gs['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
+
+ }
+
+ ?></div>
+
+ </div>
+
+<?php } ?>
+
+<div class="basket_sum_row">
+ <div class="title2">
+ <?php echo __('Zu zahlen', 'wpsg'); ?>:
+ </div>
+ <div class="sum">
+ <?php echo wpsg_ff($arCalculation['sum']['topay_brutto'], $this->get_option('wpsg_currency')); ?>
+ </div>
+</div>
+<div class="wpsg_spacer"></div>
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml index fc6ddb0..4582533 100644 --- a/views/mods/mod_gutschein/index.phtml +++ b/views/mods/mod_gutschein/index.phtml @@ -17,7 +17,7 @@ <ul class="nav navbar-nav">
<li role="presentation" class="wpsg-voucher-tab-a active"><a href="#" onclick="return false;"><?php echo __("Gutscheinverwaltung", "wpsg"); ?></a></li>
<li role="presentation" class="wpsg-voucher-tab-a wpsg_showhide_filter <?php echo ((($this->view['hasFilter']) && (wpsg_getStr($this->view['arFilter']['s']) != ''))?'active':''); ?>" id="wpsg-voucher-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
- <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
+ <li role="presentation" class="wpsg-voucher-add" onclick="return false;"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=import&noheader=1"><span class="glyphicon glyphicon-import"></span><?php echo __("Import", "wpsg"); ?></a></li>
@@ -90,21 +90,35 @@ <?php /* <td class="col_code"><?php echo $oVoucher->code; ?></td> */ ?>
<td class="col_code">
- <a title="<?php echo __('Gutschein bearbeiten', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=edit&edit_id=<?php echo $oVoucher->id; ?>"><?php echo $oVoucher->code; ?></a>
+ <span><?php echo $oVoucher->code; ?></span><br />
<?php if ($this->hasMod('wpsg_mod_voucherproduct') && $oVoucher->isAutoCreated()) { ?>
[ <a href="<?php echo WPSG_URL_WP . 'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_voucherproduct&gs_id='.$oVoucher->id.'&order_id='.$oVoucher->autocreate_order.'&noheader=1&cmd=getVoucher'; ?>"><?php echo __('PDF', 'wpsg'); ?></a> ]
<?php } ?>
+
+ <div class="actions">
+ <span class="edit"><a title="<?php echo __("Diesen Gutschein bearbeiten", "wpsg"); ?>" href="#" class="wpsg_voucher_edit" onclick="return false;" data-voucher_id="<?php echo $oVoucher->getId(); ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
+ |
+ <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diesen Gutschein löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Gutschein löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_gutschein&subaction=delete&noheader=1&voucher_id=<?php echo $oVoucher->getId(); ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
+ </div>
</td>
- <td class="col_start"><?php echo wpsg_formatTimestamp($oVoucher->start_date); ?></td>
- <td class="col_end"><?php echo wpsg_formatTimestamp($oVoucher->end_date); ?></td>
- <td class="col_value"><?php
+ <td class="col_start"><?php echo wpsg_formatTimestamp($oVoucher->start_date, true); ?></td>
+ <td class="col_end"><?php echo wpsg_formatTimestamp($oVoucher->end_date, true); ?></td>
+ <td class="col_value"><span><?php
if ($oVoucher->calc_typ == 'w') echo wpsg_ff($oVoucher->value, $this->get_option('wpsg_currency'));
else if ($oVoucher->calc_typ == 'p') echo wpsg_ff($oVoucher->value, '%');
- ?></td>
+ ?></span><?php
+
+ if ($oVoucher->isCoupon()) {
+
+ echo '<br />'.__('Wertgutschein', 'wpsg');
+
+ }
+
+ ?></td>
<td class="col_status">
<?php $comment = $oVoucher->comment; if (wpsg_isSizedString($comment)) { ?>
@@ -123,7 +137,7 @@ </td>
</tr>
- <?php } ?>
+ <?php } ?>
</tbody>
</table>
@@ -134,14 +148,17 @@ </div>
</form>
-
- <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>
+ <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>
<?php } else { ?>
+
+ <div class="table wpsg_clear">
+
+ <?php echo wpsg_drawForm_AdminboxStart(); ?>
+ <?php echo __('Keine Gutscheine in der Datenbank.', 'wpsg'); ?>
+ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
- <?php echo wpsg_drawForm_AdminboxStart(); ?>
- <?php echo __('Keine Gutscheine in der Datenbank.', 'wpsg'); ?>
- <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+ </div>
<?php } ?>
@@ -149,12 +166,95 @@ </div>
+<!-- Modaldialog für Gutscheine -->
+<div class="modal fade" id="wpsg_voucher_dialog" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+ <h4 class="modal-title" id="myModalLabel"><?php echo __('Gutschein hinzufügen/bearbeiten', 'wpsg'); ?></h4>
+ </div>
+ <div class="modal-body"></div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Abbrechen', 'wpsg'); ?></button>
+ <button type="button" class="btn btn-primary wpsg-voucher-save" onclick="return false;"><?php echo __('OK', 'wpsg'); ?></button>
+ </div>
+ </div>
+ </div>
+</div>
+
<script type="text/javascript">/* <![CDATA[ */
<?php if (wpsg_isSizedString($this->view['arFilter']['order']) && wpsg_isSizedString($this->view['arFilter']['ascdesc'])) { ?>
jQuery('th[data-order="<?php echo $this->view['arFilter']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['arFilter']['ascdesc']); ?>');
<?php } ?>
+
+ jQuery('.wpsg-voucher-add').on('click', function() {
+
+ jQuery('#wpsg_voucher_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+ jQuery('#wpsg_voucher_dialog').modal( { } ).modal('show');
+ jQuery.ajax({
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_gutschein&subaction=addedit&noheader=1',
+ success: function(data) {
+
+ jQuery('#wpsg_voucher_dialog .modal-body').html(data);
+
+ }
+ });
+
+ return false;
+
+ }).attr("onclick", null);
+
+ jQuery('.wpsg_voucher_edit').on('click', function() {
+
+ jQuery('#wpsg_voucher_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+ jQuery('#wpsg_voucher_dialog').modal( { } ).modal('show');
+
+ jQuery.ajax({
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_gutschein&subaction=addedit&noheader=1&voucher_id=' + jQuery(this).data("voucher_id"),
+ success: function(data) {
+
+ jQuery('#wpsg_voucher_dialog .modal-body').html(data);
+
+ }
+ });
+
+ return false;
+
+ }).attr("onclick", null);
+
+ jQuery('.wpsg-voucher-save').on('click', function() {
+
+ //jQuery('#wpsg_voucher_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+ //jQuery('#wpsg_voucher_dialog').modal('hide');
+
+ wpsg_loading('#wpsg_voucher_dialog .modal-body');
+
+ jQuery.ajax({
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_gutschein&subaction=save&noheader=1',
+ data: {
+ form_data: jQuery('#wpsg_voucher_form').serialize()
+ },
+ success: function(data) {
+
+ wpsg_loading_done('#wpsg_voucher_dialog .modal-body');
+
+ if (data !== "1") alert(data);
+ else {
+
+ location.reload();
+
+ }
+
+ }
+ });
+
+ return false;
+
+ }).attr("onclick", null);
+
function wpsg_setFilterStatus(state)
{
diff --git a/views/mods/mod_gutschein/overview_row_end_coupon.phtml b/views/mods/mod_gutschein/overview_row_end_coupon.phtml new file mode 100644 index 0000000..e50d5eb --- /dev/null +++ b/views/mods/mod_gutschein/overview_row_end_coupon.phtml @@ -0,0 +1,52 @@ +<?php
+
+ declare(strict_types=1);
+
+ /**
+ * User: Daschmi (daschmi@daschmi.de)
+ * Date: 20.07.2019
+ * Time: 16:11
+ */
+
+ $arCalculation = &$this->view['basket']['arCalculation'];
+
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
+
+?>
+
+<?php if (wpsg_isSizedArray($arCalculation['coupon'])) { ?>
+
+ <?php foreach ($arCalculation['coupon'] as $gs) { ?>
+
+ <div class="overview_sum_row">
+ <div class="title">
+ <?php echo __('Wertgutschein', 'wpsg'); ?> <?php echo ($gs['code'] != '')? '('.$gs['code'].')':'' ?>
+ </div>
+ <div class="value"><?php
+
+ echo '-'.wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
+
+ if (strpos($gs['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
+
+ }
+
+ ?></div>
+ </div>
+
+ <?php } ?>
+
+<?php } ?>
+
+<div class="wpsg_spacer"></div>
+<div class="overview_sum_row">
+ <div class="title2">
+ <?php echo __('Zu zahlen', 'wpsg'); ?>:
+ </div>
+ <div class="sum">
+ <?php echo wpsg_ff($arCalculation['topay_'.$display_brutto_netto], $this->get_option('wpsg_currency')); ?>
+ </div>
+</div>
+<div class="wpsg_spacer"></div>
\ No newline at end of file diff --git a/views/order/backendEdit/addVoucher.phtml b/views/order/backendEdit/addVoucher.phtml index 7b90086..88d8e2b 100644 --- a/views/order/backendEdit/addVoucher.phtml +++ b/views/order/backendEdit/addVoucher.phtml @@ -15,25 +15,45 @@ else $strBN = 'BRUTTO';
$arCalculation = $oCalculation->getCalculationArray();
+ $voucher = [
+ 'code' => '',
+ 'id' => 0,
+ 'set' => 0,
+ 'type' => 'voucher'
+ ];
- $strVal = ((isset($arCalculation['voucher'][0]['set']))?$arCalculation['voucher'][0]['set']:0);
+ // Voucher suchen
+ foreach (array_merge($arCalculation['voucher'], $arCalculation['coupon']) as $v) {
+
+ if ($v['order_voucher_id'] == $_REQUEST['order_voucher_id']) {
+
+ $voucher = $v;
+
+ }
+
+ }
+
+ $strVal = ((isset($voucher['set']))?$voucher['set']:0);
if (strpos($strVal, '%') !== false) $strVal = wpsg_ff(wpsg_tf($strVal), '%');
else $strVal = wpsg_ff(wpsg_tf($strVal), $this->get_option('wpsg_currency'));
-
+
?>
<form id="wpsg_be_voucher_form">
+ <input type="hidden" name="order_voucher_id" value="<?php echo wpsg_getInt($_REQUEST['order_voucher_id']); ?>" />
+
<div class="autocomplete_wrap">
<?php echo wpsg_drawForm_Input('be_voucher_search', __('Gutscheinsuche', 'wpsg'), ''); ?>
</div>
<br />
- <?php echo wpsg_drawForm_Input('be_voucher_code', __('Code (Optional)', 'wpsg'), @$arCalculation['voucher'][0]['code']); ?>
- <?php echo wpsg_drawForm_Input('be_voucher_id', __('Guschein ID (Optional)', 'wpsg'), @$arCalculation['voucher'][0]['id']); ?>
+ <?php echo wpsg_drawForm_Input('be_voucher_code', __('Code (Optional)', 'wpsg'), @$voucher['code']); ?>
+ <?php echo wpsg_drawForm_Input('be_voucher_id', __('Guschein ID', 'wpsg'), @$voucher['id']); ?>
<?php echo wpsg_drawForm_Input('be_voucher_amount', wpsg_translate(__('Gutscheinwert in #1# (#2#) oder % ', 'wpsg'), $this->get_option('wpsg_currency'), $strBN), $strVal); ?>
+ <?php echo wpsg_drawForm_Checkbox('be_voucher_coupon', __('Wertgutschein'), (($voucher['type'] === 'coupon')?'1':'0')); ?>
</form>
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index 1f5d037..244ee56 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -98,8 +98,8 @@ <?php echo __('(zzgl. MwSt.)', 'wpsg'); ?>
<?php } ?>
- <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.editVoucher();"><span class="glyphicon glyphicon-pencil"></span></a>
- <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.removeVoucher();"><span class="glyphicon glyphicon-trash"></span></a>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.editVoucher(<?php echo $v['order_voucher_id']; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.removeVoucher(<?php echo $v['order_voucher_id']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
</div>
<div>
Code: <?php echo $v['code']; ?>
@@ -109,7 +109,7 @@ <td class="wpsg_cell_preis">
<?php if (strpos($v['set'], '%') === false) { ?>
- <?php echo wpsg_ff($arCalculation['sum']['voucher_'.$display], $this->get_option('wpsg_currency')); ?>
+ <?php echo wpsg_ff($v[$display], $this->get_option('wpsg_currency')); ?>
<?php } else { ?>
<?php echo wpsg_ff($v['set'], '%'); ?>
<?php } ?>
@@ -121,11 +121,11 @@ <td>1</td>
<td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis"><?php
- echo wpsg_ff($arCalculation['sum']['voucher_'.$display]); ?> <?php echo $this->get_option('wpsg_currency');
+ echo wpsg_ff($v[$display]); ?> <?php echo $this->get_option('wpsg_currency');
- if (strpos($arCalculation['voucher'][0]['set'], '%') !== false) {
+ if (strpos($v['set'], '%') !== false) {
- echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($arCalculation['voucher'][0]['set']), '%').')</span>';
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($v['set']), '%').')</span>';
}
@@ -314,6 +314,75 @@ <?php } } ?>
<?php } ?>
+
+ <?php // Wertgutscheine ?>
+ <?php if (wpsg_isSizedArray($arCalculation['coupon'])) { ?>
+
+ <?php foreach ($arCalculation['coupon'] as $c) { ?>
+
+ <tr class="wpsg_row_discount wpsg_row_small">
+ <td colspan="" class="wpsg_cell_mwst_label">
+
+ <div>
+ <?php echo __('Wertgutschein', 'wpsg'); ?>
+
+ <?php if ($this->getBackendTaxView() === WPSG_BRUTTO) { ?>
+ <?php echo __('(inkl. MwSt.)', 'wpsg'); ?>
+ <?php } else { ?>
+ <?php echo __('(zzgl. MwSt.)', 'wpsg'); ?>
+ <?php } ?>
+
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Wertgtschein bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.editVoucher(<?php echo $c['order_voucher_id']; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
+ <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Wertgutschein löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Voucher.removeVoucher(<?php echo $c['order_voucher_id']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
+ </div>
+ <div>
+ Code: <?php echo $c['code']; ?>
+ </div>
+
+ </td>
+ <td class="wpsg_cell_preis">
+
+ <?php if (strpos($c['set'], '%') === false) { ?>
+ <?php echo wpsg_ff($c[$display], $this->get_option('wpsg_currency')); ?>
+ <?php } else { ?>
+ <?php echo wpsg_ff($c['set'], '%'); ?>
+ <?php } ?>
+
+ </td>
+ <?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <td class="wpsg_cell_mwst"><?php echo $arTaxShort[$c['tax_key']]; ?></td>
+ <?php } ?>
+ <td>1</td>
+ <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis"><?php
+
+ echo wpsg_ff($c[$display]); ?> <?php echo $this->get_option('wpsg_currency');
+
+ if (strpos($c['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($c['set']), '%').')</span>';
+
+ }
+
+ ?></td>
+ </tr>
+
+ <?php } ?>
+
+ <tr class="wpsg_row_gesamt">
+ <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+ <strong><?php echo __('Zu zahlen', 'wpsg'); ?></strong>
+ <?php if ($this->getBackendTaxView() === WPSG_BRUTTO) { ?>
+ <?php echo __('(inkl. MwSt.)', 'wpsg'); ?>
+ <?php } else { ?>
+ <?php echo __('(zzgl. MwSt.)', 'wpsg'); ?>
+ <?php } ?>
+ </td>
+ <td class="wpsg_cell_gesamt_value wpsg_cell_gesamtpreis">
+ <strong><?php echo wpsg_ff($arCalculation['sum']['topay_brutto']); ?> <?php echo $this->get_option('wpsg_currency'); ?></strong>
+ </td>
+ </tr>
+
+ <?php } ?>
</tbody>
</table>
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index 69df736..5f63a8d 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -182,13 +182,13 @@ var WPSG_BE_Voucher = {
- editVoucher: function() {
+ editVoucher: function(order_voucher_id) {
jQuery('#wpsg_voucher_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
jQuery('#wpsg_voucher_dialog').modal( { } ).modal('show');
jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editVoucher&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editVoucher&edit_id=<?php echo $_REQUEST['edit_id']; ?>&order_voucher_id=' + order_voucher_id + '&noheader=1',
success: function(data) {
jQuery('#wpsg_voucher_dialog .modal-body').html(data);
@@ -200,12 +200,12 @@ },
- removeVoucher: function() {
+ removeVoucher: function(order_voucher_id) {
jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
jQuery.ajax( {
- url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editVoucher&do=remove&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+ url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editVoucher&do=remove&edit_id=<?php echo $_REQUEST['edit_id']; ?>&order_voucher_id=' + order_voucher_id + '&noheader=1',
success: function(data) {
jQuery('#wpsg_product_table_wrap').html(data.product_table);
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 0345a85..d3641f1 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -5,11 +5,15 @@ */
//wpsg_debug($this->view['basket']);
+ //wpsg_debug($this->view['basket']['arCalculation']);
//wpsg_debug($_SESSION);
//wpsg_debug($this->arShipping);
//wpsg_debug(__('Deutschland', 'wpsg'));
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
+
?>
<div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
@@ -140,29 +144,36 @@ <?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>
<?php $bLine = false; ?>
- <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+
+
+
+ <?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>
- <div class="basket_sum_row">
- <div class="title">
- <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $this->getRemoveLinkURL('gs')); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
- <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
- </div>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
- <?php } ?>
- <div class="value"><?php
+ <?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
+
+ <div class="basket_sum_row">
+ <div class="title">
+ <a class="wpsg_basket_removelink" href="<?php echo str_replace('&', '&', $this->getRemoveLinkURL('voucher_'.$gs['id'])); ?>" title="<?php echo __('Gutschein aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie den Gutschein aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');"><span class="glyphicon glyphicon-trash"></span></a>
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>
+ </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="colgsr"><?php echo __('anteilig', 'wpsg'); ?></div>
+ <?php } ?>
+ <div class="value"><?php
+
+ echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
- echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
+ if (strpos($gs['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
+
+ }
+
+ ?></div>
- if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
-
- echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
-
- }
-
- ?></div>
+ </div>
- </div>
+ <?php } ?>
<?php } ?>
@@ -373,7 +384,9 @@ </div>
<div class="wpsg_spacer"></div>
<?php } ?>
-
+
+ <?php $this->callMod('wpsg_mod_gutschein', 'basket_row_end_coupon'); ?>
+
<?php $this->callMods('basket_row_end', array(&$this->view)); ?>
<br />
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 4e5453c..b860b89 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -6,6 +6,9 @@ */
//wpsg_debug($this->view['basket']);
+
+ if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
+ else $display_brutto_netto = 'netto';
?>
<div class="wpsg wpsg_overview">
@@ -267,25 +270,31 @@ <div class="overview_sum_wrap">
<?php $bLine = false; ?>
- <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
- <div class="overview_sum_row">
- <div class="title">
- <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
- </div>
- <div class="value"><?php
-
- echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency'));
-
- if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) {
-
- echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')</span>';
+ <?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>
+
+ <?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>
+
+ <div class="overview_sum_row">
+ <div class="title">
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($gs['code'] != '')? '('.$gs['code'].')':'' ?>
+ </div>
+ <div class="value"><?php
+
+ echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));
- }
+ if (strpos($gs['set'], '%') !== false) {
+
+ echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';
+
+ }
- ?></div>
- </div>
+ ?></div>
+ </div>
+
+ <?php } ?>
+
<?php } ?>
-
+
<div class="overview_sum_row">
<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
<div class="title">
@@ -460,7 +469,10 @@ <div class="wpsg_spacer"></div>
<?php } ?>
+ <?php echo $this->callMod('wpsg_mod_gutschein', 'overview_row_end_coupon'); ?>
+
<?php $this->callMods('overview_row_end', array(&$this->view)); ?>
+
<div class="wpsg_spacer"></div>
<br />
|