Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added voicenumber to OrderProduct

Browse Source
This commit is contained in:
Frank Schubert
2023-05-23 16:21:41 +02:00
parent de2b478c2f
commit cdae3cd24a
3 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Layout/default/Order/Form.php
View File

@@ -623,7 +623,23 @@
</div>
</div>
<?php if(
(is_array($product->product->attributes) && count($product->product->attributes))
&& (array_key_exists(TT_ATTRIB_VOICENUMBER_REQUIRED_NAME, $product->product->attributes)
&& $product->product->attributes[TT_ATTRIB_VOICENUMBER_REQUIRED_NAME]->value == 1)
|| $product->voicenumber
): ?>
<div class="row mt-1 mb-2" id="voicenumber-<?=$i?>-line">
<?php else: ?>
<div class="row mt-1 mb-2 hidden" id="voicenumber-<?=$i?>-line">
<?php endif; ?>
<!-- line to input voicenumber -->
<div class="col-6">
<label class="form-label" for="voicenumber-<?=$i?>">Rufnummer</label>
<textarea class="form-control" name="products[<?=$i?>][voicenumber]" id="voicenumber-<?=$i?>" placeholder="Eine Rufnummer pro Zeile (+43 123 456 78)" /><?=(is_array($product->voicenumbers) && count($product->voicenumbers)) ? implode("\n", $product->voicenumbers) : ""?></textarea>
<small>Wenn Rufnummern bekannt sind oder portiert werden (Eine Rufnummer pro Zeile (+43 123 456 78))</small>
</div>
</div>
<div class="row mt-1 mb-2">
<!-- line 2 -->
@@ -709,8 +725,6 @@
<label class="form-label" for="price_setup-<?=$i?>">Preis Setup</label>
<input type="text" class="form-control" name="products[<?=$i?>][price_setup]" id="price_setup-<?=$i?>" value="" placeholder="Preis Setup" />
</div>
</div>
<div class="row mt-1 mb-2 hidden" id="termination_id-<?=$i?>-line">
@@ -726,7 +740,14 @@
</div>
</div>
<div class="row mt-1 mb-2 hidden" id="voicenumber-<?=$i?>-line">
<!-- line to input voicenumber -->
<div class="col-6">
<label class="form-label" for="voicenumber-<?=$i?>">Rufnummer</label>
<textarea class="form-control" name="products[<?=$i?>][voicenumber]" id="voicenumber-<?=$i?>" placeholder="Eine Rufnummer pro Zeile (+43 123 456 78)" /></textarea>
<small>Wenn Rufnummern bekannt sind oder portiert werden (Eine Rufnummer pro Zeile (+43 123 456 78))</small>
</div>
</div>
<div class="row mt-1 mb-2">
<!-- line 2 -->
@@ -1193,6 +1214,13 @@
$('#termination_id-' + id + '-line').hide();
//$('#termination_id-' + id + '-line').hide();
}
if(typeof p.attributes === 'object' && "needs_number" in p.attributes && p.attributes.needs_number == 1) {
console.log("needs_number");
$('#voicenumber-' + id + '-line').show();
} else {
$('#voicenumber-' + id + '-line').hide();
}
},
'json');
@@ -1509,6 +1537,15 @@
</div> \
</div> \
\
<div class="row mt-1 mb-2 hidden" id="voicenumber-' + i + '-line"> \
<!-- line to input voicenumber --> \
<div class="col-6"> \
<label class="form-label" for="voicenumber-' + i + '">Rufnummer</label> \
<textarea class="form-control" name="products[' + i + '][voicenumber]" id="voicenumber-' + i + '" placeholder="Eine Rufnummer pro Zeile (+43 123 456 78)" /></textarea> \
<small>Wenn Rufnummern bekannt sind oder portiert werden (Eine Rufnummer pro Zeile (+43 123 456 78))</small> \
</div> \
</div> \
\
<div class="row mt-1 mb-2"> \
<!-- line 2 --> \
<div class="col-8"> \

18
application/Order/OrderController.php
View File

@@ -894,6 +894,24 @@ class OrderController extends mfBaseController {
$product_data['termination_id'] = null;
}
if(array_key_exists(TT_ATTRIB_VOICENUMBER_REQUIRED_NAME, $prod->attributes) && $prod->attributes[TT_ATTRIB_VOICENUMBER_REQUIRED_NAME]->value == 1) {
$voicenumbers = [];
foreach(explode("\n", $p['voicenumber']) as $number) {
$number = preg_replace('/\D/', '', trim($number));
if(substr($number, 0, 2) == "00") $number = "+".substr($number, 2);
if(preg_match('/^0[^0]/', $number)) {
$number = "+43".substr($number, 1);
}
if(substr($number, 0, 1) != "+") $number = "+$number";
if($number && !in_array($number, $voicenumbers)) $voicenumbers[] = $number;
}
$product_data['voicenumber'] = json_encode($voicenumbers);
} else {
$product_data['voicenumber'] = null;
}
if(!$orderproduct_id) {
$product = OrderProductModel::create($product_data);

13
application/OrderProduct/OrderProduct.php
View File

@@ -6,6 +6,7 @@ class OrderProduct extends mfBaseModel {
private $termination;
private $cpeprovisioning;
private $contract;
private $voicenumbers;
private $editor;
private $creator;
@@ -50,6 +51,18 @@ class OrderProduct extends mfBaseModel {
return $this->contract;
}
if($name == "voicenumbers") {
$this->voicenumbers = [];
if(!$this->voicenumber) return [];
$json = json_decode($this->voicenumber);
if(!is_array($json)) return [];
$this->voicenumbers = $json;
return $this->voicenumbers;
}
if($name == "creator") {
$this->creator = mfValuecache::singleton()->get("Worker-id-".$this->create_by);
if($this->creator === null) {