Order: Save Voicenumber when saving Order and check if number exists
This commit is contained in:
@@ -31,7 +31,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- end page title -->
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
|
||||
@@ -50,8 +52,20 @@
|
||||
<div class="card-body">
|
||||
|
||||
<input type="hidden" name="id" value="<?=$order->id?>" />
|
||||
|
||||
|
||||
<?php if(array_key_exists(MFAPPNAME."_orderproduct_warnings", $_SESSION) && count($_SESSION[MFAPPNAME."_orderproduct_warnings"])): ?>
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-8">
|
||||
<div class="alert alert-danger">
|
||||
<strong>ACHTUNG:</strong> Bei einem oder mehreren Produkten ist ein Fehler aufgetreten!
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-lg-6" id="owner-block">
|
||||
|
||||
|
||||
@@ -780,7 +794,19 @@
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php if(array_key_exists(MFAPPNAME."_orderproduct_warnings", $_SESSION) && count($_SESSION[MFAPPNAME."_orderproduct_warnings"]) && array_key_exists($product->id, $_SESSION[MFAPPNAME."_orderproduct_warnings"])): ?>
|
||||
<div class="row">
|
||||
<div class="col-10">
|
||||
<div class="alert alert-danger">
|
||||
<?=$_SESSION[MFAPPNAME."_orderproduct_warnings"][$product->id]?>
|
||||
<?php unset($_SESSION[MFAPPNAME."_orderproduct_warnings"][$product->id]); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php $i++; ?>
|
||||
<?php endforeach; ?>
|
||||
@@ -1431,14 +1457,26 @@
|
||||
|
||||
if(("numbers" in success.result) && success.result.numbers.length) {
|
||||
$("#voicenumber-" + id + "-" + num).empty();
|
||||
var found_default = false;
|
||||
success.result.numbers.forEach(function(number) {
|
||||
if(number == default_value) {
|
||||
$("#voicenumber-" + id + "-" + num).append("<option value='" + number + "' selected='selected'>+" + number + "</option>");
|
||||
found_default = true;
|
||||
} else {
|
||||
$("#voicenumber-" + id + "-" + num).append("<option value='" + number + "'>+" + number + "</option>");
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
if(default_value && !found_default) {
|
||||
// default value is the number saved in this OrderProduct, so it's not free anymore
|
||||
// and needs to be added to the select element
|
||||
$("#voicenumber-" + id + "-" + num).append("<option value='" + default_value + "' selected='selected'>+" + default_value + "</option>");
|
||||
// sort number list
|
||||
$("#voicenumber-" + id + "-" + num).html($("#voicenumber-" + id + "-" + num + " option").sort(function (a, b) {
|
||||
return a.text == b.text ? 0 : a.text < b.text ? -1 : 1
|
||||
}));
|
||||
}
|
||||
//$("#voicenumberblock-" + id + "-line-" + num).hide();
|
||||
$("#voicenumber-custom-" + id + "-line-" + num).hide();
|
||||
$("#voicenumber-custom-" + id + "-line-" + num + " input").val("");
|
||||
|
||||
Reference in New Issue
Block a user