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

Add more columns to companies table

Alan Lam 3 лет назад
Родитель
Сommit
8f353c1382
2 измененных файлов с 31 добавлено и 6 удалено
  1. 3 6
      controllers/company_form.php
  2. 28 0
      views/companies.php

+ 3 - 6
controllers/company_form.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
 
 namespace App;
 
@@ -15,12 +15,9 @@ $core->addBreadcrumb("/companies", __("Companies"));
 $user = $core->getUser();
 
 if(isset($id)) {
-	$company = Company::get($id);
-	if(!$company) {
-		throw new RuntimeException(__("Company not found."));
-	}
+	$company = Company::require($id);
 
-	$core->addBreadcrumb($company->getUrl(), $company->name);
+	$core->addBreadcrumb("#", $company->name);
 
 	$company->dts_updated = Database::dts();
 

+ 28 - 0
views/companies.php

@@ -32,22 +32,50 @@ if(empty($companies)) {
 else {
 	?>
 	<table class="table table-bordered table-hover mb-3">
+		<colgroup>
+			<col style="width: 1%"/>
+			<col style="width: 25%"/>
+			<col style="width: 25%"/>
+			<col style="width: 25%"/>
+			<col style="width: 12.5%"/>
+			<col style="width: 12.5%"/>
+			<col style="width: 1%"/>
+		</colgroup>
 		<thead>
 		<tr>
 			<th><?=htmlspecialchars(__("ID"))?></th>
 			<th><?=htmlspecialchars(__("Name"))?></th>
+			<th><?=htmlspecialchars(__("Address"))?></th>
+			<th><?=htmlspecialchars(__("Contact"))?></th>
+			<th><?=htmlspecialchars(__("Company No."))?></th>
+			<th><?=htmlspecialchars(__("VAT No."))?></th>
 			<th><?=htmlspecialchars(__("Actions"))?></th>
 		</tr>
 		</thead>
 		<tbody>
 		<?php
 		foreach($companies as $company) {
+			$address = $company->getAddress();
 			?>
 			<tr>
 				<td class="text-end"><?=htmlspecialchars($company->id)?></td>
 				<td>
 					<?=htmlspecialchars($company->name)?>
 				</td>
+				<td>
+					<?=$address->getLinesHtml()?>
+				</td>
+				<td>
+					<i class="fa fa-fw fa-phone"></i> <?=htmlspecialchars($company->phone)?><br />
+					<i class="fa fa-fw fa-fax"></i> <?=htmlspecialchars($company->fax)?><br />
+					<i class="fa fa-fw fa-envelope"></i> <?=htmlspecialchars($company->email)?><br />
+				</td>
+				<td>
+					<?=htmlspecialchars($company->company_number)?>
+				</td>
+				<td>
+					<?=htmlspecialchars($company->vat_number)?>
+				</td>
 				<td class="p-1">
 					<a class="btn btn-sm btn-primary" href="<?=htmlspecialchars($company->getUrl())?>/update">
 						<?=htmlspecialchars(__("Update"))?>