From cd03a7765d6fffdee0cb357a538953ce3b98f404 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 20 Oct 2026 11:20:45 -0400 Subject: [PATCH] Vendor templates stage 2: keep client vendors in step with the template they were made from - saving a template updates the fields its vendors still shared, the template window gets the vendor window's tabs, a template page shows each client vendor as in step or the fields it differs in with Bring in line, Link and Unlink, lists hand-made vendors that look like it to link, and sets who should have it (no one, every client or clients with chosen tags) with coverage and Add to clients for those missing; the list gains Required and Out of step tabs, a client vendor shows its differences with Update from template, a client's Vendors list and overview show vendors missing, Add to clients no longer skips a client whose vendor from the template was archived, and database 3.3.5 adds vendor_template_required, vendor_template_required_tags and a vendor_template_id key on vendors --- CHANGELOG.md | 26 +- admin/database_updates/3.3.5.php | 37 ++ .../vendor_template/vendor_template_form.php | 24 +- .../vendor_template_required.php | 89 ++++ admin/post/vendor_template.php | 57 ++- admin/vendor_template.php | 244 ++++++++- admin/vendor_templates.php | 73 ++- .../modals/vendor/vendor_template_clients.php | 23 +- .../modals/vendor/vendor_template_update.php | 117 +++++ agent/post/vendor.php | 95 +++- agent/vendor.php | 38 ++ agent/vendors.php | 18 + db.sql | 21 +- functions/client_overview.php | 10 + functions/vendor_template.php | 471 ++++++++++++++++-- 15 files changed, 1242 insertions(+), 101 deletions(-) create mode 100644 admin/database_updates/3.3.5.php create mode 100644 admin/modals/vendor_template/vendor_template_required.php create mode 100644 agent/modals/vendor/vendor_template_update.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 7363703b7..f3b28ecbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ This file documents all notable changes made to ITFlow. ### Upgrading to 26.11 -Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.3.4) in the same pass. Nothing else is required. +Update from Maintenance > Update — Queue Update hands the job to cron, which updates the files and applies this release's database changes (2.7.9 to 3.3.5) in the same pass. Nothing else is required. -This is a big release, with fifty-five database steps in one go, so take a backup before you update. +This is a big release, with fifty-six database steps in one go, so take a backup before you update. The update also clears out data that deletes in older versions left behind, all of it pointing at something that no longer exists: @@ -51,7 +51,7 @@ Document templates keep their names, summaries, what they say and their images. License templates keep everything they hold. A license called exactly what one license template is called - as the New License form named it when started from one - counts as made from that template, so a template's use starts out counted; where two templates share a name, neither is given its licenses. Other licenses don't know a template, so they count from the update. No template sets seats, a renewal term, a vendor or a product until you give it one, and none is required of anyone until you set it up on its page. Maintenance > Starter Content has a new License Templates pack to add. -Vendor templates keep everything they hold, and the vendors made from them stay linked to them. Who made each and last changed it is taken from the audit log, where it has a record of it. +Vendor templates keep everything they hold, and the vendors made from them stay linked to them. Who made each and last changed it is taken from the audit log, where it has a record of it. A vendor made from one that has since been changed by hand shows as out of step with it, and nothing on it changes until you bring it in line. Vendors made by hand stay unlinked - a template's page lists the ones that look like it, to link. No template is required of anyone until you set it up on its page. The app logs are kept for as many days as the audit log, as before, and each can now be set on its own in Admin > Settings > Logs, which is where the log retention went from Settings > Security. A retention of 0 now keeps a log forever (see Breaking Changes, Logs). Nothing is sent to a syslog server or SIEM until you set one up there. @@ -583,7 +583,15 @@ If you are coming from 26.08 or earlier, the database update still has to be run - **Vendor templates** (rebuilt) - Admin > Vendor Templates lists what each is, its support line, hours and SLA, its support site and email, how many clients have a vendor made from it - and whether it is one of your own - when one was last added and when it last changed, and by whom. Searched by name, what they are, support line, email, site, hours, SLA, account manager or notes, sorted from the column headings, a page at a time, with Active and Archived tabs. - A template's page shows what a vendor made from it starts with, its support line a click to call, the clients with a vendor from it - each with its own account number, or marked when it has none yet - a click from their vendor, the license templates that take their vendor from it, who made it and last changed it, and its history. Add to clients is on the page and the list. - - The template window has the vendor window's tabs - Details, Support, Account and Notes - with their icons. Editing, any of its fields can be changed on the vendors made from it too, ticked one by one; what the window says replaces what each one had, and each vendor's history says so. The audit log says what changed on the template. + - The template window has the vendor window's tabs - Details, Support, Account and Notes - with their icons. The audit log says what changed on the template. + - Clients' vendors are kept in step with the template they were made from - its name, what they are, the support line, hours, SLA, support email, site and notes. Their account number, PIN and account manager are always each client's own. Case, spacing, and a site written with https:// or www. don't count as a difference, and a field the template says nothing for never does. + - Saving a template changes each field on the vendors made from it that still said what the template said - the one a client has its own for is left alone. A field taken off the template is taken off no vendor. Switch off Change the vendors made from it too to change only the template. Each vendor's history says what changed. + - A template's page shows each client's vendor as in step, or the fields it differs in, with All, Out of step and No account number views. Bring in line shows one vendor's fields beside the template's, or for several - ticked, or Bring these in line on Out of step - how many differ in each, and takes the fields ticked from the template. A vendor can be unlinked from its template there, or from its own page. + - Not linked yet on a template's page lists vendors made by hand with its name, or a support site on the same host, at clients without one from it, to link one by one or all at once - their details left as they are, or brought in line too. + - Who should have it, on a template's page and in the list's menu: no one in particular, every client, or the clients with one of the client tags picked. The page shows how many of them have it, with the clients missing it to add it to - one at a time or all at once, picked for you in Add to clients. Leads, archived clients and archived vendors don't count. + - The list has Required and Out of step tabs, and shows how many of the clients a required one is for have it, and how many of its vendors are out of step. + - A client's vendor says which fields differ from its template, with Update from template, and has Unlink from template in its menu. One made by hand that looks like a template - the same name or support site - offers Link to template. + - A client's Vendors list the vendors it should have and doesn't, each a click from New Vendor started from its template, and its overview counts them as Vendors missing. - Templates can be copied, archived - not offered on New Vendor or Add to Clients, while the vendors made from them stay - restored and deleted. Deleted, its vendors and the license templates that used it stay, no longer linked to it. - Make a template from it, in the menu of a client's vendor for an admin, starts a template from that vendor - leaving its account number, PIN and account manager, which are the client's own - and links the vendor to it, so other clients can have the same one. - A vendor made from a template links to it from its page, for an admin. @@ -1114,6 +1122,7 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Notifications: shared-link notifications reached agents without Support, with a link they couldn't open. - License templates: the type picker showed a stray "<" at the top. - Vendor templates: Delete was only offered to the built-in Administrator role, not to other admin roles. +- Vendor templates: Add to clients skipped a client whose vendor from the template had been archived, as if it still had it. - App Logs: the category filter did nothing - it read a misspelt field - and the date filter was slow on a large log. - App logs: an entry over 1,000 characters with an accented letter or a symbol where it was cut could fail to save, stopping what was logging it. - Admin > Settings > Defaults: Payment Method and Expense Payment Method listed the payment method categories that moved to Admin > Payment Methods in 2.3.1, so a new install had nothing to pick. They list Admin > Payment Methods now. @@ -1647,9 +1656,14 @@ If you are coming from 26.08 or earlier, the database update still has to be run - Report: `agent/reports/audit_activity.php` (`client_id`, `agent` and the period; `export=csv` by person, `table=clients`, `kinds`, or for an admin `security`), `audit_activity` in `reportCatalog()` in a new Activity group, needing `module_client`; entries scoped by `auditLogRoleSql()` and `clientScopeSql()`. Out of hours uses the SLA business days and hours (`getSlaSettings()`), else 9 to 5 on weekdays. - Vendor templates: - Database 3.3.4: `vendor_templates.vendor_template_created_by` and `vendor_template_updated_by` (0), taken from the first Vendor Template Create and the latest Edit in the audit log with `log_entity_id` the template, where they are 0, without touching `vendor_template_updated_at`. - - New `functions/vendor_template.php`: `vendorTemplateFieldLabels()` (key => `label`, `icon`), `vendorTemplateColumns()` (key => [template column, vendor column] pairs - the support line is three), `vendorTemplateInfo()` (archived or not, with `created_by_name` and `updated_by_name`; `vendorTemplateRow()` in `functions/vendor.php` stays the current-only one used to make vendors), `vendorTemplateUsage($ids)` (`clients`, `vendors`, `ours`, `last` - current vendors, current clients), `vendorTemplateFields($post, &$error)` (as `vendorFormSet()` reads a vendor's, and the support email checked), `vendorTemplateRowFields()`, `vendorTemplateSave()`, `vendorTemplateChanged()`, `vendorTemplateCopy()`, `vendorTemplateDelete()` (vendors and license templates unlinked, their updated dates kept), `vendorTemplatePush($id, $keys)`, `vendorTemplateVendors()`, `vendorTemplateLicenseTemplates()`, `vendorTemplateTile()` and `vendorTemplatePhoneHtml()`. - - Admin: `admin/vendor_templates.php` is rebuilt (`q` - a support line searched by its digits - `sort` - `vendor_template_name`, `used_count`, `last_used` or `changed_at` - `order`, `page` and `show=archived`, `archived=1` still taken). New `admin/vendor_template.php` (`vendor_template_id`). `admin/modals/vendor_template/vendor_template_form.php` is shared by `vendor_template_add.php` (`from_vendor`) and `vendor_template_edit.php` (`id`); both post to `/admin/post.php`. `admin/post/vendor_template.php`: `add_vendor_template` (`from_vendor` links that vendor; redirects to its page) and `edit_vendor_template` (`push[]` - keys of `vendorTemplateFieldLabels()`, replacing the `global_update_vendor_*` and `update_base_vendors` fields), GET `copy_vendor_template`, `archive_vendor_template`, `restore_vendor_template` and `delete_vendor_template` (`from_page`). Audit entries are Vendor Template Create (with where a copy or one made from a vendor came from), Edit (with what changed), Archive, Restore and Delete, on the template, and Vendor Edit on each vendor a push changed. It no longer includes `agent/post/vendor.php`, so the agent vendor handlers don't run on `admin/post.php`. + - New `functions/vendor_template.php`: `vendorTemplateFieldLabels()` (key => `label`, `icon`), `vendorTemplateColumns()` (key => [template column, vendor column] pairs - the support line is three), `vendorTemplateInfo()` (archived or not, with `created_by_name` and `updated_by_name`; `vendorTemplateRow()` in `functions/vendor.php` stays the current-only one used to make vendors), `vendorTemplateUsage($ids)` (`clients`, `vendors`, `ours`, `last` - current vendors, current clients), `vendorTemplateFields($post, &$error)` (as `vendorFormSet()` reads a vendor's, and the support email checked), `vendorTemplateRowFields()`, `vendorTemplateSave()`, `vendorTemplateChanged()`, `vendorTemplateCopy()`, `vendorTemplateDelete()` (vendors and license templates unlinked, their updated dates kept), `vendorTemplateVendors()` (with each vendor's `differences` and raw `row`), `vendorTemplateLicenseTemplates()`, `vendorTemplateTile()` and `vendorTemplatePhoneHtml()`. + - Admin: `admin/vendor_templates.php` is rebuilt (`q` - a support line searched by its digits - `sort` - `vendor_template_name`, `used_count`, `last_used` or `changed_at` - `order`, `page` and `show=archived`, `archived=1` still taken). New `admin/vendor_template.php` (`vendor_template_id`). `admin/modals/vendor_template/vendor_template_form.php` is shared by `vendor_template_add.php` (`from_vendor`) and `vendor_template_edit.php` (`id`); both post to `/admin/post.php`. `admin/post/vendor_template.php`: `add_vendor_template` (`from_vendor` links that vendor; redirects to its page) and `edit_vendor_template` (`follow` - replacing the `global_update_vendor_*` and `update_base_vendors` fields), GET `copy_vendor_template`, `archive_vendor_template`, `restore_vendor_template` and `delete_vendor_template` (`from_page`). Audit entries are Vendor Template Create (with where a copy or one made from a vendor came from), Edit (with what changed), Archive, Restore and Delete, on the template, and Vendor Edit on each vendor that followed it. It no longer includes `agent/post/vendor.php`, so the agent vendor handlers don't run on `admin/post.php`. - `auditLogKinds()` links Vendor Template entries to the template's page. `agent/vendor.php` links its template for an admin, and has Make a template from it for a vendor with none. + - Database 3.3.5: `vendor_templates.vendor_template_required` (tinyint, 0 no one, 1 every client, 2 tagged), `vendor_template_required_tags` (`vendor_template_id`, `tag_id`, cascading from both) and a `vendor_template_id` (`vendor_template_id`, `vendor_client_id`) key on `vendors`. + - In step, in `functions/vendor_template.php`: `VENDOR_TEMPLATE_SHARED` (the keys kept in step - not `account_number`, `code` or `contact_name`), `vendorTemplateCompareValue($key, $row, $side)` (`template` or `vendor` columns), `vendorTemplateHasValue()`, `vendorTemplateDifferences($template, $vendor)` (key => label), `vendorTemplateLabelsText()`, `vendorTemplateValueHtml()`, `vendorTemplateFieldsRow()`, `vendorTemplateApply()`, `vendorTemplateFollow($id, $before, $after)` and `vendorTemplateBringInLine($id, $vendor_ids, $keys)` (both vendor id => `name`, `client_id`, `fields`), `vendorTemplateOutOfStep($ids)` (current vendors, current clients), `vendorTemplateHost()`, `vendorTemplateMatches($id)`, `vendorTemplateMatchFor($vendor)` and `vendorTemplateLink()`. Who should have one: `VENDOR_TEMPLATE_REQUIRED_NONE`, `_EVERY` and `_TAGGED`, `vendorTemplateRequiredTags($ids)`, `vendorTemplateSetRequired()` (client tags only), `vendorTemplateScopeSql()`, `vendorTemplateScopeText()`, `vendorTemplateCoverage()` (`clients`, `covered`, `missing`) and `vendorTemplatesMissingFor($client_id)`, as the license and document templates have. + - `admin/post/vendor_template.php`: `save_vendor_template_required` (`vendor_template_id`, `required`, `tags[]`), logged as Vendor Template Edit. New `admin/modals/vendor_template/vendor_template_required.php` (`id`). `admin/vendor_template.php` takes `view` (`out` or `account`) and loads `js/bulk_actions.js` (`vendor_ids[]`); `admin/vendor_templates.php` takes `show=required` and `show=out`. + - `agent/post/vendor.php`: `update_vendors_from_template` (`vendor_template_id`, `vendor_ids[]`, `fields[]` - keys of `VENDOR_TEMPLATE_SHARED`), `link_vendors_to_template` (`vendor_template_id`, `vendor_ids[]`, `bring`; not to an archived template) and GET `unlink_vendor_template`, each only for vendors the agent may edit (`vendorsForRequest()`), logged as Vendor Edit on each vendor with its client. `add_vendor_template_to_clients` counts only a current vendor from the template as having it. New `agent/modals/vendor/vendor_template_update.php` (`vendor_id`, or `template_id` and `vendor_ids[]`); `vendor_template_clients.php` takes `client_ids[]` and `missing=1` to start with clients picked. + - `agent/vendors.php` with `client_id` shows `vendorTemplatesMissingFor()` (`.itflow-vendors-missing`), and `clientOverviewAttention()` adds Vendors missing for agents with `module_client`. - Empty states: every list page sets `$empty_state` before including `includes/filter_footer.php`, and `includes/inc_empty_state.php` draws it with `emptyStateHtml()` (`functions/format.php`) when the list has nothing - `thing`, `icon`, `title`, `text`, `actions` (`label`, `modal` or `href`, `size`, `icon`; the first is the main one), `archived`, `view`, `filtered`, `views`, `match_title`, `match_text` and `clear_url`. `emptyStateFiltered($views)` reads the GET string for a search or filter, leaving out paging, sorting, `client_id`, `archived` and the page's views, and `emptyStateClearUrl($views)` is the page without them. `emptyStatePill($pills, $key, $default, $good)` builds a pill's own state from the page's pill array (`label`, `icon`, `title`, `alarm`), with a tick for `alarm` pills and the keys in `$good`. Files, notifications and racks call `emptyStateHtml()` in their own layout; files and notifications set `$empty_state_skip`. A page that sets nothing still gets one, worded from `$page_title`. The pages' own empty blocks (`.itflow-asset-empty` under a list) are gone. CSS: `.itflow-empty-state` with `-icon` (a grey round tile), `-title`, `-text` and `-actions`. - Removed unused helpers and files: - `credentialLink()`, `projectLink()`, `linkCounts()`, `assetContactAvatar()`, `clientOverviewPersonInitials()`, and `getMonthlyTax()` and `getQuarterlyTax()`, which looked a tax up by name diff --git a/admin/database_updates/3.3.5.php b/admin/database_updates/3.3.5.php new file mode 100644 index 000000000..160772437 --- /dev/null +++ b/admin/database_updates/3.3.5.php @@ -0,0 +1,37 @@ + - -
-
Change them on the vendor made from it too
-
Ticked fields are set to what is here on each one - what a client's vendor says now is replaced.
-
- $field) { ?> -
-
- - -
-
- + +
+
+ +
+
Each field you change here changes on the vendors that still say what it said - one a client has its own for is left as it is, and shows as out of step on the template's page. Account numbers, PINs and account managers are always each client's own.
diff --git a/admin/modals/vendor_template/vendor_template_required.php b/admin/modals/vendor_template/vendor_template_required.php new file mode 100644 index 000000000..f5fa95b82 --- /dev/null +++ b/admin/modals/vendor_template/vendor_template_required.php @@ -0,0 +1,89 @@ + +
+
Who should have it
+ +
+
That vendor template no longer exists.
+ + +
+
Who should have it
+ +
+
+ + + +
+ +
+ +
+ + +
+
Leads and archived clients don't count. The template's page, each client's Vendors and their overview show who is missing it.
+
+ +
> + +
+ + +
+
Clients with any of them - VoIP, say, for the phone carrier every client on your hosted phones has.
+
+ +
+ +
+ + +
+ +
+ + + + Vendor Templates) - making, changing (and the - * fields ticked on the vendors made from it too), copying, archiving, - * restoring and deleting them. The work is in functions/vendor_template.php; - * a vendor is made from one by add_vendor, add_vendor_from_template and - * add_vendor_template_to_clients (agent/post/vendor.php). + * Vendor templates (Admin > Vendor Templates) - making, changing (the + * vendors made from it that still said what it did changing with it), + * copying, archiving, restoring and deleting them, and saying who should have + * one. The work is in functions/vendor_template.php; a vendor is made from + * one by add_vendor, add_vendor_from_template and + * add_vendor_template_to_clients, and brought in line with one, linked to one + * or unlinked by update_vendors_from_template, link_vendors_to_template and + * unlink_vendor_template (agent/post/vendor.php). */ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); @@ -41,18 +44,15 @@ if (isset($_POST['add_vendor_template']) || isset($_POST['edit_vendor_template'] $renamed = $before['vendor_template_name'] !== $name ? ' (was ' . $before['vendor_template_name'] . ')' : ''; logAudit("Vendor Template", "Edit", "$session_name edited vendor template " . escapeSql($name . $renamed) . ($changed ? ' - ' . escapeSql(mb_strtolower(implode(', ', $changed))) : ''), 0, $vendor_template_id); - // The fields ticked, on every vendor made from it too - $labels = array_map(function ($field) { - return $field['label']; - }, vendorTemplateFieldLabels()); - $push = array_values(array_intersect(array_keys($labels), array_map('strval', array_filter((array) ($_POST['push'] ?? []), 'is_scalar')))); - $pushed = $push ? vendorTemplatePush($vendor_template_id, $push) : []; - $what = mb_strtolower(implode(', ', array_intersect_key($labels, array_flip($push)))); - foreach ($pushed as $vendor_id => $vendor) { - logAudit("Vendor", "Edit", "$session_name updated vendor " . escapeSql($vendor['name']) . " from template " . escapeSql($name) . " - " . escapeSql($what), $vendor['client_id'], $vendor_id); + // The vendors made from it that still said what it did follow it (vendorTemplateFollow()) + $followed = !empty($_POST['follow']) ? vendorTemplateFollow($vendor_template_id, vendorTemplateRowFields($before), $fields) : []; + foreach ($followed as $vendor_id => $vendor) { + logAudit("Vendor", "Edit", "$session_name updated vendor " . escapeSql($vendor['name']) . " from template " . escapeSql($name) . " - " . escapeSql(mb_strtolower(implode(', ', $vendor['fields']))), $vendor['client_id'], $vendor_id); } + $out_of_step = $followed || !empty($_POST['follow']) ? (vendorTemplateOutOfStep([$vendor_template_id])[$vendor_template_id] ?? 0) : 0; - flashAlert("Vendor template " . escapeHtml($name) . " saved" . ($pushed ? ", and " . escapeHtml($what) . " changed on " . count($pushed) . " vendor" . (count($pushed) === 1 ? '' : 's') . " made from it" : '')); + flashAlert("Vendor template " . escapeHtml($name) . " saved" . ($followed ? ", and " . count($followed) . " vendor" . (count($followed) === 1 ? '' : 's') . " made from it changed with it" : '') + . ($out_of_step ? " - $out_of_step out of step" : '')); redirect(); } @@ -125,3 +125,30 @@ if (isset($_GET['delete_vendor_template'])) { redirect(!empty($_GET['from_page']) ? 'vendor_templates.php' : null); } + +if (isset($_POST['save_vendor_template_required'])) { + + // Who should have a vendor from it + validateCSRFToken(); + + $row = vendorTemplateForRequest($_POST['vendor_template_id'] ?? 0); + $vendor_template_id = intval($row['vendor_template_id']); + $required = intval($_POST['required'] ?? 0); + $tag_ids = array_map('intval', array_filter((array) ($_POST['tags'] ?? []), 'is_scalar')); + if ($required === VENDOR_TEMPLATE_REQUIRED_TAGGED && !array_filter($tag_ids)) { + flashAlert('Pick the client tags - or Every client.', 'error'); + redirect(); + } + vendorTemplateSetRequired($vendor_template_id, $required, $tag_ids); + + $saved = vendorTemplateInfo($vendor_template_id); + $scope = vendorTemplateScopeText($saved['vendor_template_required'], vendorTemplateRequiredTags([$vendor_template_id])[$vendor_template_id]); + $said = $scope !== '' ? "required of " . lcfirst($scope) : 'not required of anyone'; + + logAudit("Vendor Template", "Edit", "$session_name set vendor template " . escapeSql($row['vendor_template_name']) . " " . escapeSql($said), 0, $vendor_template_id); + + flashAlert("" . escapeHtml($row['vendor_template_name']) . " is " . escapeHtml($said)); + + redirect(); + +} diff --git a/admin/vendor_template.php b/admin/vendor_template.php index e41511101..b40340039 100644 --- a/admin/vendor_template.php +++ b/admin/vendor_template.php @@ -5,9 +5,12 @@ * what they are, the support line, hours, SLA, support email and site, any * account number, PIN and account manager every client shares, and its * notes), who made it and last changed it, and its use: the clients with a - * vendor made from it - each with its own account number and PIN, or not yet - * - and the license templates that take their vendor from it. It can be - * added to clients from here. The work is in functions/vendor_template.php. + * vendor made from it - each with its own account number and PIN, or not yet, + * and in step with it or saying something else (views, and bringing one or + * several in line) - the vendors made by hand that look like it (linking + * them), who should have it with the clients missing it, and the license + * templates that take their vendor from it. It can be added to clients from + * here. The work is in functions/vendor_template.php. */ require_once "includes/inc_all_admin.php"; @@ -30,20 +33,59 @@ $csrf = $_SESSION['csrf_token']; // Its vendors - the current ones for current clients listed, the rest counted $all_vendors = vendorTemplateVendors($vendor_template_id); -$vendors = array_filter($all_vendors, function ($vendor) { +$current = array_filter($all_vendors, function ($vendor) { return !$vendor['archived'] && !$vendor['client_archived']; }); -$set_up = count(array_filter($vendors, function ($vendor) { +$set_up = count(array_filter($current, function ($vendor) { return $vendor['client_id'] && $vendor['account_number'] !== ''; })); -$client_vendors = count(array_filter($vendors, function ($vendor) { +$client_vendors = count(array_filter($current, function ($vendor) { return $vendor['client_id'] > 0; })); -$others = count($all_vendors) - count($vendors); +$out_of_step = count(array_filter($current, function ($vendor) { + return (bool) $vendor['differences']; +})); +$others = count($all_vendors) - count($current); $license_templates = vendorTemplateLicenseTemplates($vendor_template_id); +// ...seen all at once, the ones out of step, or the ones without the client's account number +$views = [ + '' => ['label' => 'All', 'icon' => 'fa-list', 'title' => 'Every current vendor made from it', 'test' => function ($vendor) { + return true; + }], + 'out' => ['label' => 'Out of step', 'icon' => 'fa-not-equal', 'title' => 'Saying something other than the template does', 'test' => function ($vendor) { + return (bool) $vendor['differences']; + }], + 'account' => ['label' => 'No account number', 'icon' => 'fa-fingerprint', 'title' => "Without the client's account number", 'test' => function ($vendor) { + return $vendor['client_id'] && $vendor['account_number'] === ''; + }], +]; +$view = is_string($_GET['view'] ?? null) && isset($views[$_GET['view']]) ? $_GET['view'] : ''; +$view_counts = []; +foreach ($views as $key => $definition) { + $view_counts[$key] = count(array_filter($current, $definition['test'])); +} +$vendors = array_filter($current, $views[$view]['test']); +$view_url = function ($key) use ($vendor_template_id) { + return '?' . http_build_query(array_filter(['vendor_template_id' => $vendor_template_id, 'view' => $key])) . '#vendorTemplateVendors'; +}; + +// Vendors made by hand that look like it - not offered while it is archived +$matches = $archived ? [] : vendorTemplateMatches($vendor_template_id); + +// Who should have one - not counted while it is archived +$required = intval($template['vendor_template_required']); +$required_tags = vendorTemplateRequiredTags([$vendor_template_id])[$vendor_template_id]; +$scope_text = vendorTemplateScopeText($required, $required_tags); +$coverage = $required && !$archived ? vendorTemplateCoverage($vendor_template_id, $required, array_keys($required_tags)) : null; +$list_limit = 8; +$missing_text = $coverage && $coverage['missing'] ? (count($coverage['missing']) === 1 ? 'the client missing it' : 'the ' . count($coverage['missing']) . ' clients missing it') : ''; + $edit_url = "modals/vendor_template/vendor_template_edit.php?id=$vendor_template_id"; $clients_url = "/agent/modals/vendor/vendor_template_clients.php?template_id=$vendor_template_id"; +$required_url = "modals/vendor_template/vendor_template_required.php?id=$vendor_template_id"; +$update_url = "/agent/modals/vendor/vendor_template_update.php"; +$in_line_url = "$update_url?template_id=$vendor_template_id"; // What a vendor from it starts with - the ones it has $t = $template; @@ -89,12 +131,23 @@ foreach (vendorTemplateFieldLabels() as $field) {
- + +
+ + +
+ To +
+
+ + +
+ Who should have it Copy Restore @@ -144,30 +197,81 @@ foreach (vendorTemplateFieldLabels() as $field) {

Clients with it

- - +
+ + + + + +
+ +
+ +
+ +
+ Saying something other than the template does - it may be the client's own, or the template changed since. + +
+ +
- + + + + $vendor) { $client_id = $vendor['client_id']; $vendor_url = '/agent/vendor.php?' . ($client_id ? "client_id=$client_id&" : '') . "vendor_id=$vendor_id"; + $differences = $vendor['differences']; + $differs_text = count($differences) > 2 ? count($differences) . ' fields' : ucfirst(vendorTemplateLabelsText($differences)); ?> - + + + - - - + + @@ -188,11 +305,59 @@ foreach (vendorTemplateFieldLabels() as $field) {
And archived, or for an archived client.
+ +
None of them - see them all.
No client has a vendor made from it yet. Agents add one from New Vendor on a client's Vendors.
+ + +
+
+

Not linked yet

+
+
Vendors made by hand with its name or support site, at clients without one from it. Linked, they count as made from it and are kept in step with it - nothing on them changes unless you say so.
+
+ $match) { + $match_client = $match['client_id']; + $match_url = '/agent/vendor.php?' . ($match_client ? "client_id=$match_client&" : '') . "vendor_id=$match_id"; ?> +
+
+ Ours' ?> + +
+ + - +
+
+
+ + + + + +
+ +
+ 1 || array_filter(array_column($matches, 'differences'))) { ?> +
+ + + + + +
+ + +
+ + + +
+ +
@@ -206,6 +371,9 @@ foreach (vendorTemplateFieldLabels() as $field) { - last added
+ +
+
@@ -231,6 +399,50 @@ foreach (vendorTemplateFieldLabels() as $field) { +
+
+

Who should have it

+ +
+
+ +
No one in particular. Set it up to see which clients are missing it - every client, or the ones with a tag.
+ +
- not counted while it is archived.
+ +
+ + of have it +
+
+
+
+ +
Missing it
+
+ $client_name) { ?> +
+ + + +
+ +
+ $list_limit) { ?> +
and more
+ + + +
Every one of them has it.
+ +
.
+ + +
+
+

Details

@@ -251,5 +463,7 @@ foreach (vendorTemplateFieldLabels() as $field) {
+ + 0"); +while ($row = mysqli_fetch_row($sql)) { + $made_from[] = intval($row[0]); +} +$out_of_step = vendorTemplateOutOfStep($made_from); +$out_ids = implode(',', array_keys($out_of_step) ?: [0]); + +// '' current, 'required' the current ones someone should have, 'out' the current ones with vendors out of step, 'archived' +$show = (string) ($_GET['show'] ?? ''); +if (($_GET['archived'] ?? '') === '1') { + $show = 'archived'; +} +$show = in_array($show, ['required', 'out', 'archived'], true) ? $show : ''; +$show_archived = $show === 'archived'; +$show_where = [ + '' => 'vendor_template_archived_at IS NULL', + 'required' => 'vendor_template_archived_at IS NULL AND vendor_template_required > 0', + 'out' => "vendor_template_archived_at IS NULL AND vendor_templates.vendor_template_id IN ($out_ids)", + 'archived' => 'vendor_template_archived_at IS NOT NULL', +][$show]; // Tab title - the file is named for the table, the page for what it holds $page_title = 'Vendor Templates'; @@ -45,7 +66,7 @@ $search = "(vendor_template_name LIKE '%$q%' OR vendor_template_description LIKE // Its use is the current vendors made from it for current clients - as vendorTemplateUsage() counts them $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS vendor_templates.vendor_template_id, vendor_template_name, vendor_template_description, vendor_template_phone_country_code, vendor_template_phone, vendor_template_extension, vendor_template_email, vendor_template_website, vendor_template_hours, vendor_template_sla, - vendor_template_created_at, vendor_template_updated_at, vendor_template_archived_at, + vendor_template_created_at, vendor_template_updated_at, vendor_template_archived_at, vendor_template_required, COALESCE(vendor_template_updated_at, vendor_template_created_at) AS changed_at, COALESCE(updater.user_name, creator.user_name) AS changed_by, COALESCE(used.used_count, 0) AS used_count, used.last_used FROM vendor_templates @@ -68,7 +89,17 @@ while ($row = mysqli_fetch_assoc($sql)) { } $usage = vendorTemplateUsage(array_keys($rows)); -$counts = mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(SUM(vendor_template_archived_at IS NULL), 0), COALESCE(SUM(vendor_template_archived_at IS NOT NULL), 0) +// How many of the clients a required one is for have it +$required_tags = vendorTemplateRequiredTags(array_keys($rows)); +$coverage = []; +foreach ($rows as $template_id => $row) { + if (intval($row['vendor_template_required']) && !$row['vendor_template_archived_at']) { + $coverage[$template_id] = vendorTemplateCoverage($template_id, $row['vendor_template_required'], array_keys($required_tags[$template_id])); + } +} + +$counts = mysqli_fetch_row(mysqli_query($mysqli, "SELECT COALESCE(SUM(vendor_template_archived_at IS NULL), 0), COALESCE(SUM(vendor_template_archived_at IS NOT NULL), 0), + COALESCE(SUM(vendor_template_archived_at IS NULL AND vendor_template_required > 0), 0), COALESCE(SUM(vendor_template_archived_at IS NULL AND vendor_template_id IN ($out_ids)), 0) FROM vendor_templates WHERE $search")); $sort_link = function ($column, $label) use ($url_query_strings_sort, $sort, $disp, $order_icon) { @@ -106,7 +137,7 @@ $csrf = $_SESSION['csrf_token'];
- +
@@ -116,8 +147,10 @@ $csrf = $_SESSION['csrf_token'];
-
@@ -168,6 +201,23 @@ $csrf = $_SESSION['csrf_token'];
+ +
+ + + of clients + + + + + out of step + + +
+
Archived
@@ -208,6 +258,9 @@ $csrf = $_SESSION['csrf_token']; Add to clients + + Who should have it + Copy @@ -240,6 +293,8 @@ $csrf = $_SESSION['csrf_token']; 'filtered' => $q !== '', 'archived' => $show_archived, 'views' => ['show'], + 'view' => ['required' => ['title' => 'No required templates', 'text' => 'Set one up from its page - Who should have it - to see which clients are missing a vendor from it.'], + 'out' => ['title' => 'Every vendor is in step', 'text' => 'Every client\'s vendor made from a template says what the template says.']][$show] ?? null, 'text' => 'A vendor your clients use again and again - an ISP, a hardware maker, the software they run - set up once with its support line, hours and site, ready to add to any client. Agents start one from New Vendor on a client\'s Vendors.', 'actions' => [['label' => 'New Vendor Template', 'modal' => $add_url, 'size' => 'lg'], ['label' => 'Starter vendor templates', 'href' => 'starter_content.php', 'icon' => 'fa-seedling']], ]; diff --git a/agent/modals/vendor/vendor_template_clients.php b/agent/modals/vendor/vendor_template_clients.php index 5a4b9360e..9e24cd225 100644 --- a/agent/modals/vendor/vendor_template_clients.php +++ b/agent/modals/vendor/vendor_template_clients.php @@ -3,8 +3,11 @@ /* * Add one vendor template to several clients at once - a standard vendor * rolled out everywhere. Opened from the vendors lists and from Admin > - * Vendor Templates, so it posts to the agent handler by its full path. A client that already has a vendor made from the - * template is shown as having it and is left alone. + * Vendor Templates, so it posts to the agent handler by its full path. A + * client that already has a current vendor made from the template is shown + * as having it and is left alone. ?client_ids[]= starts with those clients + * picked; ?missing=1 with the clients the template is required of that don't + * have it (vendorTemplateCoverage()). */ require_once '../../../includes/modal_header.php'; @@ -27,13 +30,23 @@ if (!in_array($template_id, $template_ids, true)) { $template_id = $template_ids[0]; } -// Which clients already have a vendor from each template +// Which clients already have a current vendor from each template $has = []; -$sql = mysqli_query($mysqli, "SELECT DISTINCT vendor_template_id, vendor_client_id FROM vendors WHERE vendor_template_id > 0 AND vendor_client_id > 0"); +$sql = mysqli_query($mysqli, "SELECT DISTINCT vendor_template_id, vendor_client_id FROM vendors WHERE vendor_template_id > 0 AND vendor_client_id > 0 AND vendor_archived_at IS NULL"); while ($row = mysqli_fetch_row($sql)) { $has[intval($row[0])][intval($row[1])] = true; } +// The clients to start with picked +$picked = array_map('intval', array_filter((array) ($_GET['client_ids'] ?? []), 'is_scalar')); +if (!empty($_GET['missing'])) { + $required_template = vendorTemplateInfo($template_id); + if ($required_template && intval($required_template['vendor_template_required'])) { + $picked = array_merge($picked, array_keys(vendorTemplateCoverage($template_id, $required_template['vendor_template_required'], array_keys(vendorTemplateRequiredTags([$template_id])[$template_id]))['missing'])); + } +} +$picked = array_flip($picked); + $clients = []; $sql = mysqli_query($mysqli, "SELECT client_id, client_name, client_abbreviation FROM clients WHERE client_archived_at IS NULL " . clientScopeSql('clients.client_id') . " ORDER BY client_name ASC"); while ($row = mysqli_fetch_assoc($sql)) { @@ -77,7 +90,7 @@ ob_start(); - + diff --git a/agent/modals/vendor/vendor_template_update.php b/agent/modals/vendor/vendor_template_update.php new file mode 100644 index 000000000..4a84e1476 --- /dev/null +++ b/agent/modals/vendor/vendor_template_update.php @@ -0,0 +1,117 @@ + +
+
Bring in line' . escapeHtml($template['vendor_template_name']) . '' : '' ?>
+ +
+ + +
+ +
what the template says already.
+ + + + + + + + +
+ +

+ differs from its template in . Tick the ones to take from the template. +

+
+
ClientTheir vendorAccountAdded
ClientTheir vendorIn stepAccountAdded
+ Ours +
+ 		+ + + + In step + @@ -178,8 +282,21 @@ foreach (vendorTemplateFieldLabels() as $field) { - +
+ +
+ Open their vendor + + Bring in line + +
+ ?" data-confirm-text="It stays as it is, and is no longer kept in step with the template." data-confirm-button="Unlink">Unlink +
+
+
+ + + $label) { ?> + + + + + + + + +
FieldIt saysThe template says
Nothing' ?>
+
+ +

from the template. Tick the fields to take from it - only the ones that differ change.

+
+ $count) { ?> + + +
+
The vendors
+
    + +
    • + +
+ +
Their account number, PIN and account manager stay their own.
+
+
+ + +
+ + + + row. */ +function vendorsForRequest(array $vendor_ids) { + $vendors = []; + foreach (array_unique(array_filter(array_map('intval', array_filter($vendor_ids, 'is_scalar')))) as $vendor_id) { + $row = vendorRow($vendor_id); + if ($row && vendorCan($row['vendor_client_id'], 2)) { + $vendors[$vendor_id] = $row; + } + } + return $vendors; +} + +/* + * Vendors made from a template brought in line with it - the fields picked, + * where they differ (vendorTemplateBringInLine()). Their account number, PIN + * and account manager are never touched. From the template's page, the + * vendor's page, or the window either opens. + */ +if (isset($_POST['update_vendors_from_template'])) { + + validateCSRFToken(); + + $template = vendorTemplateInfo($_POST['vendor_template_id'] ?? 0); + if (!$template) { + flashAlert('That template no longer exists.', 'error'); + redirect(); + } + $vendors = vendorsForRequest((array) ($_POST['vendor_ids'] ?? [])); + $keys = array_map('strval', array_filter((array) ($_POST['fields'] ?? []), 'is_scalar')); + if (!$vendors || !$keys) { + flashAlert(!$vendors ? 'Pick the vendors to bring in line.' : 'Tick the fields to take from the template.', 'error'); + redirect(); + } + + $changed = vendorTemplateBringInLine($template['vendor_template_id'], array_keys($vendors), $keys); + foreach ($changed as $vendor_id => $vendor) { + logAudit("Vendor", "Edit", "$session_name brought vendor " . escapeSql($vendor['name']) . " in line with template " . escapeSql($template['vendor_template_name']) . " - " . escapeSql(mb_strtolower(implode(', ', $vendor['fields']))), $vendor['client_id'], $vendor_id); + } + + flashAlert($changed ? "Brought " . count($changed) . " vendor" . (count($changed) === 1 ? '' : 's') . " in line with " . escapeHtml($template['vendor_template_name']) . "" : 'Nothing to change - they already say what the template says.', $changed ? 'success' : 'warning'); + + redirect(); + +} + +/* + * Vendors made by hand linked to a template, as if made from it - so they + * count as made from it, and are kept in step with it. With bring, every + * field they differ in is taken from it too. + */ +if (isset($_POST['link_vendors_to_template'])) { + + validateCSRFToken(); + + $template = vendorTemplateInfo($_POST['vendor_template_id'] ?? 0); + if (!$template || $template['vendor_template_archived_at']) { + flashAlert($template ? 'That template is archived - restore it to link vendors to it.' : 'That template no longer exists.', 'error'); + redirect(); + } + $vendors = vendorsForRequest((array) ($_POST['vendor_ids'] ?? [])); + $linked = vendorTemplateLink($template['vendor_template_id'], array_keys($vendors)); + foreach ($linked as $vendor_id => $vendor) { + logAudit("Vendor", "Edit", "$session_name linked vendor " . escapeSql($vendor['name']) . " to template " . escapeSql($template['vendor_template_name']), $vendor['client_id'], $vendor_id); + } + $changed = !empty($_POST['bring']) && $linked ? vendorTemplateBringInLine($template['vendor_template_id'], array_keys($linked), VENDOR_TEMPLATE_SHARED) : []; + foreach ($changed as $vendor_id => $vendor) { + logAudit("Vendor", "Edit", "$session_name brought vendor " . escapeSql($vendor['name']) . " in line with template " . escapeSql($template['vendor_template_name']) . " - " . escapeSql(mb_strtolower(implode(', ', $vendor['fields']))), $vendor['client_id'], $vendor_id); + } + + flashAlert($linked ? "Linked " . count($linked) . " vendor" . (count($linked) === 1 ? '' : 's') . " to " . escapeHtml($template['vendor_template_name']) . "" . ($changed ? ", bringing " . count($changed) . " in line" : '') + : 'Nothing to link - they are made from a template already.', $linked ? 'success' : 'warning'); + + redirect(); + +} + +/* A vendor no longer made from its template - it stays as it is, and is no longer kept in step. */ +if (isset($_GET['unlink_vendor_template'])) { + + validateCSRFToken(); + + $row = vendorForRequest($_GET['unlink_vendor_template'], 2); + $vendor_id = intval($row['vendor_id']); + if (intval($row['vendor_template_id'])) { + mysqli_query($mysqli, "UPDATE vendors SET vendor_template_id = 0 WHERE vendor_id = $vendor_id"); + logAudit("Vendor", "Edit", "$session_name unlinked vendor " . escapeSql($row['vendor_name']) . " from template " . escapeSql((string) $row['vendor_template_name']), $client_id, $vendor_id); + flashAlert("" . escapeHtml($row['vendor_name']) . " is no longer linked to " . escapeHtml((string) $row['vendor_template_name']) . ""); + } + + redirect(); + +} + if (isset($_POST['edit_vendor'])) { validateCSRFToken(); diff --git a/agent/vendor.php b/agent/vendor.php index 1082654a2..53cdf88cc 100644 --- a/agent/vendor.php +++ b/agent/vendor.php @@ -165,6 +165,11 @@ if (!$vendor || (isset($_GET['client_id']) && $vendor_client_id !== intval($clie } } + // Kept in step with the template it was made from - where it differs; or, made by hand, a template it looks like + $template_row = intval($vendor['vendor_template_id']) ? vendorTemplateInfo($vendor['vendor_template_id']) : null; + $template_differences = $template_row && !$vendor_archived_at ? vendorTemplateDifferences($template_row, $vendor) : []; + $template_match = !$template_row && !$vendor_archived_at && $can_edit ? vendorTemplateMatchFor($vendor) : null; + $elsewhere = lookupUserPermission('module_client') >= 1 ? vendorElsewhere($vendor) : []; $history = auditLogHistory('Vendor', $vendor_id); @@ -322,6 +327,18 @@ if (!$vendor || (isset($_GET['client_id']) && $vendor_client_id !== intval($clie
+ + + + Update from template + + + + Unlink from template + +
+ Make a template from it @@ -350,6 +367,27 @@ if (!$vendor || (isset($_GET['client_id']) && $vendor_client_id !== intval($clie
+ + +
+ + Differs from the template it was made from in its - its own, or the template changed since. + + + +
+ + +
+ + + + + Looks like the vendor template. Link it, and it counts as made from it and is kept in step with it - nothing here changes unless you say so. + +
+ +
diff --git a/agent/vendors.php b/agent/vendors.php index 32c50bf61..2a449d74a 100644 --- a/agent/vendors.php +++ b/agent/vendors.php @@ -111,6 +111,9 @@ $vendors_counts = vendorCounts($vendors); $has_templates = (bool) mysqli_num_rows(mysqli_query($mysqli, "SELECT 1 FROM vendor_templates WHERE vendor_template_archived_at IS NULL LIMIT 1")); $add_url = "modals/vendor/vendor_add.php?" . ($view === 'client' ? "client_id=$client_id" : ($view === 'clients' ? 'view=clients' : '')); +// The vendor templates this client should have a vendor from, and hasn't +$missing_templates = $view === 'client' && !$archived ? vendorTemplatesMissingFor($client_id) : []; + ?>
@@ -255,6 +258,21 @@ $add_url = "modals/vendor/vendor_add.php?" . ($view === 'client' ? "client_id=$c
+ + +
+ : + $missing_name) { ?> + + + + + + +
+
diff --git a/db.sql b/db.sql index 51853ca81..6f5e25ab8 100644 --- a/db.sql +++ b/db.sql @@ -3988,6 +3988,23 @@ CREATE TABLE `vendor_tags` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `vendor_template_required_tags` +-- + +DROP TABLE IF EXISTS `vendor_template_required_tags`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `vendor_template_required_tags` ( + `vendor_template_id` int(11) NOT NULL, + `tag_id` int(11) NOT NULL, + PRIMARY KEY (`vendor_template_id`,`tag_id`), + KEY `tag_id` (`tag_id`), + CONSTRAINT `vendor_template_required_tags_ibfk_1` FOREIGN KEY (`vendor_template_id`) REFERENCES `vendor_templates` (`vendor_template_id`) ON DELETE CASCADE, + CONSTRAINT `vendor_template_required_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `vendor_templates` -- @@ -4010,6 +4027,7 @@ CREATE TABLE `vendor_templates` ( `vendor_template_code` varchar(200) DEFAULT NULL, `vendor_template_account_number` varchar(200) DEFAULT NULL, `vendor_template_notes` text DEFAULT NULL, + `vendor_template_required` tinyint(1) NOT NULL DEFAULT 0, `vendor_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), `vendor_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `vendor_template_archived_at` datetime DEFAULT NULL, @@ -4052,7 +4070,8 @@ CREATE TABLE `vendors` ( `vendor_client_id` int(11) NOT NULL DEFAULT 0, `vendor_template_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`vendor_id`), - KEY `vendor_client_id` (`vendor_client_id`,`vendor_archived_at`) + KEY `vendor_client_id` (`vendor_client_id`,`vendor_archived_at`), + KEY `vendor_template_id` (`vendor_template_id`,`vendor_client_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; diff --git a/functions/client_overview.php b/functions/client_overview.php index 6fbbd2af5..54716ba07 100644 --- a/functions/client_overview.php +++ b/functions/client_overview.php @@ -166,6 +166,16 @@ function clientOverviewAttention($client_id, $access, $renewals) { ]; } + if (lookupUserPermission('module_client') >= 1) { + // Vendor templates it should have a vendor from - the strip across the top of its Vendors + $items[] = [ + 'count' => count(vendorTemplatesMissingFor($client_id)), + 'label' => 'Vendors missing', 'icon' => 'building', 'tone' => 'warning', + 'detail' => 'Ones every client like it should have', + 'url' => "/agent/vendors.php?client_id=$client_id", + ]; + } + if ($access['docs'] && $renewals) { $expired = count(array_filter($renewals['items'], function ($r) { return $r['days'] < 0; })); $soon = count($renewals['items']) - $expired; diff --git a/functions/vendor_template.php b/functions/vendor_template.php index e3d832f9a..37347e2b9 100644 --- a/functions/vendor_template.php +++ b/functions/vendor_template.php @@ -13,6 +13,16 @@ * * From database 3.3.4 on a template says who made it and last changed it. * + * From database 3.3.5 on a template says who should have it - every client, + * or the clients with one of its tags - so the clients missing it show on its + * page, on their Vendors and on their overview. The vendors made from it are + * kept in step with it: the fields every client shares (VENDOR_TEMPLATE_SHARED + * - not the account number, PIN or account manager, which are each client's + * own) are compared with the template's, a vendor that differs is out of step, + * and it can be brought in line field by field. Saving a template changes the + * vendors that still had what it said before; vendors made by hand with its + * name or support site can be linked to it. + * * Shared by admin/vendor_templates.php, admin/vendor_template.php, * admin/modals/vendor_template/* and admin/post/vendor_template.php. A * vendor is made from one on the agent side by add_vendor, @@ -225,54 +235,26 @@ function vendorTemplateDelete($vendor_template_id) { mysqli_query($mysqli, "DELETE FROM vendor_templates WHERE vendor_template_id = $vendor_template_id"); } -/* - * Put the template's fields picked ($keys, from vendorTemplateColumns()) on - * every vendor made from it - for Change them on the client vendors too. - * The vendors changed: vendor id => ['name', 'client_id']. - */ -function vendorTemplatePush($vendor_template_id, array $keys) { - global $mysqli; - $vendor_template_id = intval($vendor_template_id); - $row = vendorTemplateInfo($vendor_template_id); - $columns = vendorTemplateColumns(); - $keys = array_values(array_intersect(array_keys($columns), $keys)); - if (!$row || !$keys) { - return []; - } - $set = []; - foreach ($keys as $key) { - foreach ($columns[$key] as [$template_column, $vendor_column]) { - $set[] = "$vendor_column = '" . escapeSql((string) $row[$template_column]) . "'"; - } - } - $vendors = []; - $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name, vendor_client_id FROM vendors WHERE vendor_template_id = $vendor_template_id"); - while ($vendor = mysqli_fetch_assoc($sql)) { - $vendors[intval($vendor['vendor_id'])] = ['name' => $vendor['vendor_name'], 'client_id' => intval($vendor['vendor_client_id'])]; - } - if ($vendors) { - mysqli_query($mysqli, "UPDATE vendors SET " . implode(', ', $set) . " WHERE vendor_template_id = $vendor_template_id"); - } - return $vendors; -} - /* * The vendors made from a template, for its page - current ones first, by * client: vendor id => vendor_id, vendor_name, client_id (0 for ours), * client_name, client_abbreviation, account_number, code, created_at, - * archived (the vendor), client_archived. + * archived (the vendor), client_archived, differences (key => label, as + * vendorTemplateDifferences()) and row (the vendor, raw). */ function vendorTemplateVendors($vendor_template_id) { global $mysqli; $vendor_template_id = intval($vendor_template_id); + $template = vendorTemplateInfo($vendor_template_id) ?: []; $vendors = []; - $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name, vendor_client_id, vendor_account_number, vendor_code, vendor_created_at, vendor_archived_at, - client_name, client_abbreviation, client_archived_at + $sql = mysqli_query($mysqli, "SELECT vendors.*, client_name, client_abbreviation, client_archived_at FROM vendors LEFT JOIN clients ON client_id = vendor_client_id AND vendor_client_id > 0 WHERE vendor_template_id = $vendor_template_id ORDER BY vendor_archived_at IS NOT NULL, client_archived_at IS NOT NULL, vendor_client_id = 0, client_name ASC, vendor_name ASC"); while ($row = mysqli_fetch_assoc($sql)) { $vendors[intval($row['vendor_id'])] = [ + 'differences' => $template ? vendorTemplateDifferences($template, $row) : [], + 'row' => $row, 'vendor_id' => intval($row['vendor_id']), 'vendor_name' => (string) $row['vendor_name'], 'client_id' => intval($row['vendor_client_id']), @@ -319,3 +301,424 @@ function vendorTemplatePhoneHtml($phone, $country_code, $extension) { } return $html . (trim((string) $extension) !== '' ? ' then ' . escapeHtml($extension) . '' : ''); } + +/* ---------------------------------------------------------------- in step */ + +/** The fields a vendor keeps in step with its template. Its account number, PIN and account manager are its client's own. */ +const VENDOR_TEMPLATE_SHARED = ['name', 'description', 'phone', 'hours', 'sla', 'email', 'website', 'notes']; + +/* + * A field of a row as it compares - $side 'template' for a template's + * columns, 'vendor' for a vendor's. Text by its words, whatever the case and + * spacing; the email by its address; the site without its scheme, www or a + * trailing slash; notes by their lines; the support line as [country code, + * number, extension] digits. + */ +function vendorTemplateCompareValue($key, array $row, $side) { + $index = $side === 'template' ? 0 : 1; + $values = []; + foreach (vendorTemplateColumns()[$key] ?? [] as $pair) { + $values[] = trim(html_entity_decode((string) ($row[$pair[$index]] ?? ''), ENT_QUOTES, 'UTF-8')); + } + switch ($key) { + case 'phone': + return array_map(function ($value) { + return preg_replace('/[^0-9]/', '', $value); + }, $values); + case 'website': + return mb_strtolower(rtrim(preg_replace(['#^[a-z][a-z0-9+.-]*://#i', '#^www\.#i'], '', $values[0]), '/')); + case 'notes': + return trim(preg_replace("/[ \t]+\n/", "\n", str_replace(["\r\n", "\r"], "\n", $values[0]))); + default: + return mb_strtolower(preg_replace('/\s+/u', ' ', $values[0])); + } +} + +/** Does a template say anything for this field? */ +function vendorTemplateHasValue($key, array $template) { + $value = vendorTemplateCompareValue($key, $template, 'template'); + return $key === 'phone' ? $value[1] !== '' : $value !== ''; +} + +/* + * Where a vendor differs from its template - key => label, for the shared + * fields the template says something for. A support line differs by its + * number or extension, or its country code when both have one. + */ +function vendorTemplateDifferences(array $template, array $vendor) { + $labels = vendorTemplateFieldLabels(); + $differences = []; + foreach (VENDOR_TEMPLATE_SHARED as $key) { + if (!vendorTemplateHasValue($key, $template)) { + continue; + } + $theirs = vendorTemplateCompareValue($key, $vendor, 'vendor'); + $ours = vendorTemplateCompareValue($key, $template, 'template'); + if ($key === 'phone') { + $same = $theirs[1] === $ours[1] && $theirs[2] === $ours[2] && ($theirs[0] === '' || $ours[0] === '' || $theirs[0] === $ours[0]); + } else { + $same = $theirs === $ours; + } + if (!$same) { + $differences[$key] = $labels[$key]['label']; + } + } + return $differences; +} + +/** Field labels as they read in a sentence - "support line, SLA and notes": lower case, but for SLA. */ +function vendorTemplateLabelsText(array $labels) { + $labels = array_values(array_map(function ($label) { + return preg_match('/^[A-Z]{2,}\b/', $label) ? $label : mb_strtolower($label); + }, $labels)); + $last = array_pop($labels); + return $labels ? implode(', ', $labels) . ' and ' . $last : (string) $last; +} + +/** A field of a row, as it reads - the support line formatted with its extension. Raw in, escaped out; '' for nothing. */ +function vendorTemplateValueHtml($key, array $row, $side) { + $index = $side === 'template' ? 0 : 1; + $columns = vendorTemplateColumns()[$key]; + if ($key === 'phone') { + $values = array_map(function ($pair) use ($row, $index) { + return (string) ($row[$pair[$index]] ?? ''); + }, $columns); + return vendorTemplatePhoneHtml($values[1], $values[0], $values[2]); + } + $value = trim((string) ($row[$columns[0][$index]] ?? '')); + return $value === '' ? '' : ($key === 'notes' ? '' . escapeHtml($value) . '' : escapeHtml($value)); +} + +/** A template's fields (vendorTemplateFields()) as a row of its columns - for comparing what it said before a save. */ +function vendorTemplateFieldsRow(array $fields) { + $row = []; + foreach (vendorTemplateColumns() as $pairs) { + foreach ($pairs as [$template_column]) { + $row[$template_column] = (string) ($fields[substr($template_column, strlen('vendor_template_'))] ?? ''); + } + } + return $row; +} + +/* Set these fields of a vendor to the template's - raw template row, keys of VENDOR_TEMPLATE_SHARED. */ +function vendorTemplateApply($vendor_id, array $template, array $keys) { + global $mysqli; + $set = []; + foreach (array_intersect(VENDOR_TEMPLATE_SHARED, $keys) as $key) { + foreach (vendorTemplateColumns()[$key] as [$template_column, $vendor_column]) { + $set[] = "$vendor_column = '" . escapeSql((string) ($template[$template_column] ?? '')) . "'"; + } + } + if ($set) { + mysqli_query($mysqli, "UPDATE vendors SET " . implode(', ', $set) . " WHERE vendor_id = " . intval($vendor_id)); + } +} + +/* + * After a template is saved: each vendor made from it that still had what + * it said before - field by field - gets what it says now. A vendor with its + * own value is left alone, and shows as out of step. A field the template no + * longer says anything for takes nothing away. The vendors changed: vendor + * id => ['name', 'client_id', 'fields' => [labels]]. + */ +function vendorTemplateFollow($vendor_template_id, array $before, array $after) { + global $mysqli; + $vendor_template_id = intval($vendor_template_id); + $old = vendorTemplateFieldsRow($before); + $new = vendorTemplateFieldsRow($after); + $changed = []; + foreach (VENDOR_TEMPLATE_SHARED as $key) { + if (vendorTemplateHasValue($key, $new) && vendorTemplateCompareValue($key, $old, 'template') !== vendorTemplateCompareValue($key, $new, 'template')) { + $changed[] = $key; + } + } + $followed = []; + if (!$changed) { + return $followed; + } + $labels = vendorTemplateFieldLabels(); + $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template_id = $vendor_template_id"); + while ($vendor = mysqli_fetch_assoc($sql)) { + $keys = []; + $differed = vendorTemplateDifferences($old, $vendor); + foreach ($changed as $key) { + if (vendorTemplateHasValue($key, $old)) { + // It still had what the template said + $follows = !isset($differed[$key]); + } else { + // The template said nothing - only a vendor with nothing there either takes it + $theirs = vendorTemplateCompareValue($key, $vendor, 'vendor'); + $follows = $key === 'phone' ? $theirs[1] === '' : $theirs === ''; + } + if ($follows) { + $keys[] = $key; + } + } + if ($keys) { + vendorTemplateApply($vendor['vendor_id'], $new, $keys); + $followed[intval($vendor['vendor_id'])] = ['name' => $vendor['vendor_name'], 'client_id' => intval($vendor['vendor_client_id']), + 'fields' => array_map(function ($key) use ($labels) { + return $labels[$key]['label']; + }, $keys)]; + } + } + return $followed; +} + +/* + * Bring vendors made from a template in line with it - the fields picked, + * where they differ. The vendors changed: vendor id => ['name', 'client_id', + * 'fields' => [labels]]. Vendors not made from it are left alone. + */ +function vendorTemplateBringInLine($vendor_template_id, array $vendor_ids, array $keys) { + global $mysqli; + $template = vendorTemplateInfo($vendor_template_id); + $vendor_ids = array_values(array_unique(array_filter(array_map('intval', $vendor_ids)))); + $keys = array_values(array_intersect(VENDOR_TEMPLATE_SHARED, $keys)); + $changed = []; + if (!$template || !$vendor_ids || !$keys) { + return $changed; + } + $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template_id = " . intval($template['vendor_template_id']) . " AND vendor_id IN (" . implode(',', $vendor_ids) . ")"); + while ($vendor = mysqli_fetch_assoc($sql)) { + $differences = array_intersect_key(vendorTemplateDifferences($template, $vendor), array_flip($keys)); + if ($differences) { + vendorTemplateApply($vendor['vendor_id'], $template, array_keys($differences)); + $changed[intval($vendor['vendor_id'])] = ['name' => $vendor['vendor_name'], 'client_id' => intval($vendor['vendor_client_id']), 'fields' => array_values($differences)]; + } + } + return $changed; +} + +/** How many of each template's current vendors, for current clients, are out of step - template id => count. */ +function vendorTemplateOutOfStep(array $vendor_template_ids) { + global $mysqli; + $ids = array_values(array_filter(array_map('intval', $vendor_template_ids))); + $counts = []; + if (!$ids) { + return $counts; + } + $templates = []; + $sql = mysqli_query($mysqli, "SELECT * FROM vendor_templates WHERE vendor_template_id IN (" . implode(',', $ids) . ")"); + while ($row = mysqli_fetch_assoc($sql)) { + $templates[intval($row['vendor_template_id'])] = $row; + } + $sql = mysqli_query($mysqli, "SELECT vendors.* FROM vendors LEFT JOIN clients ON client_id = vendor_client_id AND vendor_client_id > 0 + WHERE vendor_template_id IN (" . implode(',', $ids) . ") AND vendor_archived_at IS NULL AND (vendor_client_id = 0 OR client_archived_at IS NULL AND client_id IS NOT NULL)"); + while ($vendor = mysqli_fetch_assoc($sql)) { + $template_id = intval($vendor['vendor_template_id']); + if (isset($templates[$template_id]) && vendorTemplateDifferences($templates[$template_id], $vendor)) { + $counts[$template_id] = ($counts[$template_id] ?? 0) + 1; + } + } + return $counts; +} + +/** A website's host, for matching - lowercase, without www. '' for none. */ +function vendorTemplateHost($website) { + $website = trim(html_entity_decode((string) $website, ENT_QUOTES, 'UTF-8')); + if ($website === '') { + return ''; + } + $host = (string) parse_url(preg_match('#^[a-z][a-z0-9+.-]*://#i', $website) ? $website : "https://$website", PHP_URL_HOST); + return preg_replace('/^www\./', '', mb_strtolower($host)); +} + +/* + * Current vendors not made from any template that look like this one - the + * same name, whatever the case, or a website on the same host - at clients + * (or ours) without a vendor from it already: vendor id => vendor_id, + * vendor_name, client_id, client_name, how ('name' or 'site') and + * differences (as if it were made from it). + */ +function vendorTemplateMatches($vendor_template_id) { + global $mysqli; + $template = vendorTemplateInfo($vendor_template_id); + $matches = []; + if (!$template) { + return $matches; + } + $template_id = intval($template['vendor_template_id']); + $name = escapeSql(mb_strtolower(trim($template['vendor_template_name']))); + $host = vendorTemplateHost($template['vendor_template_website']); + $site_sql = $host !== '' ? " OR vendor_website LIKE '%" . escapeSql($host) . "%'" : ''; + $sql = mysqli_query($mysqli, "SELECT vendors.*, client_name FROM vendors LEFT JOIN clients ON client_id = vendor_client_id AND vendor_client_id > 0 + WHERE vendor_template_id = 0 AND vendor_archived_at IS NULL AND (vendor_client_id = 0 OR client_archived_at IS NULL AND client_id IS NOT NULL) + AND (LOWER(TRIM(vendor_name)) = '$name'$site_sql) + AND NOT EXISTS (SELECT 1 FROM vendors made WHERE made.vendor_template_id = $template_id AND made.vendor_client_id = vendors.vendor_client_id AND made.vendor_archived_at IS NULL) + ORDER BY vendor_client_id = 0, client_name ASC, vendor_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $by_name = mb_strtolower(trim($row['vendor_name'])) === mb_strtolower(trim($template['vendor_template_name'])); + if (!$by_name && ($host === '' || vendorTemplateHost($row['vendor_website']) !== $host)) { + continue; + } + $matches[intval($row['vendor_id'])] = ['vendor_id' => intval($row['vendor_id']), 'vendor_name' => (string) $row['vendor_name'], 'client_id' => intval($row['vendor_client_id']), + 'client_name' => (string) $row['client_name'], 'how' => $by_name ? 'name' : 'site', 'differences' => vendorTemplateDifferences($template, $row)]; + } + return $matches; +} + +/* + * The current template a vendor made by hand looks like - the same name, + * whatever the case, or a support site on the same host - when its client + * (or we) has no current vendor from it already. The template's row, its + * name first, or null. + */ +function vendorTemplateMatchFor(array $vendor) { + global $mysqli; + if (intval($vendor['vendor_template_id'] ?? 0)) { + return null; + } + $client_id = intval($vendor['vendor_client_id'] ?? 0); + $name = mb_strtolower(trim((string) ($vendor['vendor_name'] ?? ''))); + $host = vendorTemplateHost($vendor['vendor_website'] ?? ''); + $sql = mysqli_query($mysqli, "SELECT * FROM vendor_templates WHERE vendor_template_archived_at IS NULL + AND (LOWER(TRIM(vendor_template_name)) = '" . escapeSql($name) . "'" . ($host !== '' ? " OR vendor_template_website LIKE '%" . escapeSql($host) . "%'" : '') . ") + AND NOT EXISTS (SELECT 1 FROM vendors WHERE vendor_client_id = $client_id AND vendors.vendor_template_id = vendor_templates.vendor_template_id AND vendor_archived_at IS NULL) + ORDER BY LOWER(TRIM(vendor_template_name)) = '" . escapeSql($name) . "' DESC, vendor_template_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + if (mb_strtolower(trim($row['vendor_template_name'])) === $name || ($host !== '' && vendorTemplateHost($row['vendor_template_website']) === $host)) { + return $row; + } + } + return null; +} + +/* + * Link vendors to a template, as if made from it - only ones not made from + * one. The vendors linked: vendor id => ['name', 'client_id']. + */ +function vendorTemplateLink($vendor_template_id, array $vendor_ids) { + global $mysqli; + $vendor_template_id = intval($vendor_template_id); + $vendor_ids = array_values(array_unique(array_filter(array_map('intval', $vendor_ids)))); + $linked = []; + if (!$vendor_template_id || !$vendor_ids) { + return $linked; + } + $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name, vendor_client_id FROM vendors WHERE vendor_template_id = 0 AND vendor_id IN (" . implode(',', $vendor_ids) . ")"); + while ($row = mysqli_fetch_assoc($sql)) { + $linked[intval($row['vendor_id'])] = ['name' => $row['vendor_name'], 'client_id' => intval($row['vendor_client_id'])]; + } + if ($linked) { + mysqli_query($mysqli, "UPDATE vendors SET vendor_template_id = $vendor_template_id WHERE vendor_template_id = 0 AND vendor_id IN (" . implode(',', array_keys($linked)) . ")"); + } + return $linked; +} + +/* ---------------------------------------------------------------- who should have one */ + +/** Who should have a vendor from a template (vendor_template_required). */ +const VENDOR_TEMPLATE_REQUIRED_NONE = 0; +const VENDOR_TEMPLATE_REQUIRED_EVERY = 1; +const VENDOR_TEMPLATE_REQUIRED_TAGGED = 2; + +/** The client tags templates are required by - [template id => [tag id => tag name]], in name order. */ +function vendorTemplateRequiredTags(array $vendor_template_ids) { + global $mysqli; + $ids = array_values(array_filter(array_map('intval', $vendor_template_ids))); + $tags = array_fill_keys($ids, []); + if (!$ids) { + return $tags; + } + $sql = mysqli_query($mysqli, "SELECT vendor_template_id, tags.tag_id, tag_name FROM vendor_template_required_tags + JOIN tags ON tags.tag_id = vendor_template_required_tags.tag_id + WHERE vendor_template_id IN (" . implode(',', $ids) . ") ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $tags[intval($row['vendor_template_id'])][intval($row['tag_id'])] = (string) $row['tag_name']; + } + return $tags; +} + +/* + * Set who should have a vendor from a template - $required one of the + * VENDOR_TEMPLATE_REQUIRED_ values, $tag_ids the client tags for TAGGED. Not + * a change to what a vendor starts with, so when it last changed stays. + */ +function vendorTemplateSetRequired($vendor_template_id, $required, array $tag_ids) { + global $mysqli; + $vendor_template_id = intval($vendor_template_id); + $required = in_array(intval($required), [VENDOR_TEMPLATE_REQUIRED_EVERY, VENDOR_TEMPLATE_REQUIRED_TAGGED], true) ? intval($required) : VENDOR_TEMPLATE_REQUIRED_NONE; + mysqli_query($mysqli, "UPDATE vendor_templates SET vendor_template_required = $required, vendor_template_updated_at = vendor_template_updated_at + WHERE vendor_template_id = $vendor_template_id"); + // Client tags only - any others are left out + $tag_ids = $required === VENDOR_TEMPLATE_REQUIRED_TAGGED ? array_values(array_unique(array_filter(array_map('intval', $tag_ids)))) : []; + mysqli_query($mysqli, "DELETE FROM vendor_template_required_tags WHERE vendor_template_id = $vendor_template_id"); + if ($tag_ids) { + mysqli_query($mysqli, "INSERT INTO vendor_template_required_tags (vendor_template_id, tag_id) + SELECT $vendor_template_id, tag_id FROM tags WHERE tag_type = 1 AND tag_id IN (" . implode(',', $tag_ids) . ")"); + } +} + +/* + * The clients a template is required of, as SQL on clients: current clients, + * not leads - every one, or the ones with any of its tags (none when it has + * no tags left, or isn't required). + */ +function vendorTemplateScopeSql($required, array $tag_ids) { + $sql = "clients.client_archived_at IS NULL AND clients.client_lead = 0"; + if (intval($required) === VENDOR_TEMPLATE_REQUIRED_EVERY) { + return $sql; + } + $tag_ids = array_values(array_filter(array_map('intval', $tag_ids))); + if (intval($required) !== VENDOR_TEMPLATE_REQUIRED_TAGGED || !$tag_ids) { + return '0'; + } + return "$sql AND EXISTS (SELECT 1 FROM client_tags WHERE client_tags.client_id = clients.client_id AND client_tags.tag_id IN (" . implode(',', $tag_ids) . "))"; +} + +/** Who a template is required of, in words - '' when it isn't. */ +function vendorTemplateScopeText($required, array $tags) { + if (intval($required) === VENDOR_TEMPLATE_REQUIRED_EVERY) { + return 'Every client'; + } + if (intval($required) !== VENDOR_TEMPLATE_REQUIRED_TAGGED) { + return ''; + } + return $tags ? 'Clients tagged ' . implode(' or ', $tags) : 'Clients with a tag - none picked'; +} + +/* + * How far a required template reaches - ['clients' => how many it is + * required of, 'covered' => how many of them have a current vendor from it, + * 'missing' => [client id => name] the rest, by name]. + */ +function vendorTemplateCoverage($vendor_template_id, $required, array $tag_ids) { + global $mysqli; + $vendor_template_id = intval($vendor_template_id); + $coverage = ['clients' => 0, 'covered' => 0, 'missing' => []]; + $sql = mysqli_query($mysqli, "SELECT client_id, client_name, EXISTS (SELECT 1 FROM vendors WHERE vendor_client_id = clients.client_id + AND vendor_template_id = $vendor_template_id AND vendor_archived_at IS NULL) AS covered + FROM clients WHERE " . vendorTemplateScopeSql($required, $tag_ids) . " ORDER BY client_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $coverage['clients']++; + if (intval($row['covered'])) { + $coverage['covered']++; + } else { + $coverage['missing'][intval($row['client_id'])] = (string) $row['client_name']; + } + } + return $coverage; +} + +/* + * The required templates a client has no current vendor from - [template id + * => name]. None for an archived client or a lead. + */ +function vendorTemplatesMissingFor($client_id) { + global $mysqli; + $client_id = intval($client_id); + $missing = []; + $sql = mysqli_query($mysqli, "SELECT vendor_template_id, vendor_template_name FROM vendor_templates + WHERE vendor_template_archived_at IS NULL AND vendor_template_required IN (" . VENDOR_TEMPLATE_REQUIRED_EVERY . ", " . VENDOR_TEMPLATE_REQUIRED_TAGGED . ") + AND EXISTS (SELECT 1 FROM clients WHERE clients.client_id = $client_id AND clients.client_archived_at IS NULL AND clients.client_lead = 0) + AND (vendor_template_required = " . VENDOR_TEMPLATE_REQUIRED_EVERY . " OR EXISTS (SELECT 1 FROM vendor_template_required_tags rt + JOIN client_tags ON client_tags.tag_id = rt.tag_id AND client_tags.client_id = $client_id + WHERE rt.vendor_template_id = vendor_templates.vendor_template_id)) + AND NOT EXISTS (SELECT 1 FROM vendors WHERE vendor_client_id = $client_id AND vendors.vendor_template_id = vendor_templates.vendor_template_id AND vendor_archived_at IS NULL) + ORDER BY vendor_template_name ASC"); + while ($row = mysqli_fetch_assoc($sql)) { + $missing[intval($row['vendor_template_id'])] = (string) $row['vendor_template_name']; + } + return $missing; +}