Skip to content

Commit f23afdd

Browse files
johnnyqjohnnyq
committed
Added Quick Category/Tag Add throughout utilizes the new ajax modal
1 parent bac7687 commit f23afdd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+525
-98
lines changed

‎ajax/ajax_asset_details.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@
121121
logins.login_note,
122122
logins.login_important,
123123
logins.login_contact_id,
124-
logins.login_vendor_id,
125-
logins.login_asset_id,
126-
logins.login_software_id
124+
logins.login_asset_id
127125
FROM logins
128126
LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
129127
LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
@@ -474,9 +472,7 @@ function updateAssetNotes(asset_id) {
474472
$login_note = nullable_htmlentities($row['login_note']);
475473
$login_important = intval($row['login_important']);
476474
$login_contact_id = intval($row['login_contact_id']);
477-
$login_vendor_id = intval($row['login_vendor_id']);
478475
$login_asset_id = intval($row['login_asset_id']);
479-
$login_software_id = intval($row['login_software_id']);
480476

481477
// Tags
482478
$login_tag_name_display_array = array();

‎ajax/ajax_category_add.php

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
require_once '../includes/ajax_header.php';
4+
5+
$category = nullable_htmlentities($_GET['category']);
6+
7+
?>
8+
9+
<div class="modal-header">
10+
<h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>New <?php echo $category; ?> Category</h5>
11+
<button type="button" class="close text-white" data-dismiss="modal">
12+
<span>&times;</span>
13+
</button>
14+
</div>
15+
<form action="post.php" method="post" autocomplete="off">
16+
<input type="hidden" name="type" value="<?php echo ($category); ?>">
17+
18+
<div class="modal-body bg-white">
19+
20+
<div class="form-row">
21+
22+
<div class="form-group col-sm-9">
23+
<div class="input-group">
24+
<input type="text" class="form-control" name="name" placeholder="Category name" maxlength="200" required autofocus>
25+
</div>
26+
</div>
27+
28+
<div class="form-group col-sm-3">
29+
<div class="input-group">
30+
<input type="color" class="form-control" name="color" required>
31+
</div>
32+
</div>
33+
</div>
34+
35+
</div>
36+
<div class="modal-footer bg-white">
37+
<button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
38+
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
39+
</div>
40+
</form>
41+
42+
<?php
43+
require_once "../includes/ajax_footer.php";

‎ajax/ajax_client_edit.php

+17
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@
125125
}
126126
?>
127127
</select>
128+
<div class="input-group-append">
129+
<button class="btn btn-secondary" type="button"
130+
data-toggle="ajax-modal"
131+
data-modal-size="sm"
132+
data-ajax-url="ajax/ajax_category_add.php?category=Referral">
133+
<i class="fas fa-fw fa-plus"></i>
134+
</button>
135+
</div>
128136
</div>
129137
</div>
130138

@@ -157,6 +165,15 @@
157165
<?php } ?>
158166

159167
</select>
168+
<div class="input-group-append">
169+
<button class="btn btn-secondary" type="button"
170+
data-toggle="ajax-modal"
171+
data-modal-size="sm"
172+
data-ajax-url="ajax/ajax_tag_add.php"
173+
data-ajax-id="1">
174+
<i class="fas fa-fw fa-plus"></i>
175+
</button>
176+
</div>
160177
</div>
161178
</div>
162179

‎ajax/ajax_contact_details.php

-2
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,7 @@ function updateContactNotes(contact_id) {
446446
$login_note = nullable_htmlentities($row['login_note']);
447447
$login_important = intval($row['login_important']);
448448
$login_contact_id = intval($row['login_contact_id']);
449-
$login_vendor_id = intval($row['login_vendor_id']);
450449
$login_asset_id = intval($row['login_asset_id']);
451-
$login_software_id = intval($row['login_software_id']);
452450

453451
// Tags
454452
$login_tag_name_display_array = array();

‎ajax/ajax_contact_edit.php

+9
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,15 @@
311311
<?php } ?>
312312

313313
</select>
314+
<div class="input-group-append">
315+
<button class="btn btn-secondary" type="button"
316+
data-toggle="ajax-modal"
317+
data-modal-size="sm"
318+
data-ajax-url="ajax/ajax_tag_add.php"
319+
data-ajax-id="3">
320+
<i class="fas fa-plus"></i>
321+
</button>
322+
</div>
314323
</div>
315324
</div>
316325

‎ajax/ajax_credential_edit.php

+9
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,15 @@
242242
<?php } ?>
243243

