Просмотр исходного кода

Add "Legal Entity Name" filter for locations

Alan Lam 6 лет назад
Родитель
Сommit
f9bc74bb1f

+ 3 - 1
controllers/customer_ajax.php

@@ -20,10 +20,12 @@ switch($action) {
 		$id = http::value("id", "int");
 		$internal_id = http::value("internal_id", "trim");
 		$name = http::value("name", "trim");
+		$legal_entity_name = http::value("legal_entity_name", "trim");
 
 		if($id) $nvp["id"] = $id;
 		if($internal_id) $nvp["internal_id"] = db::escape($internal_id);
-		if($name) $nvp["name"] = (new Constraint("CONTAINS"))->setValues(db::escape($name));
+		if($name) $nvp["name"] = Constraint::contains($name);
+		if($legal_entity_name) $nvp["$legal_entity_name"] = Constraint::contains($legal_entity_name);
 
 		$locations = Location::query($nvp, ["sort" => "name", "order" => "asc"]);
 

+ 2 - 2
controllers/locations.php

@@ -26,11 +26,13 @@ $id = http::value("id", "int");
 $ids = http::value("ids", "int");
 $internal_id = http::value("internal_id", "trim");
 $name = http::value("name", "trim");
+$legal_entity_name = http::value("legal_entity_name", "trim");
 
 if($id) $nvp["id"] = $id;
 if($ids) $nvp["id"] = $ids;
 if($internal_id) $nvp["internal_id"] = Constraint::contains($internal_id);
 if($name) $nvp["name"] = Constraint::contains($name);
+if($legal_entity_name) $nvp["legal_entity_name"] = Constraint::contains($legal_entity_name);
 
 $sort = http::value("sort");
 switch($sort) {
@@ -126,5 +128,3 @@ $filter_count = count($nvp) - 1;
 View::includeOnce("header", compact("page_title"));
 View::include("locations", compact("customer", "filter_count", "sorts", "sort", "locations"));
 View::includeOnce("footer");
-
-?>

+ 2 - 1
public/js/app-locations.js

@@ -12,7 +12,8 @@ function initialiseLocations() {
 	$.get(`/api/customers/${customerId}/get-locations`, {
 		id: $("#id").val(),
 		internal_id: $("#internal-id").val(),
-		name: $("#name").val()
+		name: $("#name").val(),
+		legal_entity_name: $("#legal-entity-name").val()
 	}, function(response) {
 		if(!response.success) return false;
 		if(!response.locations) return false;

+ 4 - 0
views/location_list.php

@@ -9,6 +9,7 @@
 			<tr>
 				<th class="text-right pr-3">ID</th>
 				<th>Name / Address</th>
+				<th>Legal Entity</th>
 				<th>Internal ID</th>
 				<th></th>
 			</tr>
@@ -40,6 +41,9 @@
 					<br />
 					<small><?=htmlspecialchars($location->getDisplayAddress(["address_1", "address_2", "city", "postal_code"]))?></small>
 				</td>
+				<td>
+					<?=htmlspecialchars($location->legal_entity_name)?>
+				</td>
 				<td>
 					<?=htmlspecialchars($location->internal_id)?>
 				</td>

+ 12 - 2
views/locations.php

@@ -72,6 +72,16 @@ var customerId = <?=$customer->id?>;
 								<input class="form-control" type="number" name="id" id="id" placeholder="Enter ID" value="<?=htmlspecialchars(http::value("id", "int"))?>" />
 							</div>
 						</div>
+					</div>
+					<div class="col-lg-6">
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="internal-id">Internal ID</label>
+							<div class="col-sm">
+								<input class="form-control" type="text" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars(http::value("internal_id", "trim"))?>" />
+							</div>
+						</div>
+					</div>
+					<div class="col-lg-6">
 						<div class="row mb-1">
 							<label class="col-sm-4 col-form-label" for="name">Name</label>
 							<div class="col-sm">
@@ -81,9 +91,9 @@ var customerId = <?=$customer->id?>;
 					</div>
 					<div class="col-lg-6">
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="internal-id">Internal ID</label>
+							<label class="col-sm-4 col-form-label" for="legal-entity-name">Legal Entity Name</label>
 							<div class="col-sm">
-								<input class="form-control" type="text" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars(http::value("internal_id", "trim"))?>" />
+								<input class="form-control" type="text" name="legal_entity_name" id="legal-entity-name" placeholder="Enter legal entity name" value="<?=htmlspecialchars(http::value("legal_entity_name"))?>" />
 							</div>
 						</div>
 					</div>