AdminUi - Complete SearchKit-based listing of Financial Types

diff --git a/CRM/Contribute/xml/Menu/Contribute.xml b/CRM/Contribute/xml/Menu/Contribute.xml
index 9409e579bfb2511706dbcced3da0dc6e4eb0fddc..b57763d0d45847077a4af354a03736c38a8ac0e8 100644 (file)
--- a/CRM/Contribute/xml/Menu/Contribute.xml
+++ b/CRM/Contribute/xml/Menu/Contribute.xml
@@ -119,6 +119,11 @@
     <adminGroup>CiviContribute</adminGroup>
     <weight>580</weight>
   </item>
+  <item>
+    <path>civicrm/admin/financial/financialType/edit</path>
+    <title>Edit Financial Type</title>
+    <page_callback>CRM_Financial_Form_FinancialType</page_callback>
+  </item>
   <item>
     <path>civicrm/payment</path>
     <title>New Payment</title>

diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php
index 5c9f2d4c64c1ebadc1ed0b0efcf361cf391c560a..2cb9fb903b27a29504780f62042c71af0d73e014 100644 (file)
--- 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 (file)
index 0000000..0b0ab45
--- /dev/null
+++ b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html
@@ -0,0 +1,18 @@
+<div af-fieldset="">
+  <div class="af-markup">
+    <div class="help">
+      <p>
+        {{:: 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.') }}
+        <a href="{{ crmUrl('civicrm/admin/contribute/managePremiums') }}">{{:: ts('View Premiums') }}</a>
+      </p>
+      <p>
+        {{:: ts('Each financial type relates to a number of financial accounts to track income, accounts receivable, and fees.') }}
+        <a href="{{ crmUrl('civicrm/admin/financial/financialAccount') }}">{{:: ts('View Financial Accounts') }}</a>
+      </p>
+  </div>
+
+  </div>
+  <crm-search-display-table search-name="Administer_Financial_Types" display-name="Financial_Types_Table_1"></crm-search-display-table>
+</div>
+

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 (file)
index 42956c2..0000000
--- a/ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div af-fieldset="">
-  <div class="af-markup">
-    <div class="help">
-    <p>{{:: 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 <a href="%1">premiums</a>.', {1: CRM.url('civicrm/admin/contribute/managePremiums')}) }}
-      </p>
-      <p>
-        {{:: ts('Each financial type relates to a number of <a href="%1">financial accounts</a> to track income, accounts receivable, and fees.', {1: CRM.url('civicrm/admin/financial/financialAccount')})}}
-      </p>  
-  </div>
-
-  </div>
-  <crm-search-display-table search-name="Financial_Types" display-name="Financial_Types_Table_1"></crm-search-display-table>
-</div>
-

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 cb03b95ace1befbb331d011d63784f2b477c2faa..ba12f58fcaed715d11d12358d7ec56dce92afd7a 100644 (file)
--- 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 7700c2d237c00fe79ca605bc8db9948c06d0e785..8a7087806d2b0ea95ca7cc7570f78d99bc837bea 100644 (file)
--- 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}
       <div class="action-link">
       {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}
       </div>
     {/if}
     {strip}
@@ -49,7 +49,7 @@
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
       {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}
       </div>
     {/if}
     </div>