CIWEMB-374: Allow CiviCRM Admin to access Payment Schemes

compucorp · Jul 18, 2023 · 3dc0831 · 3dc0831
1 parent fc79d9b
commit 3dc0831
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/CRM/MembershipExtras/Form/PaymentScheme.php b/CRM/MembershipExtras/Form/PaymentScheme.php
@@ -63,7 +63,7 @@ public function buildQuickForm() {
     $this->add(
       'select',
       'permission',
-      'permission',
+      ts('Permission'),
       [
         'public' => ts('Public'),
         'admin' => ts('Admin'),

diff --git a/xml/Menu/membershipextras.xml b/xml/Menu/membershipextras.xml
@@ -88,12 +88,12 @@
     <path>civicrm/member/admin/payment-scheme</path>
     <page_callback>CRM_MembershipExtras_Form_PaymentScheme</page_callback>
     <title>Payment Scheme</title>
-    <access_arguments>administer MembershipExtras</access_arguments>
+    <access_arguments>administer CiviCRM;administer MembershipExtras</access_arguments>
   </item>
   <item>
     <path>civicrm/member/admin/payment-schemes</path>
     <page_callback>CRM_MembershipExtras_Page_PaymentScheme</page_callback>
     <title>Payments Schemes</title>
-    <access_arguments>administer MembershipExtras</access_arguments>
+    <access_arguments>administer CiviCRM;administer MembershipExtras</access_arguments>
   </item>
 </menu>
diff --git a/xml/schema/CRM/MembershipExtras/PaymentScheme.xml b/xml/schema/CRM/MembershipExtras/PaymentScheme.xml
@@ -25,40 +25,53 @@
     <name>name</name>
     <title>Name</title>
     <type>varchar</type>
-    <length>255</length>
+    <length>250</length>
     <required>true</required>
   </field>
 
   <field>
     <name>admin_title</name>
     <title>Admin title</title>
     <type>varchar</type>
-    <length>255</length>
-    <required>true</required>
+    <length>250</length>
   </field>
 
   <field>
-    <name>admin_description</name>
-    <title>Admin Description</title>
+    <name>description</name>
+    <title>Description</title>
     <type>varchar</type>
-    <length>255</length>
+    <length>500</length>
   </field>
 
   <field>
     <name>public_title</name>
     <title>Public title</title>
     <type>varchar</type>
-    <length>255</length>
+    <length>250</length>
     <required>true</required>
   </field>
 
   <field>
     <name>public_description</name>
     <title>Public description</title>
     <type>varchar</type>
-    <length>255</length>
+    <length>500</length>
+    <required>true</required>
   </field>
 
+  <field>
+    <name>payment_processor</name>
+    <title>Payment Processor</title>
+    <type>int unsigned</type>
+    <required>true</required>
+  </field>
+  <foreignKey>
+    <name>payment_processor</name>
+    <table>civicrm_payment_processor</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+  </foreignKey>
+
   <field>
     <name>permission</name>
     <title>Permission</title>
@@ -82,16 +95,4 @@
     <required>true</required>
   </field>
 
-  <field>
-    <name>payment_processor</name>
-    <title>Payment Processor</title>
-    <type>int unsigned</type>
-    <required>true</required>
-  </field>
-  <foreignKey>
-    <name>payment_processor</name>
-    <table>civicrm_payment_processor</table>
-    <key>id</key>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
 </table>