summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/css/frontend.css44
-rw-r--r--views/mods/mod_abo/basket_row.phtml20
-rw-r--r--views/mods/mod_basketteaser/basket_row.phtml31
-rw-r--r--views/mods/mod_deliverytime/basket_row.phtml31
-rw-r--r--views/mods/mod_gutschein/basket_row_end.phtml18
-rw-r--r--views/mods/mod_productvariants/basket_row.phtml19
-rw-r--r--views/mods/mod_productvars/basket_row.phtml21
-rw-r--r--views/mods/mod_produktattribute/basket_row.phtml20
-rw-r--r--views/mods/mod_weight/basket_row.phtml17
-rw-r--r--views/mods/mod_weight/basket_row_end.phtml15
-rw-r--r--views/warenkorb/basket.phtml497
11 files changed, 426 insertions, 307 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css
index 9ec60ef..6ec4044 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -31,8 +31,42 @@ input.wpsg_error { border-color:red !important; }
.basket_product_wrap .basket_product_row .productimage { max-width:150px; padding-right:0.75em; }
.basket_product_wrap .basket_product_row .product_content { width:100%; display:flex; flex-direction:column; justify-content:space-between; }
.basket_product_wrap .basket_product_row .product_action { display:flex; width:100%; justify-content:space-between; align-items:center; }
-.basket_product_wrap .basket_product_row .product_action .amount { margin-top:0.5em; margin-bottom:0.5em; }
-.basket_product_wrap .basket_product_row .product_action .price_total { font-weight:bold; }
+.basket_product_wrap .basket_product_row .product_action .amount { width:80px; margin-top:0.5em; margin-bottom:0.5em; text-align:center;}
+.basket_product_wrap .basket_product_row .product_action .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_product_wrap .basket_product_row .product_action .price { width: 39%; display:inline-block; text-align:right; }
+.basket_product_wrap .basket_product_row .product_action .price_total { width: 39%; display:inline-block; font-weight:bold; text-align:right; }
+.basket_product_wrap .basket_product_row .product_info { display:flex; width:100%; justify-content:space-between; align-items:center; }
+.basket_product_wrap .basket_product_row .product_info .titlep { width: 20%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_product_wrap .basket_product_row .product_info .title { width: 30%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_product_wrap .basket_product_row .product_info .valuel { width: 50%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_product_wrap .basket_product_row .product_info .valuer { width: 50%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_product_wrap .basket_product_row .product_info .fulll { width: 80%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_product_wrap .basket_product_row .product_info .dummyr { width: 19%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_product_wrap .basket_product_row .product_info .dummy { flex-grow:1; width:90px; }
+.basket_product_wrap .basket_product_row .product_info .dummyp { flex-grow:1; width:110px; }
+.basket_sum_wrap .basket_sum_row { display:flex; width:100%; justify-content:space-between; align-items:center; }
+.basket_sum_wrap .basket_sum_row .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_sum_wrap .basket_sum_row .title2 { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_sum_wrap .basket_sum_row .value { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_sum_wrap .basket_sum_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_sum_wrap .basket_sum_row .sum { width: 20%; display:inline-block; font-weight:bold; text-align:right; }
+.basket_sum_wrap .basket_sum_row .delgs { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_sum_wrap .basket_sum_row .codegs { width: 34%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_sum_wrap .basket_sum_row .codegsl { width: 33%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_sum_wrap .basket_sum_row .codegsr { width: 33%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_sum_wrap .basket_sum_row .colgsl { width: 20%; display:inline-block; font-weight:normal; text-align:left; }
+.basket_sum_wrap .basket_sum_row .colgsr { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_sum_wrap .basket_sum_row .titlegs { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }
+.basket_sum_wrap .wpsg_mod_basketteaser_row { display:flex; width:100%; justify-content:space-between; align-items:center; }
+.basket_sum_wrap .wpsg_mod_basketteaser_row .valuer { width: 20%; display:inline-block; font-weight:normal; text-align:right; }
+.basket_sum_wrap .wpsg_mod_basketteaser_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; }
+
+.wpsg_basket .wpsg_basket_removelink { float:right; text-decoration:none; border:0px !important; }
+.wpsg_basket .wpsg_checkoutbutton { float:right; }
+.wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; }
+.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; }
+.wpsg_basket .wpsg_basket_weiter_shoppen2 {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;}
+
/* Checkout + Request*/
.wpsg_checkout .wpsg_checkoutblock { width:100%; clear:both; margin-bottom:2px; position:relative; width:100%; }
@@ -137,6 +171,12 @@ input.wpsg_error { border-color:red !important; }
.wpsg_productform .wpsg_product_layer { position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); padding:0.75em; margin:-0.75em; box-sizing:content-box; }
.wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; }
.wpsg_productform .wpsg_produkt_produktbilder { max-width:200px; }
+.wpsg_productform label {
+ color: #333;
+ display: block;
+ font-weight: 800;
+ margin-bottom: 0.5em;
+}
@media (max-width:400px) {
diff --git a/views/mods/mod_abo/basket_row.phtml b/views/mods/mod_abo/basket_row.phtml
index 2d2d274..0163f12 100644
--- a/views/mods/mod_abo/basket_row.phtml
+++ b/views/mods/mod_abo/basket_row.phtml
@@ -5,12 +5,16 @@
*/
?>
-<tr class="wpsg_<?php echo (($this->view['i'] == 0)?'odd':'even'); ?>">
- <td class="wpsg_cell_number">
-
- </td>
- <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'); ?>">
+<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']); ?>
- </td>
-</tr> \ No newline at end of file
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </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 1d26f53..a0e3c62 100644
--- a/views/mods/mod_basketteaser/basket_row.phtml
+++ b/views/mods/mod_basketteaser/basket_row.phtml
@@ -5,21 +5,28 @@
*/
?>
-<tr class="wpsg_mod_basketteaser_row_<?php echo $this->view['data']['id']; ?> wpsg_<?php echo (($this->view['wpsg_mod_productvars']['i'] == 0)?'odd':'even'); ?>">
- <td class="wpsg_cell_number">&nbsp;</td>
- <td class="wpsg_cell_name">
+<div class="wpsg_mod_basketteaser_row wpsg_mod_basketteaser_row_<?php echo $this->view['data']['id']; ?>">
+ <div class="valuel">
<?php if ($this->getProduktLink($this->view['data'])) { ?>
<a href="<?php echo $this->getProduktLink($this->view['data']); ?>"><?php echo wpsg_hspc((($this->view['data']['detailname'] != '')?$this->view['data']['detailname']:$this->view['data']['name'])); ?></a>
<?php } else { ?>
<?php echo wpsg_hspc((($this->view['data']['detailname'] != '')?$this->view['data']['detailname']:$this->view['data']['name'])); ?>
<?php } ?>
- </td>
- <td class="wpsg_cell_preis"><?php echo wpsg_ff($this->view['data']['preis'], $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($this->view['data']['mwst_value'], '%'); ?></td>
- <?php } ?>
- <td class="wpsg_cell_menge"><input name="wpsg_mod_basketteaser_row[<?php echo $this->view['data']['id']; ?>]" type="text" size="3" value="0" /></td>
- <td class="wpsg_cell_gesamtpreis">
+ </div>
+ <div class="valuel">
+ <?php echo wpsg_ff($this->view['data']['preis'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ <div class="valuel">
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <?php echo wpsg_ff($this->view['data']['mwst_value'], '%'); ?>
+ <?php } ?>
+ </div>
+ <div class="valuer">
+ <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>
- </td>
-</tr> \ No newline at end of file
+ </div>
+
+</div>
+<br /> \ No newline at end of file
diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index 14b2d94..694286c 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -5,9 +5,12 @@
*/
?>
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td colspan="1"><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>" 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 } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
@@ -15,16 +18,18 @@
<?php } else { /* Sonst sofort lieferbar */ ?>
<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
<?php } ?>
- </td>
-</tr>
-
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </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="4">
- <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_gutschein/basket_row_end.phtml b/views/mods/mod_gutschein/basket_row_end.phtml
index 9bca86b..f9b2d0b 100644
--- a/views/mods/mod_gutschein/basket_row_end.phtml
+++ b/views/mods/mod_gutschein/basket_row_end.phtml
@@ -5,13 +5,15 @@
*/
?>
-<tr class="wpsg_gutschein_weight">
- <td colspan="<?php echo ($this->view['colspan'] + 1); ?>" class="wpsg_cell_gutschein">
-
+<br />
+<div class="basket_sum_row">
+ <div class="codegs">
<label for="wpsg_gutschein_input"><?php echo __('Gutscheincode:', 'wpsg'); ?></label>
-
- <input class="wpsg_gutschein_add wpsg_button" type="submit" name="wpsg_gutschein_add" value="<?php echo __('Hinzufügen', 'wpsg'); ?>" />
+ </div>
+ <div class="codegsl">
<input id="wpsg_gutschein_input" class="wpsg_gutschein_input <?php echo ((in_array("gutschein", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg[gutschein]" value="" />
-
- </td>
-</tr> \ No newline at end of file
+ </div>
+ <div class="codegsr">
+ <input class="wpsg_gutschein_add wpsg_button" type="submit" name="wpsg_gutschein_add" value="<?php echo '&nbsp;'.__('Einlösen', 'wpsg').'&nbsp;'; ?>" />
+ </div>
+</div> \ No newline at end of file
diff --git a/views/mods/mod_productvariants/basket_row.phtml b/views/mods/mod_productvariants/basket_row.phtml
index ba8063e..d0de622 100644
--- a/views/mods/mod_productvariants/basket_row.phtml
+++ b/views/mods/mod_productvariants/basket_row.phtml
@@ -5,10 +5,13 @@
*/
?>
-<?php //wpsg_debug($this->view['variante']) ?>
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td><?php echo __('Variante', 'wpsg'); ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>">
+<?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)) { ?>
@@ -19,5 +22,9 @@
<?php } else { ?>
<?php echo $this->view['variante']['key']; ?>
<?php } ?>
- </td>
-</tr> \ No newline at end of file
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </div>
+
+</div> \ No newline at end of file
diff --git a/views/mods/mod_productvars/basket_row.phtml b/views/mods/mod_productvars/basket_row.phtml
index dc08c07..663c956 100644
--- a/views/mods/mod_productvars/basket_row.phtml
+++ b/views/mods/mod_productvars/basket_row.phtml
@@ -6,22 +6,29 @@
?>
<?php foreach ($this->view['wpsg_mod_productvars']['data'] as $pv) { ?>
-<tr class="wpsg_<?php echo (($this->view['wpsg_mod_productvars']['i'] == 0)?'odd':'even'); ?> wpsg_basket_productvars">
- <td><?php echo __($pv['name'], 'wpsg'); ?> <?php if ($pv['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>:</td>
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>">
+<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 ?>
<select class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]">
<option value="not_set"><?php echo __('Bitte wählen', 'wpsg'); ?></option>
<?php foreach ((array)$pv['auswahl'] as $option) { ?>
- <option <?php echo (($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == wpsg_hspc($option))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
+ <option <?php echo ((@wpsg_hspc($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]) == wpsg_hspc($option))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($option); ?>"><?php echo wpsg_hspc($option); ?></option>
<?php } ?>
</select>
<?php } else if ($pv['typ'] == '2') { // Textfeld ?>
<input class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]" value="<?php echo @wpsg_hspc($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]); ?>" />
<?php } else if ($pv['typ'] == '3') { // Checkbox ?>
<input type="hidden" value="0" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]" />
- <input <?php echo (($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == '1')?'checked="checked"':''); ?> class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="checkbox" value="1" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]" />
+ <input <?php echo ((@wpsg_hspc($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]) == '1')?'checked="checked"':''); ?> class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="checkbox" value="1" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]" />
<?php } ?>
- </td>
-</tr>
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </div>
+
+</div>
<?php } ?> \ No newline at end of file
diff --git a/views/mods/mod_produktattribute/basket_row.phtml b/views/mods/mod_produktattribute/basket_row.phtml
index b53c5fa..5ad6e81 100644
--- a/views/mods/mod_produktattribute/basket_row.phtml
+++ b/views/mods/mod_produktattribute/basket_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')?'3':'2'); ?>">
+<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>
-<?php }?>
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </div>
+
+</div>
+<?php }?> \ No newline at end of file
diff --git a/views/mods/mod_weight/basket_row.phtml b/views/mods/mod_weight/basket_row.phtml
index f8739c4..2b56e5a 100644
--- a/views/mods/mod_weight/basket_row.phtml
+++ b/views/mods/mod_weight/basket_row.phtml
@@ -5,9 +5,16 @@
*/
//wpsg_debug($this->view);
?>
-<tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
- <td colspan="1"><?php echo __('Gewicht', 'wpsg'); ?>:</td>
- <td class="wpsg_cell_weight_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>">
+<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')); ?>
- </td>
-</tr> \ No newline at end of file
+ </div>
+ <div class="dummyr">
+ <?php echo __('&nbsp;'); ?>
+ </div>
+
+</div> \ No newline at end of file
diff --git a/views/mods/mod_weight/basket_row_end.phtml b/views/mods/mod_weight/basket_row_end.phtml
index 97da5bf..a320397 100644
--- a/views/mods/mod_weight/basket_row_end.phtml
+++ b/views/mods/mod_weight/basket_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="basket_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 __('&nbsp;'); ?>
+ </div>
+</div> \ No newline at end of file
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 3fecba6..7a3bfca 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -23,11 +23,11 @@
<?php if (sizeof($this->view['basket']['produkte']) > 0) { ?>
<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
- <?php } else {?>
+ <?php } else {?>
<?php $GLOBALS['step'] = 1; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
- <?php } ?>
+ <?php } ?>
- <?php if (!isset($this->view['noFormTag'])) { ?>
+ <?php if (!isset($this->view['noFormTag'])) { ?>
<form id="wpsg_basket_form" name="wpsg_basket_form" method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>">
<?php } ?>
@@ -37,18 +37,44 @@
<div class="basket_product_wrap">
- <?php foreach ($this->view['basket']['produkte'] as $k => $product_data) { ?>
+ <?php $i = 0; foreach ($this->view['basket']['produkte'] as $k => $product_data) { $i ++; ?>
+
<div class="basket_product_row">
- <?php $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_data['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); ?>
- <?php if (wpsg_isSizedArray($arImages)) { ?>
+ <?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 echo wp_get_attachment_image($arImages[0]['post_id'], array(300, 300), false, array()); ?>
+ <?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 } ?>
</div>
<?php } ?>
-
+
<div class="product_content">
<div class="product_name">
@@ -62,162 +88,144 @@
<div class="product_shortdesc"><?php echo $product_data['shortdesc']; ?></div>
<?php } ?>
+ <a class="wpsg_basket_removelink" href="<?php echo $this->getRemoveLinkURL($product_data['product_index']); ?>" title="<?php echo __('Produkt aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie das Produkt aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
+ <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
+ </a>
+
</div>
<div class="product_action">
+ <div class="title">
+ <?php echo __("Menge", "wpsg"); ?>
+ </div>
<div class="amount">
<input class="wpsg_form_submit_return" type="text" name="wpsg[menge][<?php echo $product_data['product_index']; ?>]" <?php echo ((wpsg_isTrue($product_data['oneOnly']) || wpsg_isSizedInt($product_data['basket_multiple'], 4))?'readonly="readonly"':''); ?> value="<?php echo wpsg_hspc($product_data['menge']); ?>" size="3" />
</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') { ?>
+ <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 __('&nbsp;'); ?>
+ </div>
+
+ </div>
+ <?php } ?>
+
+ <?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>
+ <?php echo $strBasketRow; ?>
+
</div>
</div>
- <?php } ?>
+ <?php } // foreach products ?>
+
</div>
+ <div class="basket_sum_wrap">
- <table>
- <tr class="wpsg_kopf">
- <th class="wpsg_cell_number">&nbsp;</th>
- <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 $k => $p) { $i ++; ?>
- <?php $strBasketRow = ''; ob_start(); $this->callMods('basket_row', array(&$p, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?>
- <tr class="productrow_1 wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td class="wpsg_cell_number" rowspan="<?php echo 2 + substr_count($strBasketRow, '<tr'); ?>">
-
- <a class="wpsg_basket_removelink" href="<?php echo $this->getRemoveLinkURL($p['product_index']); ?>" title="<?php echo __('Produkt aus dem Warenkorb entfernen', 'wpsg'); ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass sie das Produkt aus dem Warenkorb entfernen möchten?', 'wpsg'); ?>');">
- <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
- </a>
-
- </td>
- <td class="wpsg_cell_menge">
- <input class="wpsg_form_submit_return" type="text" name="wpsg[menge][<?php echo $p['product_index']; ?>]" <?php echo ((wpsg_isTrue($p['oneOnly']) || wpsg_isSizedInt($p['basket_multiple'], 4))?'readonly="readonly"':''); ?> value="<?php echo wpsg_hspc($p['menge']); ?>" size="3" />
- </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 } ?>
- <td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['menge'] * $p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
- </tr>
- <tr class="productrow_2 wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
- <td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>" class="wpsg_cell_name">
- <?php if ($this->get_option('wpsg_mod_produktbilder_basketimage') == '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_basket_productimage">
- <?php if (wpsg_isSizedString($arBilder[0]['guid'])) { ?>
-
- <?php
- if (isset($p['product_key'])) {
- //$url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium'));
- $arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($p['product_key']));
- $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail');
- $url = $ais[0];
- } else {
- $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'medium'));
- }
- echo "<img src=".$url." alt='' />";
- ?>
-
+ <?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>
+
+ <?php $bLine = false; ?>
+ <?php if (isset($this->view['basket']['gs'])) { $bLine = true; ?>
+ <div class="basket_sum_row">
+ <div class="titlegs">
+ <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
+ </div>
+ <div class="wpsg_basket_removelink">
+ <a href="<?php echo str_replace('&', '&amp;', $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'); ?>" />
+ </a>
+ </div>
+ </div>
+ <div class="basket_sum_row">
+ <div class="delgs">&nbsp;</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 } ?>
- <?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 $strBasketRow; ?>
- <?php } ?>
- <?php $this->callMods('basket_row_afterproducts', array(&$p, $i)); ?>
- <?php if (isset($this->view['basket']['gs'])) { ?>
- <tr class="wpsg_row_gutschein">
- <td class="wpsg_cell_number" rowspan="2">
- <a href="<?php echo str_replace('&', '&amp;', $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'); ?>" />
- </a>
- </td>
- <td class="wpsg_cell_menge">1</td>
- <td class="wpsg_cell_preis">
- <?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 } ?>
- </td>
<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
- <td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
- <?php } ?>
- <td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
- </tr>
- <tr class="productrow_2">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_name">
- <?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
- </td>
- </tr>
+ <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 } ?>
- <?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"></td>
- <td class="wpsg_cell_name">
- <?php echo __('Rabatt', 'wpsg'); ?>
- </td>
- <td class="wpsg_cell_preis">
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $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 __('anteilig', 'wpsg'); ?></td>
- <?php } ?>
- <td class="wpsg_cell_gesamtpreis">
- <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
+
+ <div class="basket_sum_row">
+ <?php if (isset($this->view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?>
+ <div class="title">
+ <?php echo __("Rabatt", "wpsg"); $bLine = true; ?>:
+ </div>
+ <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+ <div class="value">
+ <?php echo __('anteilig', 'wpsg'); ?>
+ </div>
+ <?php } ?>
+ <div class="value">
+ <?php echo '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ <?php } ?>
+ </div>
+
+ <?php if ($bLine == true) { ?>
+ <div class="wpsg_spacer"></div>
<?php } ?>
- <tr class="wpsg_row_summe">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+
+ <div class="basket_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 echo wpsg_translate(__('Summe (zzgl. #1#)', '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 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 } ?>
<?php } ?>
- <?php } ?>
- </td>
- <td class="wpsg_cell_summe_value">
+ </div>
+ <div class="value">
<?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <tr class="wpsg_basket_shipping">
- <td colspan="3" class="wpsg_cell_shipping_label">
+ </div>
+ </div>
+
+ <div class="basket_sum_row">
+ <div class="title">
<?php echo wpsg_translate(__('<a href="#1#">Versandkosten</a>:', 'wpsg'),
$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN)
); ?>
- <?php if (sizeof($this->arShipping) > 1) { ?>
+ <?php if (sizeof($this->arShipping) > 1) { ?>
<select name="set_shipping" class="wpsg_form_submit set_shipping">
<option><?php echo __('Bitte wählen', 'wpsg')?></option>
- <?php foreach ($this->arShipping as $s_id => $s) { ?>
+ <?php foreach ($this->arShipping as $s_id => $s) { ?>
<option <?php echo (($s['id'] == $this->view['basket']['checkout']['shipping'])?'selected="selected"':''); ?> value="<?php echo $s_id; ?>"><?php echo wpsg_hspc(__($s['name'], 'wpsg')); ?></option>
<?php } ?>
</select>
@@ -231,124 +239,144 @@
<?php foreach ($this->view['arLander'] as $l_id => $l) { ?>
<option <?php echo (($l_id == $this->getFrontendCountry(true))?'selected="selected"':''); ?> value="<?php echo $l_id; ?>"><?php echo wpsg_hspc(__($l, 'wpsg')); ?></option>
<?php } ?>
- </select>
+ </select>
<?php } else { ?>
<input type="hidden" name="set_land" value="<?php echo $this->view['basket']['checkout']['shipping_land']; ?>" />
<?php } ?>
- </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)
- {
-
- 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'], '%');
-
- }
-
- ?></td>
- <?php /*?><td class="wpsg_cell_mwst"><?php echo (($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'] > 0)?wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'):__('anteilig', 'wpsg')); ?></td> */?>
- <?php } ?>
- <td class="wpsg_cell_shipping_value">
+ </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')); ?>
- </td>
- </tr>
+ </div>
+ </div>
<?php /* Zeile für Zahlungsart BEGIN */ ?>
<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>
- <tr class="wpsg_basket_payment">
- <td colspan="3" class="wpsg_cell_payment_label">
- <?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>
- <?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>
+ <div class="basket_sum_row">
+ <div class="title">
+ <?php echo __('Zahlungsart:', 'wpsg').'&nbsp;&nbsp;&nbsp;&nbsp;'; ?>
+ <?php if (sizeof($this->arPayment) > 1) { ?>
+ <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 } ?>
+ </select>
+ <?php } else if (!wpsg_isSizedArray($this->arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?>
+ <span><?php echo __('Keine Zahlungsart möglich / Bitte manuell anfragen', 'wpsg'); ?></span>
+ <?php } else { ?>
+ <span><?php echo $this->arPayment[$this->view['basket']['checkout']['payment']]['name']; ?></span>
<?php } ?>
- </select>
- <?php } else if (!wpsg_isSizedArray($this->arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?>
- <span><?php echo __('Keine Zahlungsart möglich / Bitte manuell anfragen', 'wpsg'); ?></span>
- <?php } else { ?>
- <span><?php echo $this->arPayment[$this->view['basket']['checkout']['payment']]['name']; ?></span>
- <?php } ?>
- </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)
- {
-
- 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 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'], '%');
+
+ }
- }
-
- ?></td>
- <?php } ?>
- <td class="wpsg_cell_payment_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
+ } ?>
+ </div>
+ <div class="value">
+ <?php echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?>
+ </div>
+ </div>
<?php } ?>
<?php /* Zeile für Zahlungsart ENDE */ ?>
-
+
<?php if (get_option("wpsg_kleinunternehmer") == "1") { ?>
- <tr class="wpsg_basket_kleinunternehmer">
- <td colspan="<?php echo $this->view['colspan'] + 1; ?>"><?php echo get_option('wpsg_kleinunternehmer_text'); ?></td>
- </tr>
- <tr class="wpsg_basket_gesamt">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
- <?php echo __('Gesamtpreis', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamtsumme_value">
- <?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <?php } else { ?>
- <tr class="wpsg_basket_gesamt_netto wpsg_row_small">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+ <div class="basket_sum_row">
+ <div class="title2">
+ <?php echo get_option('wpsg_kleinunternehmer_text'); ?>
+ </div>
+ <div class="value">
+ <?php echo __('&nbsp;'); ?>
+ </div>
+ </div>
+
+ <div class="basket_sum_row">
+ <div class="title2">
+ <?php echo __('Gesamtpreis', 'wpsg'); ?>:
+ </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="basket_sum_row">
+ <div class="title2">
<?php echo __('Gesamtpreis (Netto)', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamtsumme_value">
+ </div>
+ <div class="sum">
<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
- <?php foreach ($this->view['basket']['mwst'] as $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'], 'wpsg')); ?>:
- </td>
- <td class="wpsg_cell_mwst_value">
- <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
- </td>
- </tr>
+ </div>
+ </div>
+
+ <?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')); ?>:
+ </div>
+ <div class="value">
+ <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+ </div>
+ </div>
<?php } ?>
- <tr class="wpsg_basket_gesamt wpsg_row_small">
- <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+ <div class="wpsg_spacer"></div>
+ <div class="basket_sum_row">
+ <div class="title2">
<?php echo __('Gesamtpreis (Brutto)', 'wpsg'); ?>:
- </td>
- <td class="wpsg_cell_gesamtsumme_value">
+ </div>
+ <div class="sum">
<?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?>
- </td>
- </tr>
+ </div>
+ </div>
+ <div class="wpsg_spacer"></div>
<?php } ?>
+
<?php $this->callMods('basket_row_end', array(&$this->view)); ?>
- </table>
-
- <?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>
-
- <br />
+
+ <br />
+ <div class="wpsg_spacer"></div>
+
+ <div class="basket_sum_row">
+ <div class="title2">
+
+ </div>
+ <div class="value">
+ <?php echo __('&nbsp;', 'wpsg'); ?>
+ </div>
+ </div>
+
+ <?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>
+
+ </div>
<input type="hidden" name="wpsg_basket_submit" value="1" />
@@ -360,17 +388,20 @@
<br /><br />
<a href="<?php echo WPSG_URL_WP;?>" class="wpsg_basket_weiter_shoppen"><?php echo __('weiter shoppen', 'wpsg'); ?></a>
- <?php } ?>
+ <?php } ?>
<div class="wpsg_clear"></div>
-
- <?php $this->ClearSessionErrors(); ?>
- <?php if (!isset($this->view['noFormTag'])) { ?>
- </form>
+ <?php $this->ClearSessionErrors(); ?>
+
+ <?php if (!isset($this->view['noFormTag'])) { ?>
+ </form>
<?php } ?>
+ <br />
<?php $this->callMods('basket_after', array(&$this->view)); ?>
-
+
+ <br />
+
<?php } else { ?>
<p><?php echo __('Keine Produkte im Warenkorb.', 'wpsg'); ?></p>
<?php } ?>
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-16 21:26:17 +0000