Order reference

This commit is contained in:
“VeLiTi”
2024-03-19 20:15:23 +01:00
parent 2c0b76d965
commit 73baa19c2d
7 changed files with 20 additions and 3 deletions

View File

@@ -169,7 +169,7 @@ else {
} }
//SQL for Paging //SQL for Paging
$sql = 'SELECT e.rowID as equipmentID, e.productrowid, e.serialnumber, e.status, e.created, e.createdby, e.hw_version, e.sw_version, e.accounthierarchy, e.service_date, e.warranty_date, p.productcode, p.productname from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.' ORDER BY '.$sort.' LIMIT :page,:num_products'; $sql = 'SELECT e.rowID as equipmentID, e.productrowid, e.serialnumber, e.status, e.created, e.createdby, e.hw_version, e.sw_version, e.accounthierarchy, e.service_date, e.warranty_date, e.order_ref, p.productcode, p.productname from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.' ORDER BY '.$sort.' LIMIT :page,:num_products';
} }
$stmt = $pdo->prepare($sql); $stmt = $pdo->prepare($sql);

View File

@@ -120,6 +120,11 @@ if ($command == 'update'){
{ {
changelog($dbname,'equipment',$equipment_data['rowID'],'status',$post_content['status'],$username); changelog($dbname,'equipment',$equipment_data['rowID'],'status',$post_content['status'],$username);
} }
//UPDATE CHANGELOG BASED ON ORDER_REF change
if ($post_content['order_ref'] != $equipment_data['order_ref'])
{
changelog($dbname,'equipment',$equipment_data['rowID'],'order_ref',$post_content['order_ref'],$username);
}
$post_content['accounthierarchy'] = $accounthierarchy; $post_content['accounthierarchy'] = $accounthierarchy;

View File

@@ -1715,7 +1715,7 @@ function showlog($object,$objectID){
$object_text = 'status'.$change['object_value'].'_text'; $object_text = 'status'.$change['object_value'].'_text';
$object_value = $$object_text; $object_value = $$object_text;
} }
$view .= '<input id="name" type="text" value="'.$change['object_field'].' - '.$object_value.' - '.$change['CREATED'].' - '.$change['createdby'].'" readonly>'; $view .= '<input id="name" type="text" value="'.$change['object_field'].' - '.$object_value.' - '.$change['created'].' - '.$change['createdby'].'" readonly>';
} }
return $view; return $view;

View File

@@ -26,7 +26,8 @@ $equipment = [
'hw_version' => 'R08', 'hw_version' => 'R08',
'sw_version' => '', 'sw_version' => '',
'service_date' => $date, 'service_date' => $date,
'warranty_date' => $date 'warranty_date' => $date,
'order_ref' => ''
]; ];
$equipment_ID = $_GET['equipmentID'] ?? ''; $equipment_ID = $_GET['equipmentID'] ?? '';
@@ -218,6 +219,8 @@ $view .= '<div class="content-block tab-content">
<input id="name" type="text" name="" placeholder="'.$general_created.'" value="'.$equipment['created'].'" readonly> <input id="name" type="text" name="" placeholder="'.$general_created.'" value="'.$equipment['created'].'" readonly>
<label for="productcode">'.$general_createdby.'</label> <label for="productcode">'.$general_createdby.'</label>
<input id="name" type="text" name="" placeholder="'.$general_createdby.'" value="'.$equipment['createdby'].'" readonly> <input id="name" type="text" name="" placeholder="'.$general_createdby.'" value="'.$equipment['createdby'].'" readonly>
<label for="productcode">'.$equipment_label11.'</label>
<input id="name" type="text" name="order_ref" placeholder="'.$equipment_label11.'" value="'.$equipment['order_ref'].'">
'.$changelog.' '.$changelog.'
</div> </div>
</div>'; </div>';

View File

@@ -54,6 +54,7 @@ if ($update_allowed === 1){
if (isset ($responses->rowID)){ if (isset ($responses->rowID)){
$output_excel[$val]['rowID'] = $responses->rowID; $output_excel[$val]['rowID'] = $responses->rowID;
$output_excel[$val]['serialnumber'] = $val; $output_excel[$val]['serialnumber'] = $val;
$output_excel[$val]['order_ref'] = $_POST['order_ref'];
$output_excel[$val]['status'] = $_POST['status']; $output_excel[$val]['status'] = $_POST['status'];
$output_excel[$val]['salesid'] = $_POST['salesid']; $output_excel[$val]['salesid'] = $_POST['salesid'];
$output_excel[$val]['soldto'] = $_POST['soldto']; $output_excel[$val]['soldto'] = $_POST['soldto'];
@@ -166,6 +167,12 @@ $view .= ' <div class="content-block order-details">
<div class="block-header"> <div class="block-header">
<i class="fa-solid fa-circle-info"></i></i>'.$mass_update_input.' <i class="fa-solid fa-circle-info"></i></i>'.$mass_update_input.'
</div> </div>
<div class="order-detail">
<h3><label for="status">'.$equipment_label11.'</label></h3>
</div>
<div class="order-detail">
<input id="name" type="text" name="order_ref">
</div>
<div class="order-detail"> <div class="order-detail">
<h3><label for="status">'.$equipment_label3.'</label></h3> <h3><label for="status">'.$equipment_label3.'</label></h3>
</div> </div>

View File

@@ -114,6 +114,7 @@ $equipment_label7 = 'Garantie startdatum';
$equipment_label8 = 'Service datum'; $equipment_label8 = 'Service datum';
$equipment_label9 = 'Service geldig tot'; $equipment_label9 = 'Service geldig tot';
$equipment_label10 = 'Activanummer'; $equipment_label10 = 'Activanummer';
$equipment_label11 = 'Order referentie';
$equiment_search = 'Zoek serienummer...'; $equiment_search = 'Zoek serienummer...';

View File

@@ -113,6 +113,7 @@ $equipment_label7 = 'Warranty start date';
$equipment_label8 = 'Date of Service'; $equipment_label8 = 'Date of Service';
$equipment_label9 = 'Service renewal'; $equipment_label9 = 'Service renewal';
$equipment_label10 = 'Assets ID'; $equipment_label10 = 'Assets ID';
$equipment_label11 = 'Order reference';
$equiment_search = 'Search serialnumber...'; $equiment_search = 'Search serialnumber...';