瀏覽代碼

Move date fields to same row as status field

Alan Lam 2 年之前
父節點
當前提交
bb2d498d8f
共有 3 個文件被更改,包括 41 次插入 和 22 次删除
  1. 2 2
      controllers/document.php
  2. 8 0
      engine/Document.php
  3. 31 20
      views/document.php

+ 2 - 2
controllers/document.php

@@ -217,8 +217,8 @@ $controller = new class($document_type, $document_number) {
 			$document->vat_number = $this->request->string("vat_number");
 			$document->currency = $this->request->string("currency");
 			$document->tax_rate = $this->request->decimal("tax_rate", 2);
-			$document->dts_finalised = $this->request->dateTime("dts_finalised", "Y-m-d\TH:i", $this->user->getTimezone());
-			$document->dts_paid = $this->request->dateTime("dts_paid", "Y-m-d\TH:i", $this->user->getTimezone());
+			$document->dts_finalised = $this->request->date("dts_finalised") . " 12:00:00";
+			$document->dts_paid = $this->request->date("dts_paid") . " 12:00:00";
 		}
 
 		if($document->isAru()) {

+ 8 - 0
engine/Document.php

@@ -429,4 +429,12 @@ class Document extends Model {
 		return array_values($products);
 	}
 
+	public function getDateTimeFinalised(): ?CarbonImmutable {
+		return $this->dts_finalised ? new CarbonImmutable($this->dts_finalised, "UTC") : null;
+	}
+
+	public function getDateTimePaid(): ?CarbonImmutable {
+		return $this->dts_paid ? new CarbonImmutable($this->dts_paid, "UTC") : null;
+	}
+
 }

+ 31 - 20
views/document.php

@@ -18,6 +18,13 @@ $user = $core->getUser();
 $sale = $document->getSale();
 $related_document = $document->getRelatedDocument();
 
+$dt_finalised = $document->getDateTimeFinalised();
+$dt_paid = $document->getDateTimePaid();
+
+$date_finalised = $dt_finalised ? $dt_finalised->toDateString() : "";
+$date_paid = $dt_paid ? $dt_paid->toDateString() : "";
+
+
 ?>
 <section class="mb-4">
 	<h3 class="mb-3">
@@ -50,7 +57,7 @@ $related_document = $document->getRelatedDocument();
 				$user->insertCsrfToken();
 				?>
 				<div class="row">
-					<div class="col-sm-6">
+					<div class="col-lg-6">
 						<?php
 						if($document->isSalesOrder()) {
 							?>
@@ -90,6 +97,29 @@ $related_document = $document->getRelatedDocument();
 						}
 						?>
 					</div>
+					<?php
+
+					if($document->isSalesOrder()) {
+						?>
+						<div class="col-sm-6 col-lg-3">
+							<div class="mb-3">
+								<label for="dts-finalised" class="form-label">
+									<?=htmlspecialchars(__("Date/Time Finalised"))?>
+								</label>
+								<input class="form-control" type="date" name="dts_finalised" id="dts-finalised" value="<?=$date_finalised?>" />
+							</div>
+						</div>
+						<div class="col-sm-6 col-lg-3">
+							<div class="mb-3">
+								<label for="dts-paid" class="form-label">
+									<?=htmlspecialchars(__("Date/Time Paid"))?>
+								</label>
+								<input class="form-control" type="date" name="dts_paid" id="dts-paid" value="<?=$date_paid?>" />
+							</div>
+						</div>
+						<?php
+					}
+					?>
 				</div>
 
 				<div class="row">
@@ -311,25 +341,6 @@ $related_document = $document->getRelatedDocument();
 						<section class="mb-4">
 							<h4><?=htmlspecialchars(__("Additional Details"))?></h4>
 
-							<?php
-							if($document->isSalesOrder()) {
-								?>
-								<div class="mb-3">
-									<label for="dts-finalised" class="form-label">
-										<?=htmlspecialchars(__("Date/Time Finalised"))?>
-									</label>
-									<input class="form-control" type="datetime-local" name="dts_finalised" id="dts-finalised" value="<?=$document->dts_finalised?>" />
-								</div>
-								<div class="mb-3">
-									<label for="dts-paid" class="form-label">
-										<?=htmlspecialchars(__("Date/Time Paid"))?>
-									</label>
-									<input class="form-control" type="datetime-local" name="dts_paid" id="dts-paid" value="<?=$document->dts_paid?>" />
-								</div>
-								<?php
-							}
-							?>
-
 							<div class="mb-3">
 								<label for="delivery-company" class="form-label">
 									<?=htmlspecialchars(__("Delivery Company"))?>