Răsfoiți Sursa

Fix invoice status dropdown showing for ARUs

Alan Lam 3 ani în urmă
părinte
comite
49f89630e3
1 a modificat fișierele cu 40 adăugiri și 38 ștergeri
  1. 40 38
      views/document.php

+ 40 - 38
views/document.php

@@ -50,22 +50,49 @@ $location = $document->getLocation();
 
 				<?php
 				$user->insertCsrfToken();
-				?>
 
-				<div class="mb-3">
-					<label for="invoice-status" class="form-label">
-						<b><?=htmlspecialchars(__("Status"))?></b>
-					</label>
-					<span class="ms-1"></span>
-					<span class="badge rounded-pill text-bg-danger">
+				if($document->isSalesOrder()) {
+					?>
+					<div class="mb-3">
+						<label for="invoice-status" class="form-label">
+							<b><?=htmlspecialchars(__("Status"))?></b>
+						</label>
+						<span class="ms-1"></span>
+						<span class="badge rounded-pill text-bg-danger">
 						<?=htmlspecialchars(__("Important"))?>
 					</span>
-					<select class="form-select" name="invoice_status" id="invoice-status">
-						<?php
-						HtmlHelper::renderOptions(SalesOrderStatuses::options(), $document->invoice_status);
-						?>
-					</select>
-				</div>
+						<select class="form-select" name="invoice_status" id="invoice-status">
+							<?php
+							HtmlHelper::renderOptions(SalesOrderStatuses::options(), $document->invoice_status);
+							?>
+						</select>
+					</div>
+					<?php
+				}
+				else if($document->isAru()) {
+					?>
+					<div class="mb-3">
+						<div class="row">
+							<div class="col">
+								<label for="aru-status" class="form-label">
+									<b><?=htmlspecialchars(__("Status"))?></b>
+								</label>
+							</div>
+							<div class="col-auto">
+							<span class="badge rounded-pill text-bg-danger">
+								<?=htmlspecialchars(__("Important"))?>
+							</span>
+							</div>
+						</div>
+						<select class="form-select" name="aru_status" id="aru-status">
+							<?php
+							HtmlHelper::renderOptions(AruStatuses::options(), $document->aru_status);
+							?>
+						</select>
+					</div>
+					<?php
+				}
+				?>
 
 				<div class="row">
 					<?php
@@ -86,31 +113,6 @@ $location = $document->getLocation();
 						</div>
 						<?php
 					}
-					if($document->isAru()) {
-						?>
-						<div class="col-sm-6">
-							<div class="mb-3">
-								<div class="row">
-									<div class="col">
-										<label for="aru-status" class="form-label">
-											<b><?=htmlspecialchars(__("Status"))?></b>
-										</label>
-									</div>
-									<div class="col-auto">
-										<span class="badge rounded-pill text-bg-danger">
-											<?=htmlspecialchars(__("Important"))?>
-										</span>
-									</div>
-								</div>
-								<select class="form-select" name="aru_status" id="aru-status">
-									<?php
-									HtmlHelper::renderOptions(AruStatuses::options(), $document->aru_status);
-									?>
-								</select>
-							</div>
-						</div>
-						<?php
-					}
 					?>
 					<div class="col-sm-6">
 						<div class="mb-3">