diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/mailtemplates/adminmail.phtml | 2 | ||||
| -rw-r--r-- | views/mods/mod_abo/settings_edit.phtml | 14 | ||||
| -rw-r--r-- | views/mods/mod_shippingadress/checkout_inner_prebutton.phtml | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml index 5926aeb..b284ed2 100644 --- a/views/mailtemplates/adminmail.phtml +++ b/views/mailtemplates/adminmail.phtml @@ -6,6 +6,8 @@ $this->htmlMail = false;
+
+
?><?php echo __('Hallo Administrator,', 'wpsg'); ?>
<?php echo __('Eine neue Bestellung ist im Online-Shop eingegangen.', 'wpsg'); ?>
diff --git a/views/mods/mod_abo/settings_edit.phtml b/views/mods/mod_abo/settings_edit.phtml index 744969a..a69cddf 100644 --- a/views/mods/mod_abo/settings_edit.phtml +++ b/views/mods/mod_abo/settings_edit.phtml @@ -122,7 +122,19 @@ ), $this->get_option('wpsg_mod_abo_autoexpire_customer'), array('help' => 'wpsg_mod_abo_autoexpire_customer')); ?>
<?php echo wpsg_drawForm_Input(false, __('CRON URL', 'wpsg'), site_url().'/?wpsg_cron=1', ['readonly' => true]); ?>
-<?php echo wpsg_drawForm_Text(__('Letzter Cron Aufruf', 'wpsg'), wpsg_formatTimestamp($this->get_option('wpsg_mod_abo_cron_lastrun'), false, true)); ?>
+
+<?php echo wpsg_drawForm_TextStart(); ?>
+
+ <span><?php echo __('Letzter Lauf: ', 'wpsg'); ?><?php echo wpsg_formatTimestamp($this->get_option('wpsg_mod_abo_cron_lastrun'), false, true); ?></span><br />
+ <span>
+ <?php echo __('Status: ', 'wpsg'); ?><?php echo (($this->get_option('wpsg_mod_abo_cron_run') === '1')?_('Läuft gerade'):_('Wartend')); ?>
+ <?php if ($this->get_option('wpsg_mod_abo_cron_run') === '1') { ?>
+ (<?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')); ?>
<br />
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml index 2c4a55d..03adbe5 100644 --- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml +++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml @@ -34,8 +34,8 @@ <select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" type="select" id="shipping_title" name="wpsg[checkout][shipping_title]">
<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
- <option value="<?php echo $i; /*wpsg_hspc($t);*/ $i++; ?>" <?php echo ((wpsg_isSizedString($this->view['basket']['checkout']['shipping_title'], $t))?'selected="selected"':''); ?>><?php echo $t; ?></option>
- <?php } ?>
+ <option value="<?php echo $i; /*wpsg_hspc($t);*/ ?>" <?php echo ((($this->view['basket']['checkout']['shipping_title']??'') === strval($i))?'selected="selected"':''); ?>><?php echo $t; ?></option>
+ <?php $i++; } ?>
</select>
</div>
<?php } ?>
|