diff options
| -rw-r--r-- | views/mods/mod_gutschein/index.phtml | 12 | ||||
| -rw-r--r-- | views/mods/mod_gutschein/settings_edit.phtml | 3 | ||||
| -rw-r--r-- | views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml | 4 | ||||
| -rw-r--r-- | views/order/view_orderdata.phtml | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml index 22826c0..8832946 100644 --- a/views/mods/mod_gutschein/index.phtml +++ b/views/mods/mod_gutschein/index.phtml @@ -16,7 +16,16 @@ </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="#" onclick="return false;"><?php echo wpsg_translate(__("Gutscheinverwaltung (#1# Gutscheine)", "wpsg"), $this->view['countAll']); ?></a></li>
+ <?php
+ $cnt = 0;
+ if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) {
+ foreach ($this->view['arData'] as $oVoucher) {
+ if (($this->get_option('wpsg_mod_gutschein_active') == '1') && ($oVoucher->getStatus() > 0)) $cnt=$cnt;
+ else $cnt++;
+ }
+ }
+ ?>
+ <li role="presentation" class="wpsg-voucher-tab-a active"><a href="#" onclick="return false;"><?php echo wpsg_translate(__("Gutscheinverwaltung (#1# Gutscheine)", "wpsg"), $cnt); ?></a></li>
<li role="presentation" class="wpsg-voucher-tab-a wpsg_showhide_filter <?php echo (($this->view['hasFilter'])?'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>
</ul>
@@ -71,6 +80,7 @@ </thead>
<tbody>
<?php foreach ($this->view['arData'] as $oVoucher) { ?>
+ <?php if (($this->get_option('wpsg_mod_gutschein_active') == '1') && ($oVoucher->getStatus() > 0)) continue; ?>
<tr>
<td class="col_checkbox">
diff --git a/views/mods/mod_gutschein/settings_edit.phtml b/views/mods/mod_gutschein/settings_edit.phtml index 9ffdbd2..9688428 100644 --- a/views/mods/mod_gutschein/settings_edit.phtml +++ b/views/mods/mod_gutschein/settings_edit.phtml @@ -6,4 +6,5 @@ ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_size', __('Länge der Gutscheincodes', 'wpsg'), $this->get_option('wpsg_mod_gutschein_size'), array ('help' => 'wpsg_mod_gutschein_size')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_perPage', __('Gutscheine pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_gutschein_perPage'), array ('help' => 'wpsg_mod_gutschein_perPage')); ?>
\ No newline at end of file +<?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_perPage', __('Gutscheine pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_gutschein_perPage'), array ('help' => 'wpsg_mod_gutschein_perPage')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_active', __('Nur aktive Gutscheine anzeigen (Backend)', 'wpsg'), $this->get_option('wpsg_mod_gutschein_active'), array ('help' => 'wpsg_mod_gutschein_active')); ?>
\ No newline at end of file diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml index 8e80b83..5370a22 100644 --- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml +++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml @@ -72,8 +72,8 @@ ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
<?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?><br />
- <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($this->view['shipping_country']['kuerzel']); ?><br />
-
+ <?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
+ <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($lk); ?><br />
<a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Lieferanschrift ändern', 'wpsg'); ?>">
<span class="glyphicon glyphicon-pencil"></span>
</a>
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml index 40a9910..c1fa297 100644 --- a/views/order/view_orderdata.phtml +++ b/views/order/view_orderdata.phtml @@ -595,7 +595,7 @@ productinfos : <?php echo json_encode($this->view['basket']['produkte'], JSON_FORCE_OBJECT); ?>,
mwstinfos : <?php echo json_encode(wpsg_tax_groups(true), JSON_FORCE_OBJECT); ?>,
- allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1'"), JSON_FORCE_OBJECT); ?>,
+ allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1' ORDER BY `name`"), JSON_FORCE_OBJECT); ?>,
mwst1 : <?php echo json_encode($this->view['basket']['mwst'], JSON_FORCE_OBJECT); ?>,
noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',
mwst2: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
|