diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/css/frontend.css | 6 | ||||
| -rw-r--r-- | views/mods/mod_abo/index.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml | 4 | ||||
| -rw-r--r-- | views/mods/mod_productgroups/add.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_request/requestpage.phtml | 6 | ||||
| -rw-r--r-- | views/mods/mod_shippingadress/checkout_inner_prebutton.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_statistics/simplefilter.phtml | 6 | ||||
| -rw-r--r-- | views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml | 14 | ||||
| -rw-r--r-- | views/warenkorb/checkout.phtml | 6 |
9 files changed, 25 insertions, 25 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css index 8aa0631..c64bc52 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -199,9 +199,9 @@ html body .wpsg_product_garan_wrap a.wpsg_product_garan img { display:block; max .wpsg_checkout h2 { font-weight:bold; padding:10px 0; }
.wpsg_checkout .wpsg_commentblock textarea { box-sizing:border-box; padding:2px; width:100%; height:150px; }
.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; }
-.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock { display:flex; flex-direction:row; width:100%; }
-.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .street { flex-grow:1; padding-right:15px; }
-.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .nr input {width: 100%;}
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock, .wpsg_checkout #wpsg_shipping_streetnr.wpsg_checkoutblock { display:flex; flex-direction:row; width:100%; }
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .street, .wpsg_checkout #wpsg_shipping_streetnr.wpsg_checkoutblock .street { flex-grow:1; padding-right:15px; }
+.wpsg_checkout #wpsg_streetnr.wpsg_checkoutblock .nr input, .wpsg_checkout #wpsg_shipping_streetnr.wpsg_checkoutblock .nr input {width: 100%;}
/* Checkout2 */
.shippay_wrap { margin-top:40px; width:100%; font-family:Arial; padding-right:10px; }
diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml index ff64ad6..3e8bc85 100644 --- a/views/mods/mod_abo/index.phtml +++ b/views/mods/mod_abo/index.phtml @@ -51,7 +51,7 @@ <select name="filter[cdate_m]" class="form-control input-sm">
<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
<?php for ($i = 1; $i <= 12; $i ++) { ?>
- <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo wpsg_strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
<?php } ?>
</select>
</div>
@@ -72,7 +72,7 @@ <select name="filter[enddate_m]" class="form-control input-sm">
<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
<?php for ($i = 1; $i <= 12; $i ++) { ?>
- <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo wpsg_strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
<?php } ?>
</select>
</div>
diff --git a/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml b/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml index 795bbba..d10b900 100644 --- a/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_basketteaser/produkt_addedit_sidebar.phtml @@ -13,8 +13,8 @@ </h3>
</div>
<div class="panel-body">
- <?php echo wpsg_drawForm_Input('mod_basketteaser_from', __('Von', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_from']), array('datepicker' => true)); ?>
- <?php echo wpsg_drawForm_Input('mod_basketteaser_to', __('Bis', 'wpsg'), wpsg_fromDate($this->view['data']['mod_basketteaser_to']), array('datepicker' => true)); ?>
+ <?php echo wpsg_drawForm_Input('mod_basketteaser_from', __('Von', 'wpsg'), wpsg_fromDate(($this->view['data']['mod_basketteaser_from'] ?? '')), array('datepicker' => true)); ?>
+ <?php echo wpsg_drawForm_Input('mod_basketteaser_to', __('Bis', 'wpsg'), wpsg_fromDate(($this->view['data']['mod_basketteaser_to'] ?? '')), array('datepicker' => true)); ?>
<br /><br />
diff --git a/views/mods/mod_productgroups/add.phtml b/views/mods/mod_productgroups/add.phtml index 2d304f6..09de0a8 100644 --- a/views/mods/mod_productgroups/add.phtml +++ b/views/mods/mod_productgroups/add.phtml @@ -69,7 +69,7 @@ <?php echo wpsg_drawForm_Select('template_file', __('Template', 'wpsg'), $this->view['templates'], $this->view['data']['template_file']); ?>
<?php echo wpsg_drawForm_Select('infopage', __('Info Seite', 'wpsg'), $this->view['pages'], $this->view['data']['infopage']); ?>
- <?php echo wpsg_drawForm_Input('pos', __('Positionsnummer (Sortierung, aufsteigend)', 'wpsg'), $this->view['data']['pos']); ?>
+ <?php echo wpsg_drawForm_Input('pos', __('Positionsnummer (Sortierung, aufsteigend)', 'wpsg'), $this->view['data']['pos'] ?? ''); ?>
<div class="form-group form-group-sm ">
<label class="col-sm-6 control-label"><?php echo __('Produktgruppenbild', 'wpsg'); ?></label>
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml index 974ff0e..84a212a 100644 --- a/views/mods/mod_request/requestpage.phtml +++ b/views/mods/mod_request/requestpage.phtml @@ -279,7 +279,7 @@ <h2><?php echo __('Kontaktdaten', 'wpsg'); ?></h2>
<?php if ($this->view['pflicht']['firma'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_firma">
+ <div class="wpsg_checkoutblock" id="wpsg_firma_block">
<label for="wpsg_firma" class="wpsg_checkout"><?php echo __("Firma", "wpsg"); ?>:<?php if ($this->view['pflicht']['firma'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>
</label>
<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[request][customer][firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['firma'])); ?>" />
@@ -396,7 +396,7 @@ <?php } ?>
<?php if ($this->view['pflicht']['land'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_land">
+ <div class="wpsg_checkoutblock" id="wpsg_land_block">
<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?>:<?php if ($this->view['pflicht']['land'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>
</label>
<select name="wpsg[request][customer][land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_land">
@@ -409,7 +409,7 @@ <?php } ?>
<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_ustidnr">
+ <div class="wpsg_checkoutblock" id="wpsg_ustidnr_block">
<label for="wpsg_ustidnr" class="wpsg_checkout"><?php echo __("UStIdNr.", "wpsg"); ?>:<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>
</label>
<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[request][customer][ustidnr]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['ustidnr'])); ?>" />
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml index 1e7563c..b7d591b 100644 --- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml +++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml @@ -62,7 +62,7 @@ <?php if ($this->view['pflicht']['wpsg_showNr'] === '1') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_streetnr">
+ <div class="wpsg_checkoutblock" id="wpsg_shipping_streetnr">
<label for="shipping_strasse" class="street wpsg_checkout"><?php echo __('Straße:', 'wpsg'); ?>
<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'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(wpsg_getStr($this->view['basket']['checkout']['shipping_strasse'])); ?>" />
diff --git a/views/mods/mod_statistics/simplefilter.phtml b/views/mods/mod_statistics/simplefilter.phtml index 328bf34..9623431 100644 --- a/views/mods/mod_statistics/simplefilter.phtml +++ b/views/mods/mod_statistics/simplefilter.phtml @@ -22,7 +22,7 @@ }
<?php
- if ($this->view['filter']['related'] > 0)
+ if (($this->view['filter']['related'] ?? 0) > 0)
{
?>
jQuery("#filter-related").val("<?php echo $this->view['filter']['related']; ?>");
@@ -65,8 +65,8 @@ <div class="customfilter" style="display:none; width:100%;">
- <?php echo wpsg_drawForm_Date('filter[day][0]', __('von', 'wpsg'), $this->view['filter']['day'][0]['d'].'.'.$this->view['filter']['day'][0]['m'].'.'.$this->view['filter']['day'][0]['Y'], array('time' => false)); ?>
- <?php echo wpsg_drawForm_Date('filter[day][1]', __('bis', 'wpsg'), $this->view['filter']['day'][1]['d'].'.'.$this->view['filter']['day'][1]['m'].'.'.$this->view['filter']['day'][1]['Y'], array('time' => false)); ?>
+ <?php echo wpsg_drawForm_Date('filter[day][0]', __('von', 'wpsg'), (isset($this->view['filter']['day'][0]) ? $this->view['filter']['day'][0]['d'].'.'.$this->view['filter']['day'][0]['m'].'.'.$this->view['filter']['day'][0]['Y'] : ''), array('time' => false)); ?>
+ <?php echo wpsg_drawForm_Date('filter[day][1]', __('bis', 'wpsg'), (isset($this->view['filter']['day'][1]) ? $this->view['filter']['day'][1]['d'].'.'.$this->view['filter']['day'][1]['m'].'.'.$this->view['filter']['day'][1]['Y'] : ''), array('time' => false)); ?>
<?php /* if (isset($this->view['filter']['day'][0])) { ?>
diff --git a/views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml b/views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml index 65ad306..f7364b5 100644 --- a/views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml +++ b/views/mods/mod_voucherproduct/produkt_edit_sidebar.phtml @@ -13,21 +13,21 @@ </div>
<div class="panel-body">
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_gs', __('Gutschein generieren', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_gs']); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_gs', __('Gutschein generieren', 'wpsg'), ($this->view['data']['wpsg_mod_voucherproduct_gs'] ?? '')); ?>
<div class="wpsg_mod_voucherproduct_gs wpsg_mod_voucherproduct_gs_1" style="display:none;">
<br />
- <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_gslaenge', __('Länge des Gutscheincodes', 'wpsg'), (($this->view['data']['wpsg_mod_voucherproduct_gslaenge'] > 0)?$this->view['data']['wpsg_mod_voucherproduct_gslaenge']:10)); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_available', __('Gültigkeit (Tage)', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_available']); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_coupon', __('Gutschein als Wertgutschein generieren', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_coupon']); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_flexprice', __('Flexibler Preis', 'wpsg'), $this->view['data']['wpsg_mod_voucherproduct_flexprice']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_gslaenge', __('Länge des Gutscheincodes', 'wpsg'), ((($this->view['data']['wpsg_mod_voucherproduct_gslaenge'] ?? '') > 0)?($this->view['data']['wpsg_mod_voucherproduct_gslaenge'] ?? ''):10)); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_available', __('Gültigkeit (Tage)', 'wpsg'), ($this->view['data']['wpsg_mod_voucherproduct_available'] ?? '')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_coupon', __('Gutschein als Wertgutschein generieren', 'wpsg'), ($this->view['data']['wpsg_mod_voucherproduct_coupon'] ?? '')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_voucherproduct_flexprice', __('Flexibler Preis', 'wpsg'), ($this->view['data']['wpsg_mod_voucherproduct_flexprice'] ?? '')); ?>
<div class="wpsg_mod_voucherproduct_flexprice_layer wpsg_mod_voucherproduct_flexprice_layer_1" style="display:none;">
- <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_flexprice_min', __('Minimaler Preis', 'wpsg'), ((wpsg_tf($this->view['data']['wpsg_mod_voucherproduct_flexprice_min']) > 0)?wpsg_ff($this->view['data']['wpsg_mod_voucherproduct_flexprice_min']):'')); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_flexprice_max', __('Maximaler Preis', 'wpsg'), ((wpsg_tf($this->view['data']['wpsg_mod_voucherproduct_flexprice_max']) > 0)?wpsg_ff($this->view['data']['wpsg_mod_voucherproduct_flexprice_max']):'')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_flexprice_min', __('Minimaler Preis', 'wpsg'), ((wpsg_tf(($this->view['data']['wpsg_mod_voucherproduct_flexprice_min'] ?? '')) > 0)?wpsg_ff(($this->view['data']['wpsg_mod_voucherproduct_flexprice_min'] ?? '')):'')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_voucherproduct_flexprice_max', __('Maximaler Preis', 'wpsg'), ((wpsg_tf(($this->view['data']['wpsg_mod_voucherproduct_flexprice_max'] ?? '')) > 0)?wpsg_ff(($this->view['data']['wpsg_mod_voucherproduct_flexprice_max'] ?? '')):'')); ?>
</div>
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml index f58166a..f1dce4a 100644 --- a/views/warenkorb/checkout.phtml +++ b/views/warenkorb/checkout.phtml @@ -118,7 +118,7 @@ <div class="wpsg_inner">
<?php if ($this->view['pflicht']['firma'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_firma">
+ <div class="wpsg_checkoutblock" id="wpsg_firma_block">
<label for="wpsg_firma"><?php echo __("Firma:", "wpsg"); ?>
<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
</label>
@@ -307,7 +307,7 @@ <?php } ?>
<?php if ($this->view['pflicht']['land'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_land">
+ <div class="wpsg_checkoutblock" id="wpsg_land_block">
<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land:", "wpsg"); ?>
<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
</label>
@@ -321,7 +321,7 @@ <?php } ?>
<?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
- <div class="wpsg_checkoutblock" id="wpsg_ustidnr">
+ <div class="wpsg_checkoutblock" id="wpsg_ustidnr_block">
<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.:", "wpsg"); ?>
<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
</label>
|