-
-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dont show archived clients in new invoice screens
- Loading branch information
Showing
3 changed files
with
109 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,114 @@ | ||
| <div class="modal" id="addRecurringModal" tabindex="-1"> | ||
| <div class="modal-dialog"> | ||
| <div class="modal-content bg-dark"> | ||
| <div class="modal-header"> | ||
| <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5> | ||
| <button type="button" class="close text-white" data-dismiss="modal"> | ||
| <span>×</span> | ||
| </button> | ||
| </div> | ||
| <form action="post.php" method="post" autocomplete="off"> | ||
| <div class="modal-dialog"> | ||
| <div class="modal-content bg-dark"> | ||
| <div class="modal-header"> | ||
| <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5> | ||
| <button type="button" class="close text-white" data-dismiss="modal"> | ||
| <span>×</span> | ||
| </button> | ||
| </div> | ||
| <form action="post.php" method="post" autocomplete="off"> | ||
|
|
||
| <div class="modal-body bg-white"> | ||
| <div class="modal-body bg-white"> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Scope</label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span> | ||
| </div> | ||
| <input type="text" class="form-control" name="scope" placeholder="Quick description"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <?php if (isset($_GET['client_id'])) { ?> | ||
| <input type="hidden" name="client" value="<?php echo $client_id; ?>"> | ||
| <?php }else{ ?> | ||
| <div class="form-group"> | ||
| <label>Scope</label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span> | ||
| </div> | ||
| <input type="text" class="form-control" name="scope" placeholder="Quick description"> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Client <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="client" required> | ||
| <option value="">- Client -</option> | ||
| <?php | ||
|
|
||
| $sql = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC"); | ||
| while ($row = mysqli_fetch_array($sql)) { | ||
| $client_id = intval($row['client_id']); | ||
| $client_name = nullable_htmlentities($row['client_name']); | ||
| ?> | ||
| <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option> | ||
|
|
||
| <?php | ||
| } | ||
| ?> | ||
| </select> | ||
| </div> | ||
| </div> | ||
| <?php if (isset($_GET['client_id'])) { ?> | ||
| <input type="hidden" name="client" value="<?php echo $client_id; ?>"> | ||
| <?php } else { ?> | ||
|
|
||
| <?php } ?> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Start Date <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span> | ||
| </div> | ||
| <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Frequency <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="frequency" required> | ||
| <option value="">- Frequency -</option> | ||
| <option value="week">Weekly</option> | ||
| <option value="month">Monthly</option> | ||
| <option value="year">Yearly</option> | ||
| </select> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Category <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="category" required> | ||
| <option value="">- Category -</option> | ||
| <?php | ||
|
|
||
| $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC"); | ||
| while ($row = mysqli_fetch_array($sql)) { | ||
| $category_id = intval($row['category_id']); | ||
| $category_name = nullable_htmlentities($row['category_name']); | ||
| ?> | ||
| <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option> | ||
|
|
||
| <?php | ||
| } | ||
| ?> | ||
| </select> | ||
| <div class="input-group-append"> | ||
| <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label>Client <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="client" required> | ||
| <option value="">- Client -</option> | ||
| <?php | ||
| //select unarchived clients | ||
| $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC"); | ||
| while ($row = mysqli_fetch_array($sql)) { | ||
| $client_id = intval($row['client_id']); | ||
| $client_name = nullable_htmlentities($row['client_name']); | ||
| ?> | ||
| <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option> | ||
|
|
||
| <?php | ||
| } | ||
| ?> | ||
| </select> | ||
| </div> | ||
| </div> | ||
|
|
||
| <?php } ?> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Start Date <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span> | ||
| </div> | ||
| <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Frequency <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="frequency" required> | ||
| <option value="">- Frequency -</option> | ||
| <option value="week">Weekly</option> | ||
| <option value="month">Monthly</option> | ||
| <option value="year">Yearly</option> | ||
| </select> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label>Category <strong class="text-danger">*</strong></label> | ||
| <div class="input-group"> | ||
| <div class="input-group-prepend"> | ||
| <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span> | ||
| </div> | ||
| <select class="form-control select2" name="category" required> | ||
| <option value="">- Category -</option> | ||
| <?php | ||
|
|
||
| $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC"); | ||
| while ($row = mysqli_fetch_array($sql)) { | ||
| $category_id = intval($row['category_id']); | ||
| $category_name = nullable_htmlentities($row['category_name']); | ||
| ?> | ||
| <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option> | ||
|
|
||
| <?php | ||
| } | ||
| ?> | ||
| </select> | ||
| <div class="input-group-append"> | ||
| <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCategoryIncomeModal"><i class="fas fa-fw fa-plus"></i></button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| <div class="modal-footer bg-white"> | ||
| <button type="submit" name="add_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button> | ||
| <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| <div class="modal-footer bg-white"> | ||
| <button type="submit" name="add_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button> | ||
| <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> |