From 3dc083146e79d35317884e259facab3244ff76e4 Mon Sep 17 00:00:00 2001
From: Ahed <ahed@compucorp.co.uk>
Date: Mon, 17 Jul 2023 21:19:58 +0300
Subject: [PATCH] CIWEMB-374: Allow CiviCRM Admin to access Payment Schemes

---
 CRM/MembershipExtras/Form/PaymentScheme.php   |  2 +-
 xml/Menu/membershipextras.xml                 |  4 +-
 .../CRM/MembershipExtras/PaymentScheme.xml    | 41 ++++++++++---------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/CRM/MembershipExtras/Form/PaymentScheme.php b/CRM/MembershipExtras/Form/PaymentScheme.php
index 98e3ace6..ad69996a 100644
--- 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
index 1ea3484a..b5ac2639 100644
--- 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
index 2825cd08..77a4e13b 100644
--- a/xml/schema/CRM/MembershipExtras/PaymentScheme.xml
+++ b/xml/schema/CRM/MembershipExtras/PaymentScheme.xml
@@ -25,7 +25,7 @@
     <name>name</name>
     <title>Name</title>
     <type>varchar</type>
-    <length>255</length>
+    <length>250</length>
     <required>true</required>
   </field>
 
@@ -33,22 +33,21 @@
     <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>
 
@@ -56,9 +55,23 @@
     <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>