Skip to content

Commit

Permalink
Merge pull request #1010 from itflow-org/asset-purchase-ordering
Browse files Browse the repository at this point in the history 
Re-order asset purchase and install date fields to make more sense
  • Loading branch information
@johnnyq
johnnyq authored Aug 28, 2024
2 parents ddf936c + 11005fe commit af62ba8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
21 changes: 12 additions & 9 deletions client_asset_add_modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,18 @@
</div>
</div>

<?php if ($_GET['type'] !== 'virtual') { ?>
<div class="form-group">
<label>Purchase Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
</div>
<input type="date" class="form-control" name="purchase_date" max="2999-12-31">
</div>
</div>
<?php } ?>

<div class="form-group">
<label>Install Date</label>
<div class="input-group">
Expand All @@ -325,15 +337,6 @@
</div>

<?php if ($_GET['type'] !== 'virtual') { ?>
<div class="form-group">
<label>Purchase Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
</div>
<input type="date" class="form-control" name="purchase_date" max="2999-12-31">
</div>
</div>
<div class="form-group">
<label>Warranty Expire</label>
<div class="input-group">
Expand Down
22 changes: 12 additions & 10 deletions client_asset_edit_modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,6 @@
</div>
</div>

<div class="form-group">
<label>Install Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
</div>
<input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
</div>
</div>

<?php if ($asset_type !== 'Virtual Machine') { ?>
<div class="form-group">
<label>Purchase Date</label>
Expand All @@ -356,7 +346,19 @@
<input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
</div>
</div>
<?php } ?>

<div class="form-group">
<label>Install Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
</div>
<input type="date" class="form-control" name="install_date" max="2999-12-31" value="<?php echo $asset_install_date; ?>">
</div>
</div>

<?php if ($asset_type !== 'Virtual Machine') { ?>
<div class="form-group">
<label>Warranty Expire</label>
<div class="input-group">
Expand Down

0 comments on commit af62ba8

Please sign in to comment.