diff options
| -rw-r--r-- | views/admin/module.phtml | 10 | ||||
| -rw-r--r-- | views/css/admin.css | 1 | ||||
| -rw-r--r-- | views/gfx/eu.png | bin | 0 -> 3684 bytes | |||
| -rw-r--r-- | views/js/frontend.js | 1 | ||||
| -rw-r--r-- | views/order/index.phtml | 2 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 3 | ||||
| -rw-r--r-- | views/warenkorb/customerquestion.phtml | 40 |
7 files changed, 15 insertions, 42 deletions
diff --git a/views/admin/module.phtml b/views/admin/module.phtml index 5518aa9..b4d6dff 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -48,7 +48,15 @@ <?php } ?>
</h3> -->
- <p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p><br />
+ <p>
+
+ <?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?>
+
+ <a class="modul_help_link" target="_blank" href="https://doc.maennchen1.de/?modul_key=<?php echo $_REQUEST['modul']; ?>" title="<?php echo __('Hilfe zum Modul', 'wpsg'); ?>"><?php echo __('Hilfe zum Modul', 'wpsg'); ?></a>
+
+ </p>
+
+ <br />
<?php if (!isset($wpsg_update_data['modulinfo'][$_REQUEST['modul']]) || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>
diff --git a/views/css/admin.css b/views/css/admin.css index 545e1c0..becaf30 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -237,6 +237,7 @@ table.wpsgitrecht_table { width:100%; } #wpsg-bs .modultable tr > *:nth-child(2) { width:100px; }
#wpsg-bs .modultable tr > *:nth-child(3) { width:175px; }
#wpsg-bs .modultable tr > *:nth-child(4) { width:200px; }
+.modul_help_link { float:right; }
/* Domainverwaltung */
#wpsg-bs .domaintable td { padding:4px 8px !important; vertical-align:middle; }
diff --git a/views/gfx/eu.png b/views/gfx/eu.png Binary files differnew file mode 100644 index 0000000..7320c8c --- /dev/null +++ b/views/gfx/eu.png diff --git a/views/js/frontend.js b/views/js/frontend.js index e354123..67b69f5 100644 --- a/views/js/frontend.js +++ b/views/js/frontend.js @@ -21,6 +21,7 @@ jQuery('body,html').addClass('wpsg_noscroll');
jQuery('body').append('<div id="wpsg_calc_layer"><div class="content"><img class="loading" src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div></div>');
+
jQuery.ajax( {
url: wpsg_ajax.url_basket,
data: {
diff --git a/views/order/index.phtml b/views/order/index.phtml index 982a131..652c17e 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -234,7 +234,7 @@ <?php echo wpsg_translate(__('#1# x <a href="#2#">#3#</a> für je #4#', 'wpsg'),
$oOrderProduct->getCount(),
WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(),
- $oOrderProduct->getProduct()->getProductName(),
+ $oOrderProduct->getProductName(),
wpsg_ff($oOrderProduct->getOneAmount(), $this->get_option('wpsg_currency'))
); ?><br />
<?php } ?>
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 54725cb..8394ca1 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -233,6 +233,9 @@ </td>
<?php } ?>
<td class="wpsg_mwst_col">
+ <?php if (wpsg_isSizedInt($d['euleistungsortregel'])) { ?>
+ <img src="<?php echo WPSG_URL; ?>views/gfx/eu.png" alt="<?php echo __('Produkt unterliegt der EU-Leistungsortregel', 'wpsg'); ?>" />
+ <?php } ?>
<?php echo strtoupper($d['mwst_key']).' ('.wpsg_ff($oProduct->getDefaultTaxValue(), '%').' '.$this->getDefaultCountry()->kuerzel.')'; ?>
</td>
<td>
diff --git a/views/warenkorb/customerquestion.phtml b/views/warenkorb/customerquestion.phtml index 595fbdb..95ba68c 100644 --- a/views/warenkorb/customerquestion.phtml +++ b/views/warenkorb/customerquestion.phtml @@ -48,44 +48,4 @@ <script type="text/javascript">/* <![CDATA[ */
- jQuery(window).resize(function() {
-
- // Hintergrund vom Body übernehmen
- jQuery('#wpsg_calc_layer .content').css( { 'background-color': jQuery('body').css('background-color') } );
-
- if (jQuery(window).width() < 600)
- {
-
- var layer_width = jQuery(window).width() - 50;
-
- jQuery('#wpsg_calc_layer .content').css( {
- 'width': layer_width + 'px',
- 'margin-left': (-1 * (layer_width / 2)) + 'px'
- } );
-
- }
-
- var layer_height = jQuery('#wpsg_calc_layer .content').height();
-
- if (jQuery(window).height() < layer_height)
- {
-
- jQuery('#wpsg_calc_layer .content').css( {
- 'margin-top': '25px;',
- 'top': '0px'
- } );
-
- }
- else
- {
-
- jQuery('#wpsg_calc_layer .content').css( {
- 'margin-top': (-1 * (layer_height / 2)) + 'px',
- 'top': '50%'
- } );
-
- }
-
- } ).resize();
-
/* ]]> */</script>
|
