diff options
105 files changed, 1102 insertions, 394 deletions
diff --git a/views/admin/access.phtml b/views/admin/access.phtml index 9eaa323..9e41787 100644 --- a/views/admin/access.phtml +++ b/views/admin/access.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
@@ -62,7 +62,7 @@ </tr>
<?php $wpsg_update_data = wpsg_get_update_data(); if (wpsg_isSizedInt($wpsg_update_data['returnCode'])) { ?>
<tr>
- <td class="wpsg_col_capname"><?php echo __('Lizenzverwaltung', 'wpsg'); ?></td>
+ <td class="wpsg_col_capname"><?php echo __('Update-Zugang', 'wpsg'); ?></td>
<?php foreach ($arRoles as $role_key => $r) { ?>
<td class="wpsg_col_cap">
<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_lizence]" value="0" />
diff --git a/views/admin/blognetzwerk.phtml b/views/admin/blognetzwerk.phtml index ba4f338..77e6c73 100644 --- a/views/admin/blognetzwerk.phtml +++ b/views/admin/blognetzwerk.phtml @@ -9,7 +9,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/dataprotection.phtml b/views/admin/dataprotection.phtml index 8c7d6cf..d4aba39 100644 --- a/views/admin/dataprotection.phtml +++ b/views/admin/dataprotection.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/deinstall.phtml b/views/admin/deinstall.phtml index 1000e58..d125124 100644 --- a/views/admin/deinstall.phtml +++ b/views/admin/deinstall.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml index 8aade00..5337038 100644 --- a/views/admin/emailconf.phtml +++ b/views/admin/emailconf.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
@@ -43,13 +43,13 @@ <?php echo wpsg_drawForm_Checkbox(
'wpsg_email_logo_activated',
- __("E-Maillogo anzeigen"),
+ __("E-Maillogo anzeigen", 'wpsg'),
$this->get_option('wpsg_email_logo_activated')
); ?>
<?php echo wpsg_drawForm_Checkbox(
'wpsg_email_logo_watermark',
- __("E-Maillogo als Wasserzeichen anzeigen"),
+ __("E-Maillogo als Wasserzeichen anzeigen", 'wpsg'),
$this->get_option('wpsg_email_logo_watermark')
); ?>
@@ -59,7 +59,7 @@ <div class="form-group">
<div class="col-sm-6 control-label control-label-email-conf">
- <label><?php echo __("E-Maillogo (JPG)"); ?></label>
+ <label><?php echo __("E-Maillogo (JPG)", 'wpsg'); ?></label>
</div>
<div class="col-sm-6">
<?php if(file_exists($logoPath)) { ?>
@@ -71,7 +71,7 @@ <?php if(file_exists($logoPath)) { ?>
<?php echo wpsg_drawForm_Checkbox(
'wpsg_email_logo_del',
- __("Logo Löschen"),
+ __("Logo Löschen", 'wpsg'),
0
); ?>
<?php } ?>
@@ -84,15 +84,15 @@ <div class="form-group col-logo-alignment">
<div class="col-sm-6 control-label control-label-email-conf">
- <label><?php echo __("Ausrichtung des Maillogos"); ?></label>
+ <label><?php echo __("Ausrichtung des Maillogos", 'wpsg'); ?></label>
</div>
<div class="col-sm-6 email-logo-alignment">
<?php $logoAlignment = $this->get_option('wpsg_email_logo_alignment'); ?>
<?php $standardAlignment = false; ?>
<?php if(!wpsg_isSizedString($logoAlignment)) $standardAlignment = true; ?>
- <input type="radio" name="wpsg_email_logo_alignment" value="left" <?php if($logoAlignment === "left"):?>checked<?php endif;?>> <span> <?php echo __("Linksbündig"); ?></span> <br>
- <input type="radio" name="wpsg_email_logo_alignment" value="center" <?php if($logoAlignment === "center"):?>checked<?php endif;?>> <span> <?php echo __("Zentriert"); ?></span> <br>
- <input type="radio" name="wpsg_email_logo_alignment" value="right" <?php if($logoAlignment === "right" || $standardAlignment):?>checked<?php endif;?>> <span> <?php echo __("Rechtsbündig"); ?></span>
+ <input type="radio" name="wpsg_email_logo_alignment" value="left" <?php if($logoAlignment === "left"):?>checked<?php endif;?>> <span> <?php echo __("Linksbündig", 'wpsg'); ?></span> <br>
+ <input type="radio" name="wpsg_email_logo_alignment" value="center" <?php if($logoAlignment === "center"):?>checked<?php endif;?>> <span> <?php echo __("Zentriert", 'wpsg'); ?></span> <br>
+ <input type="radio" name="wpsg_email_logo_alignment" value="right" <?php if($logoAlignment === "right" || $standardAlignment):?>checked<?php endif;?>> <span> <?php echo __("Rechtsbündig", 'wpsg'); ?></span>
</div>
</div>
@@ -102,7 +102,7 @@ <?php if(!wpsg_isSized($logoTransparency)) $logoTransparency = "100%"; ?>
<?php echo wpsg_drawForm_Input(
'wpsg_email_logo_transparency',
- __("Deckkraft des Logos"),
+ __("Deckkraft des Logos", 'wpsg'),
strpos($logoTransparency, "%") !== false ? $logoTransparency : $logoTransparency."%"
); ?>
diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml index f0a736f..1b77e11 100644 --- a/views/admin/extended.phtml +++ b/views/admin/extended.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml index c08c00e..de0f5a0 100644 --- a/views/admin/includes.phtml +++ b/views/admin/includes.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/index.phtml b/views/admin/index.phtml index 72db6e2..19bb017 100644 --- a/views/admin/index.phtml +++ b/views/admin/index.phtml @@ -22,7 +22,7 @@ <li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module"><?php echo __("Module", "wpsg"); ?></a></li>
<?php if (current_user_can('wpsg_lizence') && wpsg_isSizedInt($wpsg_update_data['returnCode'])) { ?>
- <li role="presentation" class="<?php echo (($this->view['actionName'] == "registrierung")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>
+ <li role="presentation" class="<?php echo (($this->view['actionName'] == "registrierung")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung"><?php echo __("Update-Zugang", "wpsg"); ?></a></li>
<?php } ?>
<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">
diff --git a/views/admin/kalkulation.phtml b/views/admin/kalkulation.phtml index f342bd8..c55dd22 100644 --- a/views/admin/kalkulation.phtml +++ b/views/admin/kalkulation.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index e769137..6ddebfa 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/kundendaten.phtml b/views/admin/kundendaten.phtml index 04d4e72..901fa60 100644 --- a/views/admin/kundendaten.phtml +++ b/views/admin/kundendaten.phtml @@ -9,7 +9,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/laender.phtml b/views/admin/laender.phtml index 89e2d0c..76ebe2e 100644 --- a/views/admin/laender.phtml +++ b/views/admin/laender.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/licence.phtml b/views/admin/licence.phtml index 63c6d08..c2a18ed 100644 --- a/views/admin/licence.phtml +++ b/views/admin/licence.phtml @@ -1,7 +1,7 @@ <?php
/**
- * Template für die Lizenzverwaltung
+ * Template für den Update-Zugang
*/
$wpsg_update_data = wpsg_get_update_data();
@@ -23,7 +23,7 @@ <li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module"><?php echo __("Module", "wpsg"); ?></a></li>
<?php if (current_user_can('wpsg_lizence') && is_array($wpsg_update_data)) { ?>
- <li role="presentation" class="<?php echo (($this->view['actionName'] == "licence")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>
+ <li role="presentation" class="<?php echo (($this->view['actionName'] == "licence")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung"><?php echo __("Update-Zugang", "wpsg"); ?></a></li>
<?php } ?>
<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">
@@ -48,7 +48,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Lizenzverwaltung'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Update-Zugang', 'wpsg'); ?></span>
<a class="list-group-item <?php echo (($this->view['subaction'] == 'registerdata')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=registerdata"><?php echo __('Registrierungsdaten', 'wpsg'); ?></a>
<a class="list-group-item <?php echo (($this->view['subaction'] == 'domaindata')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata"><?php echo __('Domainverwaltung', 'wpsg'); ?></a>
<a class="list-group-item <?php echo (($this->view['subaction'] == 'modulactivation')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation"><?php echo __('Modulaktivierung', 'wpsg'); ?></a>
@@ -80,7 +80,7 @@ <?php if ($wpsg_update_data['licence_model'] === 'enterprise') { $strLicenceLabel = __('Enterprise', 'wpsg'); ?>
<?php } else if ($wpsg_update_data['licence_model'] === 'pro') { $strLicenceLabel = __('Pro', 'wpsg'); } ?>
- <?php echo wpsg_drawForm_Text(_('Lizenzmodel'), $strLicenceLabel); ?>
+ <?php echo wpsg_drawForm_Text(__('Edition', 'wpsg'), $strLicenceLabel); ?>
<br />
@@ -127,7 +127,7 @@ echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=domainDeRegister', 'wpsg-admin-licence-domainDeRegister');
- ?>" class="btn btn-warning btn-sm"><?php echo __('Registrierung aufheben'); ?></a>
+ ?>" class="btn btn-warning btn-sm"><?php echo __('Registrierung aufheben', 'wpsg'); ?></a>
<?php } ?>
</td>
@@ -138,7 +138,7 @@ <?php } else { ?>
- <p><?php echo __('Es sind noch keine Domains für diese Lizenz registriert.', 'wpsg'); ?></p>
+ <p><?php echo __('Es sind noch keine Domains für diesen Update-Zugang registriert.', 'wpsg'); ?></p>
<?php } ?>
@@ -146,7 +146,7 @@ <?php if (($wpsg_update_data['licence_model'] === 'enterprise' || sizeof($wpsg_update_data['domainData']) < 1) && !in_array($_SERVER['HTTP_HOST'], $wpsg_update_data['domainData'])) { ?>
- <p class="wpsg_message_ok"><?php echo __('Diese Domain kann noch auf Ihre Lizenz aktiviert werden.', 'wpsg'); ?></p>
+ <p class="wpsg_message_ok"><?php echo __('Diese Domain kann noch auf Ihren Update-Zugang aktiviert werden.', 'wpsg'); ?></p>
<br />
@@ -205,7 +205,7 @@ <tr>
<th><?php echo __('Modulname', 'wpsg'); ?></th>
<th><?php echo __('Version', 'wpsg'); ?></th>
- <th><?php echo __('Lizenz', 'wpsg'); ?></th>
+ <th><?php echo __('Update-Zugang', 'wpsg'); ?></th>
<th><?php echo __('verfügbare Version', 'wpsg'); ?></th>
</tr>
</thead>
diff --git a/views/admin/loadsavesettings.phtml b/views/admin/loadsavesettings.phtml index 93e7219..868c9e6 100644 --- a/views/admin/loadsavesettings.phtml +++ b/views/admin/loadsavesettings.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php
diff --git a/views/admin/module.phtml b/views/admin/module.phtml index b54c7d2..f698747 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -14,7 +14,7 @@ <div class="wpsg_modul_search_wrap">
<input id="wpsg_modul_search" type="text" class="wpsg_modul_search" value="<?php echo wpsg_getStr($_COOKIE['wpsg-modulfilter-search']); ?>" />
- <label title="<?php echo __('Wenn aktiviert, werden nur aktive Module angezeigt'); ?>">
+ <label title="<?php echo __('Wenn aktiviert, werden nur aktive Module angezeigt', 'wpsg'); ?>">
<input type="checkbox" <?php echo ((wpsg_isSizedString($_COOKIE['wpsg-modulfilter-check'], 'true'))?'checked="checked"':''); ?> id="wpsg_modul_onlyactive" class="wpsg_modul_onlyactive" />
<span class="glyphicon glyphicon-ok wpsg_modul_onlyactive_glyphicon" aria-hidden="true"></span>
</label>
@@ -132,10 +132,10 @@ <?php if (!wpsg_isTrue($modul_info[$_REQUEST['modul']]['demo_active'])) { ?>
<br />
- [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=startDemo&modul=<?php echo $_REQUEST['modul']; ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher? Das Modul kann 14 Tage ab heute komplett in vollem Umfang getestet werden.', 'wpsg'); ?>');"><?php echo __('Demo Modus starten'); ?></a> ]
+ [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=startDemo&modul=<?php echo $_REQUEST['modul']; ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher? Das Modul kann 14 Tage ab heute komplett in vollem Umfang getestet werden.', 'wpsg'); ?>');"><?php echo __('Demo Modus starten', 'wpsg'); ?></a> ]
<?php } ?>
<?php } else { ?>
- <br /><span class="wpsg_error"><?php echo __('Ohne Lizenz können Sie dieses Modul nicht verwenden.', 'wpsg'); ?></span>
+ <br /><span class="wpsg_error"><?php echo __('Ohne gültigen Update-Zugang können Sie dieses Modul nicht verwenden.', 'wpsg'); ?></span>
<?php } ?>
<?php } ?>
@@ -144,7 +144,7 @@ <span class="wpsg_error"><?php echo __('Unbekannt', 'wpsg'); ?></span>
<?php } ?>
- <?php echo wpsg_drawForm_TextEnd(__('Lizenz')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Update-Zugang', 'wpsg')); ?>
<?php } ?>
@@ -228,7 +228,7 @@ </form>
<?php } else { ?>
- <p><?php echo __('Modulcodes können erst verwendet werden, wenn ihre wpShopGermany Lizenz aktiviert ist.', 'wpsg'); ?>
+ <p><?php echo __('Modulcodes können erst verwendet werden, wenn Ihr wpShopGermany-Update-Zugang aktiviert ist.', 'wpsg'); ?>
<?php } ?>
diff --git a/views/admin/modulelist.phtml b/views/admin/modulelist.phtml index e74cf7b..9704987 100644 --- a/views/admin/modulelist.phtml +++ b/views/admin/modulelist.phtml @@ -2,7 +2,7 @@ /**
* Template für die Liste der Module
- * wird in der Modulverwaltungsübersicht und in der Lizenzverwaltung verwendet
+ * wird in der Modulverwaltungsübersicht und beim Update-Zugang verwendet
*/
$wpsg_update_data = wpsg_get_update_data();
@@ -32,12 +32,14 @@ <tr>
<th><?php echo __('Modulname', 'wpsg'); ?></th>
<th><?php echo __('Version', 'wpsg'); ?></th>
- <th><?php echo __('Lizenz', 'wpsg'); ?></th>
+ <th><?php echo __('Update-Zugang', 'wpsg'); ?></th>
<th><?php echo __('verfügbare Version', 'wpsg'); ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($wpsg_update_data['modulinfo'] as $modul_key => $modul_info) { ?>
+ <?php /* Installierte Modulversion; Module ohne deklariertes $version liefern null -> vor PHP-8-Warnungen und version_compare()-Deprecations schuetzen. */ ?>
+ <?php $modul_version_installed = ($this->shop->hasModInstalled($modul_key) ? ($this->shop->arAllModule[$modul_key]->version ?? '') : ''); ?>
<tr style="font-style:normal;" class="<?php
if ($modul_info['free'] === true) echo 'active';
@@ -55,12 +57,18 @@ <?php if ($this->shop->hasModInstalled($modul_key)) { ?>
</a>
<?php } ?>
+
+ <?php /* Doku-Artikel des Moduls, kommt als doc_url aus der Modul-Registry (Licence::getModulInfo()). Fehlt bei Modulen ohne eigenen Artikel. */ ?>
+ <?php $modul_doc_url = $modul_info['doc_url'] ?? ''; ?>
+ <?php if (wpsg_isSizedString($modul_doc_url)) { ?>
+ <br /><a href="<?php echo esc_url($modul_doc_url); ?>" target="_blank" rel="noopener noreferrer" style="font-size:11px;"><?php echo esc_html__('Anleitung', 'wpsg'); ?></a>
+ <?php } ?>
</td>
<td>
<?php if ($this->shop->hasModInstalled($modul_key)) { ?>
- <?php echo $this->shop->arAllModule[$modul_key]->version; ?>
+ <?php echo $modul_version_installed; ?>
<?php } ?>
</td>
@@ -94,7 +102,7 @@ </td>
<td><?php
- if ($modul_info['active'] === true && $modul_info['version'] != $modul_info['version_latest'] && version_compare($modul_info['version_latest'], $this->shop->arAllModule[$modul_key]->version) < 0)
+ if ($modul_info['active'] === true && $modul_info['version'] != $modul_info['version_latest'] && version_compare($modul_info['version_latest'], $modul_version_installed) < 0)
{
echo $modul_info['version_latest'];
@@ -109,7 +117,7 @@ echo $modul_info['version'];
- if ($this->shop->hasModInstalled($modul_key) && $modul_info['version'] === $this->shop->arAllModule[$modul_key]->version)
+ if ($this->shop->hasModInstalled($modul_key) && $modul_info['version'] === $modul_version_installed)
{
echo ' - <strong class="wpsg_message_ok">'.__('aktuell', 'wpsg').'</strong>';
@@ -121,7 +129,7 @@ echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong><br />'.wpsg_translate(__('<a href="#1#">wpShopGermany Update</a> notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php');
}
- else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->version) > 0)
+ else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], $modul_version_installed) > 0)
{
echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong>';
@@ -144,7 +152,7 @@ <?php } else { ?>
- <?php echo __('Mit einer Lizenz (Pro, Enterprise) machst du aus deinem wpShopGermany mehr.', 'wpsg'); ?><br /><br />
+ <?php echo __('Mit einem Update-Zugang (Pro- oder Enterprise-Edition) machst du aus deinem wpShopGermany mehr.', 'wpsg'); ?><br /><br />
<?php echo __('Du erhältst neben kostenlosem Support (per Mail oder Forum, 1 Jahr Updates frei) auch die Möglichkeit, die Vielzahl der zusätzlich erhältlichen wpShopGermany Module zu nutzen.', 'wpsg'); ?>
<a href="https://shop.maennchen1.de/produkt/wpshopgermany4-lizenzkey/" target="_blank"><?php echo __('wpShopGermany im Shop ansehen', 'wpsg'); ?></a>
diff --git a/views/admin/pager.phtml b/views/admin/pager.phtml index bba8cc3..b60a03f 100644 --- a/views/admin/pager.phtml +++ b/views/admin/pager.phtml @@ -13,11 +13,11 @@ <?php $offset = 5; ?>
<?php if ($this->view['arFilter']['page'] > 2) { $offset --; ?>
- <li><a onclick="return goPage(1);" href="#" aria-label="<?php echo __('Erste Seite'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-step-backward"></i></span></a></li>
+ <li><a onclick="return goPage(1);" href="#" aria-label="<?php echo __('Erste Seite', 'wpsg'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-step-backward"></i></span></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] > 1) { $offset --; ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-backward"></i></span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite', 'wpsg'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-backward"></i></span></a></li>
<?php } ?>
<?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
@@ -31,11 +31,11 @@ <?php } ?>
<?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-play"></i></span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite', 'wpsg'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-play"></i></span></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] + 2 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['pages']; ?>);" href="#" aria-label="<?php echo __('Letzte Seite'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-step-forward"></i></span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['pages']; ?>);" href="#" aria-label="<?php echo __('Letzte Seite', 'wpsg'); ?>"><span aria-hidden="true"><i class="glyphicon glyphicon-step-forward"></i></span></a></li>
<?php } ?>
</ul>
diff --git a/views/admin/path.phtml b/views/admin/path.phtml index 8a52742..db0237d 100644 --- a/views/admin/path.phtml +++ b/views/admin/path.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml index 0418ea0..9860b1d 100644 --- a/views/admin/presentation.phtml +++ b/views/admin/presentation.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
@@ -33,6 +33,12 @@ '2' => __('Serverseitig + Javascript V2', 'wpsg')
), $this->get_option('wpsg_form_validation')); ?>
+ <?php echo wpsg_drawForm_Select('wpsg_content_filter_pagecontent', __('Seiteninhalt auf Shopseiten ausgeben', 'wpsg'), array(
+ '0' => __('Nein', 'wpsg'),
+ '1' => __('Nach Shop-Inhalt', 'wpsg'),
+ '2' => __('Vor Shop-Inhalt', 'wpsg')
+ ), $this->get_option('wpsg_content_filter_pagecontent', false, '0')); ?>
+
<br />
<?php echo wpsg_drawForm_Checkbox('wpsg_imagehandler_basketimage', __('Produktbild im Warenkorb anzeigen', 'wpsg'), $this->get_option('wpsg_imagehandler_basketimage'), array('help' => 'wpsg_imagehandler_basketimage')); ?>
diff --git a/views/admin/seiten.phtml b/views/admin/seiten.phtml index cb7bc23..0b694de 100644 --- a/views/admin/seiten.phtml +++ b/views/admin/seiten.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/shopdata.phtml b/views/admin/shopdata.phtml index cd754c8..3523408 100644 --- a/views/admin/shopdata.phtml +++ b/views/admin/shopdata.phtml @@ -9,7 +9,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/versandzonen.phtml b/views/admin/versandzonen.phtml index 809e98a..76c41e9 100644 --- a/views/admin/versandzonen.phtml +++ b/views/admin/versandzonen.phtml @@ -9,7 +9,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/widerrufsbelehrung.phtml b/views/admin/widerrufsbelehrung.phtml index ac1c355..3534a5a 100644 --- a/views/admin/widerrufsbelehrung.phtml +++ b/views/admin/widerrufsbelehrung.phtml @@ -8,7 +8,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
diff --git a/views/admin/wpml.phtml b/views/admin/wpml.phtml index e1fb45d..df2c08c 100644 --- a/views/admin/wpml.phtml +++ b/views/admin/wpml.phtml @@ -13,7 +13,7 @@ <div class="wpsg_admin_submenu">
<div class="list-group">
- <span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>
+ <span class="list-group-head list-group-item"><?php echo __('Konfiguration', 'wpsg'); ?></span>
<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>
<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>
<?php } ?>
@@ -37,7 +37,7 @@ <p class="info"><?php echo __('Fügt dynamische Inhalte wie Ländernamen, Namen von Varianten etc. zu den String-Übersetzungen von WPML hinzu und ermöglicht unter WPML -> String-Übersetzung die Übersetzung von diesen Inhalten.', 'wpsg'); ?></p>
- <input type="submit" name="wpsg_set_string_translation" class="button" value="<?php echo __('String-Übersetzung füllen'); ?>" />
+ <input type="submit" name="wpsg_set_string_translation" class="button" value="<?php echo __('String-Übersetzung füllen', 'wpsg'); ?>" />
</div>
</div>
diff --git a/views/css/style.scss b/views/css/style.scss deleted file mode 100644 index e69de29..0000000 --- a/views/css/style.scss +++ /dev/null diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml index f352a62..b811ae4 100644 --- a/views/mailtemplates/html/customer.phtml +++ b/views/mailtemplates/html/customer.phtml @@ -18,7 +18,7 @@ </tr>
<tr>
<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
- <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '._($this->view['basket']['checkout']['nr']??''))); ?></td>
+ <td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?></td>
</tr>
<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
<tr>
diff --git a/views/mods/mod_abo/basket_row.phtml b/views/mods/mod_abo/basket_row.phtml index 0163f12..dfe5581 100644 --- a/views/mods/mod_abo/basket_row.phtml +++ b/views/mods/mod_abo/basket_row.phtml @@ -14,7 +14,7 @@ <?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>
</div>
<div class="dummyr">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
\ No newline at end of file diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml index b726fc0..ff64ad6 100644 --- a/views/mods/mod_abo/index.phtml +++ b/views/mods/mod_abo/index.phtml @@ -91,7 +91,7 @@ <br />
- <?php echo wpsg_drawForm_SubmitButton(__('Abonnement suchen')); ?>
+ <?php echo wpsg_drawForm_SubmitButton(__('Abonnement suchen', 'wpsg')); ?>
</form>
</div>
diff --git a/views/mods/mod_abo/mail_admin_stoprenewal.phtml b/views/mods/mod_abo/mail_admin_stoprenewal.phtml index 9bb7825..4bda001 100644 --- a/views/mods/mod_abo/mail_admin_stoprenewal.phtml +++ b/views/mods/mod_abo/mail_admin_stoprenewal.phtml @@ -6,7 +6,7 @@ ?><?php echo __('Hallo Administrator,', 'wpsg'); ?>
-<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?>
+<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.', 'wpsg'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?>
<?php echo wpsg_translate(__('Link zur Ausgangsbestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$this->view['oOrder']->id); ?>
<?php echo wpsg_translate(__('Direkt stoppen und zur Bestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id='.$this->view['oOrder']->id.'&product_key='.$this->view['product_key'].'&do=stop&noheader=1'); ?>
diff --git a/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml index 3ab6a50..538e322 100644 --- a/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml +++ b/views/mods/mod_abo/mail_admin_stoprenewal_html.phtml @@ -10,7 +10,7 @@ <?php echo __('Hallo Administrator,', 'wpsg'); ?><br />
<br />
-<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?><br />
+<?php echo wpsg_translate(__('Der Kunde "#1#" möchte sein Abo für Produkte "#2#" anhalten.', 'wpsg'), trim($this->view['oCustomer']->getFirstname().$this->view['oCustomer']->getName()), $this->view['oProduct']->getProductName()); ?><br />
<br />
<?php echo wpsg_translate(__('Link zur Ausgangsbestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$this->view['oOrder']->id); ?><br />
<?php echo wpsg_translate(__('Direkt stoppen und zur Bestellung: <a href="#1#">#1#</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id='.$this->view['oOrder']->id.'&product_key='.$this->view['product_key'].'&do=stop&noheader=1'); ?><br />
diff --git a/views/mods/mod_abo/order_view.phtml b/views/mods/mod_abo/order_view.phtml index f3035dc..1390101 100644 --- a/views/mods/mod_abo/order_view.phtml +++ b/views/mods/mod_abo/order_view.phtml @@ -84,17 +84,17 @@ <?php echo __('Aktiv', 'wpsg'); ?>
- [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&order_product_id=<?php echo $oOrderProduct->getID(); ?>&do=stop&noheader=1"><?php echo __('Deaktivieren'); ?></a> ]
+ [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&order_product_id=<?php echo $oOrderProduct->getID(); ?>&do=stop&noheader=1"><?php echo __('Deaktivieren', 'wpsg'); ?></a> ]
<?php } else if ($abo_product_status['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>
<?php echo __('Inaktiv', 'wpsg'); ?>
- [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&order_product_id=<?php echo $oOrderProduct->getID(); ?>&do=run&noheader=1"><?php echo __('Aktivieren'); ?></a> ]
+ [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_abo&edit_id=<?php echo $_REQUEST['edit_id'] ?>&order_product_id=<?php echo $oOrderProduct->getID(); ?>&do=run&noheader=1"><?php echo __('Aktivieren', 'wpsg'); ?></a> ]
<?php } ?>
- <?php echo wpsg_drawForm_TextEnd(__('Verlängerung')); ?>
+ <?php echo wpsg_drawForm_TextEnd(__('Verlängerung', 'wpsg')); ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/mods/mod_abo/overview_row.phtml b/views/mods/mod_abo/overview_row.phtml index 75b57fe..8dc1742 100644 --- a/views/mods/mod_abo/overview_row.phtml +++ b/views/mods/mod_abo/overview_row.phtml @@ -14,7 +14,7 @@ <?php echo wpsg_translate(__('Verlängerung zu Bestellung #1# (#2# Tage)', 'wpsg'), $this->view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?>
</div>
<div class="dummyr">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
\ No newline at end of file diff --git a/views/mods/mod_abo/page_abo.phtml b/views/mods/mod_abo/page_abo.phtml index 8f1d061..79cb1a9 100644 --- a/views/mods/mod_abo/page_abo.phtml +++ b/views/mods/mod_abo/page_abo.phtml @@ -76,7 +76,7 @@ <?php if ($aboStatus['status'] === wpsg_mod_abo::STATUS_ACTIVE) { ?>
- <span class="status_activ"><?php echo __('Aktiv'); ?></span>
+ <span class="status_activ"><?php echo __('Aktiv', 'wpsg'); ?></span>
<?php if (strtotime($aboStatus['mail_admin_stop']) > 0) { ?>
@@ -85,13 +85,13 @@ <?php } else { ?>
<?php if (in_array($this->callMod('wpsg_mod_abo', 'getSetting', ['wpsg_mod_abo_autoexpire_customer', $oOrderProduct->getProductId()]), Array(wpsg_mod_abo::CUSTOMER_AUTO_MAIL, wpsg_mod_abo::CUSTOMER_AUTO_DIRECT))) { ?>
- <span class="link_wrap"><a href="<?php echo $this->getUrl(wpsg_ShopController::URL_ABO, 'wpsg_mod_abo', 'stoprenewal', Array('order_id' => $oOrder->id, 'product_key' => $oOrderProduct->getProductKey())); ?>"><?php echo __('Deaktivieren'); ?></a></span>
+ <span class="link_wrap"><a href="<?php echo $this->getUrl(wpsg_ShopController::URL_ABO, 'wpsg_mod_abo', 'stoprenewal', Array('order_id' => $oOrder->id, 'product_key' => $oOrderProduct->getProductKey())); ?>"><?php echo __('Deaktivieren', 'wpsg'); ?></a></span>
<?php } ?>
<?php } ?>
<?php } else if ($aboStatus['status'] === wpsg_mod_abo::STATUS_STOPPED) { ?>
- <span class="status_inactiv"><?php echo __('Inaktiv') ?></span>
+ <span class="status_inactiv"><?php echo __('Inaktiv', 'wpsg') ?></span>
<?php } ?>
</span>
diff --git a/views/mods/mod_abo/settings_edit.phtml b/views/mods/mod_abo/settings_edit.phtml index fc418d1..44e0208 100644 --- a/views/mods/mod_abo/settings_edit.phtml +++ b/views/mods/mod_abo/settings_edit.phtml @@ -134,14 +134,14 @@ echo __('Status: ', 'wpsg');
- ?><?php echo (($this->get_option('wpsg_mod_abo_cron_run') === '1')?_('Läuft gerade'):_('Wartend')); ?>
+ ?><?php echo (($this->get_option('wpsg_mod_abo_cron_run') === '1')?__('Läuft gerade', 'wpsg'):__('Wartend', 'wpsg')); ?>
<?php if ($this->get_option('wpsg_mod_abo_cron_run') === '1' || file_exists($pid_file)) { ?>
(<?php echo __('Start: ', 'wpsg'); ?><?php echo wpsg_formatTimestamp($this->get_option('wpsg_mod_abo_cron_start'), false, true); ?>)
<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_abo&subaction=resetCron&noheader=1'; ?>"><?php echo __('Zurücksetzen', 'wpsg'); ?></a>
<?php } ?>
</span>
-<?php echo wpsg_drawForm_TextEnd(__('Cron Status')); ?>
+<?php echo wpsg_drawForm_TextEnd(__('Cron Status', 'wpsg')); ?>
<br />
diff --git a/views/mods/mod_amazon_v2/order_done.phtml b/views/mods/mod_amazon_v2/order_done.phtml index 6af6f00..cec5247 100644 --- a/views/mods/mod_amazon_v2/order_done.phtml +++ b/views/mods/mod_amazon_v2/order_done.phtml @@ -14,7 +14,7 @@ <?php if ($view['state'] === 'Completed') { ?>
- <p><?php echo __('Bestellung wurde mit Amazon Payment bezahlt.'); ?></p>
+ <p><?php echo __('Bestellung wurde mit Amazon Payment bezahlt.', 'wpsg'); ?></p>
<?php } else if ($view['state'] === 'Unpayed') { ?>
diff --git a/views/mods/mod_billsafe/gfx/logo_100x25.png b/views/mods/mod_billsafe/gfx/logo_100x25.png Binary files differdeleted file mode 100644 index 6bf1d3a..0000000 --- a/views/mods/mod_billsafe/gfx/logo_100x25.png +++ /dev/null diff --git a/views/mods/mod_billsafe/order_done.phtml b/views/mods/mod_billsafe/order_done.phtml deleted file mode 100644 index cc40dd5..0000000 --- a/views/mods/mod_billsafe/order_done.phtml +++ /dev/null @@ -1,24 +0,0 @@ -<?php
-
- /**
- * Dieses Template wird bei der Bezahlart "Billsafe" nach der Bestellung eingebunden um auf den Billsafe Gateway zu leiten
- */
-
-?>
-<p><?php echo __('Um den Betrag mit Billsafe zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p>
-<p>
- <a href="<?php echo $this->view['wpsg_mod_billsafe']['url']; ?>">
- <img src="https://images.billsafe.de/image/image/id/22227102a95c"/>
- </a>
-</p>
-<?php if ($this->get_option('wpsg_mod_billsafe_autostart') == '1') { ?>
-<script type="text/javascript">
-
- jQuery(document).ready(function() {
- window.setTimeout(function() {
- location.href = "<?php echo $this->view['wpsg_mod_billsafe']['url']; ?>";
- }, 1000);
- } );
-
-</script>
-<?php } ?>
diff --git a/views/mods/mod_billsafe/order_view_sidebar.phtml b/views/mods/mod_billsafe/order_view_sidebar.phtml deleted file mode 100644 index 5de0042..0000000 --- a/views/mods/mod_billsafe/order_view_sidebar.phtml +++ /dev/null @@ -1,30 +0,0 @@ -<?php
-
- /**
- * Template für die erweiterten Angaben der Billsafe Zahlungsart in der Rechnungsansicht
- * sollten normalerweise nicht verändert werden
- */
-
-?>
-<div id="wpsg_billsafe" class="postbox">
- <h3 class="wpsg_handlediv">
- <span class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br></span>
- <span><?php echo __('Billsafe', 'wpsg'); ?></span>
- </h3>
- <div class="inside">
- <?php echo wpsg_drawForm_Input('', __('Transaction ID', 'wpsg'), $this->view['wpsg_mod_billsafe']['data']['mod_billsafe_transaction_id'], array('text' => true)); ?>
- <?php if (wpsg_isSizedString($this->view['wpsg_mod_billsafe']['rechnung_url'])) { ?>
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for=""><?php echo __('Rechnung', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <p class="" id="">
- <a href="<?php echo $this->view['wpsg_mod_billsafe']['rechnung_url']; ?>"><?php echo __('Download', 'wpsg'); ?></a>
- </p>
- </div>
- <div class="wpsg_clear"></div>
- </div>
- <?php } ?>
- </div>
-</div>
diff --git a/views/mods/mod_billsafe/settings_edit.phtml b/views/mods/mod_billsafe/settings_edit.phtml deleted file mode 100644 index 64c1f87..0000000 --- a/views/mods/mod_billsafe/settings_edit.phtml +++ /dev/null @@ -1,30 +0,0 @@ -<?php
-
- /**
- * Template für die Einstellungen des Billsafe Moduls
- */
-
-?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_billsafe_bezeichnung'), array ('help' => 'wpsg_mod_billsafe_bezeichnung')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_billsafe_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_billsafe_aktiv'), array ('help' => 'wpsg_mod_billsafe_aktiv')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_aktiv_from', __('Aktiv ab Betrag', 'wpsg'), $this->get_option('wpsg_mod_billsafe_aktiv_from'), array ('help' => 'wpsg_mod_billsafe_aktiv_from')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_aktiv_to', __('Aktiv bis Betrag', 'wpsg'), $this->get_option('wpsg_mod_billsafe_aktiv_to'), array ('help' => 'wpsg_mod_billsafe_aktiv_to')); ?>
-<?php echo wpsg_drawForm_Textarea('wpsg_mod_billsafe_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_billsafe_hint'), array ('help' => 'wpsg_mod_billsafe_hint')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_logo', __('Logo URL', 'wpsg'), $this->get_option('wpsg_mod_billsafe_logo'), array ('help' => 'wpsg_mod_billsafe_logo')); ?>
-<br />
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_vendorID', __('Händler ID (Vendor/Merchant ID)', 'wpsg'), $this->get_option('wpsg_mod_billsafe_vendorID'), array ('help' => 'wpsg_mod_billsafe_vendorId')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_licence', __('Lizenz', 'wpsg'), $this->get_option('wpsg_mod_billsafe_licence'), array ('help' => 'wpsg_mod_billsafe_licence')); ?>
-<br />
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_billsafe_sandbox', __('Sandboxmodus', 'wpsg'), $this->get_option('wpsg_mod_billsafe_sandbox'), array ('help' => 'wpsg_mod_billsafe_sandbox')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_licencesandbox', __('Lizenz (Sandbox)', 'wpsg'), $this->get_option('wpsg_mod_billsafe_licencesandbox'), array ('help' => 'wpsg_mod_billsafe_licencesandbox')); ?>
-<br />
-<?php echo wpsg_drawForm_Input('wpsg_mod_billsafe_gebuehr', __('Gebühr', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_billsafe_gebuehr'), true), array('help' => 'wpsg_mod_billsafe_gebuehr','unit' => $this->get_option('wpsg_currency').' / %', 'hint' => __('Müssen mit dem Billsafe Support abgestimmt werden.', 'wpsg'))); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_billsafe_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_billsafe_mwst'), array ('help' => 'wpsg_mod_billsafe_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_billsafe_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_billsafe_mwstland'), array ('help' => 'wpsg_mod_billsafe_mwstland')); ?>
-<br />
-<?php echo wpsg_drawForm_Select('wpsg_mod_billsafe_currency', __('Währung', 'wpsg'), array('EUR' => __('EUR', 'wpsg')), $this->get_option('wpsg_mod_billsafe_currency'), array('help' => 'wpsg_mod_billsafe_currency','hint' => __('Derzeit nur EUR.', 'wpsg'))); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_billsafe_autorun', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_billsafe_autorun'), array ('help' => 'wpsg_mod_billsafe_autorun')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_billsafe_precheck', __('Vorabprüfung', 'wpsg'), $this->get_option('wpsg_mod_billsafe_precheck'), array ('help' => 'wpsg_mod_billsafe_precheck')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_billsafe_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_mod_billsafe_success'), array('help' => 'wpsg_mod_billsafe_success','hint' => __('Diese Seite wird nach erfolgreicher Abwicklung innerhalb des Billsafe Gateways aufgerufen und zeigt dem Nutzer das Ergebnis an.', 'wpsg'))); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_billsafe_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_mod_billsafe_error'), array('help' => 'wpsg_mod_billsafe_error','hint' => __('Diese Seite wird angezeigt wenn es technische Probleme gibt oder der Kunde die Billsafe Zahlung abbricht.', 'wpsg'))); ?>
-
\ No newline at end of file diff --git a/views/mods/mod_billsafe/zahlung_ablehnung.phtml b/views/mods/mod_billsafe/zahlung_ablehnung.phtml deleted file mode 100644 index d241110..0000000 --- a/views/mods/mod_billsafe/zahlung_ablehnung.phtml +++ /dev/null @@ -1,11 +0,0 @@ -<?php
-
- /**
- * Template welches verwendet wird, wenn die Zahlung durch Billsafe nicht verifiziert werden konnte
- * wird auf der Erfolgsseite eingebaut
- */
-
-?>
-<p>
- <?php echo __('Ihre Zahlung konnte leider nicht mittels Billsafe abgewickelt werden, bitte wenden Sie sich an den Shop Betreiber um eine alternative Zahlungsart zu vereinbaren.', 'wpsg'); ?>
-</p>
\ No newline at end of file diff --git a/views/mods/mod_billsafe/zahlung_erfolg.phtml b/views/mods/mod_billsafe/zahlung_erfolg.phtml deleted file mode 100644 index 9849024..0000000 --- a/views/mods/mod_billsafe/zahlung_erfolg.phtml +++ /dev/null @@ -1,11 +0,0 @@ -<?php
-
- /**
- * Template welches verwendet wird, wenn die Zahlung durch Billsafe verifiziert werden konnte
- * wird auf der Erfolgsseite eingebaut
- */
-
-?>
-<p>
- <?php echo __('Ihre Zahlung wurde erfolgreich angenommen und sie werden ihre Bestellung in den nächsten Tagen erhalten.', 'wpsg'); ?>
-</p>
\ No newline at end of file diff --git a/views/mods/mod_campaigns/campaign_addedit.phtml b/views/mods/mod_campaigns/campaign_addedit.phtml new file mode 100644 index 0000000..69d6fb2 --- /dev/null +++ b/views/mods/mod_campaigns/campaign_addedit.phtml @@ -0,0 +1,244 @@ +<?php + $data = $this->view['campaign_data']; + $templates = isset($this->view['campaign_templates']) && is_array($this->view['campaign_templates']) ? $this->view['campaign_templates'] : array(); + $assignedTemplateId = isset($data['assigned_template_id']) ? intval($data['assigned_template_id']) : 0; + $isEdit = intval($data['id']) > 0; + $sendDateValue = ''; + if (strtotime($data['send_date']) > 0) { + $sendDateValue = date('Y-m-d\TH:i', strtotime($data['send_date'])); + } +?> +<div class="wrap columns-2 wpng_campaign_addedit"> + <div class="icon32 icon32-posts-post" id="icon-edit"><br></div> + <h2> + <?php echo __('Kampagnen', 'wpsg'); ?> - <?php echo $isEdit ? __('Bearbeiten', 'wpsg') : __('Neu hinzufügen', 'wpsg'); ?> + </h2> + + <form method="post" action="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_campaign&wpng_action=save&noheader=1')); ?>"> + <?php wp_nonce_field('wpsg-campaigns-save'); ?> + <input type="hidden" name="id" value="<?php echo intval($data['id']); ?>" /> + + <div class="metabox-holder has-right-sidebar wpng_metabox-holder"> + <div id="side-info-column" class="inner-sidebar" style="width:386px;"> + <div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;"> + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Einstellungen', 'wpsg'); ?></h3> + <div class="inside"> + <p> + <label for="delay_value"><strong><?php echo __('Verzögerung', 'wpsg'); ?></strong></label><br /> + <input type="number" min="0" id="delay_value" name="delay_value" value="<?php echo (($data['delay_value'] === null || $data['delay_value'] === '')?'':intval($data['delay_value'])); ?>" style="width:120px;" /> + <select id="delay_unit" name="delay_unit"> + <?php $units = $this->callMod('wpsg_mod_campaigns', 'getDelayUnitOptions'); if (!is_array($units)) $units = array(); foreach ($units as $unit => $unitLabel) { ?> + <option value="<?php echo esc_attr($unit); ?>" <?php selected($data['delay_unit'], $unit); ?>><?php echo esc_html($unitLabel); ?></option> + <?php } ?> + </select> + <br /><small><?php echo __('Leer lassen, um die Verzögerung aus dem Versandprofil zu übernehmen.', 'wpsg'); ?></small> + </p> + <p> + <label for="format"><strong><?php echo __('Format', 'wpsg'); ?></strong></label><br /> + <select id="format" name="format"> + <option value="0" <?php selected(intval($data['format']), 0); ?>><?php echo __('Text', 'wpsg'); ?></option> + <option value="1" selected <?php selected(intval($data['format']), 1); ?>><?php echo __('HTML und Text', 'wpsg'); ?></option> + <option value="2" <?php selected(intval($data['format']), 2); ?>><?php echo __('HTML', 'wpsg'); ?></option> + </select> + </p> + <p> + <label for="priority"><strong><?php echo __('Priorität', 'wpsg'); ?></strong></label><br /> + <?php $priority = (intval($data['priority']) >= 1) ? intval($data['priority']) : 3; ?> + <select id="priority" name="priority"> + <option value="1" <?php selected($priority, 1); ?>><?php echo __('Sehr niedrig', 'wpsg'); ?></option> + <option value="2" <?php selected($priority, 2); ?>><?php echo __('Niedrig', 'wpsg'); ?></option> + <option value="3" <?php selected($priority, 3); ?>><?php echo __('Normal', 'wpsg'); ?></option> + <option value="4" <?php selected($priority, 4); ?>><?php echo __('Hoch', 'wpsg'); ?></option> + <option value="5" <?php selected($priority, 5); ?>><?php echo __('Sehr hoch', 'wpsg'); ?></option> + </select> + </p> + <p class="submit"> + <input type="submit" class="button-primary" name="submit" value="<?php echo __('Speichern', 'wpsg'); ?>" /> + <input type="submit" class="button" name="submit_index" value="<?php echo __('Speichern und zur Übersicht', 'wpsg'); ?>" /> + </p> + </div> + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Template-Zuordnung', 'wpsg'); ?></h3> + <div class="inside"> + <p> + <label for="template_id"><strong><?php echo __('Versandprofil', 'wpsg'); ?></strong></label><br /> + <select id="template_id" name="template_id" style="width:100%;"> + <option value="0"><?php echo __('Kein Versandprofil zugeordnet', 'wpsg'); ?></option> + <?php foreach ($templates as $template) { ?> + <?php $templateId = intval($template['id']); ?> + <option value="<?php echo $templateId; ?>" data-trigger-event="<?php echo esc_attr((string)($template['trigger_event'] ?? '')); ?>" <?php selected($assignedTemplateId, $templateId); ?>> + <?php echo esc_html($template['name']); ?> + </option> + <?php } ?> + </select> + <small><?php echo __('Eine Kampagne kann genau einem Versandprofil zugeordnet werden.', 'wpsg'); ?></small> + </p> + </div> + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Versandeinstellungen', 'wpsg'); ?></h3> + <div class="inside"> + <p> + <label for="subject"><strong><?php echo __('Betreff', 'wpsg'); ?></strong></label><br /> + <input type="text" class="widefat" id="subject" name="subject" value="<?php echo esc_attr($data['subject']); ?>" /> + </p> + <p> + <label for="from"><strong><?php echo __('Absender', 'wpsg'); ?></strong></label><br /> + <input type="text" class="widefat" id="from" name="from" value="<?php echo esc_attr($data['from']); ?>" /> + </p> + <p> + <label for="cc"><strong><?php echo __('CC', 'wpsg'); ?></strong></label><br /> + <input type="text" class="widefat" id="cc" name="cc" value="<?php echo esc_attr($data['cc']); ?>" /> + </p> + <p> + <label for="bcc"><strong><?php echo __('BCC', 'wpsg'); ?></strong></label><br /> + <input type="text" class="widefat" id="bcc" name="bcc" value="<?php echo esc_attr($data['bcc']); ?>" /> + </p> + </div> + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Verfügbare Platzhalter', 'wpsg'); ?></h3> + <div class="inside"> + <p><small><?php echo __('Diese Platzhalter werden beim Versand automatisch mit den Bestell- und Kundendaten ersetzt. Nutzbar in Betreff, HTML- und Text-Inhalt.', 'wpsg'); ?></small></p> + <ul style="margin:0; padding-left:18px; list-style:disc;"> + <li><code>%kunde_anrede%</code> – <?php echo __('Anrede', 'wpsg'); ?></li> + <li><code>%kunde_vname%</code> – <?php echo __('Vorname', 'wpsg'); ?></li> + <li><code>%kunde_name%</code> – <?php echo __('Nachname', 'wpsg'); ?></li> + <li><code>%kunde_email%</code> – <?php echo __('E-Mail-Adresse', 'wpsg'); ?></li> + <li><code>%order_id%</code> – <?php echo __('Bestellnummer', 'wpsg'); ?></li> + <li><code>%order_cdate_format_de%</code> – <?php echo __('Bestelldatum', 'wpsg'); ?></li> + <li><code>%product_name%</code> – <?php echo __('Produktname', 'wpsg'); ?></li> + </ul> + </div> + </div> + </div> + </div> + + <div id="post-body"> + <div id="titlediv" style="margin-right:400px;"> + <div id="titlewrap"> + <input type="text" value="<?php echo esc_attr($data['name']); ?>" size="30" name="name" id="title" required /> + </div> + </div> + + <div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px; width:initial !important;"> + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Inhalt (HTML)', 'wpsg'); ?></h3> + <div class="inside"> + +<!-- Einbindung TinyMCE --> + + <div id="wpng_rte_inside" class="inside wpng_rte_inside"> + + <?php if ($this->get_option('wpng_rte') == '1') { ?> + + <?php + + function wpng_tiny_mce_before_init($in) + { + $in['readonly'] = true; + return $in; + } + + function wpng_ShowTinyMCE() { + + wp_enqueue_script('common'); + wp_enqueue_script('jquery-color'); + wp_print_scripts('editor'); + if (function_exists('add_thickbox')) add_thickbox(); + wp_print_scripts('media-upload'); + if (function_exists('wp_tiny_mce')) wp_tiny_mce(); + wp_admin_css(); + wp_enqueue_script('utils'); + do_action("admin_print_styles-post-php"); + do_action('admin_print_styles'); + + } + + // Damit die qTranslate Interne Editor Übersetzung nicht aufgerufen wird + remove_filter('the_editor', 'qtrans_modifyRichEditor'); + remove_filter('the_editor', 'wpautop'); + + if ($this->view['data']->status == '1') + { + + add_filter('tiny_mce_before_init', 'wpng_tiny_mce_before_init'); + + } + + add_filter('mce_buttons', 'wpng_tinymce_button'); + add_filter('mce_external_plugins', 'wpng_tinymce_plugin'); + add_filter('admin_head','wpng_ShowTinyMCE'); + + wp_editor(@$data['content_html'], 'content_html'); + + ?> + + <?php } else if ($this->get_option('wpng_rte') == '0') { ?> + + <?php /* Ohne Editor ein einfaches Textfeld — vorher stand hier id/name "content_text", + wodurch der HTML-Inhalt unter dem Textfeld-Namen gepostet wurde und mit dem + echten Textfeld weiter unten kollidierte. */ ?> + <textarea id="content_html" name="content_html" rows="12" class="large-text code"><?php echo esc_textarea($data['content_html']); ?></textarea> + + <?php } else if ($this->get_option('wpng_rte') == '2') { $this->callMods('newsletter_addedit_rte', array($data)); } ?> + +<!-- Einbindung TinyMCE --> + +<!-- <textarea id="content_html" name="content_html" rows="12" class="large-text code">--><?php //echo esc_textarea($data['content_html']); ?><!--</textarea>--> + </div> + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Inhalt (Text)', 'wpsg'); ?></h3> + <div class="inside"> + <textarea id="content_text" name="content_text" rows="10" class="large-text code"><?php echo esc_textarea($data['content_text']); ?></textarea> + </div> + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Bedingungen', 'wpsg'); ?></h3> + <div class="inside"> + <?php include(WPSG_PATH_VIEW . '/mods/mod_campaigns/conditions_fields.phtml'); ?> + </div> + </div> + </div> + </div> + </div> + </form> +</div> +<script type="text/javascript">/* <![CDATA[ */ + + /** + * Die Bedingung "Bestellstatus" ergibt nur Sinn, wenn das zugeordnete Versandprofil auf + * den Statuswechsel-Trigger steht. Beim Produktkauf steht die Bestellung zum + * Pruefzeitpunkt immer auf "Eingegangen" — die Bedingung koennte dort nur diesen einen + * Wert treffen und wuerde jede andere Auswahl den Versand verhindern. + */ + ( function() { + + var elTemplate = document.getElementById('template_id'); + var elCond = document.getElementById('wpsg_cond_order_status_wrap'); + + if (!elTemplate || !elCond) return; + + function wpsgToggleStatusCondition() { + + var elOption = elTemplate.options[elTemplate.selectedIndex]; + var sEvent = (elOption ? elOption.getAttribute('data-trigger-event') : ''); + + elCond.style.display = ((sEvent === 'order_status') ? '' : 'none'); + + } + + elTemplate.addEventListener('change', wpsgToggleStatusCondition); + wpsgToggleStatusCondition(); + + } )(); + +/* ]]> */</script> diff --git a/views/mods/mod_campaigns/campaign_index.phtml b/views/mods/mod_campaigns/campaign_index.phtml new file mode 100644 index 0000000..089ad3d --- /dev/null +++ b/views/mods/mod_campaigns/campaign_index.phtml @@ -0,0 +1,105 @@ +<?php +$list = $this->view['mod_campaigns']; +?> +<div class="wrap wpng_campaign_index"> + <h2> + <?php echo __('Kampagnen', 'wpsg'); ?> + <a href="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_campaign&wpng_action=add')); ?>" class="button add-new-h2"><?php echo __('Neu hinzufügen', 'wpsg'); ?></a> + </h2> + + <form id="wpsg_campaign_form" method="post" action="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_campaign')); ?>"> + <input type="hidden" id="order" name="filter[order]" value="<?php echo esc_attr($list['filter']['order']); ?>" /> + <input type="hidden" id="direction" name="filter[direction]" value="<?php echo esc_attr($list['filter']['direction']); ?>" /> + + <p class="search-box wpng-search-box"> + <label for="post-search-input" class="screen-reader-text"><?php echo __('Kampagne suchen', 'wpsg'); ?></label> + <input type="text" value="<?php echo esc_attr($list['filter']['search']); ?>" name="filter[search]" id="post-search-input" /> + <input type="submit" value="<?php echo __('Kampagne suchen', 'wpsg'); ?>" class="button" id="search-submit" /> + </p> + + <?php if (is_array($list['data']) && sizeof($list['data']) > 0) { ?> + <div class="tablenav top wpng_tablenav"> + <div class="tablenav-pages"> + <span class="displaying-num"><?php echo intval($list['count']); ?> <?php echo __('Elemente', 'wpsg'); ?></span> + <span class="pagination-links"> + <a onclick="return goPage(1);" href="#" class="first-page <?php echo (($list['seite'] == 1) ? 'disabled' : ''); ?>">«</a> + <a onclick="return goPage(<?php echo intval($list['seite']) - 1; ?>);" href="#" class="prev-page <?php echo (($list['seite'] <= 1) ? 'disabled' : ''); ?>">‹</a> + <span class="paging-input"> + <input type="text" size="1" value="<?php echo intval($list['seite']); ?>" id="seite" name="seite" class="current-page" /> + <?php echo __('von', 'wpsg'); ?> + <span class="total-pages"><?php echo intval($list['pages']); ?></span> + </span> + <a onclick="return goPage(<?php echo intval($list['seite']) + 1; ?>);" href="#" class="next-page <?php echo (($list['seite'] >= $list['pages']) ? 'disabled' : ''); ?>">›</a> + <a onclick="return goPage(<?php echo intval($list['pages']); ?>);" href="#" class="last-page <?php echo (($list['seite'] == $list['pages']) ? 'disabled' : ''); ?>">»</a> + </span> + </div> + </div> + <?php } ?> + + <?php if (is_array($list['data']) && sizeof($list['data']) > 0) { ?> + <table class="widefat fixed striped"> + <thead> + <tr> + <th><a href="#" onclick="return setOrder('id');"><?php echo __('ID', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('name');"><?php echo __('Name', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('subject');"><?php echo __('Betreff', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('create_date');"><?php echo __('Erstellt', 'wpsg'); ?></a></th> + <th><?php echo __('Verzögerung', 'wpsg'); ?></th> + <th><?php echo __('Versandprofil', 'wpsg'); ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($list['data'] as $row) { ?> + <tr> + <td><?php echo intval($row['id']); ?></td> + <td class="column-primary"> + <strong><a href="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_campaign&wpng_action=edit&id='.intval($row['id']))); ?>"><?php echo esc_html($row['name']); ?></a></strong> + <div class="row-actions"> + <?php + $editUrl = admin_url('admin.php?page=wpng-mod_campaign&wpng_action=edit&id='.intval($row['id'])); + $copyUrl = wp_nonce_url(admin_url('admin.php?page=wpng-mod_campaign&wpng_action=copy&id='.intval($row['id']).'&noheader=1'), 'wpsg-campaigns-copy-'.intval($row['id'])); + $deleteUrl = wp_nonce_url(admin_url('admin.php?page=wpng-mod_campaign&wpng_action=delete&id='.intval($row['id']).'&noheader=1'), 'wpsg-campaigns-delete-'.intval($row['id'])); + ?> + <span class="edit"><a href="<?php echo esc_url($editUrl); ?>"><?php echo __('Bearbeiten', 'wpsg'); ?></a></span> | + <span class="copy"><a onclick="return confirm('<?php echo esc_js(__('Die Daten werden kopiert und ein neuer Eintrag angelegt. Fortfahren?', 'wpsg')); ?>');" href="<?php echo esc_url($copyUrl); ?>"><?php echo __('Kopieren', 'wpsg'); ?></a></span> | + <span class="delete"><a onclick="return confirm('<?php echo esc_js(__('Sind Sie sicher, dass Sie diesen Eintrag löschen möchten?', 'wpsg')); ?>');" href="<?php echo esc_url($deleteUrl); ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span> + </div> + </td> + <td><?php echo esc_html($row['subject']); ?></td> + <td><?php echo (strtotime($row['create_date']) > 0) ? esc_html(date('d.m.Y H:i', strtotime($row['create_date']))) : '-'; ?></td> + <td><?php + if ($row['delay_value'] === null || $row['delay_value'] === '') { echo esc_html(__('aus Versandprofil', 'wpsg')); } + else { echo intval($row['delay_value']).' '.esc_html($this->callMod('wpsg_mod_campaigns', 'getDelayUnitLabel', array($row['delay_unit']))); } + ?></td> + <td> + <?php if (!empty($row['template_id'])) { ?> + [<a href="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=edit&id='.intval($row['template_id']))); ?>"><?php echo intval($row['template_id']); ?></a>] <?php echo esc_html($row['template_name']); ?> + <?php } else { ?> + - + <?php } ?> + </td> + </tr> + <?php } ?> + </tbody> + </table> + <?php } else { ?> + <p><?php echo __('Keine Kampagnen in der Datenbank.', 'wpsg'); ?></p> + <?php } ?> + </form> +</div> + +<script type="text/javascript"> +function setOrder(column) { + jQuery('#order').val(column); + if (jQuery('#direction').val() === 'DESC') jQuery('#direction').val('ASC'); else jQuery('#direction').val('DESC'); + jQuery('#wpsg_campaign_form').trigger('submit'); + return false; +} +function goPage(page) { + if (page <= 0 || page > <?php echo intval($list['pages']); ?>) return false; + jQuery('#seite').val(page); + jQuery('#wpsg_campaign_form').trigger('submit'); + return false; +} +jQuery(document).ready(function() { jQuery('.tablenav-pages .disabled').on('click', function() { return false; }); }); +</script> diff --git a/views/mods/mod_campaigns/conditions_fields.phtml b/views/mods/mod_campaigns/conditions_fields.phtml new file mode 100644 index 0000000..d122b05 --- /dev/null +++ b/views/mods/mod_campaigns/conditions_fields.phtml @@ -0,0 +1,104 @@ +<?php + + /** + * Gemeinsame Auswahl-Felder für Kampagnen-/Template-Bedingungen. + * Erwartet $this->view['condition_options'] (id => label je Feld) und + * $this->view['condition_values'] (Feld => array('operator','value')). + * Wird von campaign_addedit.phtml und template_addedit.phtml eingebunden. + */ + + $opts = (isset($this->view['condition_options']) && is_array($this->view['condition_options'])) ? $this->view['condition_options'] : array(); + $vals = (isset($this->view['condition_values']) && is_array($this->view['condition_values'])) ? $this->view['condition_values'] : array(); + + $cond_val = function($field) use ($vals) { return isset($vals[$field]['value']) ? (string)$vals[$field]['value'] : ''; }; + $cond_op = function($field) use ($vals) { return isset($vals[$field]['operator']) ? (string)$vals[$field]['operator'] : '=='; }; + + $opt_status = (isset($opts['order_status']) && is_array($opts['order_status'])) ? $opts['order_status'] : array(); + $opt_payment = (isset($opts['order_payment_type']) && is_array($opts['order_payment_type'])) ? $opts['order_payment_type'] : array(); + $opt_subgroup = (isset($opts['subscriber_group']) && is_array($opts['subscriber_group'])) ? $opts['subscriber_group'] : array(); + $opt_pgroup = (isset($opts['product_group']) && is_array($opts['product_group'])) ? $opts['product_group'] : array(); + $opt_country = (isset($opts['customer_country']) && is_array($opts['customer_country'])) ? $opts['customer_country'] : array(); + +?> +<p><small><?php echo __('Optionale Bedingungen. Nur gesetzte Felder werden geprüft; es müssen alle gesetzten Bedingungen zutreffen, damit die Kampagne ausgelöst wird.', 'wpsg'); ?></small></p> + +<?php + /** + * Bedingung "Bestellstatus" — vorerst deaktiviert, weil sie in keinem der beiden + * Trigger einen Nutzen hat: + * + * - Produktkauf: die Bestellung steht zum Pruefzeitpunkt immer auf "Eingegangen", + * jede andere Auswahl wuerde den Versand nur verhindern. + * - Statuswechsel: der Zielstatus steht bereits als Trigger-Wert im Versandprofil, + * die Bedingung waere eine Dublette davon. + * + * Zum Reaktivieren genuegt es, den folgenden Block wieder freizugeben; die Auswertung + * im Matcher (Feld order_status) und das Ein-/Ausblenden in beiden Formularen sind + * weiterhin vorhanden. + * + * Hinweis: Bereits gespeicherte order_status-Bedingungen bleiben wirksam, bis der + * betreffende Datensatz einmal neu gespeichert wird — buildConditionsFromRequest() + * uebernimmt nur Felder, die auch im Formular stehen. + */ +?> +<?php /* +<p id="wpsg_cond_order_status_wrap"> + <label for="cond_order_status"><strong><?php echo __('Bestellstatus', 'wpsg'); ?></strong></label><br /> + <select id="cond_order_status" name="cond[order_status]" class="widefat"> + <option value=""><?php echo __('— egal —', 'wpsg'); ?></option> + <?php foreach ($opt_status as $k => $label) { ?> + <option value="<?php echo esc_attr($k); ?>" <?php selected($cond_val('order_status'), (string)$k); ?>><?php echo esc_html($label); ?></option> + <?php } ?> + </select> +</p> +*/ ?> + +<p> + <label for="cond_order_total"><strong><?php echo __('Bestellsumme (brutto)', 'wpsg'); ?></strong></label><br /> + <select name="cond[order_total_op]" style="width:70px;"> + <?php foreach (array('>=' => '≥', '<=' => '≤', '==' => '=') as $op => $sym) { ?> + <option value="<?php echo esc_attr($op); ?>" <?php selected($cond_op('order_total'), $op); ?>><?php echo $sym; ?></option> + <?php } ?> + </select> + <input type="number" step="0.01" min="0" id="cond_order_total" name="cond[order_total]" value="<?php echo esc_attr($cond_val('order_total')); ?>" style="width:130px;" placeholder="<?php echo esc_attr(__('z.B. 50', 'wpsg')); ?>" /> +</p> + +<p> + <label for="cond_order_payment_type"><strong><?php echo __('Zahlart', 'wpsg'); ?></strong></label><br /> + <select id="cond_order_payment_type" name="cond[order_payment_type]" class="widefat"> + <option value=""><?php echo __('— egal —', 'wpsg'); ?></option> + <?php foreach ($opt_payment as $k => $label) { ?> + <option value="<?php echo esc_attr($k); ?>" <?php selected($cond_val('order_payment_type'), (string)$k); ?>><?php echo esc_html($label); ?></option> + <?php } ?> + </select> +</p> + +<p> + <label for="cond_subscriber_group"><strong><?php echo __('Abonnentengruppe', 'wpsg'); ?></strong></label><br /> + <select id="cond_subscriber_group" name="cond[subscriber_group]" class="widefat"> + <option value=""><?php echo __('— egal —', 'wpsg'); ?></option> + <?php foreach ($opt_subgroup as $k => $label) { ?> + <option value="<?php echo esc_attr($k); ?>" <?php selected($cond_val('subscriber_group'), (string)$k); ?>><?php echo esc_html($label); ?></option> + <?php } ?> + </select> +</p> + +<p> + <label for="cond_product_group"><strong><?php echo __('Produktgruppe', 'wpsg'); ?></strong></label><br /> + <select id="cond_product_group" name="cond[product_group]" class="widefat"> + <option value=""><?php echo __('— egal —', 'wpsg'); ?></option> + <?php foreach ($opt_pgroup as $k => $label) { ?> + <option value="<?php echo esc_attr($k); ?>" <?php selected($cond_val('product_group'), (string)$k); ?>><?php echo esc_html($label); ?></option> + <?php } ?> + </select> +</p> + +<p> + <label for="cond_customer_country"><strong><?php echo __('Land des Kunden', 'wpsg'); ?></strong></label><br /> + <select id="cond_customer_country" name="cond[customer_country]" class="widefat"> + <option value=""><?php echo __('— egal —', 'wpsg'); ?></option> + <?php foreach ($opt_country as $k => $label) { ?> + <option value="<?php echo esc_attr($k); ?>" <?php selected($cond_val('customer_country'), (string)$k); ?>><?php echo esc_html($label); ?></option> + <?php } ?> + </select> +</p> diff --git a/views/mods/mod_campaigns/template_addedit.phtml b/views/mods/mod_campaigns/template_addedit.phtml new file mode 100644 index 0000000..f46400b --- /dev/null +++ b/views/mods/mod_campaigns/template_addedit.phtml @@ -0,0 +1,220 @@ +<?php + $data = $this->view['template_data']; + $campaigns = isset($this->view['template_campaigns']) && is_array($this->view['template_campaigns']) ? $this->view['template_campaigns'] : array(); + $triggerEventOptions = isset($this->view['template_trigger_event_options']) && is_array($this->view['template_trigger_event_options']) ? $this->view['template_trigger_event_options'] : array(); + $triggerValueOptions = isset($this->view['template_trigger_value_options']) && is_array($this->view['template_trigger_value_options']) ? $this->view['template_trigger_value_options'] : array(); + $assignedCampaignIds = isset($data['assigned_campaign_ids']) && is_array($data['assigned_campaign_ids']) ? array_map('intval', $data['assigned_campaign_ids']) : array(); + $isEdit = intval($data['id']) > 0; + $triggerStatusOptions = isset($this->view['template_trigger_status_options']) && is_array($this->view['template_trigger_status_options']) ? $this->view['template_trigger_status_options'] : array(); + $selectedTriggerEvent = (string)$data['trigger_event']; + $selectedTriggerValue = (string)$data['trigger_value']; + $selectedTriggerProduct = (($data['trigger_product'] === null || $data['trigger_product'] === '')?'':(string)intval($data['trigger_product'])); + $bStatusTrigger = ($selectedTriggerEvent === 'order_status'); +?> +<div class="wrap columns-2 wpng_template_addedit"> + <div class="icon32 icon32-posts-post" id="icon-edit"><br></div> + <h2> + <?php echo __('Versandprofile', 'wpsg'); ?> - <?php echo $isEdit ? __('Bearbeiten', 'wpsg') : __('Neu hinzufügen', 'wpsg'); ?> + </h2> + + <form method="post" action="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=save&noheader=1')); ?>"> + <?php wp_nonce_field('wpsg-campaigns-save'); ?> + <input type="hidden" name="id" value="<?php echo intval($data['id']); ?>" /> + + <div class="metabox-holder has-right-sidebar wpng_metabox-holder"> + <div id="side-info-column" class="inner-sidebar" style="width:386px;"> + <div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;"> + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Einstellungen', 'wpsg'); ?></h3> + <div class="inside"> +<!-- <p>--> +<!-- <label><input type="checkbox" id="status" name="status" value="1" --><?php //checked(intval($data['status']), 1); ?><!-- /> --><?php //echo __('Aktiv', 'wpsg'); ?><!--</label>--> +<!-- </p>--> + <p class="submit"> + <input type="submit" class="button-primary" name="submit" value="<?php echo __('Speichern', 'wpsg'); ?>" /> + <input type="submit" class="button" name="submit_index" value="<?php echo __('Speichern und zur Übersicht', 'wpsg'); ?>" /> + </p> + + </div> + </div> + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Kampagnen-Zuordnung', 'wpsg'); ?></h3> + <div class="inside"> + <p> + <label for="campaign_ids"><strong><?php echo __('Kampagnen', 'wpsg'); ?></strong></label><br /> + <select id="campaign_ids" name="campaign_ids[]" multiple="multiple" size="8" style="width:100%;"> + <?php foreach ($campaigns as $campaign) { ?> + <?php $campaignId = intval($campaign['id']); ?> + <option value="<?php echo $campaignId; ?>" <?php echo in_array($campaignId, $assignedCampaignIds, true) ? 'selected="selected"' : ''; ?>> + <?php echo esc_html($campaign['name']); ?> + </option> + <?php } ?> + </select> + <small><?php echo __('Mehrfachauswahl: Strg/Cmd gedrückt halten.', 'wpsg'); ?></small> + </p> + </div> + </div> + </div> + </div> + + <div id="post-body"> + <div id="titlediv" style="margin-right:400px;"> + <div id="titlewrap"> + <input type="text" value="<?php echo esc_attr($data['name']); ?>" size="30" name="name" id="title" required /> + </div> + </div> + + <br /> + + <div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px; width:initial !important;"> + + <div class="postbox"> + + <!-- <p>--> + <!-- <label><input type="checkbox" id="status" name="status" value="1" --><?php //checked(intval($data['status']), 1); ?><!-- /> --><?php //echo __('Aktiv', 'wpsg'); ?><!--</label>--> + <!-- </p>--> + + </div> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Auslöser', 'wpsg'); ?></h3> + <div class="inside"> + <p> + <label for="trigger_event"><strong><?php echo __('Trigger Event', 'wpsg'); ?></strong></label><br /> + <select class="widefat" id="trigger_event" name="trigger_event"> + <option value="" <?php selected($selectedTriggerEvent, ''); ?>><?php echo __('Bitte auswählen', 'wpsg'); ?></option> + <?php foreach ($triggerEventOptions as $eventKey => $eventLabel) { ?> + <option value="<?php echo esc_attr($eventKey); ?>" <?php selected($selectedTriggerEvent, $eventKey); ?>><?php echo esc_html($eventLabel); ?></option> + <?php } ?> + <?php if ($selectedTriggerEvent !== '' && !isset($triggerEventOptions[$selectedTriggerEvent])) { ?> + <option value="<?php echo esc_attr($selectedTriggerEvent); ?>" selected="selected"><?php echo esc_html($selectedTriggerEvent); ?></option> + <?php } ?> + </select> + </p> + <p id="wpsg_trigger_value_product_wrap"<?php if ($bStatusTrigger) { ?> style="display:none;"<?php } ?>> + <label for="trigger_value"><strong><?php echo __('Trigger Wert (Produkt)', 'wpsg'); ?></strong></label><br /> + <select class="widefat" id="trigger_value" name="trigger_value"<?php if ($bStatusTrigger) { ?> disabled="disabled"<?php } ?>> + <option value=""><?php echo __('Produkt auswählen', 'wpsg'); ?></option> + <?php foreach ($triggerValueOptions as $productId => $productName) { ?> + <?php $productId = (string)intval($productId); ?> + <option value="<?php echo esc_attr($productId); ?>" <?php selected($selectedTriggerValue, $productId); ?>> + <?php echo esc_html($productName); ?> (<?php echo intval($productId); ?>) + </option> + <?php } ?> + <?php if (!$bStatusTrigger && $selectedTriggerValue !== '' && !isset($triggerValueOptions[intval($selectedTriggerValue)])) { ?> + <option value="<?php echo esc_attr($selectedTriggerValue); ?>" selected="selected"><?php echo esc_html($selectedTriggerValue); ?></option> + <?php } ?> + </select> + <small><?php echo __('Für Trigger "WPSG: Produktkauf" wird hier die Produkt-ID ausgewählt.', 'wpsg'); ?></small> + </p> + <p id="wpsg_trigger_value_status_wrap"<?php if (!$bStatusTrigger) { ?> style="display:none;"<?php } ?>> + <label for="trigger_value_status"><strong><?php echo __('Trigger Wert (Zielstatus)', 'wpsg'); ?></strong></label><br /> + <select class="widefat" id="trigger_value_status" name="trigger_value"<?php if (!$bStatusTrigger) { ?> disabled="disabled"<?php } ?>> + <option value=""><?php echo __('Bitte auswählen', 'wpsg'); ?></option> + <?php foreach ($triggerStatusOptions as $statusKey => $statusLabel) { ?> + <option value="<?php echo esc_attr((string)$statusKey); ?>" <?php selected($selectedTriggerValue, (string)$statusKey); ?>><?php echo esc_html($statusLabel); ?></option> + <?php } ?> + </select> + <small><?php echo __('Die Kampagne wird ausgelöst, sobald eine Bestellung diesen Status erreicht.', 'wpsg'); ?></small> + </p> + <p id="wpsg_trigger_product_wrap"<?php if (!$bStatusTrigger) { ?> style="display:none;"<?php } ?>> + <label for="trigger_product"><strong><?php echo __('Produkt (optional)', 'wpsg'); ?></strong></label><br /> + <select class="widefat" id="trigger_product" name="trigger_product"<?php if (!$bStatusTrigger) { ?> disabled="disabled"<?php } ?>> + <option value=""><?php echo __('Alle Bestellungen', 'wpsg'); ?></option> + <?php foreach ($triggerValueOptions as $productId => $productName) { ?> + <?php $productId = (string)intval($productId); ?> + <option value="<?php echo esc_attr($productId); ?>" <?php selected($selectedTriggerProduct, $productId); ?>> + <?php echo esc_html($productName); ?> (<?php echo intval($productId); ?>) + </option> + <?php } ?> + </select> + <small><?php echo __('Ohne Auswahl gilt die Kampagne für jede Bestellung, die den Zielstatus erreicht.', 'wpsg'); ?></small> + </p> + </div> + </div> + + <p> + <label for="delay_value"><strong><?php echo __('Verzögerung', 'wpsg'); ?></strong></label><br /> + <input type="number" min="0" id="delay_value" name="delay_value" value="<?php echo intval($data['delay_value']); ?>" style="width:120px;" /> + <select id="delay_unit" name="delay_unit"> + <?php $units = $this->callMod('wpsg_mod_campaigns', 'getDelayUnitOptions'); if (!is_array($units)) $units = array(); foreach ($units as $unit => $unitLabel) { ?> + <option value="<?php echo esc_attr($unit); ?>" <?php selected($data['delay_unit'], $unit); ?>><?php echo esc_html($unitLabel); ?></option> + <?php } ?> + </select> + </p> + + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Bedingungen', 'wpsg'); ?></h3> + <div class="inside"> + <?php include(WPSG_PATH_VIEW . '/mods/mod_campaigns/conditions_fields.phtml'); ?> + </div> + </div> + + <?php /* "Aktionen"-Block vorerst deaktiviert: aktuell werden ausschließlich E-Mails + versendet, daher ist keine separate Aktionsdefinition nötig. Für spätere + Aktionstypen (siehe Doku-Ausblick) wieder aktivieren und dazu eine Spalte + `actions` anlegen sowie in saveTemplateAction() einlesen. + <div class="postbox"> + <h3 class="postbox-header"><?php echo __('Aktionen', 'wpsg'); ?></h3> + <div class="inside"> + <textarea id="actions" name="actions" rows="10" class="large-text code"><?php echo esc_textarea($data['actions']); ?></textarea> + </div> + </div> + */ ?> + + + + </div> + + <p class="submit"> + <input type="submit" class="button-primary" name="submit" value="<?php echo __('Speichern', 'wpsg'); ?>" /> + <input type="submit" class="button" name="submit_index" value="<?php echo __('Speichern und zur Übersicht', 'wpsg'); ?>" /> + </p> + + </div> + </div> + </form> +</div> +<script type="text/javascript">/* <![CDATA[ */ + + /** + * Schaltet die Trigger-Felder passend zum gewaehlten Ereignis um. Das jeweils nicht + * benutzte Feld wird zusaetzlich deaktiviert, damit es nicht mitgesendet wird — beide + * Auswahlfelder heissen trigger_value. + */ + ( function() { + + var elEvent = document.getElementById('trigger_event'); + + if (!elEvent) return; + + function wpsgToggleTrigger() { + + var bStatus = (elEvent.value === 'order_status'); + + [ + ['wpsg_trigger_value_product_wrap', 'trigger_value', !bStatus], + ['wpsg_trigger_value_status_wrap', 'trigger_value_status', bStatus], + ['wpsg_trigger_product_wrap', 'trigger_product', bStatus] + ].forEach(function(a) { + + var elWrap = document.getElementById(a[0]); + var elField = document.getElementById(a[1]); + + if (elWrap) elWrap.style.display = (a[2] ? '' : 'none'); + if (elField) elField.disabled = !a[2]; + + }); + + // Der Bestellstatus als Bedingung ergibt nur beim Statuswechsel-Trigger Sinn. + var elCond = document.getElementById('wpsg_cond_order_status_wrap'); + if (elCond) elCond.style.display = (bStatus ? '' : 'none'); + + } + + elEvent.addEventListener('change', wpsgToggleTrigger); + wpsgToggleTrigger(); + + } )(); + +/* ]]> */</script> diff --git a/views/mods/mod_campaigns/template_index.phtml b/views/mods/mod_campaigns/template_index.phtml new file mode 100644 index 0000000..515a11c --- /dev/null +++ b/views/mods/mod_campaigns/template_index.phtml @@ -0,0 +1,99 @@ +<?php +$list = $this->view['mod_campaign_templates']; +?> +<div class="wrap wpng_template_index"> + <h2> + <?php echo __('Versandprofile', 'wpsg'); ?> + <a href="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=add')); ?>" class="button add-new-h2"><?php echo __('Neu hinzufügen', 'wpsg'); ?></a> + </h2> + + <form id="wpsg_template_form" method="post" action="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_template')); ?>"> + <input type="hidden" id="order" name="filter[order]" value="<?php echo esc_attr($list['filter']['order']); ?>" /> + <input type="hidden" id="direction" name="filter[direction]" value="<?php echo esc_attr($list['filter']['direction']); ?>" /> + + <p class="search-box wpng-search-box"> + <label for="post-search-input" class="screen-reader-text"><?php echo __('Versandprofil suchen', 'wpsg'); ?></label> + <input type="text" value="<?php echo esc_attr($list['filter']['search']); ?>" name="filter[search]" id="post-search-input" /> + <input type="submit" value="<?php echo __('Versandprofil suchen', 'wpsg'); ?>" class="button" id="search-submit" /> + </p> + + <?php if (is_array($list['data']) && sizeof($list['data']) > 0) { ?> + <div class="tablenav top wpng_tablenav"> + <div class="tablenav-pages"> + <span class="displaying-num"><?php echo intval($list['count']); ?> <?php echo __('Elemente', 'wpsg'); ?></span> + <span class="pagination-links"> + <a onclick="return goPage(1);" href="#" class="first-page <?php echo (($list['seite'] == 1) ? 'disabled' : ''); ?>">«</a> + <a onclick="return goPage(<?php echo intval($list['seite']) - 1; ?>);" href="#" class="prev-page <?php echo (($list['seite'] <= 1) ? 'disabled' : ''); ?>">‹</a> + <span class="paging-input"> + <input type="text" size="1" value="<?php echo intval($list['seite']); ?>" id="seite" name="seite" class="current-page" /> + <?php echo __('von', 'wpsg'); ?> + <span class="total-pages"><?php echo intval($list['pages']); ?></span> + </span> + <a onclick="return goPage(<?php echo intval($list['seite']) + 1; ?>);" href="#" class="next-page <?php echo (($list['seite'] >= $list['pages']) ? 'disabled' : ''); ?>">›</a> + <a onclick="return goPage(<?php echo intval($list['pages']); ?>);" href="#" class="last-page <?php echo (($list['seite'] == $list['pages']) ? 'disabled' : ''); ?>">»</a> + </span> + </div> + </div> + <?php } ?> + + <?php if (is_array($list['data']) && sizeof($list['data']) > 0) { ?> + <table class="widefat fixed striped"> + <thead> + <tr> + <th><a href="#" onclick="return setOrder('id');"><?php echo __('ID', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('name');"><?php echo __('Name', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('trigger_event');"><?php echo __('Trigger', 'wpsg'); ?></a></th> + <th><a href="#" onclick="return setOrder('create_date');"><?php echo __('Erstellt', 'wpsg'); ?></a></th> + <th><?php echo __('Verzögerung', 'wpsg'); ?></th> + <th><?php echo __('Kampagnen', 'wpsg'); ?></th> + </tr> + </thead> + <tbody> + <?php foreach ($list['data'] as $row) { ?> + <tr> + <td><?php echo intval($row['id']); ?></td> + <td class="column-primary"> + <strong><a href="<?php echo esc_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=edit&id='.intval($row['id']))); ?>"><?php echo esc_html($row['name']); ?></a></strong> + <div class="row-actions"> + <?php + $editUrl = admin_url('admin.php?page=wpng-mod_template&wpng_action=edit&id='.intval($row['id'])); + $copyUrl = wp_nonce_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=copy&id='.intval($row['id']).'&noheader=1'), 'wpsg-campaigns-copy-'.intval($row['id'])); + $deleteUrl = wp_nonce_url(admin_url('admin.php?page=wpng-mod_template&wpng_action=delete&id='.intval($row['id']).'&noheader=1'), 'wpsg-campaigns-delete-'.intval($row['id'])); + ?> + <span class="edit"><a href="<?php echo esc_url($editUrl); ?>"><?php echo __('Bearbeiten', 'wpsg'); ?></a></span> | + <span class="copy"><a onclick="return confirm('<?php echo esc_js(__('Die Daten werden kopiert und ein neuer Eintrag angelegt. Fortfahren?', 'wpsg')); ?>');" href="<?php echo esc_url($copyUrl); ?>"><?php echo __('Kopieren', 'wpsg'); ?></a></span> | + <span class="delete"><a onclick="return confirm('<?php echo esc_js(__('Sind Sie sicher, dass Sie diesen Eintrag löschen möchten?', 'wpsg')); ?>');" href="<?php echo esc_url($deleteUrl); ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span> + </div> + </td> + <td><?php echo esc_html($row['trigger_event']); ?></td> + <td><?php echo (strtotime($row['create_date']) > 0) ? esc_html(date('d.m.Y H:i', strtotime($row['create_date']))) : '-'; ?></td> + <td><?php echo intval($row['delay_value']).' '.esc_html($this->callMod('wpsg_mod_campaigns', 'getDelayUnitLabel', array($row['delay_unit']))); ?></td> + <td> + <?php echo intval(isset($row['assigned_count']) ? $row['assigned_count'] : 0); ?> + <?php if (!empty($row['assigned_names'])) { ?><br /><small><?php echo esc_html($row['assigned_names']); ?></small><?php } ?> + </td> + </tr> + <?php } ?> + </tbody> + </table> + <?php } else { ?> + <p><?php echo __('Keine Versandprofile in der Datenbank.', 'wpsg'); ?></p> + <?php } ?> + </form> +</div> + +<script type="text/javascript"> +function setOrder(column) { + jQuery('#order').val(column); + if (jQuery('#direction').val() === 'DESC') jQuery('#direction').val('ASC'); else jQuery('#direction').val('DESC'); + jQuery('#wpsg_template_form').trigger('submit'); + return false; +} +function goPage(page) { + if (page <= 0 || page > <?php echo intval($list['pages']); ?>) return false; + jQuery('#seite').val(page); + jQuery('#wpsg_template_form').trigger('submit'); + return false; +} +jQuery(document).ready(function() { jQuery('.tablenav-pages .disabled').on('click', function() { return false; }); }); +</script> diff --git a/views/mods/mod_customergroup/index.phtml b/views/mods/mod_customergroup/index.phtml index c529e41..7c00fce 100644 --- a/views/mods/mod_customergroup/index.phtml +++ b/views/mods/mod_customergroup/index.phtml @@ -38,7 +38,7 @@ <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($this->view['arFilter']['s'])); ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Kundengruppen suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Kundengruppen suchen', 'wpsg')); ?><br />
</form>
</div>
@@ -53,13 +53,13 @@ <nav class="pagination_wrap">
<ul class="pagination">
<?php if ($this->view['arFilter']['page'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite', 'wpsg'); ?>"><span aria-hidden="true">«</span></a></li>
<?php } ?>
<?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
<li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite', 'wpsg'); ?>"><span aria-hidden="true">»</span></a></li>
<?php } ?>
</ul>
</nav>
@@ -113,13 +113,13 @@ <nav class="pagination_wrap pagination_wrap_bottom">
<ul class="pagination">
<?php if ($this->view['arFilter']['page'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite', 'wpsg'); ?>"><span aria-hidden="true">«</span></a></li>
<?php } ?>
<?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
<li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite', 'wpsg'); ?>"><span aria-hidden="true">»</span></a></li>
<?php } ?>
</ul>
</nav>
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml index deae4a0..0331c8f 100644 --- a/views/mods/mod_deliverynote/settings_edit.phtml +++ b/views/mods/mod_deliverynote/settings_edit.phtml @@ -61,9 +61,9 @@ <div class="row">
<div class="col-md-4">
<div class="align-buttons">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-left '.$alignLeft.'" name="wpsg_mod_deliverynote_logo_position_left" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo linksbündig ausrichten").'">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-center '.$alignCenter.'" name="wpsg_mod_deliverynote_logo_position_center" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo zentrieren").'">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-right '.$alignRight.' '.$defaultAlign.'" name="wpsg_mod_deliverynote_logo_position_right" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo rechtsbündig ausrichten").'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-left '.$alignLeft.'" name="wpsg_mod_deliverynote_logo_position_left" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo linksbündig ausrichten", 'wpsg').'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-center '.$alignCenter.'" name="wpsg_mod_deliverynote_logo_position_center" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo zentrieren", 'wpsg').'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-right '.$alignRight.' '.$defaultAlign.'" name="wpsg_mod_deliverynote_logo_position_right" value="" onclick="handleLogoAlignClick($(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo rechtsbündig ausrichten", 'wpsg').'">
</div>
</div>
<div class="col-md-8 logo-transparency">
diff --git a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml index d6b51f6..b1def1a 100644 --- a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml +++ b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml @@ -6,7 +6,7 @@ ?>
<?php /* Rabatt START */ ?>
-<?php echo wpsg_drawForm_AdminboxStart(__('Produktgruppen Rabatt')); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktgruppen Rabatt', 'wpsg')); ?>
<div class="inside">
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>
diff --git a/views/mods/mod_export/fields.phtml b/views/mods/mod_export/fields.phtml index c731984..8861505 100644 --- a/views/mods/mod_export/fields.phtml +++ b/views/mods/mod_export/fields.phtml @@ -16,7 +16,7 @@ <th class="wpsg_mod_export_col_value"><?php echo __('Wert', 'wpsg'); ?></th>
<th class="wpsg_mod_export_col_format"><?php echo __('Format', 'wpsg'); ?></th>
- <th style="display:<?php echo (($this->view['profil']['format'] == wpsg_mod_export::FORMAT_XML)?'table-cell':'none'); ?>;" title="<?php echo __('Feld im XML als Attribut exportieren', 'wpsg'); ?>" class="wpsg_mod_export_format wpsg_mod_export_format_<?php echo wpsg_mod_export::FORMAT_XML; ?> wpsg_mod_export_col_att"><?php echo __('Att'); ?></th>
+ <th style="display:<?php echo (($this->view['profil']['format'] == wpsg_mod_export::FORMAT_XML)?'table-cell':'none'); ?>;" title="<?php echo __('Feld im XML als Attribut exportieren', 'wpsg'); ?>" class="wpsg_mod_export_format wpsg_mod_export_format_<?php echo wpsg_mod_export::FORMAT_XML; ?> wpsg_mod_export_col_att"><?php echo __('Att', 'wpsg'); ?></th>
<th style="display:<?php echo (($this->view['profil']['format'] != wpsg_mod_export::FORMAT_XML)?'table-cell; padding:0px':'none'); ?>;" class="wpsg_mod_export_format wpsg_mod_export_format_<?php echo wpsg_mod_export::FORMAT_CSV; ?>"> </th>
<th class="wpsg_mod_export_col_remove">
diff --git a/views/mods/mod_export/order_index_tab.phtml b/views/mods/mod_export/order_index_tab.phtml index 096f2e2..c7ace13 100644 --- a/views/mods/mod_export/order_index_tab.phtml +++ b/views/mods/mod_export/order_index_tab.phtml @@ -14,7 +14,7 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_export_profile[]', $p['name'], false, array('value' => $p['id'], 'noHidden' => true)); ?>
<?php } ?>
- <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten')); ?>
+ <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten', 'wpsg')); ?>
</div>
</div>
diff --git a/views/mods/mod_export/product_index_tab.phtml b/views/mods/mod_export/product_index_tab.phtml index 493198d..27df2a9 100644 --- a/views/mods/mod_export/product_index_tab.phtml +++ b/views/mods/mod_export/product_index_tab.phtml @@ -20,7 +20,7 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_export_profile[]', $p['name'], false, array('value' => $p['id'], 'noHidden' => true)); ?>
<?php } ?>
- <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten')); ?>
+ <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten', 'wpsg')); ?>
</div>
</div>
diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml index af992f7..a3c19b9 100644 --- a/views/mods/mod_gutschein/add.phtml +++ b/views/mods/mod_gutschein/add.phtml @@ -23,7 +23,7 @@ <?php wpsg_drawForm_AdminboxStart(); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_value', __('Betrag', 'wpsg'), wpsg_ff(@$this->view['mod_gutschein']['value'])); ?>
- <?php echo wpsg_drawForm_Input(false, __('Bereits verwendet'), wpsg_ff($used), ['field_id' => 'wpsg_voucher_used', 'readonly' => true]); ?>
+ <?php echo wpsg_drawForm_Input(false, __('Bereits verwendet', 'wpsg'), wpsg_ff($used), ['field_id' => 'wpsg_voucher_used', 'readonly' => true]); ?>
<div style="margin-top:-15px;">
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_coupon', __('Als Wertgutschein behandeln', 'wpsg'), @$this->view['mod_gutschein']['coupon']); ?>
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml index a0ec2bb..0436ba5 100644 --- a/views/mods/mod_gutschein/index.phtml +++ b/views/mods/mod_gutschein/index.phtml @@ -39,7 +39,7 @@ <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), stripslashes(wpsg_getStr($this->view['arFilter']['s']))); ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Gutscheine suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Gutscheine suchen', 'wpsg')); ?><br />
<input type="hidden" id="filterstatus" name="filter[status]" value="<?php echo @$this->view['arFilter']['status']; ?>" />
</form>
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml index 648dd35..c3df1ac 100644 --- a/views/mods/mod_kundenverwaltung/edit.phtml +++ b/views/mods/mod_kundenverwaltung/edit.phtml @@ -103,7 +103,7 @@ <?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>
<?php echo wpsg_drawForm_Input('ustidnr', __('UStIdNr.', 'wpsg'), @$this->view['data']['ustidnr']); ?>
<?php } ?>
- <?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), ['1' => __('Aktiv', 'wpsg'), '0' => __('Inaktiv', 'wpsg'), '-1' => __('Anonymisiert')], @$this->view['data']['status'], array()); ?>
+ <?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), ['1' => __('Aktiv', 'wpsg'), '0' => __('Inaktiv', 'wpsg'), '-1' => __('Anonymisiert', 'wpsg')], @$this->view['data']['status'], array()); ?>
<?php echo wpsg_drawForm_Checkbox('info-mail', __('Mail bei Statusänderung', 'wpsg'), '', array()); ?>
<?php echo wpsg_drawForm_Textarea('comment', __('Kundenkommentar', 'wpsg'), @$this->view['data']['comment']); ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml index f5f5253..07ef1e7 100644 --- a/views/mods/mod_kundenverwaltung/index.phtml +++ b/views/mods/mod_kundenverwaltung/index.phtml @@ -70,7 +70,7 @@ <?php } ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Kunden suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Kunden suchen', 'wpsg')); ?><br />
</form>
</div>
@@ -91,7 +91,7 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_export_profile[]', $p['name'], false, array('value' => $p['id'], 'noHidden' => true)); ?>
<?php } ?>
- <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten')); ?>
+ <br /><?php echo wpsg_drawForm_SubmitButton(__('Export starten', 'wpsg')); ?>
</div>
</div>
diff --git a/views/mods/mod_kundenverwaltung/index_setAccount.phtml b/views/mods/mod_kundenverwaltung/index_setAccount.phtml index f5ebc2e..99f485b 100644 --- a/views/mods/mod_kundenverwaltung/index_setAccount.phtml +++ b/views/mods/mod_kundenverwaltung/index_setAccount.phtml @@ -35,7 +35,7 @@ <div class="col-lg-4">
<?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld (Zielkunde)', 'wpsg'), wpsg_getStr($_REQUEST['filter']['s'])); ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Kunden suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Kunden suchen', 'wpsg')); ?><br />
</div>
</div>
diff --git a/views/mods/mod_kundenverwaltung/register.phtml b/views/mods/mod_kundenverwaltung/register.phtml index d2967dd..26e738e 100644 --- a/views/mods/mod_kundenverwaltung/register.phtml +++ b/views/mods/mod_kundenverwaltung/register.phtml @@ -390,7 +390,7 @@ <div class="wpsg_checkoutblock">
<label class="recaptcha_v2_checkout ">
- <?php echo __('SPAM Schutz Abfrage'); ?> <span class="wpsg_required">*</span>:
+ <?php echo __('SPAM Schutz Abfrage', 'wpsg'); ?> <span class="wpsg_required">*</span>:
<?php if ($this->get_option('wpsg_mod_kundenverwaltung_recaptcha_dsgvo_layer') != '1') { ?>
<div class="g-recaptcha" data-sitekey="<?php echo $this->get_option('wpsg_mod_kundenveraltung_recaptcha_key'); ?>"></div>
diff --git a/views/mods/mod_legaltexts/settings_edit.phtml b/views/mods/mod_legaltexts/settings_edit.phtml index 5437ef4..9b3c7ec 100644 --- a/views/mods/mod_legaltexts/settings_edit.phtml +++ b/views/mods/mod_legaltexts/settings_edit.phtml @@ -11,7 +11,7 @@ <label class="bg-info mark <?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_ITRECHT)?'open':''); ?>" title="<?php echo __('Premiumpartner', 'itrecht'); ?>">
<input type="radio" <?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_ITRECHT)?'checked="checked"':''); ?> name="wpsg_mod_legaltexts_provider" class="wpsg_mod_legaltexts_provider" value="<?php echo wpsg_mod_legaltexts::PROVIDER_ITRECHT; ?>" />
- <span class="name"><?php echo __('IT-Recht Kanzlei München') ?></span>
+ <span class="name"><?php echo __('IT-Recht Kanzlei München', 'wpsg') ?></span>
<span class="grow"></span>
<span class="text-info glyphicon glyphicon-star-empty" aria-hidden="true"></span>
@@ -22,7 +22,7 @@ <label class="<?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_PROTECTEDSHOPS)?'open':''); ?>">
<input type="radio" <?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_PROTECTEDSHOPS)?'checked="checked"':''); ?> name="wpsg_mod_legaltexts_provider" class="wpsg_mod_legaltexts_provider" value="<?php echo wpsg_mod_legaltexts::PROVIDER_PROTECTEDSHOPS; ?>" />
- <span class="name"><?php echo __('Protected Shops') ?></span>
+ <span class="name"><?php echo __('Protected Shops', 'wpsg') ?></span>
</label>
@@ -31,7 +31,7 @@ <label class="<?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_HAENDLERBUND)?'open':''); ?>">
<input type="radio" <?php echo (($this->view['wpsg_mod_legaltexts_provider'] == wpsg_mod_legaltexts::PROVIDER_HAENDLERBUND)?'checked="checked"':''); ?> name="wpsg_mod_legaltexts_provider" class="wpsg_mod_legaltexts_provider" value="<?php echo wpsg_mod_legaltexts::PROVIDER_HAENDLERBUND; ?>" />
- <span class="name"><?php echo __('Händlerbund') ?></span>
+ <span class="name"><?php echo __('Händlerbund', 'wpsg') ?></span>
</label>
diff --git a/views/mods/mod_ordercondition/list.phtml b/views/mods/mod_ordercondition/list.phtml index 0a242c9..00f5535 100644 --- a/views/mods/mod_ordercondition/list.phtml +++ b/views/mods/mod_ordercondition/list.phtml @@ -108,7 +108,7 @@ jQuery('#oc_typ_<?php echo $oc['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
type: 'select',
- data: <?php echo wpsg_prepare_for_inlineEdit(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'), '3' => __('Bestimmte Versandarten'))); ?>,
+ data: <?php echo wpsg_prepare_for_inlineEdit(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'), '3' => __('Bestimmte Versandarten', 'wpsg'))); ?>,
submitdata: {
field: 'typ',
oc_id: '<?php echo $oc['id']; ?>'
diff --git a/views/mods/mod_orderupload/product_addedit_content.phtml b/views/mods/mod_orderupload/product_addedit_content.phtml index e79bbb9..e70bbd5 100644 --- a/views/mods/mod_orderupload/product_addedit_content.phtml +++ b/views/mods/mod_orderupload/product_addedit_content.phtml @@ -10,12 +10,12 @@ <?php echo wpsg_drawForm_AdminboxStart(__('Bestellupload', 'wpsg')); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload_set', __('Bestellupload ermöglichen'), (($this->view['wpsg_mod_orderupload']['set'] > 0)?true:false)); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload_set', __('Bestellupload ermöglichen', 'wpsg'), (($this->view['wpsg_mod_orderupload']['set'] > 0)?true:false)); ?>
<div class="wpsg_mod_orderupload_set_1" style="<?php echo (($this->view['wpsg_mod_orderupload']['set'] > 0)?'display:block;':'display:none;'); ?>">
- <?php echo wpsg_drawForm_Input('wpsg_mod_orderupload[set]', __('Maximale Anzahl an Uploads'), $this->view['wpsg_mod_orderupload']['set']); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload[mandatory]', __('Pflichtfeld'), $this->view['wpsg_mod_orderupload']['mandatory']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_orderupload[set]', __('Maximale Anzahl an Uploads', 'wpsg'), $this->view['wpsg_mod_orderupload']['set']); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_orderupload[mandatory]', __('Pflichtfeld', 'wpsg'), $this->view['wpsg_mod_orderupload']['mandatory']); ?>
</div>
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml index b1f62ae..510ba2d 100644 --- a/views/mods/mod_paypalapi/settings_edit.phtml +++ b/views/mods/mod_paypalapi/settings_edit.phtml @@ -22,7 +22,7 @@ <br />
-<?php echo wpsg_drawForm_Input('wpsg_mod_paypalapi_currency', __('Währungscode (Standard: EUR)'), $this->get_option('wpsg_mod_paypalapi_currency'), array('help' => 'wpsg_mod_paypal_currency')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_paypalapi_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_currency'), array('help' => 'wpsg_mod_paypal_currency')); ?>
<br />
diff --git a/views/mods/mod_printshop/producttemplate.phtml b/views/mods/mod_printshop/producttemplate.phtml index e504ea4..ed8ad94 100644 --- a/views/mods/mod_printshop/producttemplate.phtml +++ b/views/mods/mod_printshop/producttemplate.phtml @@ -253,7 +253,7 @@ <?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
<?php if (wpsg_isSizedInt($stl)) { ?>
- <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+ <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.', 'wpsg'); ?></a>
<?php } ?>
diff --git a/views/mods/mod_printshop/produkt_addedit_content.phtml b/views/mods/mod_printshop/produkt_addedit_content.phtml index 3d8805f..9771e0a 100644 --- a/views/mods/mod_printshop/produkt_addedit_content.phtml +++ b/views/mods/mod_printshop/produkt_addedit_content.phtml @@ -34,11 +34,11 @@ <?php echo wpsg_drawForm_AdminboxStart(__('Druckereiprodukt', 'wpsg')); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_printshop[set]', __('Produkt als Flächenprodukt behandeln'), $view['set']); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_printshop[set]', __('Produkt als Flächenprodukt behandeln', 'wpsg'), $view['set']); ?>
<div class="wpsg_mod_printshop wpsg_mod_printshop_1" style="display:none;">
- <?php echo wpsg_drawForm_Select('wpsg_mod_printshop[mode]', __('Modus'), $arMode, $view['mode']); ?>
+ <?php echo wpsg_drawForm_Select('wpsg_mod_printshop[mode]', __('Modus', 'wpsg'), $arMode, $view['mode']); ?>
<br />
@@ -118,13 +118,13 @@ <div class="wpsg_mod_printshop_mode wpsg_mod_printshop_mode_<?php echo wpsg_mod_printshop::MODE_LFM; ?>">
- <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[width]', __('Breite für Preisberechnung'), wpsg_ff($view['width'], false, true, 0), ['input_class' => 'wpsg_mod_printshop_input_same']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[width]', __('Breite für Preisberechnung', 'wpsg'), wpsg_ff($view['width'], false, true, 0), ['input_class' => 'wpsg_mod_printshop_input_same']); ?>
</div>
<div class="wpsg_mod_printshop_mode wpsg_mod_printshop_mode_<?php echo wpsg_mod_printshop::MODE_LFM_SELECT; ?>">
- <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[width]', __('Breite für Preisberechnung'), wpsg_ff($view['width'], false, true, 0), ['input_class' => 'wpsg_mod_printshop_input_same']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[width]', __('Breite für Preisberechnung', 'wpsg'), wpsg_ff($view['width'], false, true, 0), ['input_class' => 'wpsg_mod_printshop_input_same']); ?>
<br />
@@ -176,8 +176,8 @@ <div class="wpsg_mod_printshop_productupload_set_1" style="<?php echo (($view['wpsg_mod_printshop[productupload_set]'] === true)?'display:block;':'display:none;'); ?>">
- <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[productupload_length]', __('Maximale Anzahl an Uploads'), $view['productupload_length']); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_printshop[productupload_mandatory]', __('Pflichtfeld'), $view['productupload_mandatory']); ?>
+ <?php echo wpsg_drawForm_Input('wpsg_mod_printshop[productupload_length]', __('Maximale Anzahl an Uploads', 'wpsg'), $view['productupload_length']); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_printshop[productupload_mandatory]', __('Pflichtfeld', 'wpsg'), $view['productupload_mandatory']); ?>
</div>
diff --git a/views/mods/mod_productgroups/index.phtml b/views/mods/mod_productgroups/index.phtml index b5cdc02..274c25a 100644 --- a/views/mods/mod_productgroups/index.phtml +++ b/views/mods/mod_productgroups/index.phtml @@ -43,7 +43,7 @@ <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($this->view['arFilter']['s'])); ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Produktgruppen suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Produktgruppen suchen', 'wpsg')); ?><br />
</form>
</div>
@@ -59,13 +59,13 @@ <nav class="pagination_wrap">
<ul class="pagination">
<?php if ($this->view['arFilter']['page'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite', 'wpsg'); ?>"><span aria-hidden="true">«</span></a></li>
<?php } ?>
<?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
<li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite', 'wpsg'); ?>"><span aria-hidden="true">»</span></a></li>
<?php } ?>
</ul>
</nav>
@@ -139,13 +139,13 @@ <nav class="pagination_wrap pagination_wrap_bottom">
<ul class="pagination">
<?php if ($this->view['arFilter']['page'] > 1) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">«</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite', 'wpsg'); ?>"><span aria-hidden="true">«</span></a></li>
<?php } ?>
<?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
<li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
<?php } ?>
<?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
- <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite'); ?>"><span aria-hidden="true">»</span></a></li>
+ <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('Nächste Seite', 'wpsg'); ?>"><span aria-hidden="true">»</span></a></li>
<?php } ?>
</ul>
</nav>
diff --git a/views/mods/mod_productgroups/productgroups_addedit_sidebar.phtml b/views/mods/mod_productgroups/productgroups_addedit_sidebar.phtml index d37e654..8fa7067 100644 --- a/views/mods/mod_productgroups/productgroups_addedit_sidebar.phtml +++ b/views/mods/mod_productgroups/productgroups_addedit_sidebar.phtml @@ -8,7 +8,7 @@ <?php /* Lagerbestand START */ ?>
<?php if ($this->hasMod('wpsg_mod_stock')) { ?>
-<?php echo wpsg_drawForm_AdminboxStart(__('Produktgruppen Lagerbestand')); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktgruppen Lagerbestand', 'wpsg')); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_productgroups[stock_value]', __('Bestand', 'wpsg'), wpsg_hspc(@$this->view['wpsg_mod_productgroups']['data']['stock_value']), array()); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productgroups[stock_aktiv]', __('Lagerbestand zählen', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data']['stock_aktiv'], array()); ?>
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index 57f7ddb..d85d397 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -33,7 +33,7 @@ <th class="col_id"><?php echo __('Id', 'wpsg'); ?></th>
<th class="col1"><?php echo __('Name', 'wpsg'); ?></th>
- <th class="col_shortname"><?php echo __('Kurzname'); ?></th>
+ <th class="col_shortname"><?php echo __('Kurzname', 'wpsg'); ?></th>
<?php $colspan += 3; ?>
<?php if (wpsg_isSizedInt($this->view['product_id'])) { $colspan += 2; ?>
diff --git a/views/mods/mod_productvariants/settings_edit.phtml b/views/mods/mod_productvariants/settings_edit.phtml index 0f669e3..5495a19 100644 --- a/views/mods/mod_productvariants/settings_edit.phtml +++ b/views/mods/mod_productvariants/settings_edit.phtml @@ -19,7 +19,7 @@ </div>
<div id="tab2" role="tabpanel" class="tab-pane">
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvariants_price', __('Preis der Variation direkt anzeigen'), $this->get_option('wpsg_mod_productvariants_price')); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvariants_price', __('Preis der Variation direkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_productvariants_price')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_vp_detailview', __('Erweiterte Variantenanzeige aktivieren', 'wpsg'), $this->get_option('wpsg_vp_detailview'), array('help' => 'wpsg_vp_detailview')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_vp_replaceanr', __('Produktartikelnummer ersetzen', 'wpsg'), $this->get_option('wpsg_vp_replaceanr'), array('hint' => __('Ersetzt die Produktartikelnummer durch die zusammengesetzte Artikelnummern der Varianten.', 'wpsg'), 'help' => 'wpsg_vp_replaceanr')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_vp_product_stock_nocalc', __('Produktbestand nach Kauf nicht berechnen', 'wpsg'), $this->get_option('wpsg_vp_product_stock_nocalc'), [
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml index 2f45f66..fd4c273 100644 --- a/views/mods/mod_rechnungen/accounting_pdf.phtml +++ b/views/mods/mod_rechnungen/accounting_pdf.phtml @@ -494,7 +494,7 @@ if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
@@ -548,7 +548,7 @@ if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml index 50ffada..c5d649c 100644 --- a/views/mods/mod_rechnungen/invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/invoice_pdf.phtml @@ -175,6 +175,8 @@ $pdf->SetAutoPageBreak(true, 5);
AddRechnungPage($this, $pdf);
+ $deliverycountrytax = false;
+
if ($this->get_option('wpsg_deliverycountrytax') === '1') {
$value = false;
$kl = $this->view['kunde']['land'];
@@ -519,7 +521,7 @@ if ($this->view['basket']['arCalculation']['shipping'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
@@ -573,7 +575,7 @@ if ($this->view['basket']['arCalculation']['payment'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
diff --git a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml index ca4cc50..b0c9344 100644 --- a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml +++ b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml @@ -690,7 +690,7 @@ $sum = $this->view['multi_data']['orders'][0]['sum']; if ($arCalculation['shipping'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
@@ -741,7 +741,7 @@ $sum = $this->view['multi_data']['orders'][0]['sum']; if ($arCalculation['payment'][0]['tax_key'] === '0') {
- $mwst = _('anteilig');
+ $mwst = __('anteilig', 'wpsg');
} else {
@@ -778,10 +778,10 @@ $sum = $this->view['multi_data']['orders'][0]['sum']; $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++;
$pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset);
- $pdf->Cell( (($bTaxCol)?87:102), 8, _('Rabatt'), 1, 0, 'L');
+ $pdf->Cell( (($bTaxCol)?87:102), 8, __('Rabatt', 'wpsg'), 1, 0, 'L');
$pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset);
- $pdf->Cell(15, 8, _('anteilig'), 1, 0, 'C');
+ $pdf->Cell(15, 8, __('anteilig', 'wpsg'), 1, 0, 'C');
$pdf->setXY($prod_left + 112, $prod_top + $offset + $sum_multi_offset);
$pdf->Cell(15, 8, '1', 1, 0, 'C');
@@ -804,10 +804,10 @@ $sum = $this->view['multi_data']['orders'][0]['sum']; $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++;
$pdf->setXY($prod_left + 10, $prod_top + $offset + $sum_multi_offset);
- $pdf->Cell( (($bTaxCol)?87:102), 8, _('Wertgutschein').' ('.$c['code'].')', 1, 0, 'L');
+ $pdf->Cell( (($bTaxCol)?87:102), 8, __('Wertgutschein', 'wpsg').' ('.$c['code'].')', 1, 0, 'L');
$pdf->setXY($prod_left + 97, $prod_top + $offset + $sum_multi_offset);
- $pdf->Cell(15, 8, _('anteilig'), 1, 0, 'C');
+ $pdf->Cell(15, 8, __('anteilig', 'wpsg'), 1, 0, 'C');
$pdf->setXY($prod_left + 112, $prod_top + $offset + $sum_multi_offset);
$pdf->Cell(15, 8, $c['amount'], 1, 0, 'C');
diff --git a/views/mods/mod_rechnungen/order_view_row.phtml b/views/mods/mod_rechnungen/order_view_row.phtml index 3bafd25..61bb3f0 100644 --- a/views/mods/mod_rechnungen/order_view_row.phtml +++ b/views/mods/mod_rechnungen/order_view_row.phtml @@ -34,7 +34,7 @@ <?php if ($invoice_amount > 0) { ?>
<div style="display:flex; flex-direction:row; gap:0.5rem; font-weight:normal; align-items:center;">
- <span><?php echo __('Menge'); ?></span>
+ <span><?php echo __('Menge', 'wpsg'); ?></span>
<input form="invoice_form" type="hidden" name="invoice_products[<?php echo $p['order_product_id']; ?>][set]" value="0" class="" />
<input checked="checked" form="invoice_form" type="checkbox" class="wpsg_mod_deliverynote_product wpsg_check_amount_invoice" name="invoice_products[<?php echo $p['order_product_id']; ?>][set]" value="1" style="margin:0;" />
@@ -61,7 +61,7 @@ <?php if ($storno_amount > 0) { ?>
<div style="display:flex; flex-direction:row; gap:0.5rem; font-weight:normal; align-items:center;">
- <span><?php echo __('Menge'); ?></span>
+ <span><?php echo __('Menge', 'wpsg'); ?></span>
<input form="storno_form" type="hidden" name="storno_products[<?php echo $p['order_product_id']; ?>][set]" value="0" class="" />
<input form="storno_form" type="checkbox" class="wpsg_mod_deliverynote_product wpsg_check_amount_storno" name="storno_products[<?php echo $p['order_product_id']; ?>][set]" value="1" style="margin:0;" />
diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml index 60d7583..73aa609 100644 --- a/views/mods/mod_rechnungen/settings_edit.phtml +++ b/views/mods/mod_rechnungen/settings_edit.phtml @@ -87,9 +87,9 @@ <div class="row">
<div class="col-md-4">
<div class="align-buttons">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-left '.$alignLeft.'" name="wpsg_rechnungen_logo_position_left" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo linksbündig ausrichten").'">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-center '.$alignCenter.'" name="wpsg_rechnungen_logo_position_center" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo zentrieren").'">
- <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-right '.$alignRight.' '.$defaultAlign.'" name="wpsg_rechnungen_logo_position_right" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo rechtsbündig ausrichten").'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-left '.$alignLeft.'" name="wpsg_rechnungen_logo_position_left" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo linksbündig ausrichten", 'wpsg').'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-center '.$alignCenter.'" name="wpsg_rechnungen_logo_position_center" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo zentrieren", 'wpsg').'">
+ <input type="input" data-toggle="tooltip" class="logo-align-button logo-align-button-right '.$alignRight.' '.$defaultAlign.'" name="wpsg_rechnungen_logo_position_right" value="" onclick="handleLogoAlignClick(jQuery(this))" onkeydown="return false;" onfocus="return false;" autocomplete="off" title="'.__("Logo rechtsbündig ausrichten", 'wpsg').'">
</div>
</div>
<div class="col-md-8 logo-transparency">
diff --git a/views/mods/mod_revocation/ajaxDialogContent.phtml b/views/mods/mod_revocation/ajaxDialogContent.phtml index 633f643..89a32c3 100644 --- a/views/mods/mod_revocation/ajaxDialogContent.phtml +++ b/views/mods/mod_revocation/ajaxDialogContent.phtml @@ -61,7 +61,7 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); <input type="hidden" readonly name="wpsg_revocation_reason[row][<?php echo $key; ?>][order_product_id]" value="<?php echo $oOrderProduct->getId(); ?>" /> <div class="form_field"> - <div class="label"><?php echo __('Bestellnummer / Menge', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Bestellnummer / Menge', 'wpsg'); ?></div> <div class="value"> <input type="text" readonly name="wpsg_revocation_reason[row][<?php echo $key; ?>][order_nr]" value="<?php echo $oOrder->getNr(); ?>" /> <input type="number" min="1" max="<?php echo $amount; ?>" name="wpsg_revocation_reason[row][<?php echo $key; ?>][amount]" value="<?php echo $amount; ?>" /> @@ -69,10 +69,10 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); </div> <div class="form_field"> - <div class="label"><?php echo __('Widerrufsgrund', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Widerrufsgrund', 'wpsg'); ?></div> <div class="value"> <select name="wpsg_revocation_reason[row][<?php echo $key; ?>][reason]" required> - <option value=""><?php echo __("Keinen Grund angeben", 'wpsgRevocation') ?></option> + <option value=""><?php echo __("Keinen Grund angeben", 'wpsg') ?></option> <?php foreach ($arReason as $reason) { ?> <option value="<?php echo htmlspecialchars($reason['id']); ?>"><?php echo htmlspecialchars($reason['text']); ?></option> <?php } ?> @@ -81,7 +81,7 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); </div> <div class="form_field"> - <div class="label"><?php echo __('Bemerkung', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Bemerkung', 'wpsg'); ?></div> <div class="value"> <textarea name="wpsg_revocation_reason[row][<?php echo $key; ?>][comment]"></textarea> </div> @@ -101,14 +101,14 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); <fieldset class="wpsg_revocation_order_product"> <div class="form_field"> - <div class="label"><?php echo __('Artikel - Nr.', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Artikel - Nr.', 'wpsg'); ?></div> <div class="value"> <input type="text" name="wpsg_revocation_reason[row][<?php echo $key; ?>][product_nr]" value="<?php echo ($dialog_config['set_product_anr']??''); ?>" /> </div> </div> <div class="form_field"> - <div class="label"><?php echo __('Bestellnummer / Menge', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Bestellnummer / Menge', 'wpsg'); ?></div> <div class="value"> <input type="text" name="wpsg_revocation_reason[row][<?php echo $key; ?>][order_nr]" value="" /> <input type="number" name="wpsg_revocation_reason[row][<?php echo $key; ?>][amount]" value="1" /> @@ -116,10 +116,10 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); </div> <div class="form_field"> - <div class="label"><?php echo __('Widerrufsgrund', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Widerrufsgrund', 'wpsg'); ?></div> <div class="value"> <select name="wpsg_revocation_reason[row][<?php echo $key; ?>][reason]"> - <option value=""><?php echo __("Keinen Grund angeben", 'wpsgRevocation') ?></option> + <option value=""><?php echo __("Keinen Grund angeben", 'wpsg') ?></option> <?php foreach ($arReason as $reason) { ?> <option value="<?php echo htmlspecialchars($reason['id']); ?>"><?php echo htmlspecialchars($reason['text']); ?></option> <?php } ?> @@ -128,7 +128,7 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); </div> <div class="form_field"> - <div class="label"><?php echo __('Bemerkung', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Bemerkung', 'wpsg'); ?></div> <div class="value"> <textarea name="wpsg_revocation_reason[row][<?php echo $key; ?>][comment]"></textarea> </div> @@ -139,7 +139,7 @@ $arReason = \wpsgRevocation\Revocation::getReasons(); <?php } ?> <div class="form_field"> - <div class="label"><?php echo __('Kontakt - E-Mail', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo __('Kontakt - E-Mail', 'wpsg'); ?></div> <div class="value"> <input type="email" required name="wpsg_revocation_reason[contact]" value="<?php echo $contact_email; ?>" <?php echo (($contact_email !== '')?'readonly':''); ?> diff --git a/views/mods/mod_revocation/mail_row.phtml b/views/mods/mod_revocation/mail_row.phtml index 399bef0..fc784e7 100755 --- a/views/mods/mod_revocation/mail_row.phtml +++ b/views/mods/mod_revocation/mail_row.phtml @@ -13,6 +13,6 @@ $revo_url = get_home_url('/', '', 'http').'?wpsg_revo_order='.urlencode($order_nr).'&wpsg_revo_product='.urlencode($product_nr).'&wpsg_revo_amount='.urlencode($amount); ?><?php echo "\n"; ?> -<?php echo wpsg_pad_left(__('Vertrag widerrufen:', 'wpsgRevocation').' ', 15); ?> <?php echo $revo_url; ?> -<?php echo "\n"; ?> <?php echo wpsg_pad_left(__("--------------------"), 15) ?> +<?php echo wpsg_pad_left(__('Vertrag widerrufen:', 'wpsg').' ', 15); ?> <?php echo $revo_url; ?> +<?php echo "\n"; ?> <?php echo wpsg_pad_left(__("--------------------", 'wpsg'), 15) ?> <?php echo "\n"; ?>
\ No newline at end of file diff --git a/views/mods/mod_revocation/mail_row_html.phtml b/views/mods/mod_revocation/mail_row_html.phtml index 47293f5..e58ae64 100755 --- a/views/mods/mod_revocation/mail_row_html.phtml +++ b/views/mods/mod_revocation/mail_row_html.phtml @@ -17,8 +17,8 @@ ?> <tr class="productrow productrow2 <?php echo ((($i % 2) == 0)?'productrow_odd':'productrow_even'); ?>"> <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"> </td> - <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo __('Widerruf', 'wpsgRevocation'); ?>:</td> + <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo __('Widerruf', 'wpsg'); ?>:</td> <td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="4"> - <a href="<?php echo $revo_url; ?>"><?php echo __('Vertrag widerrufen', 'wpsgRevocation'); ?></a> + <a href="<?php echo $revo_url; ?>"><?php echo __('Vertrag widerrufen', 'wpsg'); ?></a> </td> </tr> diff --git a/views/mods/mod_revocation/mails/mail_admin_html.phtml b/views/mods/mod_revocation/mails/mail_admin_html.phtml index 57920b5..f3c0a58 100644 --- a/views/mods/mod_revocation/mails/mail_admin_html.phtml +++ b/views/mods/mod_revocation/mails/mail_admin_html.phtml @@ -14,13 +14,13 @@ $arReason = Revocation::getReasons(); ?> -<p><?php echo __('Hallo,', 'wpsgRevocation'); ?></p> +<p><?php echo __('Hallo,', 'wpsg'); ?></p> -<p><?php echo __('ein Kunde hat einen Widerruf für ein Produkt durchgeführt.', 'wpsgRevocation'); ?></p> +<p><?php echo __('ein Kunde hat einen Widerruf für ein Produkt durchgeführt.', 'wpsg'); ?></p> <p> - <strong><?php echo __('Name', 'wpsgRevocation'); ?>:</strong> %kunde_anrede% %kunde_vname% %kunde_name%<br> - <strong><?php echo __('E-Mail', 'wpsgRevocation'); ?>:</strong> %kunde_email% + <strong><?php echo __('Name', 'wpsg'); ?>:</strong> %kunde_anrede% %kunde_vname% %kunde_name%<br> + <strong><?php echo __('E-Mail', 'wpsg'); ?>:</strong> %kunde_email% </p> <hr> @@ -40,24 +40,24 @@ <div style="margin-bottom:15px; padding-bottom:10px; border-bottom:1px solid #ddd;"> <p> - <strong><?php echo __('Bestellung', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Bestellung', 'wpsg'); ?>:</strong> <?php echo $oOrder->getNr(); ?> </p> <p> - <strong><?php echo __('Produkt', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Produkt', 'wpsg'); ?>:</strong> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> - / <?php echo __('Artikelnummer', 'wpsgRevocation'); ?>: + / <?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> </p> <p> - <strong><?php echo __('Ausgewählter Grund', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Ausgewählter Grund', 'wpsg'); ?>:</strong> <?php echo $reasonText; ?> </p> <p> - <strong><?php echo __('Bemerkung', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Bemerkung', 'wpsg'); ?>:</strong> <?php echo nl2br(htmlspecialchars($d['comment'] ?? '')); ?> </p> </div> @@ -65,16 +65,16 @@ <?php endforeach; ?> <p> - <strong><?php echo __('Datum des Widerrufs', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Datum des Widerrufs', 'wpsg'); ?>:</strong> <?php echo date('d.m.Y H:i:s'); ?> </p> <p> - <?php echo __('Bitte prüft den Vorgang und führt die Rückabwicklung (Storno / Rückerstattung) durch.', 'wpsgRevocation'); ?> + <?php echo __('Bitte prüft den Vorgang und führt die Rückabwicklung (Storno / Rückerstattung) durch.', 'wpsg'); ?> </p> <p> - <?php echo __('Viele Grüße', 'wpsgRevocation'); ?><br> - <?php echo __(\wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'), 'wpsgRevocation'); ?> - - <?php echo __('Team', 'wpsgRevocation'); ?> + <?php echo __('Viele Grüße', 'wpsg'); ?><br> + <?php echo \wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'); ?> + - <?php echo __('Team', 'wpsg'); ?> </p>
\ No newline at end of file diff --git a/views/mods/mod_revocation/mails/mail_admin_text.phtml b/views/mods/mod_revocation/mails/mail_admin_text.phtml index 8ce601a..6b00c4d 100644 --- a/views/mods/mod_revocation/mails/mail_admin_text.phtml +++ b/views/mods/mod_revocation/mails/mail_admin_text.phtml @@ -13,12 +13,12 @@ $arSubmitData = \wpsg_ShopController::getShop()->view['arSubmitData'] ?? []; $arReason = Revocation::getReasons(); -?><?php echo __('Hallo,', 'wpsgRevocation'); ?> +?><?php echo __('Hallo,', 'wpsg'); ?> -<?php echo __('ein Kunde hat einen Widerruf für ein Produkt durchgeführt.', 'wpsgRevocation'); ?> +<?php echo __('ein Kunde hat einen Widerruf für ein Produkt durchgeführt.', 'wpsg'); ?> -<?php echo mb_str_pad(__('Name', 'wpsgRevocation').':', 25); ?> %kunde_anrede% %kunde_vname% %kunde_name% -<?php echo mb_str_pad(__('E-Mail', 'wpsgRevocation').':', 25); ?> %kunde_email% +<?php echo mb_str_pad(__('Name', 'wpsg').':', 25); ?> %kunde_anrede% %kunde_vname% %kunde_name% +<?php echo mb_str_pad(__('E-Mail', 'wpsg').':', 25); ?> %kunde_email% <?php foreach ($arSubmitData as $key => $d) { @@ -29,16 +29,16 @@ $oOrderProduct = $d['oOrderProduct']; ?> -<?php echo mb_str_pad(__('Bestellung', 'wpsgRevocation').':', 25); ?> <?php echo $oOrder->getNr(); ?> -<?php echo mb_str_pad(__('Produkt', 'wpsgRevocation').':', 25); ?> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> / <?php echo __('Artikelnummer', 'wpsgRevocation'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> -<?php echo mb_str_pad(__('Ausgewählter Grund', 'wpsgRevocation').':', 25); ?> <?php echo array_values(array_filter($arReason, function($item) use ($d) { return $item['id'] === $d['reason']; }))[0]['text'] ?? ''; ?> -<?php echo mb_str_pad(__('Bemerkung', 'wpsgRevocation').':', 25); ?> <?php echo $d['comment']; ?> +<?php echo mb_str_pad(__('Bestellung', 'wpsg').':', 25); ?> <?php echo $oOrder->getNr(); ?> +<?php echo mb_str_pad(__('Produkt', 'wpsg').':', 25); ?> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> / <?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> +<?php echo mb_str_pad(__('Ausgewählter Grund', 'wpsg').':', 25); ?> <?php echo array_values(array_filter($arReason, function($item) use ($d) { return $item['id'] === $d['reason']; }))[0]['text'] ?? ''; ?> +<?php echo mb_str_pad(__('Bemerkung', 'wpsg').':', 25); ?> <?php echo $d['comment']; ?> <?php } ?> -<?php echo mb_str_pad(__('Datum des Widerrufs', 'wpsgRevocation').':', 25); ?> <?php echo date('d.m.Y H:i:s'); ?> +<?php echo mb_str_pad(__('Datum des Widerrufs', 'wpsg').':', 25); ?> <?php echo date('d.m.Y H:i:s'); ?> -<?php echo __('Bitte prüft den Vorgang und führt die Rückabwicklung (Storno / Rückerstattung) durch.', 'wpsgRevocation'); ?> +<?php echo __('Bitte prüft den Vorgang und führt die Rückabwicklung (Storno / Rückerstattung) durch.', 'wpsg'); ?> -<?php echo __('Viele Grüße', 'wpsgRevocation'); ?> -<?php echo __(\wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'), 'wpsgRevocation'); ?> - <?php echo __('Team', 'wpsgRevocation'); ?>
\ No newline at end of file +<?php echo __('Viele Grüße', 'wpsg'); ?> +<?php echo \wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'); ?> - <?php echo __('Team', 'wpsg'); ?>
\ No newline at end of file diff --git a/views/mods/mod_revocation/mails/mail_customer_html.phtml b/views/mods/mod_revocation/mails/mail_customer_html.phtml index 9b84c5a..cc7fac6 100644 --- a/views/mods/mod_revocation/mails/mail_customer_html.phtml +++ b/views/mods/mod_revocation/mails/mail_customer_html.phtml @@ -14,11 +14,11 @@ $arReason = Revocation::getReasons(); ?> -<p><?php echo __('Hallo', 'wpsgRevocation'); ?> %kunde_anrede% %kunde_name%,</p> +<p><?php echo __('Hallo', 'wpsg'); ?> %kunde_anrede% %kunde_name%,</p> -<p><?php echo __('wir haben Ihren Widerruf erhalten und bedanken uns für Ihre Mitteilung.', 'wpsgRevocation'); ?></p> +<p><?php echo __('wir haben Ihren Widerruf erhalten und bedanken uns für Ihre Mitteilung.', 'wpsg'); ?></p> -<h3><?php echo __('Ihre Widerrufsanmeldung:', 'wpsgRevocation'); ?></h3> +<h3><?php echo __('Ihre Widerrufsanmeldung:', 'wpsg'); ?></h3> <?php foreach ($arSubmitData as $key => $d): @@ -35,25 +35,25 @@ <div style="margin-bottom:20px; padding:15px; background-color:#f9f9f9; border-radius:5px;"> <p style="margin:0 0 10px 0;"> - <strong><?php echo __('Bestellnummer', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Bestellnummer', 'wpsg'); ?>:</strong> <?php echo $oOrder->getNr(); ?> </p> <p style="margin:0 0 10px 0;"> - <strong><?php echo __('Produkt', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Produkt', 'wpsg'); ?>:</strong> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> - / <?php echo __('Artikelnr.', 'wpsgRevocation'); ?>: + / <?php echo __('Artikelnr.', 'wpsg'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> </p> <p style="margin:0 0 10px 0;"> - <strong><?php echo __('Grund', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Grund', 'wpsg'); ?>:</strong> <?php echo $reasonText; ?> </p> <?php if (!empty($d['comment'])): ?> <p style="margin:0 0 10px 0;"> - <strong><?php echo __('Bemerkung', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Bemerkung', 'wpsg'); ?>:</strong> <?php echo nl2br(htmlspecialchars($d['comment'])); ?> </p> <?php endif; ?> @@ -62,15 +62,15 @@ <?php endforeach; ?> <p> - <strong><?php echo __('Widerrufdatum', 'wpsgRevocation'); ?>:</strong> + <strong><?php echo __('Widerrufdatum', 'wpsg'); ?>:</strong> <?php echo date('d.m.Y H:i:s'); ?> </p> -<!--<p>--><?php //echo __('Wir werden Ihren Widerruf nun schnellstmöglich bearbeiten und uns bei Fragen mit Ihnen in Verbindung setzen.', 'wpsgRevocation'); ?><!--</p>--> -<p><?php echo __('Bitte beachten Sie, dass die Prüfung der Wirksamkeit und Reichweite Ihrer Widerrufserklärung noch aussteht. Wir werden Ihre Mitteilung nun bearbeiten und uns bei Rückfragen mit Ihnen in Verbindung setzen.', 'wpsgRevocation'); ?></p> +<!--<p>--><?php //echo __('Wir werden Ihren Widerruf nun schnellstmöglich bearbeiten und uns bei Fragen mit Ihnen in Verbindung setzen.', 'wpsg'); ?><!--</p>--> +<p><?php echo __('Bitte beachten Sie, dass die Prüfung der Wirksamkeit und Reichweite Ihrer Widerrufserklärung noch aussteht. Wir werden Ihre Mitteilung nun bearbeiten und uns bei Rückfragen mit Ihnen in Verbindung setzen.', 'wpsg'); ?></p> <p> - <?php echo __('Mit freundlichen Grüßen', 'wpsgRevocation'); ?><br> + <?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?><br> <?php echo \wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'); ?> - - <?php echo __('Team', 'wpsgRevocation'); ?> + - <?php echo __('Team', 'wpsg'); ?> </p>
\ No newline at end of file diff --git a/views/mods/mod_revocation/mails/mail_customer_text.phtml b/views/mods/mod_revocation/mails/mail_customer_text.phtml index fb65b63..5636d6b 100644 --- a/views/mods/mod_revocation/mails/mail_customer_text.phtml +++ b/views/mods/mod_revocation/mails/mail_customer_text.phtml @@ -13,11 +13,11 @@ $arSubmitData = \wpsg_ShopController::getShop()->view['arSubmitData'] ?? []; $arReason = Revocation::getReasons(); -?><?php echo __('Hallo', 'wpsgRevocation'); ?> %kunde_anrede% %kunde_name%, +?><?php echo __('Hallo', 'wpsg'); ?> %kunde_anrede% %kunde_name%, -<?php echo __('wir haben Ihren Widerruf erhalten und bedanken uns für Ihre Mitteilung.', 'wpsgRevocation'); ?> +<?php echo __('wir haben Ihren Widerruf erhalten und bedanken uns für Ihre Mitteilung.', 'wpsg'); ?> -<?php echo __('Ihre Widerrufsanmeldung:', 'wpsgRevocation'); ?> +<?php echo __('Ihre Widerrufsanmeldung:', 'wpsg'); ?> <?php foreach ($arSubmitData as $key => $d): @@ -32,23 +32,23 @@ ))[0]['text'] ?? ''; ?> -<?php echo mb_str_pad(__('Bestellnummer', 'wpsgRevocation').':', 20); ?> <?php echo $oOrder->getNr(); ?> +<?php echo mb_str_pad(__('Bestellnummer', 'wpsg').':', 20); ?> <?php echo $oOrder->getNr(); ?> -<?php echo mb_str_pad(__('Produkt', 'wpsgRevocation').':', 20); ?> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> / <?php echo __('Artikelnr.', 'wpsgRevocation'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> +<?php echo mb_str_pad(__('Produkt', 'wpsg').':', 20); ?> <?php echo $d['amount']; ?> x <?php echo $oOrderProduct->getProduct()->getProductName(true); ?> / <?php echo __('Artikelnr.', 'wpsg'); ?>: <?php echo $oOrderProduct->getProduct()->getNr(); ?> -<?php echo mb_str_pad(__('Grund', 'wpsgRevocation').':', 20); ?> <?php echo $reasonText; ?> +<?php echo mb_str_pad(__('Grund', 'wpsg').':', 20); ?> <?php echo $reasonText; ?> <?php if (!empty($d['comment'])): ?> -<?php echo mb_str_pad(__('Bemerkung', 'wpsgRevocation').':', 20); ?> <?php echo $d['comment']; ?> +<?php echo mb_str_pad(__('Bemerkung', 'wpsg').':', 20); ?> <?php echo $d['comment']; ?> <?php endif; ?> <?php endforeach; ?> -<?php echo mb_str_pad(__('Widerrufdatum', 'wpsgRevocation').':', 20); ?> <?php echo date('d.m.Y H:i:s'); ?> +<?php echo mb_str_pad(__('Widerrufdatum', 'wpsg').':', 20); ?> <?php echo date('d.m.Y H:i:s'); ?> -<?php echo __('Wir werden Ihren Widerruf nun schnellstmöglich bearbeiten und uns bei Fragen mit Ihnen in Verbindung setzen.', 'wpsgRevocation'); ?> -<?php echo __('Bitte beachten Sie, dass die Prüfung der Wirksamkeit und Reichweite Ihrer Widerrufserklärung noch aussteht. Wir werden Ihre Mitteilung nun bearbeiten und uns bei Rückfragen mit Ihnen in Verbindung setzen.', 'wpsgRevocation'); ?> +<?php echo __('Wir werden Ihren Widerruf nun schnellstmöglich bearbeiten und uns bei Fragen mit Ihnen in Verbindung setzen.', 'wpsg'); ?> +<?php echo __('Bitte beachten Sie, dass die Prüfung der Wirksamkeit und Reichweite Ihrer Widerrufserklärung noch aussteht. Wir werden Ihre Mitteilung nun bearbeiten und uns bei Rückfragen mit Ihnen in Verbindung setzen.', 'wpsg'); ?> -<?php echo __('Mit freundlichen Grüßen', 'wpsgRevocation'); ?> +<?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?> -<?php echo \wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'); ?> - <?php echo __('Team', 'wpsgRevocation'); ?>
\ No newline at end of file +<?php echo \wpsg_ShopController::getShop()->get_option('wpsg_shopdata_name'); ?> - <?php echo __('Team', 'wpsg'); ?>
\ No newline at end of file diff --git a/views/mods/mod_revocation/order_view_row.phtml b/views/mods/mod_revocation/order_view_row.phtml index 0d1cecc..9a58cc1 100644 --- a/views/mods/mod_revocation/order_view_row.phtml +++ b/views/mods/mod_revocation/order_view_row.phtml @@ -15,8 +15,8 @@ <tr class="wpsg_<?php echo (($this->view['i'] == 0)?'odd':'even'); ?>"> <td colspan="5"> - <?php echo __('Widerruf', 'wpsgRevocation'); ?>: - <?php echo wpsg_translate(__('#1# Stück am #2# widerrufen', 'wpsgRevocation'), $row['amount'], \wp_date('d. F Y H:i:s', strtotime($row['time']))); ?> + <?php echo __('Widerruf', 'wpsg'); ?>: + <?php echo wpsg_translate(__('#1# Stück am #2# widerrufen', 'wpsg'), $row['amount'], \wp_date('d. F Y H:i:s', strtotime($row['time']))); ?> </td> </tr> diff --git a/views/mods/mod_revocation/page_form.phtml b/views/mods/mod_revocation/page_form.phtml index daa8eff..5640420 100644 --- a/views/mods/mod_revocation/page_form.phtml +++ b/views/mods/mod_revocation/page_form.phtml @@ -48,14 +48,14 @@ <fieldset class="wpsg_revocation_order_product"> <div class="form_field"> - <div class="label"><?php echo \__('Artikel - Nr.', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo \__('Artikel - Nr.', 'wpsg'); ?></div> <div class="value"> <input type="text" name="wpsg_revocation_reason[row][<?php echo $key; ?>][product_nr]" value="<?php echo \esc_attr($get_product); ?>" /> </div> </div> <div class="form_field"> - <div class="label"><?php echo \__('Bestellnummer / Menge', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo \__('Bestellnummer / Menge', 'wpsg'); ?></div> <div class="value"> <input type="text" name="wpsg_revocation_reason[row][<?php echo $key; ?>][order_nr]" value="<?php echo \esc_attr($get_order); ?>" /> <input type="number" min="1" name="wpsg_revocation_reason[row][<?php echo $key; ?>][amount]" value="<?php echo intval($get_amount); ?>" /> @@ -63,10 +63,10 @@ </div> <div class="form_field"> - <div class="label"><?php echo \__('Widerrufsgrund', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo \__('Widerrufsgrund', 'wpsg'); ?></div> <div class="value"> <select name="wpsg_revocation_reason[row][<?php echo $key; ?>][reason]" required> - <option value=""><?php echo __("Keinen Grund angeben", 'wpsgRevocation') ?></option> + <option value=""><?php echo __("Keinen Grund angeben", 'wpsg') ?></option> <?php foreach ($arReason as $reason) { ?> <option value="<?php echo \htmlspecialchars($reason['id']); ?>"><?php echo \htmlspecialchars($reason['text']); ?></option> <?php } ?> @@ -75,7 +75,7 @@ </div> <div class="form_field"> - <div class="label"><?php echo \__('Bemerkung', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo \__('Bemerkung', 'wpsg'); ?></div> <div class="value"> <textarea name="wpsg_revocation_reason[row][<?php echo $key; ?>][comment]"></textarea> </div> @@ -84,7 +84,7 @@ </fieldset> <div class="form_field"> - <div class="label"><?php echo \__('Kontakt - E-Mail', 'wpsgRevocation'); ?></div> + <div class="label"><?php echo \__('Kontakt - E-Mail', 'wpsg'); ?></div> <div class="value"> <input type="email" required name="wpsg_revocation_reason[contact]" value="<?php echo \esc_attr($contact_email); ?>" <?php echo (($customer_login_id > 0 && $contact_email !== '') ? 'readonly' : ''); ?> @@ -93,12 +93,12 @@ </div> <p class="wpsg_revocation_page_datenschutz"> - <?php echo \__('Es gelten unsere', 'wpsgRevocation'); ?> - <a href="<?php echo $GLOBALS['wpsg_sc']->getURL(wpsg_ShopController::URL_DATENSCHUTZ); ?>"><?php echo \__('Datenschutzbestimmungen', 'wpsgRevocation'); ?></a>. + <?php echo \__('Es gelten unsere', 'wpsg'); ?> + <a href="<?php echo $GLOBALS['wpsg_sc']->getURL(wpsg_ShopController::URL_DATENSCHUTZ); ?>"><?php echo \__('Datenschutzbestimmungen', 'wpsg'); ?></a>. </p> <div class="form_field wpsg_revocation_page_submit_wrap"> - <button type="submit" class="button button-primary wpsg_revocation_page_submit"><?php echo \__('Widerruf bestätigen', 'wpsgRevocation'); ?></button> + <button type="submit" class="button button-primary wpsg_revocation_page_submit"><?php echo \__('Widerruf bestätigen', 'wpsg'); ?></button> </div> </form> @@ -173,7 +173,7 @@ } else { form.style.display = 'none'; - msg.innerHTML = '<div class="wpsg_revocation_page_success"><?php echo \esc_js(\__('Ihr Widerruf ist bei uns eingegangen und wird nun bearbeitet.', 'wpsgRevocation')); ?></div>'; + msg.innerHTML = '<div class="wpsg_revocation_page_success"><?php echo \esc_js(\__('Ihr Widerruf ist bei uns eingegangen und wird nun bearbeitet.', 'wpsg')); ?></div>'; msg.scrollIntoView({ behavior: 'smooth', block: 'center' }); } @@ -181,7 +181,7 @@ }).catch(() => { button.disabled = false; - msg.innerHTML = '<ul id="wpsg_error" class="wpsg_error"><li><?php echo \esc_js(\__('Es ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.', 'wpsgRevocation')); ?></li></ul>'; + msg.innerHTML = '<ul id="wpsg_error" class="wpsg_error"><li><?php echo \esc_js(\__('Es ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.', 'wpsg')); ?></li></ul>'; }); diff --git a/views/mods/mod_revocation/settings_edit.phtml b/views/mods/mod_revocation/settings_edit.phtml index c47b46b..47666f4 100644 --- a/views/mods/mod_revocation/settings_edit.phtml +++ b/views/mods/mod_revocation/settings_edit.phtml @@ -16,8 +16,8 @@ <div id="wpsg_mod_revocation_reason_app"> <ul class="nav nav-tabs" role="tablist"> - <li role="presentation" :class="{ 'active': tab === 1 }"><a href="#tab1" @click.prevent.stop="tab = 1"><?php echo __('Einstellungen', 'wpsgRevocation'); ?></a></li> - <li role="presentation" :class="{ 'active': tab === 2 }"><a href="#tab2" @click.prevent.stop="tab = 2"><?php echo __('Gründe für Retouren', 'wpsgRevocation'); ?></a></li> + <li role="presentation" :class="{ 'active': tab === 1 }"><a href="#tab1" @click.prevent.stop="tab = 1"><?php echo __('Einstellungen', 'wpsg'); ?></a></li> + <li role="presentation" :class="{ 'active': tab === 2 }"><a href="#tab2" @click.prevent.stop="tab = 2"><?php echo __('Gründe für Retouren', 'wpsg'); ?></a></li> </ul> <input type="hidden" name="wpsg_mod_revocation_reason" v-model="jsonString" /> @@ -25,23 +25,23 @@ <div class="tab-content"> <div v-show="tab === 1" class="tab-pane active"> - <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_order', __('An Produkten im Kundenfrontend an den Bestellungen anzeigen.', 'wpsgRevocation'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_order'), ['fullWidth' => true]); ?> - <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_flyout', __('Auf allen Seiten ein Widerrufs-Flyout anzeigen.', 'wpsgRevocation'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_flyout'), ['fullWidth' => true]); ?> - <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_product', __('Im Produkt neben "In den Warenkorb" anzeigen.', 'wpsgRevocation'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_product'), ['fullWidth' => true]); ?> - <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_customer_mail', __('Widerruflink in Bestellbestätigungsmail an Kunden.', 'wpsgRevocation'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_customer_mail'), ['fullWidth' => true]); ?> + <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_order', __('An Produkten im Kundenfrontend an den Bestellungen anzeigen.', 'wpsg'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_order'), ['fullWidth' => true]); ?> + <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_flyout', __('Auf allen Seiten ein Widerrufs-Flyout anzeigen.', 'wpsg'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_flyout'), ['fullWidth' => true]); ?> + <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_product', __('Im Produkt neben "In den Warenkorb" anzeigen.', 'wpsg'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_product'), ['fullWidth' => true]); ?> + <?php echo wpsg_drawForm_Checkbox('wpsg_mod_revocation_view_customer_mail', __('Widerruflink in Bestellbestätigungsmail an Kunden.', 'wpsg'), wpsg_ShopController::getShop()->get_option('wpsg_mod_revocation_view_customer_mail'), ['fullWidth' => true]); ?> <hr /> <div v-pre> - <?php echo wpsg_drawForm_Select('wpsg_page_widerrufsformular', __('Seite für das Widerrufsformular', 'wpsgRevocation'), wpsg_ShopController::getShop()->view['pages'], wpsg_ShopController::getShop()->get_option('wpsg_page_widerrufsformular'), ['hint' => __('Wählen Sie „Neu anlegen und zuordnen", damit beim Speichern automatisch eine eigene Seite erstellt wird – oder ordnen Sie eine bestehende Seite zu. Das Formular wird automatisch in diese Seite eingebunden.', 'wpsgRevocation')]); ?> + <?php echo wpsg_drawForm_Select('wpsg_page_widerrufsformular', __('Seite für das Widerrufsformular', 'wpsg'), wpsg_ShopController::getShop()->view['pages'], wpsg_ShopController::getShop()->get_option('wpsg_page_widerrufsformular'), ['hint' => __('Wählen Sie „Neu anlegen und zuordnen", damit beim Speichern automatisch eine eigene Seite erstellt wird – oder ordnen Sie eine bestehende Seite zu. Das Formular wird automatisch in diese Seite eingebunden.', 'wpsg')]); ?> </div> <p class="wpsg_note"> <?php echo wpsg_translate( - __('Einstellungen zu den E-Mails finden Sie in der <a href="#1#">E-Mail Konfiguration</a>.', 'wpsgRevocation'), + __('Einstellungen zu den E-Mails finden Sie in der <a href="#1#">E-Mail Konfiguration</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf' ); ?><br /> - <?php echo __('Das Modul setzt eindeutige Artikelnummern voraus.', 'wpsgRevocation'); ?> + <?php echo __('Das Modul setzt eindeutige Artikelnummern voraus.', 'wpsg'); ?> </p> </div> @@ -49,14 +49,14 @@ <div class="reason_wrap" v-if="arReason.length > 0"> <template v-for="r of arReason"> <div class="wpsg_form_field"> - <label class="label"><?php echo __('ID', 'wpsgRevocation'); ?></label> + <label class="label"><?php echo __('ID', 'wpsg'); ?></label> <div class="value"> {{r.id}} <a data-id="1" class="removeReason" @click.prevent.stop="removeReason(r)" href="#"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span></a> </div> </div> <div class="wpsg_form_field"> - <label class="label"><?php echo __('Text', 'wpsgRevocation'); ?></label> + <label class="label"><?php echo __('Text', 'wpsg'); ?></label> <div class="value"> <input type="text" v-model="r.text" /> </div> @@ -64,9 +64,9 @@ <hr /> </template> </div> - <p v-else><?php echo __('Keine Gründe definiert', 'wpsgRevocation'); ?></p> + <p v-else><?php echo __('Keine Gründe definiert', 'wpsg'); ?></p> - <a href="#" @click.prevent.stop="addReason" class="addReason"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neuen Grund anlegen', 'wpsgRevocation'); ?></a> + <a href="#" @click.prevent.stop="addReason" class="addReason"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neuen Grund anlegen', 'wpsg'); ?></a> </div> </div> @@ -107,7 +107,7 @@ }; const removeReason = r => { - if (confirm('<?php echo __('Sind Sie sich sicher?', 'wpsgRevocation'); ?>')) { + if (confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) { arReason.value = arReason.value.filter(v => v !== r); diff --git a/views/mods/mod_revocation/wp_footer.phtml b/views/mods/mod_revocation/wp_footer.phtml index 3c4f9c8..9e7a404 100644 --- a/views/mods/mod_revocation/wp_footer.phtml +++ b/views/mods/mod_revocation/wp_footer.phtml @@ -16,7 +16,7 @@ <div id="wpsg_revocation_button"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>Vertrag widerrufen</title><path d="M13.5,8H12V13L16.28,15.54L17,14.33L13.5,12.25V8M13,3A9,9 0 0,0 4,12H1L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3" /></svg> - <span id="wpsg_revocation_button_text"><?php echo __('Vertrag widerrufen', 'wpsgRevocation'); ?></span> + <span id="wpsg_revocation_button_text"><?php echo __('Vertrag widerrufen', 'wpsg'); ?></span> </div> <?php } else { ?> @@ -29,17 +29,17 @@ <div id="wpsg_revocation_dialog" class=""> <div class="inner"> <div class="header"> - <span><?php echo __('Widerrufsformular', 'wpsgRevocation'); ?></span> + <span><?php echo __('Widerrufsformular', 'wpsg'); ?></span> <a href="#" class="close"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" /></svg> </a> </div> <div class="content"></div> <div class="footer"> - <button class="button button-primary wpsg_revocation_button_submit"><?php echo __('Widerruf bestätigen', 'wpsgRevocation'); ?></button> + <button class="button button-primary wpsg_revocation_button_submit"><?php echo __('Widerruf bestätigen', 'wpsg'); ?></button> </div> <div class="loading"> - <img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsgRevocation'); ?>" /> + <img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" /> </div> </div> </div> @@ -119,7 +119,7 @@ } else { - alert('<?php echo __('Ihr Widerruf ist bei uns eingegangen und wird nun bearbeitet.', 'wpsgRevocation'); ?>'); + alert('<?php echo __('Ihr Widerruf ist bei uns eingegangen und wird nun bearbeitet.', 'wpsg'); ?>'); close_dialog(event); document.querySelectorAll('.wpsg_revocation_order_product_checkbox:checked').forEach(el => { diff --git a/views/mods/mod_revocation/wpsg_mod_kundenverwaltung_order_after_products.phtml b/views/mods/mod_revocation/wpsg_mod_kundenverwaltung_order_after_products.phtml index c9c0cb1..458e1f3 100644 --- a/views/mods/mod_revocation/wpsg_mod_kundenverwaltung_order_after_products.phtml +++ b/views/mods/mod_revocation/wpsg_mod_kundenverwaltung_order_after_products.phtml @@ -38,11 +38,11 @@ data-amount="<?php echo $amount; ?>" /> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>Vertrag widerrufen</title><path d="M13.5,8H12V13L16.28,15.54L17,14.33L13.5,12.25V8M13,3A9,9 0 0,0 4,12H1L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3" /></svg> - <span><?php echo __('Vertrag widerrufen', 'wpsgRevocation'); ?></span> + <span><?php echo __('Vertrag widerrufen', 'wpsg'); ?></span> </div> <?php } else { ?> - <p class="wpsg_revocation_complete"><?php echo __('Bereits komplett widerrufen', 'wpsgRevocation'); ?></p> + <p class="wpsg_revocation_complete"><?php echo __('Bereits komplett widerrufen', 'wpsg'); ?></p> <?php } ?> </td> diff --git a/views/mods/mod_revocation/wpsg_revocation.css b/views/mods/mod_revocation/wpsg_revocation.css index 7d6a9ea..4ebad37 100644 --- a/views/mods/mod_revocation/wpsg_revocation.css +++ b/views/mods/mod_revocation/wpsg_revocation.css @@ -27,7 +27,7 @@ .wpsg_revocation_product_button { flex-shrink:0; display:inline-flex; align-items:center; gap:0.5rem; - width:100%; min-height:35px; padding:0.25rem 0.5rem; + width:auto; min-height:35px; padding:0.25rem 0.5rem; border:1px solid black; cursor:pointer; } diff --git a/views/mods/mod_stock/product_addedit_content.phtml b/views/mods/mod_stock/product_addedit_content.phtml index ededa28..e48ed6f 100644 --- a/views/mods/mod_stock/product_addedit_content.phtml +++ b/views/mods/mod_stock/product_addedit_content.phtml @@ -35,8 +35,8 @@ __('Voreinstellung (#1#)', 'wpsg'),
(($this->get_option('wpsg_vp_product_stock_nocalc') === '1')?'nicht berechnen':'berechnen')
),
- '2' => __('berechnen'),
- '1' => __('nicht berechnen')
+ '2' => __('berechnen', 'wpsg'),
+ '1' => __('nicht berechnen', 'wpsg')
], $oProduct->getMeta('wpsg_vp_product_stock_nocalc'), [
'hint' => __('Ist hier "berechnen" eingestellt, wird beim Ändern des Bestandes einer Variante der Bestand im Produkt aus den Varianten ermittelt. (Lagerbestand im Produkt = Bestand(Variante 1) + Bestand(Variante 2) + ... )', 'wpsg')
]); ?>
@@ -46,8 +46,8 @@ __('Voreinstellung (#1#)', 'wpsg'),
(($this->get_option('wpsg_vp_product_stock_varinotchange') === '1')?'nicht verringern':'verringern')
),
- '2' => __('verringern'),
- '1' => __('nicht verringern')
+ '2' => __('verringern', 'wpsg'),
+ '1' => __('nicht verringern', 'wpsg')
], $oProduct->getMeta('wpsg_vp_product_stock_varinotchange'), [
'hint' => __('Ist hier "nicht verringern" aktiviert, so wird der Bestand in der Variante beim Kauf nicht reduziert.', 'wpsg')
]); ?>
@@ -57,8 +57,8 @@ __('Voreinstellung (#1#)', 'wpsg'),
(($this->get_option('wpsg_vp_product_stock_display') === '1')?'Produktbestand':'Variantenbestand')
),
- '2' => __('Variantenbestand'),
- '1' => __('Produktbestand')
+ '2' => __('Variantenbestand', 'wpsg'),
+ '1' => __('Produktbestand', 'wpsg')
], $oProduct->getMeta('wpsg_vp_product_stock_display'), [
'hint' => __('Bestimmt ob der Variantenbestand (Produktbestand + Variantenbestand) oder nur der Produktbestand im Frontend angezeigt werden soll.', 'wpsg')
]); ?>
diff --git a/views/mods/mod_stock/stockmail.phtml b/views/mods/mod_stock/stockmail.phtml index a124582..36585e8 100644 --- a/views/mods/mod_stock/stockmail.phtml +++ b/views/mods/mod_stock/stockmail.phtml @@ -15,9 +15,9 @@ echo wpsg_translate(__('Eine Produktvariation hat das Erreichen des minimalen Lagerbestands am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));
echo "\r\n";
echo "\r\n";
- echo __("Produkt").': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'];
+ echo __("Produkt", 'wpsg').': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'];
echo "\r\n";
- echo __("Produktvariation").': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];
+ echo __("Produktvariation", 'wpsg').': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];
echo "\r\n";
}
@@ -29,7 +29,7 @@ foreach ((array)$this->basket->arProdukte as $p)
$id = $p['id'];
echo ('');
- echo __('Produkt').': '.$p['id'].' '.$p['name'];
+ echo __('Produkt', 'wpsg').': '.$p['id'].' '.$p['name'];
}
?>
diff --git a/views/mods/mod_stock/stockmail_html.phtml b/views/mods/mod_stock/stockmail_html.phtml index 75b3de6..c56dab2 100644 --- a/views/mods/mod_stock/stockmail_html.phtml +++ b/views/mods/mod_stock/stockmail_html.phtml @@ -18,9 +18,9 @@ echo wpsg_translate(__('Eine Produktvariation hat das Erreichen des minimalen Lagerbestands am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));
echo '<br />';
- echo __("Produkt").': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'].' ';
+ echo __("Produkt", 'wpsg').': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'].' ';
echo '<br />';
- echo __("Produktvariation").': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];
+ echo __("Produktvariation", 'wpsg').': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];
}
else
@@ -31,7 +31,7 @@ foreach ((array)$this->basket->arProdukte as $p)
$id = $p['id'];
echo ('<br />');
- echo __('Produkt').': '.$p['id'].' '.$p['name'];
+ echo __('Produkt', 'wpsg').': '.$p['id'].' '.$p['name'];
}
?>
diff --git a/views/mods/mod_ticket/product_addedit_content.phtml b/views/mods/mod_ticket/product_addedit_content.phtml index 2d1870d..38798cd 100644 --- a/views/mods/mod_ticket/product_addedit_content.phtml +++ b/views/mods/mod_ticket/product_addedit_content.phtml @@ -156,7 +156,7 @@ </td> <td> <template v-if="t.autoticket_id > 0"> - <a title="<?php echo __('Termine dieses Serientermins anzeigen', 'wpsg'); ?>" href="#" @click.prevent="display_autoTermin(t.autoticket_id)"><?php echo __('Serientermin'); ?> #{{t.autoticket_id}}</a> + <a title="<?php echo __('Termine dieses Serientermins anzeigen', 'wpsg'); ?>" href="#" @click.prevent="display_autoTermin(t.autoticket_id)"><?php echo __('Serientermin', 'wpsg'); ?> #{{t.autoticket_id}}</a> </template> </td> </tr> diff --git a/views/mods/mod_weight/basket_row_end.phtml b/views/mods/mod_weight/basket_row_end.phtml index a320397..21d98b5 100644 --- a/views/mods/mod_weight/basket_row_end.phtml +++ b/views/mods/mod_weight/basket_row_end.phtml @@ -13,6 +13,6 @@ <?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
</div>
<div class="value">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
\ No newline at end of file diff --git a/views/mods/mod_weight/overview_row_end.phtml b/views/mods/mod_weight/overview_row_end.phtml index de38b35..84a3d83 100644 --- a/views/mods/mod_weight/overview_row_end.phtml +++ b/views/mods/mod_weight/overview_row_end.phtml @@ -13,6 +13,6 @@ <?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>
</div>
<div class="value">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
\ No newline at end of file diff --git a/views/order/backendEdit/addVoucher.phtml b/views/order/backendEdit/addVoucher.phtml index 9e87b25..890dcca 100644 --- a/views/order/backendEdit/addVoucher.phtml +++ b/views/order/backendEdit/addVoucher.phtml @@ -60,7 +60,7 @@ <?php echo wpsg_drawForm_Input('be_voucher_code', __('Code (Optional)', 'wpsg'), @$voucher['code']); ?>
<?php echo wpsg_drawForm_Input('be_voucher_id', __('Gutschein ID', 'wpsg'), @$voucher['id']); ?>
<?php echo wpsg_drawForm_Input('be_voucher_amount', wpsg_translate(__('Gutscheinwert in #1# (#2#) oder % ', 'wpsg'), $this->get_option('wpsg_currency'), $strBN), $strVal); ?>
- <?php echo wpsg_drawForm_Checkbox('be_voucher_coupon', __('Wertgutschein'), (($voucher['type'] === 'coupon')?'1':'0')); ?>
+ <?php echo wpsg_drawForm_Checkbox('be_voucher_coupon', __('Wertgutschein', 'wpsg'), (($voucher['type'] === 'coupon')?'1':'0')); ?>
</form>
diff --git a/views/order/index.phtml b/views/order/index.phtml index 584f947..398a04f 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -71,7 +71,7 @@ <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_order_filter') === '1') { ?>
<?php $arProductgroups = $this->callMod('wpsg_mod_productgroups', 'getAllProductGroups'); ?>
- <?php echo wpsg_drawForm_Select('filter[productgroup_id]', __('Bestellungen mit Produkten aus Produktgruppe'), ['0' => __('Alle', 'wpsg')] + $arProductgroups, wpsg_getStr($this->view['arFilter']['productgroup_id'])); ?>
+ <?php echo wpsg_drawForm_Select('filter[productgroup_id]', __('Bestellungen mit Produkten aus Produktgruppe', 'wpsg'), ['0' => __('Alle', 'wpsg')] + $arProductgroups, wpsg_getStr($this->view['arFilter']['productgroup_id'])); ?>
<?php } ?>
@@ -121,7 +121,7 @@ <br />
- <?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen')); ?>
+ <?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen', 'wpsg')); ?>
</form>
</div>
@@ -156,7 +156,7 @@ <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1') $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff(wpsg_getStr($payment['price'])).')'; ?>
<?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, wpsg_getStr($_REQUEST['add_payment'])); ?>
- <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen')); ?><br />
+ <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen', 'wpsg')); ?><br />
<script>
@@ -522,32 +522,58 @@ </script>
<div class="multiRechnung_tab" id="multiRechnung_inform" style="padding: 15px 0 15px 0; display:none;">
+
+ <div class="multiinvoice_form">
+
+ <?php $oCustomer = wpsg_customer::getInstance(intval($this->view['arFilter']['k_id'])); ?>
+ <div class="row">
+ <input type="checkbox" name="wpsg_Multirechnung_sendmail" value="1" id="invoice_sendmail" />
+ <label for="invoice_sendmail"><?php echo __('E-Mail an Kunden senden', 'wpsg'); ?></label>
+ <input type="email" name="wpsg_Multirechnung_email" value="<?php echo $oCustomer->getEMailEInvoice(); ?>" />
+ </div>
+
+ <div class="row">
+ <input type="checkbox" name="wpsg_Multirechnung_faelligkeit" value="1" id="invoice_faelligkeit" />
+ <label for="invoice_faelligkeit"><?php echo __('Fälligkeit anzeigen', 'wpsg'); ?></label>
+ <input type="date" name="wpsg_Multirechnung_faelligkeitsdatum" value="<?php echo date('Y-m-d', strtotime('+'.intval($this->get_option("wpsg_rechnungen_faelligkeit")).' day')); ?>" />
+ </div>
+
+ <div class="row">
+ <input type="checkbox" name="wpsg_Multirechnung_url" value="1" id="invoice_url" />
+ <label for="invoice_url"><?php echo __('URL Benachrichtigung', 'wpsg'); ?></label>
+ <span></span>
+ </div>
+
+ <div class="row">
+ <span></span>
+ <label for="invoice_date"><?php echo __('Rechnungsdatum', 'wpsg') ;?></label>
+ <input type="date" value="<?php echo date('Y-m-d'); ?>" name="wpsg_Multirechnung_datum" id="invoice_date" />
+ </div>
+
+ <span class="row" style="margin-top:0.5rem">
+ <input type="hidden" name="preview" id="wpsg_mod_rechnungen_preview" />
+ <input type="submit" name="wpsg_order_doaction" value="<?php echo __('Vorschau', 'wpsg'); ?>" id="wpsg_mod_rechnungen_button_preview" />
+ <input type="submit" name="wpsg_order_doaction" value="<?php echo __('Erstellen', 'wpsg'); ?>" id="wpsg_mod_rechnungen_button_submit" />
+ </span>
+
+ </div>
+ <style>
+
+ .multiinvoice_form { border:1px solid black; padding:1rem 0.5rem; display:flex; flex-direction:column; gap:1rem; width:500px; user-select:none;
+ .row { margin:0; display:flex; justify-content:flex-start; gap:0.5rem; align-items:center; min-height:26px;
+ & > * { margin:0; }
+ & > *:first-child { width:16px; min-width:16px; flex-shrink:0; }
+ input[type="text"], input[type="date"], input[type="email"] { height:26px; min-height:26px; }
+ }
+ }
+
+ </style>
+
+
<div style="width: 100%; padding: 1rem; display: grid; row-gap: 0.5rem; column-gap: 0.5rem; grid-template-columns: 25px 1fr 150px; align-items: center; grid-auto-rows: 30px; padding-bottom: 0.5rem;" >
- <?php $oCustomer = wpsg_customer::getInstance(intval($this->view['arFilter']['k_id'])); ?>
-
- <input type="checkbox" name="wpsg_Multirechnung_sendmail" value="1" id="invoice_sendmail" />
- <label for="invoice_sendmail"><?php echo __('E-Mail an Kunden senden', 'wpsg'); ?></label>
- <input type="email" name="wpsg_Multirechnung_email" value="<?php echo $oCustomer->getEMailEInvoice(); ?>" />
-
- <input type="checkbox" name="wpsg_Multirechnung_faelligkeit" value="1" id="invoice_faelligkeit" />
- <label for="invoice_faelligkeit"><?php echo __('Fälligkeit anzeigen', 'wpsg'); ?></label>
- <input type="date" name="wpsg_Multirechnung_faelligkeitsdatum" value="<?php echo date('Y-m-d', strtotime('+'.intval($this->get_option("wpsg_rechnungen_faelligkeit")).' day')); ?>" />
-
- <input type="checkbox" name="wpsg_Multirechnung_url" value="1" id="invoice_url" />
- <label for="invoice_url"><?php echo __('URL Benachrichtigung', 'wpsg'); ?></label>
- <span></span>
-
- <span></span>
- <label for="invoice_date"><?php echo __('Rechnungsdatum', 'wpsg') ;?></label>
- <input type="date" value="<?php echo date('Y-m-d'); ?>" name="wpsg_Multirechnung_datum" id="invoice_date" />
-
- <span style="display:flex; justify-content:flex-start; gap:0.5rem; grid-column:1/span 3;">
- <input type="hidden" name="preview" id="wpsg_mod_rechnungen_preview" />
- <input type="submit" name="wpsg_order_doaction" value="<?php echo _('Vorschau'); ?>" id="wpsg_mod_rechnungen_button_preview" />
- <input type="submit" name="wpsg_order_doaction" value="<?php echo _('Erstellen'); ?>" id="wpsg_mod_rechnungen_button_submit" />
- </span>
+
</div>
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml index 3fc4499..37533bb 100644 --- a/views/order/product_table.phtml +++ b/views/order/product_table.phtml @@ -26,10 +26,10 @@ </style>
-<?php echo wpsg_drawForm_Select('tax_mode', __('Besteuerung'), [
- \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS => __('Kleinunternehmerregelung'),
- \wpsg\wpsg_calculation::TAXMODE_B2C => __('Endkundenbesteuerung'),
- \wpsg\wpsg_calculation::TAXMODE_B2B => __('Firmenkundenbesteuerung (USTIdNr)')
+<?php echo wpsg_drawForm_Select('tax_mode', __('Besteuerung', 'wpsg'), [
+ \wpsg\wpsg_calculation::TAXMODE_SMALLBUSINESS => __('Kleinunternehmerregelung', 'wpsg'),
+ \wpsg\wpsg_calculation::TAXMODE_B2C => __('Endkundenbesteuerung', 'wpsg'),
+ \wpsg\wpsg_calculation::TAXMODE_B2B => __('Firmenkundenbesteuerung (USTIdNr)', 'wpsg')
], $this->view['oCalculation']->getTaxMode(), ['onchange' => 'WPSG_BE.updateCalculation();', 'help' => 'tax_mode']); ?>
<br />
diff --git a/views/order/view_dev.phtml b/views/order/view_dev.phtml index 6a3c9f7..6c96cbc 100644 --- a/views/order/view_dev.phtml +++ b/views/order/view_dev.phtml @@ -52,7 +52,7 @@ <?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php echo wpsg_drawForm_AdminboxStart(__('Technische Einstellungen', 'wüsg')); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Technische Einstellungen', 'wpsg')); ?>
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=save&edit_id=<?php echo $this->view['oOrder']->id; ?>&noheader=1" enctype="multipart/form-data">
<?php echo wpsg_drawForm_Checkbox('ext_payed', __('Externe Zahlungseingänge ignorieren', 'wpsg'), wpsg_getStr($this->view['data']['ext_payed'])); ?>
diff --git a/views/produkt/addedit_rating.phtml b/views/produkt/addedit_rating.phtml index 44a6265..5376801 100644 --- a/views/produkt/addedit_rating.phtml +++ b/views/produkt/addedit_rating.phtml @@ -69,7 +69,7 @@ </div>
<?php } else { ?>
- <?php echo __('Keine Bewertungen vorhanden'); ?>
+ <?php echo __('Keine Bewertungen vorhanden', 'wpsg'); ?>
<?php } ?>
</div>
</div>
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 88eb19a..b9379b8 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -121,7 +121,7 @@ <input type="hidden" name="submit-button" value="1" />
<?php } ?>
- <?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen')); ?><br />
+ <?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen', 'wpsg')); ?><br />
</form>
</div>
@@ -337,7 +337,7 @@ </div>
<?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($oProduct->getProductKey())) ?>
<?php if (wpsg_isSizedInt($stl)) { ?>
- <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+ <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.', 'wpsg'); ?></a>
<?php } ?>
<?php } else { ?>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index 4456ca3..bf8a4d3 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -260,7 +260,7 @@ <?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
<?php if (wpsg_isSizedInt($stl)) { ?>
- <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+ <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.', 'wpsg'); ?></a>
<?php } ?>
diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml index 3ef75a7..dd6576f 100644 --- a/views/produkttemplates/standard2.phtml +++ b/views/produkttemplates/standard2.phtml @@ -252,7 +252,7 @@ <?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
<?php if (wpsg_isSizedInt($stl)) { ?>
- <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+ <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.', 'wpsg'); ?></a>
<?php } ?>
diff --git a/views/produkttemplates/standard3.phtml b/views/produkttemplates/standard3.phtml index 219b9e2..92f4998 100644 --- a/views/produkttemplates/standard3.phtml +++ b/views/produkttemplates/standard3.phtml @@ -222,7 +222,7 @@ <?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
<?php if (wpsg_isSizedInt($stl)) { ?>
- <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+ <a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.', 'wpsg'); ?></a>
<?php } ?>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 52ff93c..63f46ec 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -16,7 +16,7 @@ else $display_brutto_netto = 'netto';
?>
-<div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
+<div class="wpsg alignwide wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
<?php } else {?>
@@ -126,7 +126,7 @@ <?php echo wpsg_ff($product_data['mwst_value'], ' %'); ?>
</div>
<div class="dummyr">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
@@ -351,7 +351,7 @@ <?php echo get_option('wpsg_kleinunternehmer_text'); ?>
</div>
<div class="value">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
diff --git a/views/warenkorb/checkout.phtml b/views/warenkorb/checkout.phtml index d1a5053..0e62dd7 100644 --- a/views/warenkorb/checkout.phtml +++ b/views/warenkorb/checkout.phtml @@ -91,7 +91,7 @@ /* ]]> */</script>
-<div class="wpsg wpsg_checkout">
+<div class="wpsg alignwide wpsg_checkout">
<?php echo $this->writeFrontendMessage(); ?>
diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml index 97160b9..1f47bcb 100644 --- a/views/warenkorb/checkout2.phtml +++ b/views/warenkorb/checkout2.phtml @@ -8,7 +8,7 @@ //die();
?>
-<div class="wpsg wpsg_checkout2">
+<div class="wpsg wpsg_checkout2 alignwide">
<?php echo $this->writeFrontendMessage(); ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index 0703012..edc0e3d 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -9,7 +9,7 @@ else $display_brutto_netto = 'netto';
?>
-<div class="wpsg wpsg_overview">
+<div class="wpsg wpsg_overview alignwide">
<?php echo $this->writeFrontendMessage(); ?>
@@ -261,7 +261,7 @@ <?php echo wpsg_ff($product_data['mwst_value'], ' %'); ?>
</div>
<div class="dummyr">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
@@ -432,7 +432,7 @@ <?php echo get_option('wpsg_kleinunternehmer_text'); ?>
</div>
<div class="value">
- <?php echo __(' '); ?>
+ <?php echo __(' ', 'wpsg'); ?>
</div>
</div>
|
