Merge branch 'fronkdev' into 'master'
new OAID type "other" / added adrcd to preorderreporting api See merge request fronk/thetool!1006
This commit is contained in:
Frank Schubert
@@ -165,7 +165,7 @@
|
||||
<td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->units?></td>
|
||||
<td onclick="toggleBuilding(<?=$building->id?>)" class="text-monospace"><?=__($building->status->name."-b")?></td>
|
||||
<!--td><input type="checkbox" class="form-control" id="snopp-export-<?=$building->id?>" data-building-id="<?=$building->id?>" /></td-->
|
||||
<td class="text-monospace">
|
||||
<td class="text-monospace" onclick="toggleBuilding(<?=$building->id?>)">
|
||||
<?=date('d.m.Y H:i:s',$building->create)?> (<?=$building->creator->name?>)<br />
|
||||
<?=date('d.m.Y H:i:s',$building->edit)?> (<?=$building->editor->name?>)
|
||||
</td>
|
||||
|
||||
@@ -158,6 +158,9 @@
|
||||
<option value="ofaa" <?= ($campaign->oaid_origin == "ofaa") ? "selected='selected'" : "" ?>>
|
||||
OFAA
|
||||
</option>
|
||||
<option value="other" <?= ($campaign->oaid_origin == "other") ? "selected='selected'" : "" ?>>
|
||||
Andere (importieren, aber nicht verarbeiten)
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -377,73 +380,81 @@
|
||||
</div>
|
||||
|
||||
<h4>Emailbenachrichtigungen</h4>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="">Absender</h4>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="from_email_name">Name</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="from_email_name" id="from_email_name" value="<?= $campaign->from_email_name ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="from_email">Emailadresse</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="from_email" id="from_email" value="<?= $campaign->from_email ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-3">Emailtemplates</h4>
|
||||
<?php $i=0; foreach(PreorderstatusModel::getAll() as $status): ?>
|
||||
<div class="form-group row p-2 mb-0 border-bottom" id="statustemplate-<?=$status->code?>" style="background-color: #<?=($i%2 == 0) ? "fafafa" : "fff"?>">
|
||||
|
||||
<label class="col-lg-2 col-form-label text-right text-monospace" for="mailtemplates_<?=$status->code?>"><?=$status->name?></label>
|
||||
<?php if(isset($campaign) && $campaign): ?>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h4 class="">Absender</h4>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="from_email_name">Name</label>
|
||||
<div class="col-lg-10">
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend text-monospace">
|
||||
<span class="input-group-text" id="basic-addon1"><?=$status->code?></span>
|
||||
<input type="text" class="form-control" name="from_email_name" id="from_email_name" value="<?= $campaign->from_email_name ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="from_email">Emailadresse</label>
|
||||
<div class="col-lg-10">
|
||||
<input type="text" class="form-control" name="from_email" id="from_email" value="<?= $campaign->from_email ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-3">Emailtemplates</h4>
|
||||
<?php $i=0; foreach(PreorderstatusModel::getAll() as $status): ?>
|
||||
<div class="form-group row p-2 mb-0 border-bottom" id="statustemplate-<?=$status->code?>" style="background-color: #<?=($i%2 == 0) ? "fafafa" : "fff"?>">
|
||||
|
||||
<label class="col-lg-2 col-form-label text-right text-monospace" for="mailtemplates_<?=$status->code?>"><?=$status->name?></label>
|
||||
<div class="col-lg-10">
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend text-monospace">
|
||||
<span class="input-group-text" id="basic-addon1"><?=$status->code?></span>
|
||||
</div>
|
||||
<select name="mailtemplates[<?=$status->code?>][mailtemplate_id]" id="mailtemplate-<?=$status->code?>" class="form-control select2">
|
||||
<option value=""></option>
|
||||
<?php foreach(MailtemplateModel::search(["is_include" => "0"]) as $template): ?>
|
||||
<option value="<?=$template->id?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->mailtemplate_id == $template->id) ? "selected='selected'" : ""?>><?=$template->name?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<select name="mailtemplates[<?=$status->code?>][mailtemplate_id]" id="mailtemplate-<?=$status->code?>" class="form-control select2">
|
||||
<option value=""></option>
|
||||
<?php foreach(MailtemplateModel::search(["is_include" => "0"]) as $template): ?>
|
||||
<option value="<?=$template->id?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->mailtemplate_id == $template->id) ? "selected='selected'" : ""?>><?=$template->name?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend text-monospace">
|
||||
<span class="input-group-text">@</span>
|
||||
</div>
|
||||
<input type="text" class="form-control" name="test_to" id="test-to-<?=$status->code?>" value="" placeholder="Test Emailadresse" />
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-success" type="button" onclick="sendTestStatusEmail(<?=$status->code?>)"><i class="fas fa-envelope"></i> Testmail versenden</button>
|
||||
<div class="col">
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend text-monospace">
|
||||
<span class="input-group-text">@</span>
|
||||
</div>
|
||||
<input type="text" class="form-control" name="test_to" id="test-to-<?=$status->code?>" value="" placeholder="Test Emailadresse" />
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-outline-success" type="button" onclick="sendTestStatusEmail(<?=$status->code?>)"><i class="fas fa-envelope"></i> Testmail versenden</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-1">
|
||||
<div class="col-lg">
|
||||
<label>
|
||||
<input type="checkbox" name="mailtemplates[<?=$status->code?>][allow_on_skip]" value="1" id="allow_on_skip-<?=$status->code?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->allow_on_skip) ? "checked='checked'" : ""?> />
|
||||
Benachrichtigung darf bei Überspringen versendet werden, wenn nötig
|
||||
</label><br />
|
||||
<label>
|
||||
<input type="checkbox" name="mailtemplates[<?=$status->code?>][prevent_previous]" value="1" id="prevent_previous-<?=$status->code?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->prevent_previous) ? "checked='checked'" : ""?> />
|
||||
Keine vorigen Benachrichtigungen versenden, wenn dieser Status ohne Mailtemplate eintritt
|
||||
</label>
|
||||
<div class="row mt-1">
|
||||
<div class="col-lg">
|
||||
<label>
|
||||
<input type="checkbox" name="mailtemplates[<?=$status->code?>][allow_on_skip]" value="1" id="allow_on_skip-<?=$status->code?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->allow_on_skip) ? "checked='checked'" : ""?> />
|
||||
Benachrichtigung darf bei Überspringen versendet werden, wenn nötig
|
||||
</label><br />
|
||||
<label>
|
||||
<input type="checkbox" name="mailtemplates[<?=$status->code?>][prevent_previous]" value="1" id="prevent_previous-<?=$status->code?>" <?=(is_array($campaign->statusnotifcation_mailtemplates) && array_key_exists($status->code, $campaign->statusnotifcation_mailtemplates) && $campaign->statusnotifcation_mailtemplates[$status->code]->prevent_previous) ? "checked='checked'" : ""?> />
|
||||
Keine vorigen Benachrichtigungen versenden, wenn dieser Status ohne Mailtemplate eintritt
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<?php $i++; endforeach; ?>
|
||||
<?php $i++; endforeach; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<i>Verfügbar nach Speichern...</i>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
<h4>API-User</h4>
|
||||
@@ -566,30 +577,32 @@
|
||||
background: "bg-danger"
|
||||
});
|
||||
|
||||
function sendTestStatusEmail(status_code) {
|
||||
if(!status_code) return;
|
||||
<?php if(isset($campaign) && $campaign): ?>
|
||||
function sendTestStatusEmail(status_code) {
|
||||
if(!status_code) return;
|
||||
|
||||
var template_id = $("#mailtemplate-" + status_code).val();
|
||||
var email_to = $("#test-to-" + status_code).val();
|
||||
var template_id = $("#mailtemplate-" + status_code).val();
|
||||
var email_to = $("#test-to-" + status_code).val();
|
||||
|
||||
$.post("<?=self::getUrl("Preordercampaign", "Api")?>",
|
||||
{
|
||||
do: "sendStatusEmail",
|
||||
campaign_id: <?=$campaign->id?>,
|
||||
template_id: template_id,
|
||||
to_email: email_to
|
||||
},
|
||||
(success) => {
|
||||
if(success.status == "OK") {
|
||||
window.notify("success", "Testmail wurde versendet");
|
||||
} else {
|
||||
window.notify("error", "Beim versenden ist ein Fehler aufgetragen.");
|
||||
}
|
||||
$.post("<?=self::getUrl("Preordercampaign", "Api")?>",
|
||||
{
|
||||
do: "sendStatusEmail",
|
||||
campaign_id: <?=$campaign->id?>,
|
||||
template_id: template_id,
|
||||
to_email: email_to
|
||||
},
|
||||
(success) => {
|
||||
if(success.status == "OK") {
|
||||
window.notify("success", "Testmail wurde versendet");
|
||||
} else {
|
||||
window.notify("error", "Beim versenden ist ein Fehler aufgetragen.");
|
||||
}
|
||||
|
||||
console.log(success);
|
||||
},
|
||||
"json"
|
||||
);
|
||||
}
|
||||
console.log(success);
|
||||
},
|
||||
"json"
|
||||
);
|
||||
}
|
||||
<?php endif; ?>
|
||||
</script>
|
||||
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>
|
||||
Reference in New Issue
Block a user