diff options
5 files changed, 75 insertions, 12 deletions
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index d104b9b..7906b5a 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -1,4 +1,4 @@ -<div class="form-group form-group-text form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>">
+<div class="form-group form-group-text form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?> <?php echo wpsg_getStr($this->view['field_config']['class_wrap']); ?>" <?php echo ((isset($this->view['field_config']['wrap_id']))?'id="'.$this->view['field_config']['wrap_id'].'" ':''); ?>>
<label class="col-sm-6 control-label" for=""><?php echo $this->view['field_label']; ?></label>
diff --git a/views/mods/mod_kundenkontakt/order_index_bottom.phtml b/views/mods/mod_kundenkontakt/order_index_bottom.phtml index 2784eed..b405b58 100644 --- a/views/mods/mod_kundenkontakt/order_index_bottom.phtml +++ b/views/mods/mod_kundenkontakt/order_index_bottom.phtml @@ -22,10 +22,36 @@ <?php echo wpsg_drawForm_Select('wpsg_mod_kundenkontakt_template', __('Template', 'wpsg'), $arTemplateSelect, '0'); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_kundenkontakt_subject', __('Betreff', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_subject_wrap']); ?>
- <?php echo wpsg_drawForm_Textarea('wpsg_mod_kundenkontakt_text', __('Text', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_text_wrap']); ?>
-
+
+ <?php /* echo wpsg_drawForm_Textarea('wpsg_mod_kundenkontakt_text', __('Text', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_text_wrap']); */ ?>
+
+ <div class="form-group form-group-sm form-textarea" id="wpsg_mod_kundenkontakt_text_wrap">
+ <label class="col-sm-6 control-label" for="wpsg_mod_kundenkontakt_text">Text</label>
+ <div class="col-sm-6">
+ <div class="wpsg_field_wrap">
+
+ <?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>
+
+ <?php wp_editor('', 'wpsg_mod_kundenkontakt_text'); ?>
+
+ <?php } else { ?>
+
+ <textarea class="form-control" id="wpsg_mod_kundenkontakt_text" name="wpsg_mod_kundenkontakt_text"></textarea>
+
+ <?php } ?>
+
+ </div>
+
+ </div>
+
+ <div class="clearfix wpsg_clear"></div>
+
+ </div>
+
<?php echo wpsg_drawForm_Button(__('Kunden informieren', 'wpsg'), '', ['wrap_id' => 'wpsg_mod_kundenkontakt_submit_wrap', 'field_id' => 'wpsg_mod_kundenkontakt_submit']); ?>
+ <?php echo wpsg_drawForm_Text('', __('Bitte warten ...', 'wpsg'), 'wpsg_mod_kundenverwaltung_loading', ['wrap_id' => 'wpsg_mod_kundenkontakt_loading_wrap']); ?>
+
</div>
</fieldset>
@@ -42,12 +68,16 @@ let el_wpsg_mod_kundenkontakt_submit = document.getElementById('wpsg_mod_kundenkontakt_submit');
let el_wpsg_mod_kundenkontakt_submit_wrap = document.getElementById('wpsg_mod_kundenkontakt_submit_wrap');
+ let el_wpsg_mod_kundenkontakt_loading_wrap = document.getElementById('wpsg_mod_kundenkontakt_loading_wrap');
+
let el_doaction = document.getElementById('doaction');
document.getElementById('wpsg_mod_kundenkontakt_template').addEventListener('change', (event) => {
if (event.target.value !== '0') {
-
+
+ el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'block';
+
jQuery.ajax({
url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&do=kk_switchTemplate",
dataType: 'json',
@@ -56,12 +86,19 @@ },
success: function(data) {
+ el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
+
el_wpsg_mod_kundenkontakt_subject_wrap.style.display = 'block';
el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'block';
el_wpsg_mod_kundenkontakt_submit_wrap.style.display = 'block';
el_wpsg_mod_kundenkontakt_subject.value = data.subject;
+
+ <?php if ($this->get_option('wpsg_htmlmail') === '1') { ?>
+ tinyMCE.get('wpsg_mod_kundenkontakt_text').setContent(data.content);
+ <?php } else { ?>
el_wpsg_mod_kundenkontakt_text.value = data.content;
+ <?php } ?>
}
});
@@ -71,6 +108,7 @@ el_wpsg_mod_kundenkontakt_subject_wrap.style.display = 'none';
el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'none';
el_wpsg_mod_kundenkontakt_submit_wrap.style.display = 'none';
+ el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
}
@@ -95,6 +133,10 @@ }
el_wpsg_mod_kundenkontakt_submit.setAttribute("disabled", "disabled");
+ el_wpsg_mod_kundenkontakt_subject.setAttribute("disabled", "disabled");
+ el_wpsg_mod_kundenkontakt_text.setAttribute("disabled", "disabled");
+
+ el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'block';
jQuery.ajax({
url: "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_kundenkontakt&noheader=1&do=kk_sendMail",
@@ -104,8 +146,28 @@ el_wpsg_mod_kundenkontakt_subject: el_wpsg_mod_kundenkontakt_subject.value
},
success: function(data) {
-
+
+ document.getElementById('wpsg_mod_kundenkontakt_template').selectedIndex = 0;
+
+ for (let el of document.querySelectorAll('.col_set_checkbox')) {
+
+ el.checked = false;
+
+ }
+
+ el_wpsg_mod_kundenkontakt_loading_wrap.style.display = 'none';
+
+ el_wpsg_mod_kundenkontakt_subject_wrap.style.display = 'none';
+ el_wpsg_mod_kundenkontakt_subject.value = '';
+
+ el_wpsg_mod_kundenkontakt_text_wrap.style.display = 'none';
+ el_wpsg_mod_kundenkontakt_text.value = '';
+
el_wpsg_mod_kundenkontakt_submit.removeAttribute("disabled");
+ el_wpsg_mod_kundenkontakt_subject.removeAttribute("disabled");
+ el_wpsg_mod_kundenkontakt_text.removeAttribute("disabled");
+
+ el_wpsg_mod_kundenkontakt_submit_wrap.style.display = 'none';
alert(data);
@@ -138,5 +200,10 @@ #wpsg_mod_kundenkontakt_subject_wrap { display:none; }
#wpsg_mod_kundenkontakt_text_wrap { display:none; }
#wpsg_mod_kundenkontakt_submit_wrap { display:none; }
+ #wpsg_mod_kundenkontakt_loading_wrap { display:none; }
+ #wpsg_mod_kundenkontakt_layer .form-group > label { width:15% !important; }
+ #wpsg_mod_kundenkontakt_layer .wpsg_form_field > .wpsg_form_left { width:15% !important; }
+ #wpsg_mod_kundenkontakt_layer .form-group > div:nth-child(2),
+ #wpsg_mod_kundenkontakt_layer .wpsg_form_field > .wpsg_form_right { width:85% !important; }
</style>
\ No newline at end of file diff --git a/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml b/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml index 60f0ead..a5ba35c 100644 --- a/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml +++ b/views/mods/mod_kundenkontakt/templates/zahlungsaufforderung_html.phtml @@ -2,15 +2,13 @@ global $template_name, $template_betreff, $absender_name, $absender_email;
- include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');
-
/**
* Betreff des Templates
*/
$template_betreff = __('wpShopGermany: Zahlungsaufforderung', 'wpsg');
-?><p><?php echo __('Hallo %kunde_anrede% %kunde_vname% %kunde_name%,', 'wpsg'); ?>,</p>
+?><p><?php echo __('Hallo %kunde_anrede% %kunde_vname% %kunde_name%,', 'wpsg'); ?></p>
<p><?php echo __('Sie sind Ihren Zahlungsverpflichtungen nicht nachgekommen. Bitte begleichen Sie umgehend den Rechnungsbetrag von %order_topay_brutto_formated%.', 'wpsg') ?></p>
diff --git a/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml b/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml index 04b96b7..a89b97f 100644 --- a/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml +++ b/views/mods/mod_kundenkontakt/templates/zahlungserinnerung_html.phtml @@ -1,9 +1,7 @@ <?php
global $template_name, $template_betreff, $absender_name, $absender_email;
-
- include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');
-
+
/**
* Betreff des Templates
*/
diff --git a/views/order/index.phtml b/views/order/index.phtml index 66ff1a4..59b315b 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -15,7 +15,7 @@ }
?>
-
+
<div class="wpsg_order" id="wpsg-bs">
<nav class="navbar navbar-default">
|