AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,448 Commits 6 Branches 15 Tags 166 MiB
Commit Graph

3448 Commits

Author SHA1 Message Date
Marcus Hill bdb0cc1e38 Time tracking input field spacing 
Reduce size of hrs, min, sec input fields
 2023-12-23 23:41:51 +00:00
Marcus Hill e04c681ca5 Time tracking input field spacing 
Reduce size of hrs, min, sec input fields
 2023-12-23 23:15:20 +00:00
Johnny 29867d6d11
Merge pull request #844 from twetech/delete-tickets-go-to-tickets.php 
Redirect to tickets.php after deleting a ticket
 2023-12-23 16:07:46 -05:00
Johnny 25087dd85f
Merge pull request #843 from twetech/v0.1.2 
Update to v0.1.2 of TWETech/ITflow
 2023-12-23 16:06:29 -05:00
o-psi 5ef96f7860 Redirect to tickets.php after deleting a ticket instead of the deleted tickets' page. 2023-12-22 23:20:21 +00:00
Andrew Malsbury 7ecabbaf0d
Merge pull request #6 from twetech/ticket-billable-module 
Fix typo in accounting module condition
 2023-12-22 11:57:43 -06:00
o-psi 5dda94a1ec Fix typo in accounting module condition 2023-12-22 17:45:39 +00:00
Andrew Malsbury d448562a24
Merge branch 'itflow-org:master' into v0.1.2 2023-12-22 11:34:05 -06:00
Johnny 471e6a9f8f
Merge pull request #842 from twetech/ticket-billable-module 
Disable ticket billable options in accounting module
 2023-12-22 12:33:18 -05:00
Johnny 27b7db63ee
Merge pull request #839 from twetech/Create-Payment-Bugfix 
Fix email data assignment and select option bug in invoice.php and ticket_invoice_add_modal.php
 2023-12-22 12:32:27 -05:00
Andrew Malsbury 0077a03be7
Merge pull request #5 from twetech/Readable-Passwords 
Readable passwords
 2023-12-22 11:32:09 -06:00
Andrew Malsbury 10b04c79d0
Merge branch 'v0.1.2' into Readable-Passwords 2023-12-22 11:31:36 -06:00
Andrew Malsbury c8d3f3df69
Merge pull request #4 from twetech/client-replied-warning-badge 
Added autoclose to dark
 2023-12-22 11:21:41 -06:00
o-psi 77145432ee Added autoclose to dark 2023-12-22 17:19:00 +00:00
Andrew Malsbury 6bceb4b33b
Merge pull request #3 from twetech:client-replied-warning-badge 
Add ticket status color for "Client-Replied"
 2023-12-22 11:17:08 -06:00
o-psi 0535a903ee Add ticket status color for "Client-Replied" 2023-12-22 17:16:26 +00:00
Andrew Malsbury fc5507272e
Merge pull request #2 from twetech/Fix-for-user-IDs-in-tickets 
Fix ticket assignment filter bug
 2023-12-22 11:09:33 -06:00
o-psi 61a0086514 Fix ticket assignment filter bug 2023-12-22 17:06:48 +00:00
Andrew Malsbury a6d43d97af
Merge pull request #1 from twetech/Fix-for-user-IDs-in-tickets 
Fix ticket_assigned_to filter in SQL query
 2023-12-22 10:50:11 -06:00
o-psi eb29f74fab fix error messages in log 2023-12-22 16:25:36 +00:00
o-psi 7709627e5b Accounting module disable ticket billable options 2023-12-22 16:19:51 +00:00
o-psi dd7131cae1 Fix ticket_assigned_to filter in SQL query 2023-12-22 15:14:56 +00:00
o-psi 87e8f9e042 Fix email data assignment and select option bug in invoice.php and ticket_invoice_add_modal.php 2023-12-22 14:52:02 +00:00
johnnyq f8702557c8 Remove Trailing slash for config_base_url during setup 2023-12-21 19:18:45 -05:00
johnnyq da73b6d634 Fixed Client Pays fee not being able to be turned off 2023-12-21 19:13:14 -05:00
johnnyq 11da9ff0d4 Fix Undefined Status Array errors in tickets 2023-12-21 18:59:57 -05:00
johnnyq 435206dded Properly fetch the user dashboard settings 2023-12-21 16:56:02 -05:00
johnnyq 297148bc63 DB Update add User settings to enable / disable Dashboard Items Financial and Technical 2023-12-21 16:36:31 -05:00
johnnyq d21e5fafca Added Your Tickets to the technical portion of the dashboard 2023-12-21 16:04:07 -05:00
johnnyq 12b8f2e005 Update Year select 2023-12-21 14:20:39 -05:00
johnnyq 5138f84575 Removed financial and technical dashboards in settings default page as these are no merged 2023-12-21 14:05:41 -05:00
johnnyq 6a63335a4a Bump PHPMailer from 6.8.1 to 6.9.1 2023-12-21 13:23:44 -05:00
johnnyq 19a18126de Bump TinyMCE from 6.7.3 to 6.8.2 2023-12-21 13:19:16 -05:00
Johnny a1be7f2a3c
Merge pull request #837 from twetech/Billable-ticket-qol 
Quality of Life - Billable Tickets
 2023-12-21 13:10:11 -05:00
johnnyq afc6dd674c Add some more padding and spacing for toggles and Year Select on the dashboard 2023-12-21 13:07:20 -05:00
johnnyq e639b69db9 Merged All Dashboards into 1 allow you to toggle between show financial and show technical 2023-12-21 13:03:37 -05:00
o-psi 3eaaf73744 Add more billable status functionality 2023-12-21 17:10:15 +00:00
o-psi f1516b06ee Refactor calculateInvoiceBalance function to sanitizr 
This commit refactors the calculateInvoiceBalance function in functions.php. The invoice_id parameter is now properly sanitized using intval() to prevent SQL injection attacks. Additionally, the SQL query for retrieving the invoice and payments data has been formatted for better readability.
 2023-12-21 14:37:19 +00:00
johnnyq 70d99d28bf Removed Unused var 2023-12-21 02:40:41 -05:00
johnnyq 08a6d1d9be Update in more places 2023-12-21 02:10:09 -05:00
johnnyq d6660bff04 Fix sending mail on item sharing 2023-12-21 02:02:40 -05:00
johnnyq 957bbc5f55 Update from name and email in other areas as well 2023-12-21 01:47:24 -05:00
johnnyq e8a53cbd6a Update new mail queue function to use the proper mail from name and mail from email 2023-12-21 01:37:21 -05:00
johnnyq cdaca0e06b Update a few var names for the new mail addToMailQueue function 2023-12-21 01:05:59 -05:00
Johnny a35a6f3ea0
Merge pull request #835 from twetech/ticket_notifications 
Notifications for technicians in tickets
 2023-12-20 23:45:00 -05:00
Johnny 8ff6271058
Merge pull request #834 from twetech/billable_tickets 
Update ticket billing functionality
 2023-12-20 23:43:51 -05:00
johnnyq 82ec1408de FEATURE: Added Batch Payment to multiple invoices, currently works by paying the oldest invoices firest this can be accessed through client invoices and will show as long as the client has a balance 2023-12-20 18:47:14 -05:00
o-psi 86d836f3d3 Add vscode to .gitignore 2023-12-19 23:18:11 +00:00
o-psi 999c8ddb40 Add sanitations 
Forgot to add in the sanitations.
 2023-12-19 23:11:50 +00:00
o-psi 4e142b26e9 Missing "}" after confict resolution 2023-12-19 23:05:56 +00:00