summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/css/frontend.css26
-rw-r--r--views/mods/mod_shippingadress/checkout_inner_prebutton.phtml16
-rw-r--r--views/warenkorb/checkout2.phtml2
3 files changed, 12 insertions, 32 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css
index a058e7a..171c100 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -71,7 +71,7 @@ input.wpsg_error { border-color:red !important; }
.wpsg_checkout .wpsg_logout_box a { float:right; border-bottom:0px; padding:15px; font-weight:bold; color:#FF0000; font-weight:bold; color:#fff; background-color:#333; }
/* Checkout2 */
-.shippay_wrap { margin-top:40px; width:100%; font-family:Arial; padding-right:10px; }
+.shippay_wrap { margin-top:40px; width:100%; font-family:Arial; }
.wpsg_payment .wpsg_payment_textwrap { margin-top:40px; }
.shippay_wrap .shippay_item_wrap { position:relative; border-top:1px solid #DFDFDF; cursor:pointer; padding-left:8px; }
.shippay_wrap .shippay_item_wrap .shippay_hint { display:none; margin-top:-5px; padding-bottom:20px; font-family:Arial; font-size:11px; color:#3F3F3F; }
@@ -87,6 +87,7 @@ input.wpsg_error { border-color:red !important; }
.wpsg_checkout2 .wpsg_mandatoryfield_hint { margin-top:1rem; }
.wpsg_checkout2 .wpsg_overviewbutton { float:right; }
.wpsg_checkout2 .wpsg_checkoutbutton { float:left; }
+.wpsg_checkout2 .wpsg_shipping { margin-bottom:2rem; }
/* Overview */
.wpsg_overview #wpsg_overview_form { display:inline; }
@@ -277,28 +278,7 @@ input.wpsg_error { border-color:red !important; }
/* Modul Zubehörprodukte */
.wpsg_mod_relatedproducts_basket { margin-top:2rem; }
-
-/* Progress bar
-.steps { list-style:none; margin:0; padding:10px 0; overflow:hidden; font-family:'inherit',sans-serif; font-size:1.5rem; width:100%; height:auto; line-height:20px; font-weight:bold; counter-reset:li; }
-.steps > a, .steps > p { float:left; margin:5px 0;}
-.steps a, .steps p { list-style-image:none; list-style-type:none; margin-left:0; text-align:center; color:#bbb; background:#f2f2f2; position:relative; margin-left:43px; border-bottom:medium none !important; }
-
-.steps a:after, .steps p:after { position:absolute; top:50%; left:100%; content:" "; height:0; width:0; border:solid transparent; border-left-color:#f2f2f2; border-width:19px; margin-top:-19px; }
-.steps a span:after, .steps p span:after { position:absolute; top:50%; right:100%; content:" "; height:0; width:0; border:solid #f2f2f2; border-left-color:transparent; border-width:19px; margin-top:-19px; }
-
-.steps a span, .steps p span { display:block; padding:9px 28px 9px 9px; }
-.steps a span:before, .steps p span:before { counter-increment:li; }
-
-.steps a.current, .steps p.current { color:#3a3a3a; background:#c9c9c9; }
-.steps a.current:after, .steps p.current:after { border-left-color:#c9c9c9; }
-.steps a.current span:after, .steps p.current span:after { border-color:#c9c9c9; border-left-color:transparent; }
-
-.steps a.step1, .steps p.step1 { z-index:9; }
-.steps a.step2, .steps p.step2 { z-index:8; }
-.steps a.step3, .steps p.step3 { z-index:7; }
-.steps a.step4, .steps p.step4 { z-index:6; }
-*/
-
+
.wpsg_progress { padding:0px; margin:0px; width:100%; margin-bottom:100px; margin-top:30px; }
.wpsg_progress:after { border:1px solid #C5C5C5; height:10px; background-color:#F2F2F2; box-sizing:border-box; display:block; width:100%; content:" "; }
.wpsg_progress span.step { width:25%; display:block; float:left; list-style:none; position:relative; }
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index dbdb5fc..c63a5b1 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -8,7 +8,7 @@
<div class="wpsg_checkoutblock">
<label for="act_checkout_shippingadress">
- <input id="act_checkout_shippingadress" class="wpsg_checkout formfield_checkbox" type="checkbox" name="wpsg[checkout][diff_shippingadress]" value="" <?php echo ($_SESSION['wpsg']['checkout']['diff_shippingadress'] == 1)? 'checked="checked"':'' ?> onclick="view_checkout_shippingadresss()" />
+ <input id="act_checkout_shippingadress" class="wpsg_checkout formfield_checkbox" type="checkbox" name="wpsg[checkout][diff_shippingadress]" value="" <?php echo ((wpsg_isSizedInt($_SESSION['wpsg']['checkout']['diff_shippingadress']))?'checked="checked"':'') ?> onclick="view_checkout_shippingadresss()" />
<?php echo __('Gesonderte Lieferadresse abweichend von der Rechnungsadresse verwenden', 'wpsg') ?>
</label>
</div>
@@ -19,7 +19,7 @@
<div class="wpsg_checkoutblock">
<label for="firma" class="wpsg_checkout"><?php echo __("Firma:", "wpsg"); ?></label>
- <input class="wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_firma']); ?>" />
+ <input class="wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_firma'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
@@ -28,7 +28,7 @@
</label>
<select class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" type="select" name="wpsg[checkout][shipping_title]" id="shipping_title" >
<?php foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
- <option value="<?php echo $t; ?>" <?php echo (($this->view['basket']['checkout']['shipping_title'] == $t)?'selected="selected"':''); ?>><?php echo $t; ?></option>
+ <option value="<?php echo $t; ?>" <?php echo ((wpsg_isSizedString($this->view['basket']['checkout']['shipping_title'], $t))?'selected="selected"':''); ?>><?php echo $t; ?></option>
<?php } ?>
</select>
</div>
@@ -37,35 +37,35 @@
<label for="vname" class="wpsg_checkout"><?php echo __("Vorname:", "wpsg"); ?>
<span class="wpsg_required">*</span>
</label>
- <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_vname']); ?>" />
+ <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_vname" name="wpsg[checkout][shipping_vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_vname'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
<label for="name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
<span class="wpsg_required">*</span>
</label>
- <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_name']); ?>" />
+ <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_name'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
<label for="strasse" class="wpsg_checkout"><?php echo __("Strasse, Nr.:", "wpsg"); ?>
<span class="wpsg_required">*</span>
</label>
- <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_strasse']); ?>" />
+ <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_strasse" name="wpsg[checkout][shipping_strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl:", "wpsg"); ?>
<span class="wpsg_required">*</span>
</label>
- <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="number" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_plz']); ?>" />
+ <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_plz" name="wpsg[checkout][shipping_plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_plz'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
<label for="ort" class="wpshopgermany_checkout"><?php echo __("Ort:", "wpsg"); ?>
<span class="wpsg_required">*</span>
</label>
- <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['shipping_ort']); ?>" />
+ <input class="validate[required_shipping] wpsg_checkout <?php echo ((in_array("shipping_ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_ort" name="wpsg[checkout][shipping_ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_ort'])); ?>" />
</div>
<div class="wpsg_checkoutblock">
diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml
index 8883ac6..41cac3c 100644
--- a/views/warenkorb/checkout2.phtml
+++ b/views/warenkorb/checkout2.phtml
@@ -33,7 +33,7 @@
<?php } else { ?>
<div class="wpsg_payship_name"><?php echo __($s['name'], 'wpsg'); ?></div>
<?php } ?>
- <?php if ((isset($s['hint']) && trim($s['hint']) != '') || $s['price'] > 0) { ?>
+ <?php if ((isset($s['hint']) && trim($s['hint']) != '') || wpsg_getFloat($s['price']) > 0) { ?>
<div id="shipping_<?php echo $s['id']; ?>_hint" class="shippay_hint">
<?php if ($s['price'] > 0) { ?>
<?php echo __('Gebühr', 'wpsg'); ?>: <?php echo wpsg_ff($s['price'], $this->get_option('wpsg_currency')); ?><br />
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-16 23:24:33 +0000