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

3364 Commits

Author SHA1 Message Date
Johnny aad7b21b24
Merge pull request #831 from twetech/master 
Fix for guest pay stripe with fees
 2023-12-06 08:43:28 -05:00
o-psi 0aa08dac83 Fix for guest pay stripe with fees 2023-12-04 21:44:31 +00:00
johnnyq 7d0813a163 Opps forgot to dump DB when remember_me_token was added causing remember_me on new installs to fail 2023-12-01 11:53:30 -05:00
Johnny 469c8aa501
Merge pull request #828 from wrongecho/quote-fix 
Bugfix: Quotes to invoice item ordering
 2023-11-30 12:50:15 -05:00
Johnny d36dca508f
Merge pull request #829 from twetech/stripe-pays-fees-undeclared-variable 
Fix undeclared variable on Guest Online Pay
 2023-11-30 12:50:01 -05:00
o-psi a74bd5ade1 Fix undeclared variable on Guest Online Pay 2023-11-30 16:29:29 +00: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 5772146d14
Merge pull request #827 from wrongecho/loc-primary 
Bugfix: New locations are set as the primary
 2023-11-25 14:14:41 -05: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 e50fbd76ae
Merge pull request #824 from wrongecho/disable-personal-dash-link 
Temporarily disable the personal dashboard link to prevent confusion
 2023-11-25 13:34:25 -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
Johnny 0196e86c16
Merge pull request #822 from wrongecho/client-tickets-default-open 
Ticketing updates
 2023-11-25 13:33:55 -05:00
Marcus Hill fe369a4078 Bugfix: New locations are set as the primary 
Bugfix: Every time you add a new location, it is marked as the primary location in the modal by default as the location_primary variable is overwritten with each iteration of a location.
This PR defaults to no location being the primary, to avoid unnecessarily overwriting the primary location.

Future work: Re-add fixed logic used to determine if a primary location is missing
 2023-11-25 18:31:05 +00:00
Marcus Hill 8068cb6081 Require CSRF token to edit more admin settings - thanks again to @stehled 2023-11-25 18:15:25 +00:00
wrongecho 51ac53dc50
Merge pull request #825 from wrongecho/csrf-stripe 
Require CSRF token to edit Stripe settings - thanks to @stehled
 2023-11-25 16:39:14 +00:00
Marcus Hill 432488eca3 Require CSRF token to edit Stripe settings - thanks to @stehled 2023-11-25 16:36:05 +00:00
wrongecho 3158353921
Update first-interaction.yml 
Bump to 1.2.0 to see if this fixes
 2023-11-25 14:37:10 +00:00
Marcus Hill 55b35d16f1 Temporarily disable the personal dashboard link to prevent confusion as it is not yet in use 2023-11-25 14:31:09 +00:00
Marcus Hill 48c381ac2d Include login key in agent invitation email 2023-11-25 12:12:45 +00:00
Marcus Hill c0eb94efc3 Ticketing updates 
- Client ticket view now defaults to showing Open tickets
- Client ticket view now has ability to quick filter between open/closed tickets
- Don't render modals for closed tickets (~6x performance boost 0.030 seconds before vs 0.005 seconds after) (we really need dynamic modals for ticketing!)
 2023-11-25 11:29:08 +00:00
wrongecho c1d0a2368d
Merge pull request #821 from twetech/Fix-collections-link 
Fix link to client overview in collections
 2023-11-25 10:31:35 +00:00
Andrew Malsbury 5653518f50
Merge branch 'master' into Fix-collections-link 2023-11-22 12:22:57 -06:00
Andrew Malsbury fe86d3982c Fix the link to client overvier in collections 2023-11-22 18:18:17 +00:00
Andrew Malsbury d90280011f Revert "Add scheduled ticket end date field" 
This reverts commit d81a04a1d4.
 2023-11-22 17:45:01 +00:00
Andrew Malsbury d81a04a1d4 Add scheduled ticket end date field 2023-11-22 17:44:43 +00:00
Johnny 2adb500612
Merge pull request #819 from twetech/fix-collections-formatting 
Add missing currency variable
 2023-11-22 11:47:24 -05:00
Johnny d19706e0c9
Merge pull request #818 from twetech/Fix-new-trips-modal-for-trips.php 
Fix-new-trips-modal-for-trips.php
 2023-11-22 11:47:05 -05:00
Andrew Malsbury 61f6735ceb added missing currency variable 2023-11-22 16:31:14 +00:00
Andrew Malsbury 7c93a073b2 fix option 2023-11-22 15:01:49 +00:00
Andrew Malsbury dc04deaada Fix new trip on trips.php 2023-11-22 15:00:42 +00:00
johnnyq b3c37b6c5f Added ability revoke a users Remember Me Token from the users listing 2023-11-21 18:28:42 -05:00
johnnyq 41ba04b881 Spacing Tidy 2023-11-21 17:37:30 -05:00
johnnyq 90bb9499d5 Moved Remember Me to the Enter MFA Screen Only 2023-11-21 17:36:45 -05:00
Johnny be10ac0b46
Merge pull request #817 from twetech/remove-gateway-fees-from-client-invoice 
Remove Stripe fee from main invoice display
 2023-11-21 17:00:34 -05:00
Andrew Malsbury 6ce72e7cc1 Remove Stripe fee from main invoice display 2023-11-21 21:57:04 +00:00
Johnny c95060727c
Merge pull request #816 from twetech/collections-report 
Add collections report
 2023-11-21 16:55:35 -05:00
johnnyq a01269ccea Updated Tax Rate to be a floatval instead of a intval 2023-11-21 16:51:05 -05:00
johnnyq c1d6220e6a Added Tax Name and Rate to the products listing 2023-11-21 16:34:26 -05:00
johnnyq 48177e4250 Updated Quote and Recurring to Automatically select the Tax based off the product tax 2023-11-21 16:17:17 -05:00
johnnyq 3ec2e79e91 Attempt to automatically select Tax based off the products tax code in invoices, it works just doesnt update the select box to show selected 2023-11-21 16:06:12 -05:00
johnnyq 1f9c6578d5 Sanitize each Status in Array 2023-11-21 15:41:03 -05:00
johnnyq 3749cbfca1 Updated multiple ticket status selection 2023-11-21 15:22:38 -05:00
Andrew Malsbury 73e14c164b Add collections report 2023-11-21 19:03:38 +00:00
johnnyq 900ec75303 Reverted Multi Status Select using select2 in Ticket filtering as it broke existing filtering 2023-11-21 12:36:37 -05:00
Johnny 5c89e9849b
Merge pull request #813 from twetech/fix-balance-sheet 
Redo Balance Sheet Report
 2023-11-21 11:57:03 -05:00
Johnny af7ef5cf20
Merge pull request #814 from twetech/fix-ticket-query 
Update Array for ticket Query
 2023-11-21 11:55:58 -05:00
Andrew Malsbury c28727f9a7 Update Array 2023-11-21 16:27:10 +00:00
Andrew Malsbury 230e649e2c Redo Balance Sheet Report 2023-11-21 16:04:41 +00:00
johnnyq f18bb340bf Keep the Remember Me checkbox selected upon inital submit 2023-11-20 21:18:35 -05:00
johnnyq 0d6c58f1d0 Added Remember Me option by checking this you wont have to enter your MFA for up to 14 days on the device 2023-11-20 20:49:33 -05:00