Przeglądaj źródła

Hide "Delivery Details" section for sales orders

Alan Lam 1 rok temu
rodzic
commit
c395ef951f
2 zmienionych plików z 40 dodań i 34 usunięć
  1. 5 2
      controllers/document.php
  2. 35 32
      views/document.php

+ 5 - 2
controllers/document.php

@@ -268,8 +268,11 @@ $controller = new class($document_type, $document_number) {
 		$document->proforma_notes = $this->request->string("proforma_notes");
 		$document->commercial_notes = $this->request->string("commercial_notes");
 
-		$document->delivery_company = $this->request->string("delivery_company");
-		$document->tracking_number = $this->request->string("tracking_number");
+		if($document->isDeliveryNote()) {
+			$document->delivery_company = $this->request->string("delivery_company");
+			$document->tracking_number = $this->request->string("tracking_number");
+		}
+
 		$document->delivery_cost = $this->request->decimal("delivery_cost", 2);
 
 		$document->contact_name = $this->request->string("contact_name");

+ 35 - 32
views/document.php

@@ -24,8 +24,19 @@ $dt_paid = $document->getDateTimePaid();
 $date_finalised = $dt_finalised ? $dt_finalised->toDateString() : "";
 $date_paid = $dt_paid ? $dt_paid->toDateString() : "";
 
-
 ?>
+
+<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>
+
 <section class="mb-4">
 	<h3 class="mb-3">
 		<?php
@@ -319,46 +330,38 @@ $date_paid = $dt_paid ? $dt_paid->toDateString() : "";
 					</div>
 					<?php
 				}
-				?>
 
-				<h4><?=htmlspecialchars(__("Delivery Details"))?></h4>
+				if($document->isDeliveryNote()) {
+					?>
+					<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" />
+					</div>
 
-				<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 for="tracking-number" class="form-label">
+							<?=htmlspecialchars(__("Tracking Number"))?>
 						</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 />
+						<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->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">