diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/css/frontend.css | 1 | ||||
| -rw-r--r-- | views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml | 59 | ||||
| -rw-r--r-- | views/mods/mod_deliverytime/settings_edit.phtml | 16 | ||||
| -rw-r--r-- | views/produkttemplates/standard.phtml | 13 |
4 files changed, 66 insertions, 23 deletions
diff --git a/views/css/frontend.css b/views/css/frontend.css index cf3c3a3..853d3c1 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -241,6 +241,7 @@ input.wpsg_error { border-color:red !important; } font-weight: 800;
margin-bottom: 0.5em;
}
+.wpsg_product_deliverytime_holiday { height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000; }
@media (max-width:400px) {
diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml index f53b258..9576850 100644 --- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml +++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml @@ -17,30 +17,42 @@ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), wpsg_getStr($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?>
<?php } ?>
</div>
- <?php /* if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) */ {?>
- <?php if (isset($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']))
- //echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct1]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?>
-
- <div class="wpsg_mod_deliverytime_store wpsg_mod_deliverytime_store_1">
- <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storetext]', __('Hinweistext', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'], array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
- <?php ?>
- <?php $arPageWithoutCreate = $this->view['pages']; unset($arPageWithoutCreate['-1']); ?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storelink]', __('Seite mit Adressdaten', 'wpsg'), wpsg_array_merge(array(
- '0' => __('Keine Verlinkung auf eine Seite anzeigen', 'wpsg')
- ), $arPageWithoutCreate), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'], array('help' => 'wpsg_page_mod_deliverytime_storelink')); ?>
- </div>
+ <?php if (isset($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'])) {?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?>
- <br />
+ <div class="wpsg_mod_deliverytime_store wpsg_mod_deliverytime_store_1">
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storetext]', __('Hinweistext', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'], array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
+ <?php ?>
+ <?php $arPageWithoutCreate = $this->view['pages']; unset($arPageWithoutCreate['-1']); ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storelink]', __('Seite mit Adressdaten', 'wpsg'), wpsg_array_merge(array(
+ '0' => __('Keine Verlinkung auf eine Seite anzeigen', 'wpsg')
+ ), $arPageWithoutCreate), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'], array('help' => 'wpsg_page_mod_deliverytime_storelink')); ?>
+ </div>
+
+ <br />
+
+ <?php } ?>
+ <?php /* Verzögerung */ ?>
+ <?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_delay') == '1')) { ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_delay')); ?>
+ <div class="wpsg_mod_deliverytime_delay_activ" style="display:none;">
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytext]', __('Grund für verzögerte Lieferung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'], array('help' => 'wpsg_mod_deliverytime_delayText')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytime]', __('Zeitangabe der Verzögerung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'], array('help' => 'wpsg_mod_deliverytime_delayTime')); ?>
+ </div>
<?php } ?>
- <?php //echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('help' => 'wpsg_mod_deliverytime_delay')); ?>
- <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_delay')); ?>
- <div class="wpsg_mod_deliverytime_delay_activ" style="display:none;">
- <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytext]', __('Grund für verzögerte Lieferung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'], array('help' => 'wpsg_mod_deliverytime_delayText')); ?>
- <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytime]', __('Zeitangabe der Verzögerung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'], array('help' => 'wpsg_mod_deliverytime_delayTime')); ?>
- </div>
+ <br />
+
+ <?php /* Urlaubsmodus aktiv */ ?>
+ <?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holiday]', __('Urlaubszeit', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produktspezifische Einstellung'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holiday'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_holiday')); ?>
+ <div class="wpsg_mod_deliverytime_holiday_activ" style="display:none;">
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holidayStart]', __('Urlaubsbeginn', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayStart'], array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayStart')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holidayEnd]', __('Urlaubsende', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidayEnd'], array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayEnd')); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_holidaytext]', __('Urlaubsgruß', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_holidaytext'], array('help' => 'wpsg_mod_deliverytime_holidayText')); ?>
+ </div>
+ <?php } ?>
<br />
@@ -69,6 +81,13 @@ } ).change();
+ jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_holiday').bind('change', function() {
+
+ if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_holiday_activ').show();
+ else jQuery('.wpsg_mod_deliverytime_holiday_activ').hide();
+
+ } ).change();
+
jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_source').bind('change', function() {
if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_show').show();
diff --git a/views/mods/mod_deliverytime/settings_edit.phtml b/views/mods/mod_deliverytime/settings_edit.phtml index d1b8d13..e206c65 100644 --- a/views/mods/mod_deliverytime/settings_edit.phtml +++ b/views/mods/mod_deliverytime/settings_edit.phtml @@ -40,6 +40,15 @@ <br /><br />
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime_holiday', __('Urlaubzeit', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_holiday'), array('help' => 'wpsg_mod_deliverytime_holiday')); ?>
+<div class="wpsg_mod_deliverytime_holiday_activ" style="display:none;">
+<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime_holidayStart', __('Urlaubsbeginn', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_holidayStart'), array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayStart')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime_holidayEnd', __('Urlaubsende', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_holidayEnd'), array('datepicker' => true, 'help' => 'wpsg_mod_deliverytime_holidayEnd')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime_holidaytext', __('Urlaubsgruß', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_holidaytext'), array('help' => 'wpsg_mod_deliverytime_holidaytext')); ?>
+</div>
+
+<br /><br />
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime_show_product', __('Im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_show_product'), array('help' => 'wpsg_mod_deliverytime_show_product')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime_show_basket', __('Im Warenkorb anzeigen', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_show_basket'), array('help' => 'wpsg_mod_deliverytime_show_basket')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime_show_overview', __('In Bestellzusammenfassung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_show_overview'), array('help' => 'wpsg_mod_deliverytime_show_overview')); ?>
@@ -80,6 +89,13 @@ else jQuery('.wpsg_mod_deliverytime_delay_activ').hide();
} ).change();
+
+ jQuery('#wpsg_mod_deliverytime_holiday').bind('change', function() {
+
+ if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_deliverytime_holiday_activ').show();
+ else jQuery('.wpsg_mod_deliverytime_holiday_activ').hide();
+
+ } ).change();
} );
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index e94fa9d..0d0d5f1 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -239,13 +239,20 @@ <label class="wpsg_amount_label" for="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>"><?php echo __('Anzahl', 'wpsg'); ?></label>
<input type="text" value="<?php echo ((wpsg_isSizedInt($this->view['data']['menge']))?$this->view['data']['menge']:'1'); ?>" name="wpsg[menge]" class="wpsg_menge" id="wpsg_menge_<?php echo $this->getTemplateIndex(); ?>" <?php echo (($this->view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> />
-
+
<?php /* Urlaubsmodus aktiv */ ?>
<?php if ($this->hasMod('wpsg_mod_deliverytime') && ($this->get_option('wpsg_mod_deliverytime_holiday') == '1')) { ?>
- <div class="wpsg_product_deliverytime_holiday"><?php echo __($this->callMod('wpsg_mod_deliverytime', 'holidayText', array($this->view['data']['product_key']))); ?></div>
+ <?php if ($this->callMod('wpsg_mod_deliverytime', 'holiday', array($this->view['data']['product_key']))) { ?>
-
+ <div class="wpsg_product_deliverytime_holiday" style="height:50px; padding:10px; width:50%; float:right; border:1px solid #ff0000;">
+
+ <?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayHolidaytext', array($this->view['data']['product_key']))); ?>
+
+ </div>
+
+ <?php } ?>
+
<?php } else {?>
<input class="wpsg_button wpsg_add_basket wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>" type="submit" value="<?php echo __('In den Warenkorb', 'wpsg'); ?>" name="wpsg[submit]" />
|
