From cfb7c546f1c162eb868ec960645a84a0268afd73 Mon Sep 17 00:00:00 2001 From: colemanw Date: Wed, 12 Oct 2022 16:50:03 +0100 Subject: [PATCH] AdminUi - Complete SearchKit-based listing of Financial Types --- CRM/Contribute/xml/Menu/Contribute.xml | 5 ++ CRM/Financial/Page/FinancialType.php | 4 +- .../ang/afsearchAdminFinancialTypes.aff.html | 18 ++++++ ...n => afsearchAdminFinancialTypes.aff.json} | 0 .../ang/afsearchFinancialTypes.aff.html | 14 ---- ...Search_Administer_Financial_Types.mgd.php} | 64 ++++++++----------- .../Financial/Page/FinancialTypeAccount.tpl | 4 +- 7 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html rename ext/civicrm_admin_ui/ang/{afsearchFinancialTypes.aff.json => afsearchAdminFinancialTypes.aff.json} (100%) delete mode 100644 ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html rename ext/civicrm_admin_ui/managed/{SavedSearch_Financial_Types.mgd.php => SavedSearch_Administer_Financial_Types.mgd.php} (78%) diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml index 9409e579bf..b57763d0d4 100644 --- a/CRM/Contribute/xml/Menu/Contribute.xml +++ b/CRM/Contribute/xml/Menu/Contribute.xml @@ -119,6 +119,11 @@ CiviContribute 580 + + civicrm/admin/financial/financialType/edit + Edit Financial Type + CRM_Financial_Form_FinancialType + civicrm/payment New Payment diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php index 5c9f2d4c64..2cb9fb903b 100644 --- a/CRM/Financial/Page/FinancialType.php +++ b/CRM/Financial/Page/FinancialType.php @@ -55,7 +55,7 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic { ], CRM_Core_Action::UPDATE => [ 'name' => ts('Edit'), - 'url' => 'civicrm/admin/financial/financialType', + 'url' => 'civicrm/admin/financial/financialType/edit', 'qs' => 'action=update&id=%%id%%&reset=1', 'title' => ts('Edit Financial Type'), ], @@ -71,7 +71,7 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic { ], CRM_Core_Action::DELETE => [ 'name' => ts('Delete'), - 'url' => 'civicrm/admin/financial/financialType', + 'url' => 'civicrm/admin/financial/financialType/edit', 'qs' => 'action=delete&id=%%id%%', 'title' => ts('Delete Financial Type'), ], diff --git a/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html new file mode 100644 index 0000000000..0b0ab455f9 --- /dev/null +++ b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html @@ -0,0 +1,18 @@ +
+
+
+

+ {{:: ts('Financial types are used to categorize contributions for reporting and accounting purposes. You may set up as many as needed, including commonly used types such as Donation, Campaign Contribution or Membership Dues.') }} + {{:: ts('Additionally, financial types can account for the inventory and expense of premiums.') }} + {{:: ts('View Premiums') }} +

+

+ {{:: ts('Each financial type relates to a number of financial accounts to track income, accounts receivable, and fees.') }} + {{:: ts('View Financial Accounts') }} +

+
+ +
+ +
+ diff --git a/ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.json b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.json similarity index 100% rename from ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.json rename to ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.json diff --git a/ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html b/ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html deleted file mode 100644 index 42956c23b1..0000000000 --- a/ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-

{{:: ts('Financial types are used to categorize contributions for reporting and accounting purposes. You may set up as many as needed, including commonly used types such as Donation, Campaign Contribution or Membership Dues. Additionally, financial types can account for the inventory and expense of premiums.', {1: CRM.url('civicrm/admin/contribute/managePremiums')}) }} -

-

- {{:: ts('Each financial type relates to a number of financial accounts to track income, accounts receivable, and fees.', {1: CRM.url('civicrm/admin/financial/financialAccount')})}} -

