From ebb97de46bae4413877c29270e49fccffda71577 Mon Sep 17 00:00:00 2001 From: ErikHommel Date: Thu, 2 Dec 2021 18:18:26 +0100 Subject: [PATCH] wip migratie --- CRM/Bij1migratie/Bij1Groep.php | 18 ----- .../DAO/MigratieLog.php | 16 ++-- Civi/Api4/MigratieLog.php | 2 +- Civi/Bij1migratie/Bij1MigratieContainer.php | 76 ++----------------- info.xml | 1 + xml/schema/CRM/Bij1migratie/MigratieLog.xml | 2 +- 6 files changed, 16 insertions(+), 99 deletions(-) delete mode 100644 CRM/Bij1migratie/Bij1Groep.php rename CRM/{Pcvmigratie => Bij1migratie}/DAO/MigratieLog.php (93%) diff --git a/CRM/Bij1migratie/Bij1Groep.php b/CRM/Bij1migratie/Bij1Groep.php deleted file mode 100644 index c45ec26..0000000 --- a/CRM/Bij1migratie/Bij1Groep.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @license AGPL-3.0 - */ -class CRM_Bij1migratie_Bij1Groep { - public function maakGroep(array $groepsData) { - - } - public function bestaatGroep(string $groepsNaam) { - - } - -} diff --git a/CRM/Pcvmigratie/DAO/MigratieLog.php b/CRM/Bij1migratie/DAO/MigratieLog.php similarity index 93% rename from CRM/Pcvmigratie/DAO/MigratieLog.php rename to CRM/Bij1migratie/DAO/MigratieLog.php index d9f8055..3e467b6 100644 --- a/CRM/Pcvmigratie/DAO/MigratieLog.php +++ b/CRM/Bij1migratie/DAO/MigratieLog.php @@ -6,14 +6,14 @@ * * Generated from bij1migratie/xml/schema/CRM/Bij1migratie/MigratieLog.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fa04d6440a14bf79c827d6d6564866c8) + * (GenCodeChecksum:186c4c3ad500e8ffcedca1378455c6d9) */ use CRM_Bij1migratie_ExtensionUtil as E; /** * Database access object for the MigratieLog entity. */ -class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { +class CRM_Bij1migratie_DAO_MigratieLog extends CRM_Core_DAO { const EXT = E::LONG_NAME; const TABLE_ADDED = ''; @@ -107,7 +107,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.id', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'Number', @@ -125,7 +125,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.mollie_customer_id', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'Text', @@ -140,7 +140,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.migratiedatum', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'Select Date', @@ -158,7 +158,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.type_migratie', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'Text', @@ -175,7 +175,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.type_melding', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'Text', @@ -192,7 +192,7 @@ class CRM_Pcvmigratie_DAO_MigratieLog extends CRM_Core_DAO { 'where' => 'civicrm_migratie_log.melding', 'table_name' => 'civicrm_migratie_log', 'entity' => 'MigratieLog', - 'bao' => 'CRM_Pcvmigratie_DAO_MigratieLog', + 'bao' => 'CRM_Bij1migratie_DAO_MigratieLog', 'localizable' => 0, 'html' => [ 'type' => 'TextArea', diff --git a/Civi/Api4/MigratieLog.php b/Civi/Api4/MigratieLog.php index d241ddc..2fd6194 100644 --- a/Civi/Api4/MigratieLog.php +++ b/Civi/Api4/MigratieLog.php @@ -4,7 +4,7 @@ namespace Civi\Api4; /** * MigratieLog entity. * - * Provided by the FIXME extension. + * Provided by the Bij1Migratie extension. * * @package Civi\Api4 */ diff --git a/Civi/Bij1migratie/Bij1MigratieContainer.php b/Civi/Bij1migratie/Bij1MigratieContainer.php index 9713b7e..a359676 100755 --- a/Civi/Bij1migratie/Bij1MigratieContainer.php +++ b/Civi/Bij1migratie/Bij1MigratieContainer.php @@ -4,14 +4,14 @@ * @date 13 Oct 2021 * @license AGPL-3.0 */ -namespace Civi\Pcvmigratie; +namespace Civi\Bij1migratie; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; -use CRM_Aivlcsvimports_ExtensionUtil as E; +use CRM_Bij1migratie_ExtensionUtil as E; -class PcvMigratieContainer implements CompilerPassInterface { +class Bij1MigratieContainer implements CompilerPassInterface { /** * You can modify the container here before it is dumped to PHP code. @@ -23,67 +23,14 @@ class PcvMigratieContainer implements CompilerPassInterface { $this->setAanhef($definition); $this->setGeslacht($definition); $this->setFinancieelType($definition); - $this->setLocationType($definition); $this->setContributionStatus($definition); $this->setPaymentInstrument($definition); - $this->setGroup($definition); - $this->setBankAccountReference($definition); $definition->setPublic(TRUE); - $container->setDefinition('paxMigratie', $definition); + $container->setDefinition('bij1Migratie', $definition); } /** - * Method om iban bank account reference in te stellen - * - * @param $definition - */ - private function setBankAccountReference(&$definition) { - $query = "SELECT cov.value - FROM civicrm_option_group AS cog JOIN civicrm_option_value AS cov ON cog.id = cov.option_group_id - WHERE cog.name = %1 AND cov.name = %2"; - $ibanValue = \CRM_Core_DAO::singleValueQuery($query, [ - 1 => ["civicrm_banking.reference_types", "String"], - 2 => ["IBAN", "String"], - ]); - if ($ibanValue) { - $definition->addMethodCall('setIbanAccountReference', [$ibanValue]); - } - } - - /** - * Method om groepsids op te slaan - * - * @param $definition - */ - private function setGroups(&$definition) { - $query = "SELECT id, name FROM civicrm_group WHERE name IN(%1, %2, %3, %4, %5, %6, %7)"; - $dao = \CRM_Core_DAO::executeQuery($query, [ - 1 => ["bij1_migratie_groep", "String"], - 2 => ["bij1_leden", "String"], - 3 => ["bij1_betaling_gemist", "String"], - 4 => ["bij1_ex_leden", "String"], - 5 => ["bij1_nieuwe_leden", "String"], - 6 => ["bij1_sociaal_tarief_leden", "String"], - 7 => ["bij1_standaard_leden", "String"], - ]); - while ($dao->fetch()) { - switch ($dao->name) { - case "bij1_migratie_groep": - $definition->addMethodCall('setMigratieGroepId', [(int) $dao->id]); - break; - case "bij1_leden": - $definition->addMethodCall('setLedenGroepId', [(int) $dao->id]); - break; - case "bij1_betaling_gemist": - $definition->addMethodCall('setBetalingGemistGroepId', [(int) $dao->id]); - break; - - } - } - } - - /** - * Zet property voor betaal methode cash + * Zet property voor betaal methode Mollie * * @param $definition */ @@ -131,19 +78,6 @@ class PcvMigratieContainer implements CompilerPassInterface { } } - /** - * Zet properties voor standaard locatie type - * - * @param $definition - */ - private function setLocationType(&$definition) { - $query = "SELECT id FROM civicrm_location_type WHERE is_default = TRUE;"; - $id = \CRM_Core_DAO::singleValueQuery($query); - if ($id) { - $definition->addMethodCall('setLocationTypeId', [(int) $id]); - } - } - /** * Zet properties voor geslacht * diff --git a/info.xml b/info.xml index 1ed8f8f..1ee45b5 100644 --- a/info.xml +++ b/info.xml @@ -20,6 +20,7 @@ 5.0 + bij1algemeen Specifieke migratie extensie diff --git a/xml/schema/CRM/Bij1migratie/MigratieLog.xml b/xml/schema/CRM/Bij1migratie/MigratieLog.xml index 3026a81..fbed27a 100644 --- a/xml/schema/CRM/Bij1migratie/MigratieLog.xml +++ b/xml/schema/CRM/Bij1migratie/MigratieLog.xml @@ -1,7 +1,7 @@ - CRM/Pcvmigratie + CRM/Bij1migratieMigratieLogcivicrm_migratie_logMigratie Log Bij1