diff options
| -rw-r--r-- | views/mods/mod_abo/overview_row.phtml | 21 | ||||
| -rw-r--r-- | views/mods/mod_basketteaser/basket_row.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_deliverytime/overview_row.phtml | 35 | ||||
| -rw-r--r-- | views/mods/mod_productvariants/overview_row.phtml | 30 | ||||
| -rw-r--r-- | views/mods/mod_productvars/overview_row.phtml | 20 | ||||
| -rw-r--r-- | views/mods/mod_produktattribute/overview_row.phtml | 18 | ||||
| -rw-r--r-- | views/mods/mod_weight/overview_row.phtml | 19 | ||||
| -rw-r--r-- | views/mods/mod_weight/overview_row_end.phtml | 15 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 26 | ||||
| -rw-r--r-- | views/warenkorb/overview.phtml | 512 |
10 files changed, 433 insertions, 267 deletions
diff --git a/views/mods/mod_abo/overview_row.phtml b/views/mods/mod_abo/overview_row.phtml index fb7bbf5..75b57fe 100644 --- a/views/mods/mod_abo/overview_row.phtml +++ b/views/mods/mod_abo/overview_row.phtml @@ -1,13 +1,20 @@ <?php
/**
- * Template für die Anzeige der Abo-Verlängerung im Warenkorb
+ * Template für die Anzeige der Abo-Verlängerung im Overview
*/
?>
-<tr class="wpsg_<?php echo (($this->view['i'] == 0)?'odd':'even'); ?>">
- <td><?php echo __('Abo Verlängerung', 'wpsg'); ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
- <?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>
- </td>
-</tr>
\ No newline at end of file +<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __("Abo Verlängerung", "wpsg"); ?>
+ </div>
+ <div class="valuel">
+ <?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
\ No newline at end of file diff --git a/views/mods/mod_basketteaser/basket_row.phtml b/views/mods/mod_basketteaser/basket_row.phtml index bea76f3..7d8b0ea 100644 --- a/views/mods/mod_basketteaser/basket_row.phtml +++ b/views/mods/mod_basketteaser/basket_row.phtml @@ -22,11 +22,11 @@ <?php } ?>
</div>
<div class="valuer">
- <input name="wpsg_mod_basketteaser_row[<?php echo $this->view['data']['id']; ?>]" type="text" size="3" value="1" />
+ <input name="wpsg_mod_basketteaser_row[<?php echo $this->view['data']['id']; ?>]" type="text" size="3" value="0" />
</div>
<div class="valuer">
<a href="#" onclick="return wpsg_mod_basketteaser_add(<?php echo $this->view['data']['id']; ?>);"><?php echo __('Hinzufügen', 'wpsg'); ?></a>
</div>
-
+
</div>
<br />
\ No newline at end of file diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml index fe27e24..87ccdc9 100644 --- a/views/mods/mod_deliverytime/overview_row.phtml +++ b/views/mods/mod_deliverytime/overview_row.phtml @@ -5,26 +5,31 @@ */
?>
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_deliverytime_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
+<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __("Lieferzeit", "wpsg"); ?>
+ </div>
+ <div class="valuel">
<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
- <?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
+ <?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
- <?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
+ <?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
<?php } else { /* Sonst sofort lieferbar */ ?>
<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
<?php } ?>
- </td>
-</tr>
-
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
<?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
- <tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td colspan="3">
- <div class="wpsg_mod_deliverytime_delay">
- <?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
- </div>
- </td>
- </tr>
+<div class="product_info">
+ <div class="fulll">
+ <?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+
+ </div>
+</div>
<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_productvariants/overview_row.phtml b/views/mods/mod_productvariants/overview_row.phtml new file mode 100644 index 0000000..1ca7e07 --- /dev/null +++ b/views/mods/mod_productvariants/overview_row.phtml @@ -0,0 +1,30 @@ + <?php
+
+ /**
+ * Render ein Variantenprodukt in der Bestellübersicht (basket.phtml)
+ */
+
+?>
+<?php //wpsg_debug($this->view['variante']) ?>
+<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __("Variante", "wpsg"); ?>
+ </div>
+ <div class="valuel">
+ <?php if (get_option('wpsg_vp_detailview') == 1) { ?>
+ <?php foreach ($this->view['variante'] as $vari => $value) { ?>
+ <?php if (is_numeric($vari)) { ?>
+ <?php echo $value['name'] ?>: <?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; <?php echo $value['preis'] ?> <?php echo $this->get_option('wpsg_currency') ?>
+ <br />
+ <?php } ?>
+ <?php } ?>
+ <?php } else { ?>
+ <?php echo $this->view['variante']['key']; ?>
+ <?php } ?>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
\ No newline at end of file diff --git a/views/mods/mod_productvars/overview_row.phtml b/views/mods/mod_productvars/overview_row.phtml index b3cd82a..7499b5a 100644 --- a/views/mods/mod_productvars/overview_row.phtml +++ b/views/mods/mod_productvars/overview_row.phtml @@ -6,11 +6,15 @@ ?>
<?php if (is_array($this->view['wpsg_mod_productvars']['data']) && sizeof($this->view['wpsg_mod_productvars']['data']) > 0) { ?>
+
<?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
-<tr class="wpsg_<?php echo (($this->view['wpsg_mod_productvars']['i'] == 0)?'odd':'even'); ?>">
- <td><?php echo __($pv['name'], 'wpsg'); ?>:</td>
- <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>">
- <?php if ($pv['typ'] == '1') { // Auswahl ?>
+<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __($pv['name'], 'wpsg'); ?><?php if ($pv['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>
+ </div>
+ <div class="valuel">
+ <?php if ($pv['typ'] == '1') { // Auswahlfeld ?>
<?php if ($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == 'not_set') { ?>
<?php echo __('Nicht angegeben', 'wpsg'); ?>
<?php } else { ?>
@@ -25,7 +29,11 @@ <?php echo __('Nein', 'wpsg'); ?>
<?php } ?>
<?php } ?>
- </td>
-</tr>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
<?php } ?>
<?php } ?>
\ No newline at end of file diff --git a/views/mods/mod_produktattribute/overview_row.phtml b/views/mods/mod_produktattribute/overview_row.phtml index 2059efb..13389a0 100644 --- a/views/mods/mod_produktattribute/overview_row.phtml +++ b/views/mods/mod_produktattribute/overview_row.phtml @@ -7,11 +7,17 @@ ?>
<?php foreach ((array)$this->view['wpsg_mod_produktattribute']['data'] as $pa_id) { ?>
-
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td colspan="1"><?php echo __('Attribut', 'wpsg'); ?>:</td>
- <td class="wpsg_cell_produktattribute_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>">
+<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>
+ </div>
+ <div class="valuel">
<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>
- </td>
-</tr>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
<?php }?>
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml index 921f387..92dc032 100644 --- a/views/mods/mod_weight/overview_row.phtml +++ b/views/mods/mod_weight/overview_row.phtml @@ -5,9 +5,16 @@ */
?>
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td ><?php echo __('Gewicht', 'wpsg'); ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_weight_value">
- <?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
- </td>
-</tr>
\ No newline at end of file +<div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __("Gewicht", "wpsg"); ?>
+ </div>
+ <div class="valuer">
+ <?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+</div>
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row_end.phtml b/views/mods/mod_weight/overview_row_end.phtml index 12da77e..de38b35 100644 --- a/views/mods/mod_weight/overview_row_end.phtml +++ b/views/mods/mod_weight/overview_row_end.phtml @@ -5,11 +5,14 @@ */
?>
-<tr class="wpsg_row_weight wpsg_row_small">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_weight_label">
+<div class="overview_sum_row">
+ <div class="title">
<?php echo __('Gesamtgewicht', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_weight_value">
+ </div>
+ <div class="value">
<?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
- </td>
-</tr>
\ No newline at end of file + </div>
+ <div class="value">
+ <?php echo __(' '); ?>
+ </div>
+</div>
\ No newline at end of file diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index a59e6ee..3320550 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -37,16 +37,16 @@ <div class="basket_product_wrap">
- <?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $product_data) { $i ++; ?>
+ <?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $product_data) { $i ++; ?>
<div class="basket_product_row">
<?php $this->view['$bPicture'] = false; ?>
- <?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) {
+ <?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) {
- if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']);
- else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id'])));
+ if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']);
+ else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id'])));
?>
<div class="productimage">
@@ -70,7 +70,6 @@ if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true;
echo "<img src=".$url." alt='' />";
?>
-
<?php } ?>
</div>
<?php } ?>
@@ -137,13 +136,12 @@ </div>
<?php } ?>
- <?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>
+ <?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>
<?php echo $strBasketRow; ?>
</div>
</div>
- <div class="wpsg_spacer"></div>
<?php } // foreach products ?>
@@ -161,7 +159,7 @@ </div>
<div class="wpsg_basket_removelink">
<a 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'); ?>');">
- <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
+ <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
</a>
</div>
</div>
@@ -208,7 +206,7 @@ <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
<?php } else { ?>
<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
- <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+ <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
<?php } else { ?>
<?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
<?php } ?>
@@ -252,7 +250,7 @@ {
echo __('anteilig', 'wpsg');
-
+
}
else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))
{
@@ -264,7 +262,7 @@ ?>
</div>
<div class="value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
</div>
</div>
@@ -274,8 +272,8 @@ <div class="title">
<?php echo __('Zahlungsart:', 'wpsg').' '; ?>
<?php if (sizeof($this->arPayment) > 1) { ?>
- <select name="set_payment" class="wpsg_form_submit set_payment">
- <option><?php echo __('Bitte wählen', 'wpsg')?></option>
+ <select name="set_payment" class="wpsg_form_submit set_payment">
+ <option><?php echo __('Bitte wählen', 'wpsg')?></option>
<?php foreach ($this->arPayment as $p_id => $p) { ?>
<option <?php echo (($p['id'] == $this->view['basket']['checkout']['payment'])?'selected="selected"':''); ?> value="<?php echo $p_id; ?>"><?php echo wpsg_hspc($p['name']); ?></option>
<?php } ?>
@@ -343,7 +341,7 @@ <?php foreach ($this->view['basket']['mwst'] as $mwst) { ?>
<div class="basket_sum_row">
<div class="title2">
- <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), __($mwst['name'], 'wpsg')); ?>:
+ <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), __($mwst['name'], 'wpsg')); ?>:
</div>
<div class="value">
<?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 972390b..f8036a0 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -6,7 +6,7 @@ */
//wpsg_debug($this->view['basket']);
-
+
?>
<div class="wpsg wpsg_overview">
@@ -20,23 +20,23 @@ <form method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>">
<h2><?php echo __('Zusammenfassung', 'wpsg'); ?></h2>
-
+
<div class="wpsg_spacer"></div>
-
+
<?php if (!$this->hasMod('wpsg_mod_ordercondition')) { ?>
<div class="wpsg_agb">
<label>
<input type="checkbox" value="1" name="wpsg[agb]" />
- <?php echo wpsg_translate(__('Ich habe die #1# des Anbieters gelesen und erkläre mit dem Absenden der Bestellung mein Einverständnis. Die #2# habe ich zur Kenntnis genommen.', 'wpsg'),
- '<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_AGB).'">'.__('AGB', 'wpsg').'</a>',
- '<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_WIDERRUF).'">'.__('Widerrufsbelehrung', 'wpsg').'</a>');
+ <?php echo wpsg_translate(__('Ich habe die #1# des Anbieters gelesen und erkläre mit dem Absenden der Bestellung mein Einverständnis. Die #2# habe ich zur Kenntnis genommen.', 'wpsg'),
+ '<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_AGB).'">'.__('AGB', 'wpsg').'</a>',
+ '<a target="_blank" href="'.$this->getURL(wpsg_ShopController::URL_WIDERRUF).'">'.__('Widerrufsbelehrung', 'wpsg').'</a>');
?>
</label>
- </div>
+ </div>
<?php } ?>
-
+
<?php $this->callMods('overview_top', array(&$this->view['basket'])); ?>
-
+
<div class="shippayment">
<div class="subtitle"><?php echo __('Zahlung/Versand', 'wpsg'); ?>
<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT2)); ?></span>
@@ -44,17 +44,17 @@ <div class="payment"><?php echo wpsg_hspc($this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?></div>
<div class="shipping"><?php echo wpsg_hspc($this->arShipping[$this->view['basket']['checkout']['shipping']]['name']); ?></div>
</div>
-
+
<?php
$arAnrede = explode('|', $this->get_option('wpsg_admin_pflicht')['anrede_auswahl']);
?>
-
+
<?php if (wpsg_getStr($this->view['basket']['checkout']['diff_shippingadress']) == '1') { ?>
<div class="anschrift">
<div class="subtitle"><?php echo __('Rechnungsanschrift', 'wpsg'); ?>
<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
</div>
- <?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
+ <?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
<?php } ?>
<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
@@ -62,15 +62,15 @@ <?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
- <?php } ?>
- </div>
+ <?php } ?>
+ </div>
<div class="wpsg_clear"></div><br />
-
+
<div class="anschrift">
<div class="subtitle"><?php echo __('Lieferanschrift', 'wpsg'); ?>
<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
</div>
- <?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>
+ <?php if (trim($this->view['basket']['checkout']['shipping_firma']) != '') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_firma']); ?><br />
<?php } ?>
<?php echo (($this->view['basket']['checkout']['shipping_title'] != '' && $this->view['basket']['checkout']['shipping_title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['shipping_title']]:''); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_name']); ?><br />
@@ -78,12 +78,12 @@ <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['shipping_ort']); ?><br />
<?php if (wpsg_isSizedArray($this->view['basket']['shipping_land'])) { ?>
<?php echo wpsg_hspc($this->view['basket']['shipping_land']['name']); ?>
- <?php } ?>
- </div>
+ <?php } ?>
+ </div>
<div class="wpsg_clear"></div><br />
-
+
<?php } else { ?>
-
+
<div class="anschrift">
<div class="subtitle"><?php echo __('Liefer- und Rechnungsanschrift', 'wpsg'); ?>
<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
@@ -92,7 +92,7 @@ <span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_CHECKOUT)); ?></span>
<?php } ?>
</div>
- <?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
+ <?php if (trim($this->view['basket']['checkout']['firma']) != '') { ?>
<?php echo wpsg_hspc($this->view['basket']['checkout']['firma']); ?><br />
<?php } ?>
<?php echo wpsg_hspc(($this->view['basket']['checkout']['title'] != '' && $this->view['basket']['checkout']['title'] != '-1')?$arAnrede[$this->view['basket']['checkout']['title']]:''); ?> <?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?><br />
@@ -100,210 +100,313 @@ <?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> <?php echo wpsg_hspc($this->view['basket']['checkout']['ort']); ?><br />
<?php if (wpsg_isSizedArray($this->view['basket']['land'])) { ?>
<?php echo wpsg_hspc($this->view['basket']['land']['name']); ?>
- <?php } ?>
- </div>
+ <?php } ?>
+ </div>
<div class="wpsg_clear"></div><br />
<?php } ?>
-
+
<?php if (wpsg_isSizedString($this->view['basket']['checkout']['ustidnr'])) { ?>
<?php echo __('UStIdNr.', 'wpsg'); ?>: <?php echo wpsg_hspc($this->view['basket']['checkout']['ustidnr']); ?><br /><br />
<?php } ?>
-
+
<div class="subtitle">
<?php echo __('Bestellte Produkte', 'wpsg'); ?>
<span class="sublink"><?php echo wpsg_translate(__('[<a href="#1#">Ändern</a>]', 'wpsg'), $this->getURL(wpsg_ShopController::URL_BASKET)); ?></span>
</div>
-
+
<div class="wpsg_table_wrap">
- <table class="wpsg_produkte">
- <tr class="wpsg_kopf">
- <th class="wpsg_cell_menge"><?php echo __("Anzahl", "wpsg"); ?></th>
- <th class="wpsg_cell_preis"><?php echo __('Einzelpreis', 'wpsg'); ?></th>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <th class="wpsg_cell_mwst"><?php echo __("MwSt.", "wpsg"); ?></th>
- <?php } ?>
- <th class="wpsg_cell_gesamtpreis"><?php echo __("Gesamtpreis", "wpsg"); ?></th>
- </tr>
- <?php $i = 0; foreach ($this->view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?>
- <?php $strOverviewRow = ''; ob_start(); $this->callMods('overview_row', array(&$p, $i)); $strOverviewRow = ob_get_contents(); ob_end_clean(); ?>
- <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td class="wpsg_cell_menge" rowspan="<?php echo 2 + substr_count($strOverviewRow, '<tr'); ?>">
- <?php echo wpsg_hspc($p['menge']); ?>
- </td>
- <td class="wpsg_cell_preis"><?php echo wpsg_ff($p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst"><?php echo wpsg_ff($p['mwst_value']); ?> %</td>
+
+ <?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $product_data) { $i ++; ?>
+
+ <div class="overview_product_row">
+
+ <?php $this->view['$bPicture'] = false; ?>
+
+ <?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) {
+
+ if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']);
+ else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id'])));
+
+ ?>
+ <div class="productimage">
+ <?php if (wpsg_isSizedString($arImages[0]['guid'])) { ?>
+
+ <?php
+ if (isset($product_data['product_key'])) {
+ $arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($product_data['product_key']));
+ if (wpsg_isSizedArray($arr))
+ {
+ $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail');
+ $url = $ais[0];
+ }
+ else
+ {
+ $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail'));
+ }
+ } else {
+ $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail'));
+ }
+ if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true;
+ echo "<img src=".$url." alt='' />";
+ ?>
+
<?php } ?>
- <td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['menge'] * $p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
- </tr>
- <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_name">
- <?php if ($this->get_option('wpsg_mod_produktbilder_overviewimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) {
-
- if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']);
- else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id'])));
-
- ?>
- <div class="wpsg_overview_productimage">
-
- <?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>
-
- <?php
- if (isset($p['product_key'])) {
- $img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'thumbnail'));
- } else {
- $img_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'thumbnail'));
- } ?>
- <?php if ($img_url !== false) { ?>
- <img class="theme_border_color_2 theme_color_2" src="<?php echo $img_url; ?>" alt="<?php echo wpsg_translate(__('Produktbilder von Produkte #1#', 'wpsg'), $p['name']); ?>" />
- <?php } ?>
-
- <?php } ?>
- </div>
- <?php } ?>
- <?php if ($this->getProduktLink($p)) { ?>
- <a href="<?php echo $this->getProduktLink($p); ?>"><?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?></a>
- <?php } else { ?>
- <?php echo wpsg_hspc((($p['detailname'] != '')?$p['detailname']:$p['name'])); ?>
- <?php } ?>
- </td>
- </tr>
- <?php echo $strOverviewRow; ?>
+ </div>
<?php } ?>
- <?php if (isset($this->view['basket']['gs'])) { ?>
- <tr class="wpsg_row_gutschein">
- <td class="wpsg_cell_menge" rowspan="2">1</td>
- <td class="wpsg_cell_preis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
+
+ <div class="product_content">
+
+ <div class="product_name">
+ <?php if ($this->getProduktLink($product_data)) { ?>
+ <a href="<?php echo $this->getProduktLink($product_data); ?>"><?php echo wpsg_hspc((($product_data['detailname'] != '')?$product_data['detailname']:$product_data['name'])); ?></a>
+ <?php } else { ?>
+ <?php echo wpsg_hspc((($product_data['detailname'] != '')?$product_data['detailname']:$product_data['name'])); ?>
+ <?php } ?>
+
+ <?php if (wpsg_isSizedString($product_data['shortdesc'])) { ?>
+ <div class="product_shortdesc"><?php echo $product_data['shortdesc']; ?></div>
+ <?php } ?>
+
+ </div>
+
+ <div class="product_action">
+ <div class="title">
+ <?php echo __("Anzahl", "wpsg"); ?>
+ </div>
+ <div class="amount">
+ <?php echo wpsg_hspc($product_data['menge']); ?>
+ </div>
+ </div>
+ <div class="product_action">
+ <div class="title">
+ <?php echo __("Einzelpreis", "wpsg"); ?>
+ </div>
+ <div class="price">
+ <?php echo wpsg_ff($product_data['preis'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+ <div class="product_action">
+ <div class="title">
+ <?php echo __("Gesamtpreis", "wpsg"); ?>
+ </div>
+ <div class="price_total">
+ <?php echo wpsg_ff($product_data['menge'] * $product_data['preis'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+
<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+ <div class="product_info">
+ <div
+ <?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+ <?php echo __("MwSt.", "wpsg"); ?>
+ </div>
+ <div class="valuer">
+ <?php echo wpsg_ff($product_data['mwst_value'], ' %'); ?>
+ </div>
+ <div class="dummyr">
+ <?php echo __(' '); ?>
+ </div>
+
+ </div>
<?php } ?>
- <td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
- </tr>
- <tr class="wpsg_row_gutschein">
- <td class="wpsg_cell_name" colspan="<?php echo $this->view['colspan']; ?>"><?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?></td>
- </tr>
+
+ <?php $strOverviewRow= ''; ob_start(); $this->callMods('overview_row', array(&$product_data, $i)); $strOverviewRow= ob_get_contents(); ob_end_clean(); ?>
+ <?php echo $strOverviewRow; ?>
+
+ </div>
+
+ </div>
+ <?php } // foreach products ?>
+
+ <div class="overview_sum_wrap">
+
+ <?php $bLine = false; ?>
+ <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+ <div class="overview_sum_row">
+ <div class="titlegs">
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
+ </div>
+ </div>
+ <div class="overview_sum_row">
+ <div class="delgs"> </div>
+ <div class="colgsl">1</div>
+ <div class="colgsl">
+ <?php if ($this->view['basket']['gs']['calc'] == 'p') { ?>
+ <?php echo '-'.wpsg_ff($this->view['basket']['gs']['value'], '%'); ?>
+ <?php } else { ?>
+ <?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+ <?php } ?>
+ </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="colgsr"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></div>
+ </div>
+ <?php } ?>
+
+ <div class="overview_sum_row">
<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
- <tr class="wpsg_row_discount">
- <td class="wpsg_cell_menge" rowspan="2"></td>
- <td class="wpsg_cell_preis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?></td>
+ <div class="title">
+ <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
+ </div>
<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+ <div class="value">
+ <?php echo __('anteilig', 'wpsg'); ?>
+ </div>
<?php } ?>
- <td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?></td>
- </tr>
- <tr class="wpsg_row_discount">
- <td class="wpsg_cell_name" colspan="<?php echo $this->view['colspan']; ?>"><?php echo __('Rabatt', 'wpsg'); ?></td>
- </tr>
+ <div class="value">
+ <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+ </div>
<?php } ?>
- <tr class="wpsg_row_summe">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
- <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
- <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
- <?php } else { ?>
- <?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
- <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
- <?php } else { ?>
- <?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
- <?php } ?>
+ </div>
+
+ <?php if ($bLine == true) { ?>
+ <div class="wpsg_spacer"></div>
+ <?php } ?>
+
+ <div class="overview_sum_row">
+ <div class="title2">
+ <?php if ($this->get_option("wpsg_kleinunternehmer") == "1") { ?>
+ <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+ <?php } else { ?>
+ <?php if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+ <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
+ <?php } else { ?>
+ <?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'</a>'); ?>:
<?php } ?>
- </td>
- <td class="wpsg_cell_summe_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
- <?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
- <tr class="wpsg_row_shipping">
- <td colspan="2" class="wpsg_cell_shipping_label">
+ <?php } ?>
+ </div>
+ <div class="value">
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+
+ <?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
+ <div class="overview_sum_row">
+ <div class="title">
<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a> (#2#)', 'wpsg'),
$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN),
$this->arShipping[$this->view['basket']['checkout']['shipping']]['name']
- ); ?>:
- </td>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst">
- <?php if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) { ?>
- <?php echo __('anteilig', 'wpsg'); ?>
- <?php } else { ?>
- <?php echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'); ?>
- <?php } ?>
- </td>
- <?php } ?>
- <td class="wpsg_cell_shipping_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <?php } ?>
- <?php if ($this->view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>
- <tr class="wpsg_row_payment">
- <td colspan="2" class="wpsg_cell_payment_label">
+ ); ?>:
+
+ </div>
+ <div class="value">
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
+ if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)
+ {
+
+ echo __('anteilig', 'wpsg');
+
+ }
+ else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))
+ {
+
+ echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');
+
+ }
+ }
+ ?>
+ </div>
+ <div class="value">
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+ <?php } ?>
+
+ <?php /* Zeile für Zahlungsart BEGIN */ ?>
+ <?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>
+ <div class="overview_sum_row">
+ <div class="title">
<?php echo wpsg_translate(__('Zahlungsart (#1#)', 'wpsg'), $this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>:
- </td>
- <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst">
- <?php if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) { ?>
- <?php echo __('anteilig', 'wpsg'); ?>
- <?php } else { ?>
- <?php echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%'); ?>
- <?php } ?>
- </td>
- <?php } ?>
- <td class="wpsg_cell_payment_value">
+ </div>
+ <div class="value">
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
+
+ if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)
+ {
+
+ echo __('anteilig', 'wpsg');
+
+ }
+ else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment))
+ {
+
+ echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');
+
+ }
+
+ } ?>
+ </div>
+ <div class="value">
<?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <?php } ?>
-
- <?php if ($this->get_option("wpsg_kleinunternehmer") == "1") { ?>
- <tr class="wpsg_basket_kleinunternehmer">
- <td colspan="<?php echo $this->view['colspan'] + 1; ?>"><?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?></td>
- </tr>
- <tr class="wpsg_row_gesamt">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
+ </div>
+ </div>
+ <?php } ?>
+ <?php /* Zeile für Zahlungsart ENDE */ ?>
+
+ <?php if (get_option("wpsg_kleinunternehmer") == "1") { ?>
+ <div class="overview_sum_row">
+ <div class="title2">
+ <?php echo get_option('wpsg_kleinunternehmer_text'); ?>
+ </div>
+ <div class="value">
+ <?php echo __(' '); ?>
+ </div>
+ </div>
+
+ <div class="overview_sum_row">
+ <div class="title2">
<?php echo __('Gesamtpreis', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamt_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
- <?php } else { ?>
- <tr class="wpsg_row_gesamt">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
+ </div>
+ <div class="sum">
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+ <?php } else { ?>
+
+ <div class="overview_sum_row">
+ <div class="title2">
<?php echo __('Gesamtpreis (Netto)', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamt_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
- <?php foreach ($this->view['basket']['mwst'] as $mwst_id => $mwst) { ?>
- <tr class="wpsg_row_mwst">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
- <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $mwst['name']); ?>
- </td>
- <td class="wpsg_cell_mwst_value">
- <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
- <?php } ?>
- <tr class="wpsg_row_gesamt_brutto wpsg_row_small">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+ </div>
+ <div class="sum">
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
+
+ <?php foreach ($this->view['basket']['mwst'] as $mwst) { ?>
+ <div class="overview_sum_row">
+ <div class="title2">
+ <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), __($mwst['name'], 'wpsg')); ?>:
+ </div>
+ <div class="value">
+ <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+ </div>
+ </div>
+ <?php } ?>
+ <div class="wpsg_spacer"></div>
+ <div class="overview_sum_row">
+ <div class="title2">
<?php echo __('Gesamtpreis (Brutto)', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamt_value">
+ </div>
+ <div class="sum">
<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <?php } ?>
-
- <?php $this->callMods('overview_row_end', array(&$this->view)); ?>
-
- </table>
-
+ </div>
+ </div>
+ <div class="wpsg_spacer"></div>
+ <?php } ?>
+
+ <?php $this->callMods('overview_row_end', array(&$this->view)); ?>
+ <div class="wpsg_spacer"></div>
+
+ <br />
+
+ </div>
+
<div class="wpsg_versandhinweis"><?php echo __('Sofern die Lieferung in das Nicht-EU-Ausland erfolgt, können weitere Zölle, Steuern oder Gebühren vom Kunden zu zahlen sein, jedoch nicht an den Anbieter, sondern an die dort zuständigen Zoll- bzw. Steuerbehörden. Dem Kunden wird empfohlen, die Einzelheiten vor der Bestellung bei den Zoll- bzw. Steuerbehörden zu erfragen.', 'wpsg'); ?></div>
</div>
-
+
<br />
-
+
<?php if ($this->view['basket']['checkout']['comment'] != '') { ?>
<div class="subtitle">
<?php echo __('Bestellkommentar', 'wpsg'); ?>
@@ -312,20 +415,19 @@ <div class="wpsg_ordercomment">
<?php echo $this->view['basket']['checkout']['comment'] ?>
</div>
- <?php }?>
-
-
+ <?php }?>
+
+
<?php $this->callMods('overview_inner_prebutton', array(&$this->view)); ?>
-
+
+ <div class="wpsg_spacer"></div>
<div class="wpsg_clear"></div>
-
- <br />
-
- <input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zurück', 'wpsg'); ?>" name="wpsg_redirect_checkout" />
- <input type="submit" class="wpsg_button wpsg_orderbutton" value="<?php echo __('zahlungspflichtig bestellen', 'wpsg'); ?>" name="wpsg_order" />
-
+
+ <input type="submit" class="wpsg_checkoutbutton" value="<?php echo __('zurück', 'wpsg'); ?>" name="wpsg_redirect_checkout" />
+ <input type="submit" class="wpsg_orderbutton" value="<?php echo __('zahlungspflichtig bestellen', 'wpsg'); ?>" name="wpsg_order" />
+
<div class="wpsg_clear"></div>
-
- </form>
+
+ </form>
</div>
|