Skip to content

Commit 43b50c4

Browse files
johnnyqjohnnyq
committed
Combined client_quotes.php and quotes.php into one file quotes.php checks if get client_id var is set and which chooses to display client top header and client side nav or global nav
1 parent f6e33d5 commit 43b50c4

9 files changed

+328
-418
lines changed

‎ajax/ajax_document_edit.php

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?php
2+
3+
require_once '../includes/ajax_header.php';
4+
5+
$document_id = intval($_GET['id']);
6+
7+
$sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_id = $document_id");
8+
9+
$row = mysqli_fetch_array($sql);
10+
$document_name = nullable_htmlentities($row['document_name']);
11+
$document_description = nullable_htmlentities($row['document_description']);
12+
$document_content = nullable_htmlentities($row['document_content']);
13+
$document_created_by_id = intval($row['document_created_by']);
14+
$document_created_at = nullable_htmlentities($row['document_created_at']);
15+
$document_updated_at = nullable_htmlentities($row['document_updated_at']);
16+
$document_archived_at = nullable_htmlentities($row['document_archived_at']);
17+
$document_folder_id = intval($row['document_folder_id']);
18+
$document_parent = intval($row['document_parent']);
19+
$document_client_visible = intval($row['document_client_visible']);
20+
$client_id = intval($row['document_client_id']);
21+
22+
// Generate the HTML form content using output buffering.
23+
ob_start();
24+
?>
25+
26+
<div class="modal-header">
27+
<h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Editing document: <strong><?php echo $document_name; ?></strong></h5>
28+
<button type="button" class="close text-white" data-dismiss="modal">
29+
<span>&times;</span>
30+
</button>
31+
</div>
32+
<form action="post.php" method="post" autocomplete="off">
33+
<input type="hidden" name="document_id" value="<?php if($document_parent == 0){ echo $document_id; } else { echo $document_parent; } ?>">
34+
<input type="hidden" name="document_parent" value="<?php echo $document_parent; ?>">
35+
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
36+
<input type="hidden" name="created_by" value="<?php echo $document_created_by_id; ?>">
37+
<div class="modal-body bg-white">
38+
39+
<div class="form-group">
40+
<input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $document_name; ?>" placeholder="Name" required>
41+
</div>
42+
43+
<div class="form-group">
44+
<textarea class="form-control tinymce<?php if($config_ai_enable) { echo "AI"; } ?>" id="textInput" name="content"><?php echo $document_content; ?></textarea>
45+
</div>
46+
47+
<div class="form-group">
48+
<div class="input-group">
49+
<div class="input-group-prepend">
50+
<span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
51+
</div>
52+
<select class="form-control select2" name="folder">
53+
<option value="0">/</option>
54+
<?php
55+
$sql_folders_select = mysqli_query($mysqli, "SELECT * FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
56+
while ($row = mysqli_fetch_array($sql_folders_select)) {
57+
$folder_id_select = intval($row['folder_id']);
58+
$folder_name_select = nullable_htmlentities($row['folder_name']);
59+
?>
60+
<option <?php if ($folder_id_select == $document_folder_id) echo "selected"; ?> value="<?php echo $folder_id_select ?>"><?php echo $folder_name_select; ?></option>
61+
<?php
62+
}
63+
?>
64+
</select>
65+
</div>
66+
</div>
67+
68+
<div class="form-group">
69+
<input type="text" class="form-control" name="description" value="<?php echo $document_description; ?>" placeholder="Short summary of changes">
70+
</div>
71+
72+
</div>
73+
<div class="modal-footer bg-white">
74+
<button type="submit" name="edit_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
75+
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
76+
</div>
77+
</form>
78+
79+
<?php
80+
require_once "../includes/ajax_footer.php";

‎client_document_details.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,12 @@
165165
<div class="col-md-3 d-print-none">
166166
<div class="row">
167167
<div class="col-12 mb-3">
168-
<button type="button" class="btn btn-primary mr-2" data-toggle="modal" data-target="#editDocumentModal<?php echo $document_id; ?>">
168+
<button type="button" class="btn btn-primary mr-2"
169+
data-toggle="ajax-modal"
170+
data-modal-size="lg"
171+
data-ajax-url="ajax/ajax_document_edit.php"
172+
data-ajax-id="<?php echo $document_id; ?>"
173+
>
169174
<i class="fas fa-fw fa-edit mr-2"></i>Edit
170175
</button>
171176
<button type="button" class="btn btn-secondary mr-2" data-toggle="modal" data-target="#shareModal"
@@ -394,7 +399,6 @@
394399

395400
<?php
396401

397-
require_once "modals/client_document_edit_modal.php";
398402
require_once "modals/client_document_link_file_modal.php";
399403
require_once "modals/client_document_link_contact_modal.php";
400404
require_once "modals/client_document_link_asset_modal.php";
@@ -403,5 +407,3 @@
403407
require_once "modals/document_edit_visibility_modal.php";
404408
require_once "modals/share_modal.php";
405409
require_once "includes/footer.php";
406-
407-
?>

‎client_documents.php

+9
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,15 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) {
425425
<i class="fas fa-fw fa-eye mr-2"></i>Quick View
426426
</a>
427427
<div class="dropdown-divider"></div>
428+
<a class="dropdown-item" href="#"
429+
data-toggle="ajax-modal"
430+
data-modal-size="lg"
431+
data-ajax-url="ajax/ajax_document_edit.php"
432+
data-ajax-id="<?php echo $document_id; ?>"
433+
>
434+
<i class="fas fa-fw fa-pencil-alt mr-2"></i>Edit
435+
</a>
436+
<div class="dropdown-divider"></div>
428437
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Document', $document_id"; ?>)">
429438
<i class="fas fa-fw fa-share mr-2"></i>Share
430439
</a>

‎client_quotes.php

-213
This file was deleted.

‎includes/client_side_nav.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
</li>
286286

287287
<li class="nav-item">
288-
<a href="client_quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
288+
<a href="quotes.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "quotes.php" || basename($_SERVER["PHP_SELF"]) == "quote.php") { echo "active"; } ?>">
289289
<i class="nav-icon fas fa-comment-dollar"></i>
290290
<p>
291291
Quotes

‎modals/client_quote_export_modal.php renamed to ‎modals/quote_export_modal.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
</button>
99
</div>
1010
<form action="post.php" method="post" autocomplete="off">
11+
<?php if(isset($_GET['client_id'])) { ?>
1112
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
13+
<?php } ?>
1214
<div class="modal-body bg-white">
1315

1416
</div>
1517
<div class="modal-footer bg-white">
16-
<button type="submit" name="export_client_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
18+
<button type="submit" name="export_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
1719
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
1820
</div>
1921
</form>

‎post/user/quote.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521

522522
}
523523

524-
if(isset($_POST['export_client_quotes_csv'])){
524+
if(isset($_POST['export_quotes_csv'])){
525525

526526
enforceUserPermission('module_sales');
527527

0 commit comments

Comments
 (0)