Commit Graph

Select branches

Hide Pull Requests

Before-Multi-Company-Removal

develop

duplicate-numbering-racecondition

feat-recurring-invoice-auto-send-toggle

master

revert-1176-Whit3XLightning-patch-2

ticket-task-approvals

undefined-asset-handling

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1019

#102

#1020

#1021

#1022

#1023

#1024

#1025

#1027

#1028

#1029

#1030

#1031

#1032

#1033

#1034

#1035

#1037

#1038

#1040

#1041

#1042

#1043

#1045

#1046

#1047

#1048

#1049

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1068

#1069

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1094

#1095

#1096

#1097

#1098

#1099

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1119

#1120

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#1129

#1130

#1131

#1132

#1133

#1134

#1135

#1136

#1137

#1138

#1139

#1140

#1141

#1142

#1143

#1144

#1145

#1146

#1147

#1148

#1149

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#1160

#1161

#1162

#1163

#1164

#1165

#1166

#1167

#1169

#1170

#1171

#1172

#1173

#1174

#1175

#1176

#1177

#1178

#1179

#1180

#1181

#1182

#1183

#1184

#1185

#1186

#1187

#1188

#1189

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#1210

#1211

#1212

#1213

#1214

#1215

#1216

#1218

#1220

#1221

#1222

#1223

#1224

#1225

#1226

#1227

#1229

#1230

#1231

#1232

#1233

#1234

#1235

#1236

#1237

#1238

#1239

#1240

#1241

#1242

#1243

#1244

#1245

#1246

#1247

#1249

#1250

#1252

#1253

#1254

#1255

#1256

#1258

#1259

#1261

#1262

#1263

#1264

#1265

#1266

#1267

#1268

#1269

#1271

#1275

#1278

#1280

#1281

#1284

#1287

#1288

#1289

#129

#1290

#1291

#1292

#1294

#1296

#1297

#1298

#1299

#1300

#1301

#1302

#1303

#1304

#1305

#1306

#1307

#1308

#1309

#1310

#198

#228

#229

#230

#231

#233

#234

#235

#236

#239

#240

#242

#243

#244

#245

#246

#247

#248

#249

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#263

#265

#266

#267

#270

#271

#272

#274

#276

#277

#278

#279

#280

#281

#282

#283

#284

#285

#286

#290

#291

#296

#297

#299

#307

#308

#318

#319

#320

#326

#329

#330

#333

#334

#335

#337

#339

#340

#341

#342

#343

#344

#345

#347

#348

#349

#350

#354

#355

#356

#357

#358

#359

#360

#362

#363

#364

#365

#367

#368

#369

#371

#372

#373

#374

#375

#376

#378

#379

#380

#381

#382

#383

#386

#387

#389

#390

#391

#392

#393

#394

#396

#398

#399

#400

#401

#402

#404

#405

#406

#409

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#421

#422

#423

#424

#425

#426

#427

#428

#429

#430

#432

#434

#435

#436

#437

#438

#439

#441

#442

#443

#444

#445

#447

#448

#449

#450

#451

#452

#453

#454

#455

#456

#457

#459

#460

#462

#463

#465

#468

#469

#470

#471

#472

#473

#478

#479

#480

#481

#485

#486

#488

#489

#490

#491

#492

#493

#494

#495

#499

#500

#502

#503

#504

#505

#506

#516

#517

#518

#520

#521

#523

#526

#528

#529

#533

#534

#536

#540

#541

#542

#543

#544

#545

#546

#547

#549

#550

#551

#552

#553

#554

#556

#557

#558

#559

#560

#565

#566

#568

#569

#570

#571

#573

#574

#575

#577

#578

#579

#580

#583

#584

#585

#586

#587

#588

#589

#590

#592

#593

#594

#595

#596

#597

#598

#599

#600

#602

#603

#604

#606

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#620

#621

#622

#623

#624

#625

#626

#628

#629

#630

#631

#632

#633

#634

#635

#636

#641

#642

#643

#644

#647

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#666

#667

#668

#671

#672

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#685

#686

#687

#688

#690

#691

#692

#693

#694

#695

#698

#699

#700

#701

#702

#705

#706

#708

#709

#710

#711

