AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DB Update, reworked upcoming tagging feature in SQL, Added Province and Postal Code to address labels, changed the field document_details to document_content in SQL

This commit is contained in:
johnnyq 2021-11-08 18:07:36 -05:00
parent 50cd239cd4
commit 6c80fa177d
15 changed files with 137 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
add_client_modal.php
View File

@ -21,7 +21,7 @@
<a class="nav-link" data-toggle="pill" href="#pills-contact">Contact</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
<a class="nav-link" data-toggle="pill" href="#pills-additional">Additional</a>
</li>
</ul>
@ -42,7 +42,7 @@
</div>
<div class="form-group">
<label>Type</label>
<label>Industry</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
@ -51,19 +51,6 @@
</div>
</div>
<div class="form-group">
<label>Support</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
</div>
<select class="form-control select2" name="support">
<option>Non-Maintenance</option>
<option>Maintenance</option>
</select>
</div>
</div>
<div class="form-group">
<label>Referral</label>
<div class="input-group">
@ -90,35 +77,6 @@
</div>
</div>
<div class="form-group">
<label>Currency <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-money-bill"></i></span>
</div>
<select class="form-control select2" name="currency_code" required>
<option value="">- Currency -</option>
<?php foreach($currencies_array as $currency_code => $currency_name) { ?>
<option <?php if($config_default_currency == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group">
<label>Invoice Net Terms</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>
<select class="form-control select2" name="net_terms">
<?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
<option <?php if($config_default_net_terms == $net_term_value){ echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
<?php } ?>
</select>
</div>
</div>
</div>
<div class="tab-pane fade" id="pills-address">
@ -144,22 +102,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State">
<input type="text" class="form-control" name="state" placeholder="State or Province">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
</div>
</div>
@ -252,10 +210,53 @@
</div>
<div class="tab-pane fade" id="pills-notes">
<div class="tab-pane fade" id="pills-additional">
<div class="form-group">
<textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
<label>Support</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
</div>
<select class="form-control select2" name="support">
<option>Non-Maintenance</option>
<option>Maintenance</option>
</select>
</div>
</div>
<div class="form-group">
<label>Currency <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-money-bill"></i></span>
</div>
<select class="form-control select2" name="currency_code" required>
<option value="">- Currency -</option>
<?php foreach($currencies_array as $currency_code => $currency_name) { ?>
<option <?php if($config_default_currency == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group">
<label>Payment Terms</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>
<select class="form-control select2" name="net_terms">
<?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
<option <?php if($config_default_net_terms == $net_term_value){ echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group">
<label>Notes</label>
<textarea class="form-control" rows="6" name="notes" placeholder="Enter some notes"></textarea>
</div>
</div>

8
add_company_modal.php
View File

@ -41,22 +41,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State">
<input type="text" class="form-control" name="state" placeholder="State or Province">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
</div>
</div>

2
add_document_modal.php
View File

@ -16,7 +16,7 @@
</div>
<div class="form-group">
<textarea class="form-control summernote" name="details"></textarea>
<textarea class="form-control summernote" name="content"></textarea>
</div>
</div>

12
add_location_modal.php
View File

@ -30,7 +30,7 @@
<div class="tab-pane fade show active" id="pills-address">
<div class="form-group">
<label>Location Name / Primary Location <strong class="text-danger">*</strong></label>
<label>Location Name / Primary <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-map-marker"></i></span>
@ -50,7 +50,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="address" placeholder="Address">
<input type="text" class="form-control" name="address" placeholder="Street Address">
</div>
</div>
@ -65,22 +65,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State">
<input type="text" class="form-control" name="state" placeholder="State or Province">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
</div>
</div>

10
add_vendor_modal.php
View File

@ -74,7 +74,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="address"placeholder="Street address" >
<input type="text" class="form-control" name="address"placeholder="Street Address" >
</div>
</div>
@ -89,22 +89,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State">
<input type="text" class="form-control" name="state" placeholder="State or Province">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
</div>
</div>

4
client_documents.php
View File

@ -42,7 +42,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM documents
WHERE document_client_id = $client_id
AND documents.company_id = $session_company_id
AND (document_name LIKE '%$q%' OR document_details LIKE '%$q%')
AND (document_name LIKE '%$q%' OR document_content LIKE '%$q%')
ORDER BY $sb $o LIMIT $record_from, $record_to");
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@ -93,7 +93,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
while($row = mysqli_fetch_array($sql)){
$document_id = $row['document_id'];
$document_name = $row['document_name'];
$document_details = $row['document_details'];
$document_content = $row['document_content'];
$document_created_at = $row['document_created_at'];
$document_updated_at = $row['document_updated_at'];

42
db.sql
View File

@ -175,6 +175,22 @@ CREATE TABLE `certificates` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `client_tags`
--
DROP TABLE IF EXISTS `client_tags`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `client_tags` (
`client_tag_id` int(11) NOT NULL AUTO_INCREMENT,
`client_id` int(11) NOT NULL,
`tag_id` int(11) NOT NULL,
`client_tag_created_at` datetime NOT NULL,
PRIMARY KEY (`client_tag_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `clients`
--
@ -186,13 +202,11 @@ CREATE TABLE `clients` (
`client_id` int(11) NOT NULL AUTO_INCREMENT,
`client_name` varchar(200) NOT NULL,
`client_type` varchar(200) DEFAULT NULL,
`client_contact` varchar(200) DEFAULT NULL,
`client_website` varchar(200) DEFAULT NULL,
`client_referral` varchar(200) DEFAULT NULL,
`client_currency_code` varchar(200) NOT NULL,
`client_net_terms` int(10) NOT NULL,
`client_support` varchar(100) DEFAULT NULL,
`client_tags` text DEFAULT NULL,
`client_notes` text DEFAULT NULL,
`client_created_at` datetime NOT NULL,
`client_updated_at` datetime DEFAULT NULL,
@ -310,7 +324,7 @@ DROP TABLE IF EXISTS `documents`;
CREATE TABLE `documents` (
`document_id` int(11) NOT NULL AUTO_INCREMENT,
`document_name` varchar(200) NOT NULL,
`document_details` longtext NOT NULL,
`document_content` longtext NOT NULL,
`document_created_at` datetime NOT NULL,
`document_updated_at` datetime DEFAULT NULL,
`document_archived_at` datetime DEFAULT NULL,
@ -867,6 +881,26 @@ CREATE TABLE `software` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `tags`
--
DROP TABLE IF EXISTS `tags`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `tags` (
`tag_id` int(11) NOT NULL AUTO_INCREMENT,
`tag_name` varchar(200) NOT NULL,
`tag_color` varchar(200) DEFAULT NULL,
`tag_icon` varchar(200) DEFAULT NULL,
`tag_created_at` datetime NOT NULL,
`tag_updated_at` datetime DEFAULT NULL,
`tag_archived_at` datetime DEFAULT NULL,
`company_id` int(11) NOT NULL,
PRIMARY KEY (`tag_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `taxes`
--
@ -1064,4 +1098,4 @@ CREATE TABLE `vendors` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2021-09-21 22:22:21
-- Dump completed on 2021-11-08 18:05:26

10
edit_client_modal.php
View File

@ -133,7 +133,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="address" placeholder="Address" value="<?php echo $location_address; ?>">
<input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $location_address; ?>">
</div>
</div>
@ -148,22 +148,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $location_state; ?>">
<input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $location_state; ?>">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code" value="<?php echo $location_zip; ?>">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $location_zip; ?>">
</div>
</div>

8
edit_company_modal.php
View File

@ -43,22 +43,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $company_state; ?>">
<input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code" value="<?php echo $company_zip; ?>">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
</div>
</div>

2
edit_document_modal.php
View File

@ -16,7 +16,7 @@
</div>
<div class="form-group">
<textarea class="form-control summernote" name="details"><?php echo $document_details; ?></textarea>
<textarea class="form-control summernote" name="content"><?php echo $document_content; ?></textarea>
</div>
</div>

12
edit_location_modal.php
View File

@ -32,7 +32,7 @@
<div class="tab-pane fade show active" id="pills-address<?php echo $location_id; ?>">
<div class="form-group">
<label>Location Name / Primary Location <strong class="text-danger">*</strong></label>
<label>Location Name / Primary <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-map-marker"></i></span>
@ -52,7 +52,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="address" placeholder="Address" value="<?php echo $location_address; ?>">
<input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $location_address; ?>">
</div>
</div>
@ -67,22 +67,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $location_state; ?>">
<input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $location_state; ?>">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code" value="<?php echo $location_zip; ?>">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $location_zip; ?>">
</div>
</div>

10
edit_vendor_modal.php
View File

@ -72,7 +72,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="address"placeholder="Street address" value="<?php echo $vendor_address; ?>">
<input type="text" class="form-control" name="address"placeholder="Street Address" value="<?php echo $vendor_address; ?>">
</div>
</div>
@ -87,22 +87,22 @@
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $vendor_state; ?>">
<input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $vendor_state; ?>">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code" value="<?php echo $vendor_zip; ?>">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $vendor_zip; ?>">
</div>
</div>

8
post.php
View File

@ -4757,9 +4757,9 @@ if(isset($_POST['add_document'])){
$client_id = intval($_POST['client_id']);
$name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
$details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
$content = trim(mysqli_real_escape_string($mysqli,$_POST['content']));
mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_details = '$details', document_created_at = NOW(), document_client_id = $client_id, company_id = $session_company_id");
mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_created_at = NOW(), document_client_id = $client_id, company_id = $session_company_id");
//Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Created', log_description = '$details', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");
@ -4774,9 +4774,9 @@ if(isset($_POST['edit_document'])){
$document_id = intval($_POST['document_id']);
$name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
$details = trim(mysqli_real_escape_string($mysqli,$_POST['details']));
$content = trim(mysqli_real_escape_string($mysqli,$_POST['content']));
mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_details = '$details', document_updated_at = NOW() WHERE document_id = $document_id AND company_id = $session_company_id");
mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_updated_at = NOW() WHERE document_id = $document_id AND company_id = $session_company_id");
//Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Note', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");

8
setup.php
View File

@ -823,22 +823,22 @@ if(isset($_POST['add_company_settings'])){
</div>
<div class="form-group">
<label>State</label>
<label>State / Province</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
</div>
<input type="text" class="form-control" name="state" placeholder="State">
<input type="text" class="form-control" name="state" placeholder="State or Province">
</div>
</div>
<div class="form-group">
<label>Zip</label>
<label>Zip / Postal Code</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
</div>
<input type="text" class="form-control" name="zip" placeholder="Postal Code">
<input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code">
</div>
</div>

2
view_document_modal.php
View File

@ -8,7 +8,7 @@
</button>
</div>
<div class="modal-body bg-white">
<?php echo $document_details; ?>
<?php echo $document_content; ?>
</div>
</div>
</div>