Mode annualAmountForContribution to Individual #151

Closes #151

Merge branch '151-readable-membership-amount' into 'main'

See merge request sudeducation/cartable!380

cartable/CRM/Cartable/Upgrader/upgrade_0055.php

@@ -5,7 +5,7 @@ use CRM_Cartable_ExtensionUtil as E;
 try {
     civicrm_api4('CustomField', 'create', [
         'values' => [
-            'custom_group_id.name' => 'Parametres',
+            'custom_group_id.name' => 'DonneesParticulier',
             'label' => E::ts('Annual amount for contribution'),
             'name' => 'annualAmountForContribution',
             'column_name' => 'annual_amount_for_contribution',

cartable/CRM/Cartable/Upgrader/upgrade_0056.php

@@ -3,7 +3,7 @@
 use CRM_Cartable_ExtensionUtil as E;
 
 try {
-    $customGroup = civicrm_api4('CustomGroup', 'get', [
+    $customGroupMembership = civicrm_api4('CustomGroup', 'get', [
         'select' => [
             'name',
             'table_name',
@@ -12,18 +12,29 @@ try {
             ['name', '=', 'Parametres'],
         ],
     ]);
+    $custom_table_membership = $customGroupMembership->first()['table_name'];
 
-    $custom_table = $customGroup->first()['table_name'];
+    $customGroupContact = civicrm_api4('CustomGroup', 'get', [
+        'select' => [
+            'name',
+            'table_name',
+        ],
+        'where' => [
+            ['name', '=', 'DonneesParticulier'],
+        ],
+    ]);
+    $custom_table_contact = $customGroupContact->first()['table_name'];
 
     $sql = "UPDATE
-    `{$custom_table}`
-   SET 
-    `annual_amount_for_contribution` = SUBSTRING_INDEX(`grille_salariale`, '|', -1)
-   WHERE
-    `grille_salariale` IS NOT NULL AND `annual_amount_for_contribution` IS NULL;
+	`{$custom_table_contact}` c
+    INNER JOIN civicrm_membership m ON m.contact_id = c.entity_id
+    INNER JOIN `{$custom_table_membership}` p ON p.entity_id = m.id
+SET
+    c.`annual_amount_for_contribution` = SUBSTRING_INDEX(p.`grille_salariale`, '|', -1)
+WHERE
+    p.`grille_salariale` IS NOT NULL AND c.`annual_amount_for_contribution` IS NULL;
     ";
 
-    // echo $sql;
     CRM_Core_DAO::executeQuery($sql);
 
 } catch(\Throwable $e) {

cartable/inc/utils.php

@@ -391,7 +391,7 @@ function cartable_get_membership_vars($vars){
     $PaymentMethodField = cartable_get_custom_field_id('PaymentMethod', 'Parametres');
     $numberOfMonthsForContributionField = cartable_get_custom_field_id('numberOfMonthsForContribution', 'Parametres');
     $numberOfMonthsForProrataField = cartable_get_custom_field_id('numberOfMonthsForProrata', 'Parametres');
-    $annualAmountForContributionField = cartable_get_custom_field_id('annualAmountForContribution', 'Parametres');
+    $annualAmountForContributionField = cartable_get_custom_field_id('annualAmountForContribution', 'DonneesParticulier');
     $membershipRatio = civicrm_api3('Setting', 'getvalue', [
         'return' => "value",
         'name' => "cartable_membership_ratio",