Alan Lam 2 лет назад
Родитель
Сommit
e3c5435758
1 измененных файлов с 37 добавлено и 35 удалено
  1. 37 35
      views/document.php

+ 37 - 35
views/document.php

@@ -321,6 +321,43 @@ $date_paid = $dt_paid ? $dt_paid->toDateString() : "";
 				}
 				?>
 
+				<h4><?=htmlspecialchars(__("Delivery Details"))?></h4>
+
+
+				<div class="mb-3">
+					<label for="delivery-company" class="form-label">
+						<?=htmlspecialchars(__("Delivery Company"))?>
+					</label>
+					<input type="text" class="form-control" name="delivery_company" id="delivery-company" placeholder="<?=htmlspecialchars(__("Type delivery company"))?>" value="<?=htmlspecialchars($document->delivery_company)?>" list="delivery-company-options" />
+					<datalist id="delivery-company-options">
+						<option value="Royal Mail"></option>
+						<option value="FedEx"></option>
+						<option value="DHL"></option>
+						<option value="UPS"></option>
+						<option value="Palletways"></option>
+						<option value="Evri"></option>
+						<option value="Hermes"></option>
+						<option value="Other"></option>
+					</datalist>
+				</div>
+				<div class="mb-3">
+					<label for="tracking-number" class="form-label">
+						<?=htmlspecialchars(__("Tracking Number"))?>
+					</label>
+					<input type="text" class="form-control" name="tracking_number" id="tracking-number" placeholder="<?=htmlspecialchars(__("Type tracking number"))?>" value="<?=htmlspecialchars($document->tracking_number)?>" />
+				</div>
+				<?php
+				if($document->isDeliveryNote() && $document->isPartOfAru()) {
+					?>
+					<div class="mb-3">
+						<label for="delivery-cost" class="form-label">
+							<?=htmlspecialchars(__("Delivery Cost"))?>
+						</label>
+						<input type="number" class="form-control" name="delivery_cost" id="delivery-cost" placeholder="<?=htmlspecialchars(__("Type delivery cost"))?>" value="<?=htmlspecialchars($document->delivery_cost)?>" min="0" required />
+					</div>
+					<?php
+				}
+				?>
 
 			</div>
 			<div class="col-xl-4">
@@ -341,41 +378,6 @@ $date_paid = $dt_paid ? $dt_paid->toDateString() : "";
 						<section class="mb-4">
 							<h4><?=htmlspecialchars(__("Additional Details"))?></h4>
 
-							<div class="mb-3">
-								<label for="delivery-company" class="form-label">
-									<?=htmlspecialchars(__("Delivery Company"))?>
-								</label>
-								<input type="text" class="form-control" name="delivery_company" id="delivery-company" placeholder="<?=htmlspecialchars(__("Type delivery company"))?>" value="<?=htmlspecialchars($document->delivery_company)?>" list="delivery-company-options" />
-								<datalist id="delivery-company-options">
-									<option value="Royal Mail"></option>
-									<option value="FedEx"></option>
-									<option value="DHL"></option>
-									<option value="UPS"></option>
-									<option value="Palletways"></option>
-									<option value="Evri"></option>
-									<option value="Hermes"></option>
-									<option value="Other"></option>
-								</datalist>
-							</div>
-							<div class="mb-3">
-								<label for="tracking-number" class="form-label">
-									<?=htmlspecialchars(__("Tracking Number"))?>
-								</label>
-								<input type="text" class="form-control" name="tracking_number" id="tracking-number" placeholder="<?=htmlspecialchars(__("Type tracking number"))?>" value="<?=htmlspecialchars($document->tracking_number)?>" />
-							</div>
-							<?php
-							if($document->isDeliveryNote() && $document->isPartOfAru()) {
-								?>
-								<div class="mb-3">
-									<label for="delivery-cost" class="form-label">
-										<?=htmlspecialchars(__("Delivery Cost"))?>
-									</label>
-									<input type="number" class="form-control" name="delivery_cost" id="delivery-cost" placeholder="<?=htmlspecialchars(__("Type delivery cost"))?>" value="<?=htmlspecialchars($document->delivery_cost)?>" min="0" required />
-								</div>
-								<?php
-							}
-							?>
-
 							<dl>
 								<dt><?=htmlspecialchars(__("Created By"))?></dt>
 								<dd><?=htmlspecialchars($document->getUser()->getDisplayName())?></dd>