Removing not used Imports

veda-consulting · Sep 16, 2013 · 030c67e · 030c67e
1 parent 3eb5a7d
commit 030c67e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 121 deletions.
diff --git a/CRM/Finance/BAO/Import/Source.php b/CRM/Finance/BAO/Import/Source.php
@@ -4,145 +4,30 @@ class CRM_Finance_BAO_Import_Source {
     public static function getAllAsOptions() {
         //matusz: TODO this should be using db table?
         return array(
-            'VirginMoney' => 'Virgin Money',
-            'VirginMoneyGiftAid' => 'Virgin Money - GiftAid',
-            //'JustGiving' => 'Just Giving (API)',
             'JustGivingCsv' => 'Just Giving (CSV)',
             'JustGivingGiftAidCsv' => 'Just Giving - GiftAid (CSV)',
-            //'DirectDebit' => 'Direct Debit (Submission)',
-            //'DirectDebitAuth' => 'Direct Debit',
-            'DirectDebitOasis' => 'Direct Debit',
-            'StandingOrderCsv' => 'Standing Orders',
-            //'StandingOrderRBS' => 'Standing Orders (RBS)',
-            //'PayrollGiving' => 'Payroll Giving',
-            //'OnlineTrading' => 'Online Trading',
-            //'PayrollCTC' => 'Payroll CTC',
-            //'PayrollCAF' => 'Payroll CAF',
-            //'BTMyDonateCsv' => 'BT My Donate (CSV)',
-            'RBSWorldPayCsv' => 'RBS World Pay (CSV)',
-            'CoopCsv' => 'Coop (CSV)',
-            'RapidPaidCsv' => 'Rapid Paid (CSV)',
-            'CafCsv' => 'CAF (CSV)',
-            'CharityTrust' => 'Charity Trust (CSV)',
-            'Stewardship' => 'Stewardship (CSV)',
         );
     }
 
     public static function factory($typeName) {
         switch($typeName) {
-            case 'VirginMoneyGiftAid':
-                require_once('CRM/Finance/BAO/Import/VirginMoneyGiftAid.php');
-                $bao = new CRM_Finance_BAO_Import_VirginMoneyGiftAid();
-                break;
-           case 'VirginMoney':
-                require_once('CRM/Finance/BAO/Import/VirginMoney.php');
-                $bao = new CRM_Finance_BAO_Import_VirginMoney();
-                break;
-            case 'DirectDebit':
-                require_once('CRM/Finance/BAO/Import/DirectDebit.php');
-                $bao = new CRM_Finance_BAO_Import_DirectDebit();
-                break;
-            case 'DirectDebitAuth':
-                require_once('CRM/Finance/BAO/Import/DirectDebitAuth.php');
-                $bao = new CRM_Finance_BAO_Import_DirectDebitAuth();
-                break;
-            case 'DirectDebitOasis':
-                require_once('CRM/Finance/BAO/Import/DirectDebitOasis.php');
-                $bao = new CRM_Finance_BAO_Import_DirectDebitOasis();
-                break;
-            case 'StandingOrder':
-                require_once('CRM/Finance/BAO/Import/StandingOrder.php');
-                $bao = new CRM_Finance_BAO_Import_StandingOrder();
-                break;
-            case 'StandingOrderCsv':
-                require_once('CRM/Finance/BAO/Import/StandingOrderCsv.php');
-                $bao = new CRM_Finance_BAO_Import_StandingOrderCsv();
-                break;
-            case 'StandingOrderRBS':
-                require_once('CRM/Finance/BAO/Import/StandingOrderRBS.php');
-                $bao = new CRM_Finance_BAO_Import_StandingOrderRBS();
-                break;
-            case 'OnlineTrading':
-                require_once('CRM/Finance/BAO/Import/OnlineTrading.php');
-                $bao = new CRM_Finance_BAO_Import_OnlineTrading();
-                break;
-            case 'JustGiving':
-                require_once('CRM/Finance/BAO/Import/JustGiving.php');
-                $bao = new CRM_Finance_BAO_Import_JustGiving();
-                break;
             case 'JustGivingCsv':
                 require_once('CRM/Finance/BAO/Import/JustGivingCsv.php');
                 $bao = new CRM_Finance_BAO_Import_JustGivingCsv();
                 break;
-            case 'BTMyDonateCsv':
-                require_once('CRM/Finance/BAO/Import/BTMyDonateCsv.php');
-                $bao = new CRM_Finance_BAO_Import_BTMyDonateCsv();
-                break;
             case 'JustGivingGiftAidCsv':
                 require_once('CRM/Finance/BAO/Import/JustGivingGiftAidCsv.php');
                 $bao = new CRM_Finance_BAO_Import_JustGivingGiftAidCsv();
                 break;
-            case 'PayrollCTC':
-                require_once('CRM/Finance/BAO/Import/PayrollCTC.php');
-                $bao = new CRM_Finance_BAO_Import_PayrollCTC();
-                break;
-            case 'PayrollCAF':
-                require_once('CRM/Finance/BAO/Import/PayrollCAF.php');
-                $bao = new CRM_Finance_BAO_Import_PayrollCAF();
-                break;
-            case 'RBSWorldPayCsv':
-                require_once('CRM/Finance/BAO/Import/RBSWorldPayCsv.php');
-                $bao = new CRM_Finance_BAO_Import_RBSWorldPayCsv();
-                break;
-            case 'CoopCsv':
-                require_once('CRM/Finance/BAO/Import/CoopCsv.php');
-                $bao = new CRM_Finance_BAO_Import_CoopCsv();
-                break;
-            case 'RapidPaidCsv':
-                require_once('CRM/Finance/BAO/Import/RapidPaidCsv.php');
-                $bao = new CRM_Finance_BAO_Import_RapidPaidCsv();
-                break;
-            case 'CafCsv':
-                require_once('CRM/Finance/BAO/Import/CafCsv.php');
-                $bao = new CRM_Finance_BAO_Import_CafCsv();
-                break;   
-            case 'CharityTrust':
-                require_once('CRM/Finance/BAO/Import/CharitiesTrustCsv.php');
-                $bao = new CRM_Finance_BAO_Import_CharitiesTrustCsv();
-                break;   
-            case 'Stewardship':
-                require_once('CRM/Finance/BAO/Import/StewardshipCsv.php');
-                $bao = new CRM_Finance_BAO_Import_StewardshipCsv();
-                break;   
             default:
                 throw new Exception("No source BAO '$typeName'");
         }
         $bao->setSourceName($typeName);
 
-        //mzeman: TODO default payment method - load from DB?
+				// Amend to your setup
         $methods = array(
-            'VirginMoney' => 6,
-            'VirginMoneyGiftAid' => 12,
-            'JustGiving' => 5,
             'JustGivingCsv' => 5,
-            'BTMyDonateCsv' => 0,
             'JustGivingGiftAidCsv' => 11,
-            'DirectDebit' => 0,
-            'DirectDebitAuth' => 0,
-            'DirectDebitOasis' => 0,
-            'StandingOrder' => 0,
-            'StandingOrderCsv' => 14,
-            'StandingOrderRBS' => 0,
-            'PayrollGiving' => 0,
-            'OnlineTrading' => 0,
-            'PayrollCTC' => 0,
-            'PayrollCAF' => 0,
-            'RBSWorldPayCsv' => 16,
-            'CoopCsv' => 17,
-            'RapidPaidCsv' => 18,
-            'CafCsv' => 19,
-            'CharityTrust' => 20,
-            'Stewardship' => 21,
         );
 
         if(!isset($methods[$typeName])) {

diff --git a/CRM/Finance/BAO/Import/SourceAbstract.php b/CRM/Finance/BAO/Import/SourceAbstract.php
@@ -761,6 +761,10 @@ protected function createFinancialTransfer(array $params) {
         $identifierColumn       = $this->getCustomFieldname($financialTransferTable->id, 'Identifier');
         $dateCreatedColumn      = $this->getCustomFieldname($financialTransferTable->id, 'Date Created');
         $transferEndDateColumn  = $this->getCustomFieldname($financialTransferTable->id, 'Transfer End Date');
+
+				if ( empty($financialTransferTable) || empty($sourceSystemColumn) || empty($identifierColumn) || empty($dateCreatedColumn) || empty($transferEndDateColumn)) {
+						throw new InvalidArgumentException("Missing Financial Import Reference table or one of its columns");
+				}
 
         // Check if a Financial Import Reference Exists
         $selectSql  = " SELECT id, entity_id ";        

diff --git a/info.xml b/info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <extension key="uk.co.vedaconsulting.module.financialImports" type="module">
   <file>financialImports</file>
-  <name>Financial Imports</name>
-  <description>Financial Imports</description>
+  <name>Just Giving Imports</name>
+  <description>Just Giving Financial Imports</description>
   <urls>
     <url desc="Main Extension Page"></url>
     <url desc="Documentation"></url>
@@ -11,16 +11,16 @@
   </urls>
   <license>AGPL</license>
   <maintainer>
-    <author>Veda Consulting</author>
+    <author>Veda NFP Consulting Limited</author>
     <email>parvez@vedaconsulting.co.uk</email>
   </maintainer>
   <releaseDate>2013-09-09</releaseDate>
   <version>1.0</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>4.2</ver>
+    <ver>4.3</ver>
   </compatibility>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>This is a Beta Release module.</comments>
   <civix>
     <namespace>CRM/Imports</namespace>
   </civix>