diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/mods/mod_gutschein/overview_row_end_coupon.phtml | 2 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 80 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 2 |
3 files changed, 38 insertions, 46 deletions
diff --git a/views/mods/mod_gutschein/overview_row_end_coupon.phtml b/views/mods/mod_gutschein/overview_row_end_coupon.phtml index e50d5eb..78e4bda 100644 --- a/views/mods/mod_gutschein/overview_row_end_coupon.phtml +++ b/views/mods/mod_gutschein/overview_row_end_coupon.phtml @@ -46,7 +46,7 @@ <?php echo __('Zu zahlen', 'wpsg'); ?>:
</div>
<div class="sum">
- <?php echo wpsg_ff($arCalculation['topay_'.$display_brutto_netto], $this->get_option('wpsg_currency')); ?>
+ <?php echo wpsg_ff($arCalculation['sum']['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/produkt/index.phtml b/views/produkt/index.phtml index 64a1fb2..d4aa0c3 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -141,42 +141,40 @@ <tr>
<th class="manage-column column-title wpsg_pic_col"></th>
<th class="wpsg_order" data-order="name"><?php echo __("Name", 'wpsg'); ?></th>
- <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
- <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
- <?php } ?>
+ <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
<?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
<th class="wpsg_order" data-order="pos-nr"><?php echo __("Positionsnummer", "wpsg"); ?></th>
<?php } */ ?>
-
+
<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
- <th class="wpsg_order" data-order="gtin-nr"><?php echo __("GTIN", "wpsg"); ?></th>
+ <th class="wpsg_order" data-order="gtin-nr"><?php echo __("GTIN", "wpsg"); ?></th>
<?php } ?>
-
+
<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
- <th class="wpsg_order" data-order="ean-nr"><?php echo __("EAN", "wpsg"); ?></th>
- <?php } ?>
-
+ <th class="wpsg_order" data-order="ean-nr"><?php echo __("EAN", "wpsg"); ?></th>
+ <?php } ?>
+
<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
- <th class="wpsg_order" data-order="deliverytime"><?php echo __("Lieferzeit", 'wpsg'); ?></th>
- <?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
- <th class="wpsg_order" data-order="weight"><?php echo __("Gewicht", 'wpsg'); ?></th>
- <?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+ <th class="wpsg_order" data-order="deliverytime"><?php echo __("Lieferzeit", 'wpsg'); ?></th>
+ <?php } ?>
+
+ <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+ <th class="wpsg_order" data-order="weight"><?php echo __("Gewicht", 'wpsg'); ?></th>
+ <?php } ?>
+
+ <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
<th class="wpsg_order" data-order="fuellmenge"><?php echo __("Füllmenge", 'wpsg'); ?></th>
- <?php } ?>
+ <?php } ?>
+
+ <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
+ <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th><th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
+ <?php } ?>
+
+ <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
+ <th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
+ <?php } ?>
- <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
- <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th>
- <?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
- <th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
- <?php } ?>
-
<th class="wpsg_order" data-order="mwst"><?php echo __("MwSt.", 'wpsg'); ?></th>
<th class="wpsg_order" data-order="price"><?php echo __("Preis", 'wpsg'); ?></th>
@@ -220,22 +218,19 @@ <?php $this->callMods('produkt_index_editmenu', array(&$d)); ?>
</div>
</td>
- <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
- <td><?php echo wpsg_hspc($d['anr']); ?></td>
- <?php } ?>
+ <td><?php echo wpsg_hspc($d['anr']); ?></td>
<?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
<td>
<?php ?>
</td>
<?php } */ ?>
- <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
- <td><?php echo wpsg_hspc($d['gtin']); ?></td>
- <?php } ?>
- <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
- <td><?php echo wpsg_hspc($d['ean']); ?></td>
- <?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
+ <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
+ <td><?php echo wpsg_hspc($d['gtin']); ?></td>
+ <?php } ?>
+ <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
+ <td><?php echo wpsg_hspc($d['ean']); ?></td>
+ <?php } ?>
+ <?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
<td>
<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($oProduct->getProductKey()))) { ?>
@@ -264,8 +259,7 @@ <?php } ?>
</td>
<?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+ <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
<td>
<?php if (($oProduct->weight) > '0') { ?>
<?php echo wpsg_translate(__('#1# #2#', 'wpsg'), '<span class="wpsg_weight" id="weight_'.$oProduct->id.'">'.wpsg_ff($oProduct->weight).'</span>', $this->get_option('wpsg_mod_weight_unit')); ?>
@@ -274,8 +268,7 @@ <?php } ?>
</td>
<?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+ <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
<td>
<?php if (($oProduct->fmenge) > '0') { ?>
<?php echo wpsg_translate(__('#1#', 'wpsg'), '<span class="wpsg_fmenge">'.wpsg_ff($oProduct->fmenge, '', true).'</span> '.$this->callMod('wpsg_mod_fuellmenge', 'getUnit', [$oProduct->feinheit])); ?>
@@ -284,8 +277,7 @@ <?php } ?>
</td>
<?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
+ <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
<td>
<?php if ($d['pgruppe'] <= 0) { ?>
<?php echo __('Nicht zugewiesen', 'wpsg'); ?>
@@ -294,7 +286,7 @@ <?php } ?>
</td>
<?php } ?>
- <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
+ <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
<td>
<div style="line-height:inherit; margin-bottom:0.2em;">
<?php if ($d['stock'] == '0' ) {?>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 3f541ef..62635ce 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -6,7 +6,7 @@ //wpsg_debug($this->view['basket']);
//wpsg_debug($this->view['basket']['arCalculation']);
- //wpsg_debug($_SESSION);
+ wpsg_debug($_SESSION['wpsg']);
//wpsg_debug($this->arShipping);
//wpsg_debug(__('Deutschland', 'wpsg'));
|