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

Merge branch 'fronkdev' into 'master'

Browse Source 
fixed numbers in Order in Voicecallhistory::addContractIds

See merge request fronk/thetool!601
This commit is contained in:
Frank Schubert
2024-08-20 19:55:42 +00:00
parent 00c76ad8c0 f24a9d47e5
commit 1b51b82866
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/OrderProduct/OrderProductModel.php
View File

@@ -129,7 +129,7 @@ class OrderProductModel
$where = self::getSqlFilter($filter);
$sql = "SELECT * FROM OrderProduct WHERE $where ORDER BY order_id, pos, product_id, description";
//mfLoghandler::singleton()->debug($sql);
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if ($db->num_rows($res)) {

17
application/VoiceCallHistory/VoiceCallHistoryController.php
View File

@@ -152,18 +152,21 @@ class VoiceCallHistoryController extends mfBaseController {
// TODO: Mail an office
if(!$voicenumber) {
$unknown_numbers[] = $number;
$op = OrderProductModel::getFirst(["voicenumber%" => $number]);
if($op) {
if(!in_array($number . " (order id " . $op->order_id . ")", $in_order)) {
$in_order[] = $number . " (order id " . $op->order_id . ")";
}
} else {
$unknown_numbers[] = $number;
}
$this->log->debug(__METHOD__.": Voicenumber $number not found.");
continue;
}
if(!$voicenumber->contract_id) {
$op = OrderProductModel::getFirst(["voicenumber%" => $number]);
if($op) {
$in_order[] = $number." (order id ".$op->order_id.")";
} else {
$missing_contracts[] = $number;
}
$missing_contracts[] = $number;
$this->log->debug(__METHOD__.": Missing Contract_ID in Voicenumber ".$voicenumber->number);
continue;