-
- -
- -
- diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Financial_Types.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php similarity index 78% rename from ext/civicrm_admin_ui/managed/SavedSearch_Financial_Types.mgd.php rename to ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php index cb03b95ace..ba12f58fca 100644 --- a/ext/civicrm_admin_ui/managed/SavedSearch_Financial_Types.mgd.php +++ b/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php @@ -3,14 +3,14 @@ use CRM_CivicrmAdminUi_ExtensionUtil as E; return [ [ - 'name' => 'SavedSearch_Financial_Types', + 'name' => 'SavedSearch_Administer_Financial_Types', 'entity' => 'SavedSearch', 'cleanup' => 'unused', 'update' => 'unmodified', 'params' => [ 'version' => 4, 'values' => [ - 'name' => 'Financial_Types', + 'name' => 'Administer_Financial_Types', 'label' => E::ts('Financial Types'), 'form_values' => NULL, 'mapping_id' => NULL, @@ -65,8 +65,8 @@ return [ 'version' => 4, 'values' => [ 'name' => 'Financial_Types_Table_1', - 'label' => E::ts('Financial Types Table 1'), - 'saved_search_id.name' => 'Financial_Types', + 'label' => E::ts('Administer Financial Types'), + 'saved_search_id.name' => 'Administer_Financial_Types', 'type' => 'table', 'settings' => [ 'actions' => FALSE, @@ -77,7 +77,12 @@ return [ ], 'pager' => [], 'placeholder' => 5, - 'sort' => [], + 'sort' => [ + [ + 'name', + 'ASC', + ], + ], 'columns' => [ [ 'type' => 'field', @@ -93,13 +98,6 @@ return [ 'label' => E::ts('Description'), 'sortable' => TRUE, 'editable' => TRUE, - 'icons' => [ - [ - 'icon' => 'fa-pencil', - 'side' => 'left', - 'if' => [], - ], - ], ], [ 'type' => 'field', @@ -136,7 +134,7 @@ return [ 'size' => 'btn-xs', 'links' => [ [ - 'path' => '/civicrm/admin/financial/financialType/accounts?reset=1&action=browse&aid=[id]', + 'path' => 'civicrm/admin/financial/financialType/accounts?reset=1&action=browse&aid=[id]', 'icon' => '', 'text' => E::ts('Accounts'), 'style' => 'default', @@ -146,41 +144,25 @@ return [ 'join' => '', 'target' => '', ], - ], - 'type' => 'buttons', - 'alignment' => 'text-right', - ], - [ - 'size' => 'btn-sm', - 'links' => [ [ - 'path' => '/civicrm/admin/financial/financialType?action=update&id=[id]&reset=1', 'icon' => 'fa-pencil', 'text' => E::ts('Edit'), 'style' => 'default', 'condition' => [], - 'entity' => '', - 'action' => '', + 'entity' => 'FinancialType', + 'action' => 'update', 'join' => '', - 'target' => '', + 'target' => 'crm-popup', ], - ], - 'type' => 'buttons', - 'alignment' => 'text-right', - ], - [ - 'size' => 'btn-sm', - 'links' => [ [ - 'path' => '/civicrm/admin/financial/financialType?action=delete&id=[id]', - 'icon' => 'fa-trash-o', + 'icon' => 'fa-trash', 'text' => E::ts('Delete'), 'style' => 'danger', 'condition' => [], - 'entity' => '', - 'action' => '', + 'entity' => 'FinancialType', + 'action' => 'delete', 'join' => '', - 'target' => '', + 'target' => 'crm-popup', ], ], 'type' => 'buttons', @@ -188,10 +170,18 @@ return [ ], ], 'addButton' => [ - 'path' => 'civicrm/admin/financial/financialType/accounts?reset=1&action=add', + 'path' => 'civicrm/admin/financial/financialType/edit?reset=1&action=add', 'text' => E::ts('Add Financial Type'), 'icon' => 'fa-plus', ], + 'cssRules' => [ + [ + 'disabled', + 'is_active', + '=', + FALSE, + ], + ], ], 'acl_bypass' => FALSE, ], diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl index 7700c2d237..8a7087806d 100644 --- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl @@ -16,7 +16,7 @@ {if $action ne 1 and $action ne 2}
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton} - {crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton} + {crmButton p="civicrm/admin/financial/financialType/edit" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
{/if} {strip} @@ -49,7 +49,7 @@ {if $action ne 1 and $action ne 2}
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton} - {crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton} + {crmButton p="civicrm/admin/financial/financialType/edit" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
{/if} -- 2.25.1