244244
</select>
245+
<div class="input-group-append">
246+
<button class="btn btn-secondary" type="button"
247+
data-toggle="ajax-modal"
248+
data-modal-size="sm"
249+
data-ajax-url="ajax/ajax_tag_add.php"
250+
data-ajax-id="4">
251+
<i class="fas fa-plus"></i>
252+
</button>
253+
</div>
245254
</div>
246255
</div>
247256

‎ajax/ajax_expense_edit.php

+12-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,12 @@
131131
?>
132132
</select>
133133
<div class="input-group-append">
134-
<a class="btn btn-secondary" href="vendors.php" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
134+
<button class="btn btn-secondary" type="button"
135+
data-toggle="ajax-modal"
136+
data-modal-size="sm"
137+
data-ajax-url="ajax/ajax_category_add.php?category=Expense">
138+
<i class="fas fa-plus"></i>
139+
</button>
135140
</div>
136141
</div>
137142
</div>
@@ -176,7 +181,12 @@
176181
?>
177182
</select>
178183
<div class="input-group-append">
179-
<a class="btn btn-secondary" href="admin_category.php?category=Expense" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
184+
<button class="btn btn-secondary" type="button"
185+
data-toggle="ajax-modal"
186+
data-modal-size="sm"
187+
data-ajax-url="ajax/ajax_category_add.php?category=Expense">
188+
<i class="fas fa-plus"></i>
189+
</button>
180190
</div>
181191
</div>
182192
</div>

‎ajax/ajax_invoice_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@
7777
?>
7878
</select>
7979
<div class="input-group-append">
80-
<a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
80+
<button class="btn btn-secondary" type="button"
81+
data-toggle="ajax-modal"
82+
data-modal-size="sm"
83+
data-ajax-url="ajax/ajax_category_add.php?category=Income">
84+
<i class="fas fa-fw fa-plus"></i>
85+
</button>
8186
</div>
8287
</div>
8388
</div>

‎ajax/ajax_location_edit.php

+9
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,15 @@
254254
<?php } ?>
255255

256256
</select>
257+
<div class="input-group-append">
258+
<button class="btn btn-secondary" type="button"
259+
data-toggle="ajax-modal"
260+
data-modal-size="sm"
261+
data-ajax-url="ajax/ajax_tag_add.php"
262+
data-ajax-id="2">
263+
<i class="fas fa-plus"></i>
264+
</button>
265+
</div>
257266
</div>
258267
</div>
259268

‎ajax/ajax_product_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@
5959
?>
6060
</select>
6161
<div class="input-group-append">
62-
<a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
62+
<button class="btn btn-secondary" type="button"
63+
data-toggle="ajax-modal"
64+
data-modal-size="sm"
65+
data-ajax-url="ajax/ajax_category_add.php?category=Income">
66+
<i class="fas fa-fw fa-plus"></i>
67+
</button>
6368
</div>
6469
</div>
6570
</div>

‎ajax/ajax_quote_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@
7373

7474
</select>
7575
<div class="input-group-append">
76-
<a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
76+
<button class="btn btn-secondary" type="button"
77+
data-toggle="ajax-modal"
78+
data-modal-size="sm"
79+
data-ajax-url="ajax/ajax_category_add.php?category=Income">
80+
<i class="fas fa-fw fa-plus"></i>
81+
</button>
7782
</div>
7883
</div>
7984
</div>

‎ajax/ajax_recurring_expense_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,12 @@
214214
?>
215215
</select>
216216
<div class="input-group-append">
217-
<a class="btn btn-secondary" href="admin_category.php?category=Expense" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
217+
<button class="btn btn-secondary" type="button"
218+
data-toggle="ajax-modal"
219+
data-modal-size="sm"
220+
data-ajax-url="ajax/ajax_category_add.php?category=Expense">
221+
<i class="fas fa-plus"></i>
222+
</button>
218223
</div>
219224
</div>
220225
</div>

‎ajax/ajax_recurring_invoice_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@
8888
?>
8989
</select>
9090
<div class="input-group-append">
91-
<a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
91+
<button class="btn btn-secondary" type="button"
92+
data-toggle="ajax-modal"
93+
data-modal-size="sm"
94+
data-ajax-url="ajax/ajax_category_add.php?category=Income">
95+
<i class="fas fa-fw fa-plus"></i>
96+
</button>
9297
</div>
9398
</div>
9499
</div>

‎ajax/ajax_revenue_edit.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,12 @@
125125
?>
126126
</select>
127127
<div class="input-group-append">
128-
<a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
128+
<button class="btn btn-secondary" type="button"
129+
data-toggle="ajax-modal"
130+
data-modal-size="sm"
131+
data-ajax-url="ajax/ajax_category_add.php?category=Income">
132+
<i class="fas fa-fw fa-plus"></i>
133+
</button>
129134
</div>
130135
</div>
131136
</div>

