Alan Lam 2 роки тому
батько
коміт
fb020b9613
1 змінених файлів з 67 додано та 55 видалено
  1. 67 55
      views/document.php

+ 67 - 55
views/document.php

@@ -90,19 +90,6 @@ $related_document = $document->getRelatedDocument();
 						}
 						?>
 					</div>
-					<div class="col-sm-6">
-						<div class="mb-3">
-							<label for="location" class="form-label">
-								<?=htmlspecialchars(__("Location"))?>
-							</label>
-							<select class="form-select" name="location_id" id="location" <?=HtmlHelper::required($document->location_id)?>>
-							    <option value=""><?=htmlspecialchars(__("Select Location"))?></option>
-								<?php
-								HtmlHelper::renderOptions(Location::getOptions(), $document->location_id);
-								?>
-							</select>
-						</div>
-					</div>
 				</div>
 
 				<div class="row">
@@ -125,6 +112,22 @@ $related_document = $document->getRelatedDocument();
 						<?php
 					}
 					?>
+					<div class="col-sm-6">
+						<div class="mb-3">
+							<label for="location" class="form-label">
+								<?=htmlspecialchars(__("Location"))?>
+							</label>
+							<select class="form-select" name="location_id" id="location" <?=HtmlHelper::required($document->location_id)?>>
+								<option value=""><?=htmlspecialchars(__("Select Location"))?></option>
+								<?php
+								HtmlHelper::renderOptions(Location::getOptions(), $document->location_id);
+								?>
+							</select>
+						</div>
+					</div>
+				</div>
+
+				<div class="row">
 					<div class="col-sm-6">
 						<div class="mb-3">
 							<label for="date" class="form-label">
@@ -133,6 +136,20 @@ $related_document = $document->getRelatedDocument();
 							<input class="form-control" type="date" name="date" id="date" value="<?=$document->date?>" required />
 						</div>
 					</div>
+					<?php
+					if($document->isSalesOrder()) {
+						?>
+						<div class="col-sm-6">
+							<div class="mb-3">
+								<label for="terms" class="form-label">
+									<?=htmlspecialchars(__("Terms"))?>
+								</label>
+								<input type="text" class="form-control" name="terms" id="terms" placeholder="<?=htmlspecialchars(__("Type terms"))?>" value="<?=htmlspecialchars($document->terms)?>" />
+							</div>
+						</div>
+						<?php
+					}
+					?>
 				</div>
 
 				<div class="row">
@@ -166,7 +183,7 @@ $related_document = $document->getRelatedDocument();
 				if($document->hasCosts()) {
 					?>
 					<div class="row">
-						<div class="col">
+						<div class="col-sm-6">
 							<div class="mb-3">
 								<label for="currency" class="form-label">
 									<?=htmlspecialchars(__("Currency"))?>
@@ -178,6 +195,37 @@ $related_document = $document->getRelatedDocument();
 								</select>
 							</div>
 						</div>
+						<?php
+						if($document->isSalesOrder() || $document->isDeliveryNote()) {
+							?>
+							<div class="col-sm-6">
+								<div class="mb-3">
+									<label for="po-number" class="form-label">
+										<?=htmlspecialchars(__("PO Number"))?>
+									</label>
+									<input type="text" class="form-control" name="po_number" id="po-number" placeholder="<?=htmlspecialchars(__("Type PO number"))?>" value="<?=htmlspecialchars($document->po_number)?>" />
+								</div>
+							</div>
+							<?php
+						}
+						?>
+					</div>
+					<?php
+				}
+
+				?>
+				<div class="row">
+					<div class="col">
+						<div class="mb-3">
+							<label for="vat-number" class="form-label">
+								<?=htmlspecialchars(__("VAT No."))?>
+							</label>
+							<input type="text" class="form-control" name="vat_number" id="vat-number" placeholder="<?=htmlspecialchars(__("Type VAT no."))?>" value="<?=htmlspecialchars($document->vat_number)?>" maxlength="32" />
+						</div>
+					</div>
+					<?php
+					if($document->hasCosts()) {
+						?>
 						<div class="col">
 							<div class="mb-3">
 								<label for="tax-rate" class="form-label">
@@ -186,9 +234,11 @@ $related_document = $document->getRelatedDocument();
 								<input type="number" class="form-control" name="tax_rate" id="tax-rate" min="0" step="0.01" value="<?=htmlspecialchars($document->tax_rate)?>" placeholder="<?=htmlspecialchars(__("Type tax rate"))?>" required />
 							</div>
 						</div>
-					</div>
-					<?php
-				}
+						<?php
+					}
+					?>
+				</div>
+				<?php
 
 				if($document->hasCosts() || $document->isDeliveryNote()) {
 					?>
@@ -215,44 +265,6 @@ $related_document = $document->getRelatedDocument();
 
 				?>
 
-
-				<div class="row">
-					<?php
-					if($document->isSalesOrder() || $document->isDeliveryNote()) {
-						?>
-						<div class="col-sm-6">
-							<div class="mb-3">
-								<label for="po-number" class="form-label">
-									<?=htmlspecialchars(__("PO Number"))?>
-								</label>
-								<input type="text" class="form-control" name="po_number" id="po-number" placeholder="<?=htmlspecialchars(__("Type PO number"))?>" value="<?=htmlspecialchars($document->po_number)?>" />
-							</div>
-						</div>
-						<?php
-					}
-					if($document->isSalesOrder()) {
-						?>
-						<div class="col-sm-6">
-							<div class="mb-3">
-								<label for="terms" class="form-label">
-									<?=htmlspecialchars(__("Terms"))?>
-								</label>
-								<input type="text" class="form-control" name="terms" id="terms" placeholder="<?=htmlspecialchars(__("Type terms"))?>" value="<?=htmlspecialchars($document->terms)?>" />
-							</div>
-						</div>
-						<div class="col-sm-6">
-							<div class="mb-3">
-								<label for="vat-number" class="form-label">
-									<?=htmlspecialchars(__("VAT No."))?>
-								</label>
-								<input type="text" class="form-control" name="vat_number" id="vat-number" placeholder="<?=htmlspecialchars(__("Type VAT no."))?>" value="<?=htmlspecialchars($document->vat_number)?>" maxlength="32" />
-							</div>
-						</div>
-						<?php
-					}
-					?>
-				</div>
-
 				<div class="mb-3">
 					<label for="notes" class="form-label">
 						<?=htmlspecialchars(__("Internal Notes"))?>