Commit Graph

156 Commits

Author SHA1 Message Date
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
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
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
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
o-psi 3eaaf73744 Add more billable status functionality 2023-12-21 17:10:15 +00:00
johnnyq 70d99d28bf Removed Unused var 2023-12-21 02:40:41 -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
Andrew Malsbury ae1496adae
Merge branch 'master' into ticket_notifications 2023-12-19 17:04:05 -06:00
o-psi 98f731b4d4 Remove any "Send Single Email" declarations except in mail queue.
All emails go through the mail queue, using the addToMailQueue() function.
2023-12-19 23:02:05 +00:00
o-psi 8b4beacf0e Update MailQueue to use function 2023-12-19 22:36:51 +00:00
johnnyq 2d06f923d4 Fix Adding NULL logins when editing license 2023-12-18 14:09:34 -05:00
o-psi 78260a2b4e Updates to mark tickets billable, and keep track of which have been billed. 2023-12-17 20:28:57 +00:00
johnnyq 3b6cfeff73 Add cfg and ps1 to the allow file upload list 2023-12-13 20:59:01 -05:00
johnnyq 74aa0e829f Fix Invoice Item order in Ticketing, When creating an invoice from a ticket make sure the item added has an item_order of 1 2023-12-09 16:31:28 -05:00
johnnyq 72e448e4f0 Item Ordering Fix for Copy Quote or Invoice, Recurring Invoice to Invoice Cron, Force Recurring, Invoice to Recurring. It was not carrying over the item order on these tasks causing item ordering to break 2023-12-09 16:12:31 -05:00
Eduard Stehlík f47c5cca84 Fix domain edit for .eu and other domains. 2023-12-04 18:40:53 +01:00
Marcus Hill a0a4e5524a Bugfix: Quotes to invoice item ordering
- Fix item ordering not working for invoices generated from quotes
- Other small quote bugfixes
2023-11-29 21:36:03 +00:00
Johnny 59aeb1e976
Merge pull request #826 from wrongecho/admin-settings-csrf
Require CSRF token to edit more admin settings
2023-11-25 14:07:31 -05:00
Johnny e261651370
Merge pull request #823 from wrongecho/agent-email-key
Include login key in agent invitation email
2023-11-25 13:34:10 -05:00
Marcus Hill 8068cb6081 Require CSRF token to edit more admin settings - thanks again to @stehled 2023-11-25 18:15:25 +00:00
Marcus Hill 432488eca3 Require CSRF token to edit Stripe settings - thanks to @stehled 2023-11-25 16:36:05 +00:00
Marcus Hill 48c381ac2d Include login key in agent invitation email 2023-11-25 12:12:45 +00:00
johnnyq b3c37b6c5f Added ability revoke a users Remember Me Token from the users listing 2023-11-21 18:28:42 -05:00
Johnny 26b439554b
Merge pull request #810 from twetech/client-pays-fees
Enable passing stripe fee to clients
2023-11-20 16:49:16 -05:00
Marcus Hill 41cfd8d27b Scheduled tickets
- Notify agent DL when scheduled tickets are raised (if configured)

- Bugfix: Ticket numbering if two or more scheduled tickets are raised in the same script execution
- Bugfix: Email processing if a contact replied to a scheduled ticket email (still showing original #--itflow# line rather than ##- Please type your reply above this line -##)
2023-11-18 11:53:24 +00:00
Andrew Malsbury cc5d274596 Update database version to 0.9.5 and add
config_stripe_client_pays_fees field
2023-11-17 22:44:10 +00:00
johnnyq b1c60fa4d8 Update Categories Create and Edit Modals to take advantage of custom colors 2023-11-16 18:54:49 -05:00
johnnyq 2779d6543e Updated Tag Create and Edit Modal UI, added icons, added ability to choose any color 2023-11-16 18:36:22 -05:00
johnnyq f6076ad97a Remove Quick Add Instead redirect them to the categories settings page when plus is clicked 2023-11-09 13:09:38 -05:00
johnnyq 408a596efa Add logging if creating a referral via create client 2023-11-08 23:35:00 -05:00
johnnyq 0103e05093 Ability to create a referral when adding a client 2023-11-08 23:30:44 -05:00
johnnyq 91924bc239 Feature: Part 2 - Added Default Hourly rate to settings pane, default to the default hourly rate when adding a client 2023-11-06 15:05:07 -05:00
johnnyq 167c2a5b43 Remove Document from many to many service_documents table when archiving or deleting a document prevents from showing up under document service relation 2023-11-06 13:27:58 -05:00
Marcus Hill 7ccd69a26f Fix trip export to csv 2023-11-05 08:24:19 +00:00
johnnyq be279b4e8d Added more hints between leads and clients under client management 2023-10-31 15:38:40 -04:00
Marcus Hill e88d0b1e23 Add ability to edit contact on a scheduled ticket 2023-10-28 14:32:15 +01:00
Andrew Malsbury adafd38684 Timer - Record time even if closed 2023-10-26 19:19:46 +00:00
Andrew Malsbury 62d3cab389 Update Quotes and Recurrings with discounts 2023-10-25 17:15:41 +00:00
johnnyq fcfb162ec8 Enable domain expire alerts and send invoice reminders did not respect their settings it would still execute as long as cron was executing, updated the desription of the options as well 2023-10-20 18:38:48 -04:00
Johnny dd644a39b8
Merge pull request #779 from o-psi/clean-requires-and-includes
Update constructs to not have parenthesis.
2023-10-20 16:32:29 -04:00
o-psi 53c11edc8c Update constructs to not have parenthesis. 2023-10-20 15:25:52 -05:00
johnnyq 762dafab7e Updated Account Types liasting and posting to use the new account_type_parent field, also update setup to inset the correct account types into the correct account_type_parent 2023-10-20 15:40:52 -04:00
Andrew Malsbury a382092dab
Merge branch 'master' into discounts 2023-10-19 17:19:32 -05:00
o-psi fdaa176486 Post handling for calculating Discounts 2023-10-19 13:56:58 -05:00
o-psi 541bd9e0ca add discount to model 2023-10-19 13:56:01 -05:00