summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/admin/form/checkbox.phtml18
-rw-r--r--views/admin/form/input.phtml2
-rw-r--r--views/admin/module.phtml2
-rw-r--r--views/css/admin.css7
-rw-r--r--views/mods/mod_discount/settings_edit.phtml203
5 files changed, 100 insertions, 132 deletions
diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index 6abc56c..fcf63e6 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -1,11 +1,17 @@
<div class="form-group form-group-sm form-checkbox <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">
- <div class="<?php
-
- if (wpsg_isTrue($this->view['field_config']['fullWidth'])) echo 'col-sm-12';
- else echo 'col-sm-offset-6 col-sm-6';
-
- ?>">
+ <?php if (wpsg_isSizedString($this->view['field_config']['label'])) { $value_class = 'col-sm-6'; ?>
+ <label class="col-sm-6 control-label">
+ <?php echo wpsg_hspc($this->view['field_config']['label']); ?>
+ </label>
+ <?php } else {
+
+ if (wpsg_isTrue($this->view['field_config']['fullWidth'])) $value_class = 'col-sm-12';
+ else $value_class = 'col-sm-offset-6 col-sm-6';
+
+ } ?>
+
+ <div class="<?php echo $value_class; ?>">
<div class="checkbox">
<label>
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 2af7457..82ea89e 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -47,7 +47,7 @@
jQuery(document).ready(function() {
- jQuery('#<?php echo $this->view['field_id']; ?>').datepicker();
+ jQuery('#<?php echo $this->view['field_id']; ?>').datepicker( { dateFormat: 'dd.mm.yy' } );
} );
diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index 5c56e73..f7be96c 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -69,7 +69,7 @@
<?php } ?>
- <?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (($this->arAllModule[$_REQUEST['modul']]->free === true || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0))) { ?>
+ <?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0))) { ?>
<?php if ($this->arAllModule[$_REQUEST['modul']]->inline === true) { ?>
<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>
<?php } ?>
diff --git a/views/css/admin.css b/views/css/admin.css
index 791eaea..b575979 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -219,5 +219,12 @@
.wpsg_mod_deliverynote_fieldtable .col_groesse { width:50px; }
.wpsg_foottextlist .col_standard { text-align:center; }
+/* Modul Rabatt */
+.wpsg_mod_discount_hirarchieorder input { display:none; }
+.wpsg_mod_discount_hirarchieorder li { border:1px solid #C4C4C4; border-radius:5px; width:100%; display:inline-block; margin-bottom:5px; padding:5px 5px 5px 5px; font-size:12px; cursor:move; }
+.wpsg_mod_discount_seriescol { width:33%; float:left; font-size:12px; line-height:30px; }
+.wpsg_mod_discount_seriescol input { width:70%; line-height:20px; float:right; }
+.wpsg_mod_discount_seriescol:nth-child(2) strong { width:70%; float:right; }
+
#beschreibung_ifr { height:500px; }
diff --git a/views/mods/mod_discount/settings_edit.phtml b/views/mods/mod_discount/settings_edit.phtml
index c33a6b9..ac61b47 100644
--- a/views/mods/mod_discount/settings_edit.phtml
+++ b/views/mods/mod_discount/settings_edit.phtml
@@ -6,137 +6,92 @@
?>
-<br />
-<div class="wpsg_mod_discount_settings">
- <div class="wpsg_admin_box" id="wpsg_tab">
- <div class="head">
- <div class="title">
- <div class="tab" id="tab1"><?php echo __('Produktrabatt', 'wpsg'); ?></div>
- <div class="tab" id="tab2"><?php echo __('Warenkorbrabatt', 'wpsg'); ?></div>
- <div class="wpsg_clear"></div>
- </div>
- </div>
- <div class="content" id="wpsg_mwst_list">
-
- <div id="tabcontent1" class="tabcontent">
-
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_productdiscount', __('Rabatt auf Produkte', 'wpsg'), $this->get_option('wpsg_mod_discount_productdiscount'), array('help' =>'wpsg_mod_discount_productdiscount')); ?>
-
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_universal', __('Rabatt auf alle Produkte', 'wpsg'), $this->get_option('wpsg_mod_discount_universal'), array('help' => 'wpsg_mod_discount_universal')); ?>
-
- <div class="wpsg_form_field" id="wpsg_mod_discount_universal_layer">
- <div class="wpsg_form_left">&nbsp;</div>
- <div class="wpsg_form_right">
- <div class="wpsg_mod_discount_generalcol">
- <strong><?php echo __('Von (tt.mm.jjjj)', 'wpsg'); ?></strong><br />
- <input name="wpsg_mod_discount_universal_from" type="text" value="<?php echo $this->get_option('wpsg_mod_discount_universal_from'); ?>" id="wpsg_mod_discount_universal_from" />
- </div>
- <div class="wpsg_mod_discount_generalcol">
- <strong><?php echo __('Bis (tt.mm.jjjj)', 'wpsg'); ?></strong><br />
- <input name="wpsg_mod_discount_universal_to" type="text" value="<?php echo $this->get_option('wpsg_mod_discount_universal_to'); ?>" id="wpsg_mod_discount_universal_to" />
- </div>
- <div class="wpsg_mod_discount_generalcol">
- <strong><?php echo __('Rabatt', 'wpsg'); ?></strong><br />
- <input name="wpsg_mod_discount_universal_value" type="text" value="<?php echo $this->get_option('wpsg_mod_discount_universal_value'); ?>" id="wpsg_mod_discount_universal_value" />
- </div>
- </div>
- <div class="wpsg_clear"></div><br />
- </div>
-
- <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_productgroupdiscount', __('Rabatt auf Produktgruppen', 'wpsg'), $this->get_option('wpsg_mod_discount_productgroupdiscount'), array('help' => 'wpsg_mod_discount_productgroupdiscount')); ?>
- <?php } ?>
-
- <?php if ($this->hasMod('wpsg_mod_customergroup')) { ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_customergroup', __('Rabatt auf Kundengruppen', 'wpsg'), $this->get_option('wpsg_mod_discount_customergroup'), array('help' => 'wpsg_mod_discount_customergroup')); ?>
- <?php } ?>
-
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_show', __('Originalpreis im Produkttemplate anzeigen', 'wpsg'), $this->get_option('wpsg_mod_discount_show'), array ('help' => 'wpsg_mod_discount_show')); ?>
-
- <div class="wpsg_form_field" id="wpsg_mod_discount_hierarchie">
- <div class="wpsg_form_left">
- <?php echo __('Rabattreihenfolge (für Berechnung):', 'wpsg')?><br />
- <a href="#" onclick="return wpsg_mod_discount_restoredefaulthierarchie();"><?php echo __('Standard wiederherstellen', 'wpsg'); ?></a>
- </div>
- <div class="wpsg_form_right">
-
- <ul>
- <?php foreach ($this->view['wpsg_mod_discount']['hierarchie'] as $discount_typ) { ?>
- <li class="<?php echo $discount_typ; ?>">
- <input type="hidden" name="wpsg_mod_discount_hierarchie[]" value="<?php echo $discount_typ; ?>" />
- <input type="checkbox" value="<?php echo $discount_typ; ?>" <?php echo ((in_array($discount_typ, (array)explode(',', $this->get_option('wpsg_mod_discount_hierarchie'))))?'checked="checked"':''); ?> name="wpsg_mod_discount_hierarchie[]" />&nbsp;
- <?php echo $this->callMod('wpsg_mod_discount', 'getNameFromType', array($discount_typ)); ?>
- </li>
- <?php } ?>
- </ul>
-
- <p class="wpsg_hinweis"><?php echo __('Reihenfolge kann mittels Drag&Drop verändert werden.', 'wpsg'); ?></p>
-
- <input type="hidden" name="wpsg_mod_discount_stopRabatt" value="0" />
- <label>
- <input type="checkbox" name="wpsg_mod_discount_stopRabatt" value="1" <?php echo (($this->get_option('wpsg_mod_discount_stopRabatt') == '1')?'checked="checked"':''); ?> />
- <?php echo __('Nur ersten Rabatt berücksichtigen', 'wpsg'); ?>
- </label>
-
- </div>
- <div class="wpsg_clear"></div>
- </div>
-
- </div>
-
- <div id="tabcontent2" class="tabcontent">
-
- <div class="wpsg_form_field">
- <div class="wpsg_form_left"><?php echo __('Staffelung:', 'wpsg'); ?></div>
- <div class="wpsg_form_right">
-
- <div class="wpsg_mod_discount_seriescol"><strong><?php echo __('Bestellwert', 'wpsg'); ?></strong></div>
- <div class="wpsg_mod_discount_seriescol"><strong><?php echo __('Rabatt', 'wpsg'); ?></strong></div>
- <div class="wpsg_clear"></div>
-
- <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg').' '.wpsg_ff(0, $this->get_option('wpsg_currency')); ?></div>
- <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[0][rabatt]" value="<?php echo wpsg_ff($this->view['data'][0]['rabatt']); ?>" /></div>
- <div class="wpsg_clear"></div>
-
- <?php foreach ($this->view['data'] as $k => $v) { if ($k > 0) { ?>
- <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg').' '.wpsg_ff($v['value'], $this->get_option('wpsg_currency')); ?></div>
- <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[<?php echo $k; ?>][rabatt]" value="<?php echo wpsg_ff($v['rabatt']); ?>" /></div>
- <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><label><input type="checkbox" name="value[<?php echo $k; ?>][del]" value="1" /> <?php echo __('löschen', 'wpsg'); ?></label></div>
- <input type="hidden" name="value[<?php echo $k; ?>][value]" value="<?php echo $v['value']; ?>" /><div class="wpsg_clear"></div>
- <?php } } ?>
-
- <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg'); ?> <input type="text" name="neu[value]" value="" /> <?php echo $this->get_option('wpsg_currency'); ?></div>
- <div class="wpsg_mod_discount_seriescol"><input type="text" name="neu[rabatt]" value="" /></div>
- <div class="wpsg_clear"></div>
-
- </div>
- </div>
- <div class="wpsg_clear"></div>
-
- <br />
-
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_showBasket', __('Nächste Staffelung im Warenkorb anpreisen', 'wpsg'), $this->get_option('wpsg_mod_discount_showBasket')); ?>
-
- </div>
-
- </div>
-
- </div>
+<div>
+ <ul class="nav nav-tabs" role="tablist">
+ <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Produktrabatt', 'wpsg'); ?></a></li>
+ <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Warenkorbrabatt', 'wpsg'); ?></a></li>
+ </ul>
+ <div class="tab-content">
+ <div role="tabpanel" class="tab-pane active" id="tab1">
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_productdiscount', __('Rabatt auf Produkte', 'wpsg'), $this->get_option('wpsg_mod_discount_productdiscount'), array('label' => __('Aktivierte Rabatte', 'wpsg'), 'help' =>'wpsg_mod_discount_productdiscount')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_universal', __('Rabatt auf alle Produkte', 'wpsg'), $this->get_option('wpsg_mod_discount_universal'), array('help' => 'wpsg_mod_discount_universal')); ?>
+
+ <div class="wpsg_form_field" id="wpsg_mod_discount_universal_layer">
+ <?php echo wpsg_drawForm_TextStart(); ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount_universal_from', __('Von (tt.mm.jjjj)', 'wpsg'), $this->get_option('wpsg_mod_discount_universal_from'), array('datepicker' => true)); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount_universal_to', __('Bis (tt.mm.jjjj)', 'wpsg'), $this->get_option('wpsg_mod_discount_universal_to'), array('datepicker' => true)); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_discount_universal_value', __('Rabatt', 'wpsg'), $this->get_option('wpsg_mod_discount_universal_value'), array()); ?>
+
+ <?php echo wpsg_drawForm_TextEnd('', array('noP' => true)); ?>
+ </div>
+
+ <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_productgroupdiscount', __('Rabatt auf Produktgruppen', 'wpsg'), $this->get_option('wpsg_mod_discount_productgroupdiscount'), array('help' => 'wpsg_mod_discount_productgroupdiscount')); ?>
+ <?php } ?>
+
+ <?php if ($this->hasMod('wpsg_mod_customergroup')) { ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_customergroup', __('Rabatt auf Kundengruppen', 'wpsg'), $this->get_option('wpsg_mod_discount_customergroup'), array('help' => 'wpsg_mod_discount_customergroup')); ?>
+ <?php } ?>
+
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_show', __('Originalpreis im Produkttemplate anzeigen', 'wpsg'), $this->get_option('wpsg_mod_discount_show'), array ('help' => 'wpsg_mod_discount_show')); ?>
+
+ <br />
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <ul class="wpsg_mod_discount_hirarchieorder">
+ <?php foreach ($this->view['wpsg_mod_discount']['hierarchie'] as $discount_typ) { ?>
+ <li class="<?php echo $discount_typ; ?>">
+ <input type="hidden" name="wpsg_mod_discount_hierarchie[]" value="<?php echo $discount_typ; ?>" />
+ <input type="checkbox" value="<?php echo $discount_typ; ?>" <?php echo ((in_array($discount_typ, (array)explode(',', $this->get_option('wpsg_mod_discount_hierarchie'))))?'checked="checked"':''); ?> name="wpsg_mod_discount_hierarchie[]" />
+ <?php echo $this->callMod('wpsg_mod_discount', 'getNameFromType', array($discount_typ)); ?>
+ </li>
+ <?php } ?>
+ </ul>
+ <p class="info"><?php echo __('Reihenfolge kann mittels Drag&Drop verändert werden.', 'wpsg'); ?></p>
+ <a href="#" onclick="return wpsg_mod_discount_restoredefaulthierarchie();"><?php echo __('Standard wiederherstellen', 'wpsg'); ?></a>
+
+ <?php echo wpsg_drawForm_TextEnd(__('Rabattreihenfolge (für Berechnung)', 'wpsg'), array('noP' => true)); ?>
+
+ <br />
+
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_stopRabatt', __('Nur ersten Rabatt berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_discount_stopRabatt'), array('label' => __('Optionen', 'wpsg'))); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_showBasket', __('Nächste Staffelung im Warenkorb anpreisen', 'wpsg'), $this->get_option('wpsg_mod_discount_showBasket')); ?>
+
+ </div>
+ <div role="tabpanel" class="tab-pane" id="tab2">
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <div class="wpsg_mod_discount_seriescol"><strong><?php echo __('Bestellwert', 'wpsg'); ?></strong></div>
+ <div class="wpsg_mod_discount_seriescol"><strong><?php echo __('Rabatt', 'wpsg'); ?></strong></div>
+ <div class="wpsg_clear"></div>
+
+ <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg').' '.wpsg_ff(0, $this->get_option('wpsg_currency')); ?></div>
+ <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[0][rabatt]" value="<?php echo wpsg_ff($this->view['data'][0]['rabatt']); ?>" /></div>
+ <div class="wpsg_clear"></div>
+
+ <?php foreach ($this->view['data'] as $k => $v) { if ($k > 0) { ?>
+ <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg').' '.wpsg_ff($v['value'], $this->get_option('wpsg_currency')); ?></div>
+ <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><input type="text" name="value[<?php echo $k; ?>][rabatt]" value="<?php echo wpsg_ff($v['rabatt']); ?>" /></div>
+ <div class="wpsg_mod_discount_seriescol wpsg_mod_discount_seriescol_sub"><label><input type="checkbox" name="value[<?php echo $k; ?>][del]" value="1" /> <?php echo __('löschen', 'wpsg'); ?></label></div>
+ <input type="hidden" name="value[<?php echo $k; ?>][value]" value="<?php echo $v['value']; ?>" /><div class="wpsg_clear"></div>
+ <?php } } ?>
+
+ <div class="wpsg_mod_discount_seriescol"><?php echo __('ab', 'wpsg'); ?> <input type="text" name="neu[value]" value="" /> <?php echo $this->get_option('wpsg_currency'); ?></div>
+ <div class="wpsg_mod_discount_seriescol"><input type="text" name="neu[rabatt]" value="" /></div>
+ <div class="wpsg_clear"></div>
+ <?php echo wpsg_drawForm_TextEnd(__('Staffelung', 'wpsg'), array('noP' => true)); ?>
+
+
+ </div>
+ </div>
</div>
<script type="text/javascript">/* <![CDATA[ */
jQuery(document).ready(function() {
- jQuery("#wpsg_mod_discount_hierarchie ul").sortable().disableSelection();
-
- jQuery('#wpsg_tab').wpsg_tab( {
- 'cookiename': 'wpsg_mod_discount_tab',
- 'tab1': function() {
- jQuery('.tablink').show();
- }
- } );
+ jQuery("ul.wpsg_mod_discount_hirarchieorder").sortable().disableSelection();
jQuery('#wpsg_mod_discount_universal').bind('change', function() {
wpsg_switchUniversalDiscount();
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-16 21:32:50 +0000