‎ajax/ajax_tag_add.php

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php
2+
3+
require_once '../includes/ajax_header.php';
4+
5+
$type = intval($_GET['id']);
6+
7+
?>
8+
9+
<!-- <option value="1">Client Tag</option> -->
10+
<!-- <option value="2">Location Tag</option> -->
11+
<!-- <option value="3">Contact Tag</option> -->
12+
<!-- <option value="4">Credential Tag</option> -->
13+
14+
<div class="modal-header">
15+
<h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>New Tag</h5>
16+
<button type="button" class="close text-white" data-dismiss="modal">
17+
<span>&times;</span>
18+
</button>
19+
</div>
20+
<form action="post.php" method="post" autocomplete="off">
21+
<input type="hidden" name="type" value="<?php echo $type; ?>">
22+
<div class="modal-body bg-white">
23+
<div class="form-group">
24+
<label>Name <strong class="text-danger">*</strong></label>
25+
<div class="input-group">
26+
<div class="input-group-prepend">
27+
<span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
28+
</div>
29+
<input type="text" class="form-control" name="name" placeholder="Tag name" maxlength="200" required autofocus>
30+
</div>
31+
</div>
32+
33+
<div class="form-group">
34+
<label>Color <strong class="text-danger">*</strong></label>
35+
<div class="input-group">
36+
<div class="input-group-prepend">
37+
<span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
38+
</div>
39+
<input type="color" class="form-control col-3" name="color" required>
40+
</div>
41+
</div>
42+
43+
<div class="form-group">
44+
<label>Icon</label>
45+
<div class="input-group">
46+
<div class="input-group-prepend">
47+
<span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
48+
</div>
49+
<input type="text" class="form-control" name="icon" placeholder="Icon ex handshake">
50+
</div>
51+
</div>
52+
53+
</div>
54+
<div class="modal-footer bg-white">
55+
<button type="submit" name="add_tag" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
56+
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
57+
</div>
58+
</form>
59+
60+
<?php
61+
require_once "../includes/ajax_footer.php";

‎ajax/ajax_ticket_edit.php

+8
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@
107107
<?php } ?>
108108

109109
</select>
110+
<div class="input-group-append">
111+
<button class="btn btn-secondary" type="button"
112+
data-toggle="ajax-modal"
113+
data-modal-size="sm"
114+
data-ajax-url="ajax/ajax_category_add.php?category=Ticket">
115+
<i class="fas fa-fw fa-plus"></i>
116+
</button>
117+
</div>
110118
</div>
111119
</div>
112120
</div>

‎ajax/ajax_vendor_details.php

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
require_once '../includes/ajax_header.php';
4+
5+
$vendor_id = intval($_GET['id']);
6+
7+
$sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_id = $vendor_id LIMIT 1");
8+
9+
$row = mysqli_fetch_array($sql);
10+
$name = sanitizeInput($row['vendor_name']);
11+
$description = sanitizeInput($row['vendor_description']);
12+
$account_number = sanitizeInput($row['vendor_account_number']);
13+
$contact_name = sanitizeInput($row['vendor_contact_name']);
14+
$phone = preg_replace("/[^0-9]/", '',$row['vendor_phone']);
15+
$extension = preg_replace("/[^0-9]/", '',$row['vendor_extension']);
16+
$email = sanitizeInput($row['vendor_email']);
17+
$website = sanitizeInput($row['vendor_website']);
18+
$hours = sanitizeInput($row['vendor_hours']);
19+
$sla = sanitizeInput($row['vendor_sla']);
20+
$code = sanitizeInput($row['vendor_code']);
21+
$notes = sanitizeInput($row['vendor_notes']);
22+
23+
24+
// Generate the HTML form content using output buffering.
25+
ob_start();
26+
?>
27+
28+
<div class="modal-header">
29+
<h5 class="modal-title text-white"><i class="fas fa-fw fa-building mr-2"></i><?php echo $vendor_name; ?></h5>
30+
<button type="button" class="close text-white" data-dismiss="modal">
31+
<span>&times;</span>
32+
</button>
33+
</div>
34+
<div class="modal-body bg-white">
35+
<div>Description:</div><?php echo $vendor_description; ?></div>
36+
</div>
37+
38+
<div class="modal-footer bg-white">
39+
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
40+
</div>
41+
42+
<?php
43+
require_once "../includes/ajax_footer.php";

0 commit comments

Comments
 (0)