#712

#713

#714

#715

#716

#717

#718

#720

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#735

#736

#737

#738

#746

#747

#748

#749

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#770

#771

#772

#774

#775

#776

#777

#778

#779

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#802

#803

#804

#804

#805

#806

#807

#808

#809

#810

#811

#812

#813

#814

#815

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#860

#861

#862

#863

#864

#865

#866

#867

#868

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#890

#891

#892

#893

#894

#895

#897

#898

#900

#902

#903

#904

#905

#907

#908

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#920

#926

#927

#928

#929

#931

#932

#934

#935

#936

#938

#939

#940

#943

#944

#945

#947

#948

#949

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#964

#965

#966

#967

#968

#969

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#990

#991

#992

#993

#996

#997

#998

#999

v25.01

v25.01.2

v25.01.3

v25.02

v25.02.1

v25.02.2

v25.02.3

v25.02.4

v25.03

v25.05

v25.06

v25.09

v25.10

v25.11

v25.12

v26.02

v26.04

v26.05

v26.07

v26.08

v26.09

v26.10

v26.11

v26.3

v26.4

Mono Color

• f97f6ebdb6 Set Item Order to 998 for Late fee so they appear at the bottom of the invoice. Note: Item Order 999 is used for payment gateway fees johnnyq 2024-02-03 18:31:26 -05:00
• 877ae71284 Additional wording johnnyq 2024-02-03 18:13:56 -05:00
• a3567af8a1 Added some legal terms to client pays fees and some links to stripe's current pricing johnnyq 2024-02-03 18:11:48 -05:00
• b386cbb170 Client Payment Gateway Fee is added as a line item if client pays fees is on and client chooses online pay this Fixes the negative invoice Balances when client pays fees is enabled johnnyq 2024-02-03 17:44:48 -05:00
• a6a93fd820 Fix client pays fees calculation. I didn't quite understand why the previous formula was used until i read this https://support.stripe.com/questions/passing-the-stripe-fee-on-to-customers johnnyq 2024-02-03 17:14:48 -05:00
• 4f4bb56820 update .gitignore to include custom favicon johnnyq 2024-02-03 14:33:48 -05:00
• 5d9ab76689 Remove Custom favicon johnnyq 2024-02-03 14:32:08 -05:00
• e9c85297eb Feature: Allow to upload custom fav icon under settings > Theme, icon is limited to .ico format only johnnyq 2024-02-03 14:30:03 -05:00
• 01b717615e Added favicon condition everywhere johnnyq 2024-02-03 13:18:20 -05:00
• a5f08af78e Added condition to check if favicon.ico exists in /uploads else use the default johnnyq 2024-02-03 13:11:04 -05:00
• 16420f417f Add Default Fav icon for now johnnyq 2024-02-03 13:02:24 -05:00
• 505ecb2701 Fix Delete Confirmation for services, missing </div> Tag in add Service was causing it, also tidyed up service code johnnyq 2024-02-03 12:25:38 -05:00
• c26787b1d2 Merge pull request #2 from twetech/Unbilled-tickets-dashboard Andrew Malsbury 2024-02-02 13:28:27 -06:00
• 23770ac114 Merge pull request #1 from twetech/scheduled-tickets Andrew Malsbury 2024-02-02 12:38:33 -06:00
• 3a74786cc4 Update side_nav.php to highlight "scheduled_tickets.php" as active o-psi 2024-02-02 17:42:24 +00:00
• f71d3d9b19 finish rename scheduled tickets to recurring tickets in UI o-psi 2024-02-02 15:08:44 +00:00
• 0ac36f91eb Update recurring expenses icon o-psi 2024-02-02 14:40:35 +00:00
• a6f105e660 Update side_nav.php with recurring tickets link o-psi 2024-02-02 14:40:24 +00:00
• 03d3b04bdb Update side_nav.php: Changed label from "Scheduled Tickets" to "Recurring Tickets" o-psi 2024-02-02 14:38:25 +00:00
• 6c247e0f58 Merge branch '0.1.7' into scheduled-tickets Andrew Malsbury 2024-02-01 21:42:24 -06:00
• 1303f18218 Tidy johnnyq 2024-01-31 22:16:21 -05:00
• 28e7a6b195 Removed Gateway Fee from the baance of Guest View Invoice and displayed it on the Pay Online button, as the client can pay other ways if they decide to not pay online if Client Pays Fees is enabled johnnyq 2024-01-31 22:11:27 -05:00
• 1bbb4426f6 Fix Expense being off for Payment Gateway Fee johnnyq 2024-01-31 21:33:37 -05:00
• 96ff92d070 Feature: Bulk Edit Category, Client and Account for expenses johnnyq 2024-01-31 17:09:35 -05:00
• 19f4e215de feat. Bulk Reply To Tickets including create a private note johnnyq 2024-01-31 15:24:54 -05:00
• 7975505823 feat. Updated Bulk Close Ticket to allow for a Private Note instead of public johnnyq 2024-01-31 14:49:25 -05:00
• 5818c7fe18 feat. Added Contact Roles to Bulk Actions johnnyq 2024-01-31 14:23:47 -05:00
• dad2a7d376 Update Contact Department wording to also include group changed icon from building to users which is more suitable johnnyq 2024-01-31 13:56:00 -05:00
• 00197cef96 feat: Bulk Set Contact Department / Group johnnyq 2024-01-31 13:53:25 -05:00
• da98f84774 Move the MailQueue Action out of the get email loop on close Bulk Tickets this prevent unessessary mysql connections johnnyq 2024-01-30 16:55:04 -05:00
• e524f1ce7c Fix issue with adding slashes to close email config_from_name vars johnnyq 2024-01-30 16:40:19 -05:00
• 80fdad81e9 Fix Not being able to Enable Stripe Pay on Updated or new Installs johnnyq 2024-01-30 16:25:27 -05:00
• 731b60b07a Feature: Added Bulk Ticket Closure johnnyq 2024-01-30 16:04:29 -05:00
• c6f1a25692 Feature: Added Bulk Set Priority on Tickets johnnyq 2024-01-30 14:54:00 -05:00
• db8ae13135 Feature: Add Bulk Move Folder Action to Client Documents and Files johnnyq 2024-01-30 14:11:29 -05:00
• ff1616de94 Updated Guest Invoice logic so if they payed gateway fee is not shown johnnyq 2024-01-29 21:56:13 -05:00
• e82ba786a5 Added One more code piece from Pull #866 to fix Gateway Fees shown and to fix balance on guest view invoice johnnyq 2024-01-29 21:17:12 -05:00
• 007d07d417 Added unbilled ticket wording per Pull Req #866 johnnyq 2024-01-28 15:57:27 -05:00
• f8dc67fbf9 Added Gateway Fee to the Guest View Invoice and minor fix for ticket counter per Pull Request #866 also added stripe flat and percent config vars to guest view invoice. Note We do not need to merge Pull #866 as all changes nessessary have been implented manually johnnyq 2024-01-28 15:55:05 -05:00
• 5afacf78cf Convert strip Percentage Decimal from decimal vlaue to percentage value on view form and then reconvert from Percent back to Decimal value on POST johnnyq 2024-01-28 15:23:58 -05:00
• 9bd924dc67 Only create a Stripe Expense if client pays fee is off, a stripe expense vendor and expense category is selected in settings johnnyq 2024-01-28 14:54:28 -05:00
• 063d042378 Update guest_ajax.php with the new stripe vars johnnyq 2024-01-28 14:45:43 -05:00
• 56c138fb12 cleanup johnnyq 2024-01-28 02:08:11 -05:00
• 3d3bb6a436 Feature: Stripe Payment now logs an expense to the selected account johnnyq 2024-01-28 01:49:49 -05:00
• b986f04a0c Add More Configurable variabled for Stripe including such as Flat Rate and Percent Fees, expense vendor and expense category update guest stripe pay to take advantage of these vars and updated settings johnnyq 2024-01-28 00:00:28 -05:00
• 777637277b Fix Issue where if you edited first record that shared the same form input name like location then it would blank out the first record if edited this is fixed by adding bulk_ in front of the form Input names under the bulk modals not sure why this happens but this is the fix johnnyq 2024-01-27 14:15:18 -05:00
• c711db937d Updated Edit Location logic in contacts added Pop Over Title for archived Items in assets and contacts johnnyq 2024-01-27 14:01:10 -05:00
• 50b00c5712 Feature: Bulk Edit Contact Phone Number useful where the share an Office Number but have seperate extensions johnnyq 2024-01-27 13:45:11 -05:00
• 8b85ae377a Updated the way Archived Items are displayed in asset list view and when editing, this will be standard going forward, added Bulk Set Asset Status, further work on improving the archived logic, assets is pretty much gold standard here now johnnyq 2024-01-27 13:23:44 -05:00
• d8de41d937 Do Not show archived items when copying asset johnnyq 2024-01-27 11:59:05 -05:00
• 36e9f8cd3d Add Red X next to Assigned to for Archived Users still palying with this design maybe just make the user text red with a pop over that says archived when hovered johnnyq 2024-01-27 03:44:32 -05:00
• 0b7b7e298a Remove unessesary () johnnyq 2024-01-27 03:35:22 -05:00
• d3153a29cb Asset Assignment Do not show all archived users from the date the asset is created instead if an asset has an archive user show that user and all new users johnnyq 2024-01-27 03:32:30 -05:00
• 9184fa3ab3 Fix Copy IP to clipboard in Assets missing clipboardjs class johnnyq 2024-01-27 03:10:54 -05:00
• 8562906fa6 Prevent Copy to Clipboard button from submitting in assets since we wrapped listings in a form to allow for bulk actions this caused buttons like this to act as submits unless we add type='button' johnnyq 2024-01-27 03:04:43 -05:00
• e139190377 UI: Set IP Column to Text no wrap to prevent the Copy IP Button from wrapping johnnyq 2024-01-27 02:55:06 -05:00
• fe33cfa4e9 UI: Fix the client top head city state postal below the address from being offset by using a font awesome dummy icon johnnyq 2024-01-27 02:48:31 -05:00
• 3c28c2b89b Prevent Password Manager from asking to save password for every asset edit / add / bulk submit johnnyq 2024-01-27 02:16:41 -05:00
• 7e50634c07 Added Bulk Assign contacts to Assets johnnyq 2024-01-27 01:56:10 -05:00
• 1deba6eac5 Added Bulk Assign Location to Assets johnnyq 2024-01-27 01:41:25 -05:00
• ee3087725d Rename inconsistent multi Actions to Bulk Actions johnnyq 2024-01-27 01:03:18 -05:00
• f2719a612e Feature: Bulk Action - Assign Location for contacts johnnyq 2024-01-26 23:59:24 -05:00
• dec2f484ab added - between App Name and Task for ticket assignment email johnnyq 2024-01-26 22:57:41 -05:00
• a197151286 Update email wording on tech notify of assigned tickets johnnyq 2024-01-26 22:35:40 -05:00
• d7a58c01f9 Update bulk assign tech to only notify by one email with all tickets assigned instead of multiple same with notification, updated some wording as well and include a ticket count in the logging email and notification johnnyq 2024-01-26 22:30:55 -05:00
• 47d2ad993e Don't show checkboxes next to closed tickets johnnyq 2024-01-26 21:44:03 -05:00
• 6dbbb232ed Update Bulk Ticket assign action: Updated button, not notifies newly assigned tech via email and in app notification and now logs properly johnnyq 2024-01-26 20:21:55 -05:00
• fd48d991d9 Feature: Ticket Bulk Actions Assign Tech has been added, still work in progress, update ticket reply added tech notification add logging, do not allow to assign ticket on closed ticket and more refinements johnnyq 2024-01-26 17:12:57 -05:00
• 937397e9c0 Allow .vsdx and .drawio diagram files to be uploaded via client files johnnyq 2024-01-25 12:01:09 -05:00
• 9ce280d80d Fix Redirect to non-existent page after login when force MFA is enabled johnnyq 2024-01-24 15:46:30 -05:00
• 861c8e4252 Merge pull request #873 from braadaaay/master wrongecho 2024-01-24 06:23:47 +00:00
• b854e9569b Remove extra "you" in dialog Brady Williams 2024-01-24 17:58:54 +13:00
• 07c126db2b Fix Spelling from "wather" to "watcher" Brady Williams 2024-01-24 17:57:05 +13:00
• 4b6495b01a UI Update for Asset Listing, combined columns to allow for a better display johnnyq 2024-01-23 16:44:30 -05:00
• 981010b2f7 Merge pull request #871 from wrongecho/logins_js_cleanup Johnny 2024-01-22 16:37:20 -05:00
• ba0917e142 Logins JS Cleanup Marcus Hill 2024-01-22 21:25:21 +00:00
• 4e0c7230f3 Update README.md wrongecho 2024-01-22 20:47:21 +00:00
• 9e8c3ed2fd Fix Redirect Link in Stripe Pay johnnyq 2024-01-22 12:27:47 -05:00
• 8d2a9bbf60 Fix Broke Guest Pay Invoice via Stripe removed additional ) johnnyq 2024-01-22 12:17:06 -05:00
• ad1ec7d338 Allow to set an optional queue time in bulk mail, update cron_mail_queue.php to only send mail after its queued_at date and time johnnyq 2024-01-21 15:52:15 -05:00
• 62fb73875b Updated addToMailQueue Function to allow specifing an optional queue time to schedule outbound mail johnnyq 2024-01-21 15:27:15 -05:00
• 9db7947004 Bulk Mail: Make contacts select table responsive johnnyq 2024-01-21 14:34:45 -05:00
• 2ee21c3f9a Bulkmail: Use default mail from email and mail from name but still can be changed johnnyq 2024-01-21 14:25:56 -05:00
• 782b0cfd96 Bulk Mail: Show dash if title is blank johnnyq 2024-01-21 14:22:18 -05:00
• a8872ae804 Bulk Mail: Don't show contacts that have no email address johnnyq 2024-01-21 14:18:55 -05:00
• 413645154d Feature: Add initial basic Bulk Mail Sending capabilities via client section johnnyq 2024-01-21 14:15:10 -05:00
• 0ca50bf6de Switch from ~ to -- in signature footer johnnyq 2024-01-21 00:27:01 -05:00
• cb1b6e4231 Fix client portal reset password johnnyq 2024-01-20 23:37:12 -05:00
• bd8c93cb71 Update client portal login reset for the new mail function and made some minor UI / Code changes johnnyq 2024-01-20 23:28:00 -05:00
• 623ed33a27 Update Portal UI elements and Mail Functions johnnyq 2024-01-20 23:11:35 -05:00
• 3b71e6132e Change Respond icon from check mark to a paper plane in ticket view johnnyq 2024-01-20 22:08:41 -05:00
• 493c83e3f1 Added Days over due by to invoice reminders johnnyq 2024-01-20 21:44:58 -05:00
• d390bee0bc Update/Fix Mail Functions in cron.php - sanitize POST vars instead the whole mail subject and body which prevents having a mixed of confusing redundant escaped and unescaped vars johnnyq 2024-01-20 21:16:28 -05:00
• c801e58cc9 Removed redundent get stripe client pays fee as the var is already aquired in beginning johnnyq 2024-01-20 20:58:53 -05:00
• b1fd0fb4aa fixed johnnyq 2024-01-20 20:56:00 -05:00
• 00d4f7d66f moved config_stripe_client_pays_fees out of an unnessesary function and moved it to the setup stripe section johnnyq 2024-01-20 20:54:56 -05:00
• 3c3e0f5f80 Cleaned up guest_pay_invoice_stripe.php incorrect DB Handling for vars was HTML encoding instead of proper SQL escaping johnnyq 2024-01-20 20:49:37 -05:00
• 0cdf49f69a Update/Fix Mail Functions in POST/user.php and ajax.php - sanitize POST vars instead the whole mail subject and body which prevents having a mixed of confusing redundant escaped and unescaped vars johnnyq 2024-01-20 20:31:46 -05:00
• 63d4419ff5 Update/Fix Mail Functions in POST/quote.php - sanitize POST vars instead the whole mail subject and body which prevents having a mixed of confusing redundant escaped and unescaped vars also johnnyq 2024-01-20 20:10:33 -05:00
• 1479caa8e8 Set Textarea rows from 4 to 5 johnnyq 2024-01-20 19:26:00 -05:00