From ea927522bc623b96ba417c310e152ba5286bdd01 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Thu, 23 Feb 2017 01:38:26 +0530 Subject: [PATCH] CRM-20158, added card_type and pan_truncation field ---------------------------------------- * CRM-20158: Store card type and last 4 digits of credit card https://issues.civicrm.org/jira/browse/CRM-20158 --- CRM/Financial/DAO/FinancialTrxn.php | 42 +++++++++++++++++++- CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl | 5 +++ xml/schema/Financial/FinancialTrxn.xml | 26 ++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php index d7f37ea86a..2a13482928 100644 --- a/CRM/Financial/DAO/FinancialTrxn.php +++ b/CRM/Financial/DAO/FinancialTrxn.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:f8e72183039a2faadf244264d5f5da22) + * (GenCodeChecksum:52a627d344bca95d30eb8b22aad1e245) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -133,12 +133,24 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { * @var int unsigned */ public $payment_instrument_id; + /** + * FK to accept_creditcard option group values + * + * @var int unsigned + */ + public $card_type; /** * Check number * * @var string */ public $check_number; + /** + * Last 4 digits of credit card + * + * @var int unsigned + */ + public $pan_truncation; /** * Class constructor. */ @@ -371,6 +383,22 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'optionEditPath' => 'civicrm/admin/options/payment_instrument', ) ) , + 'financial_trxn_card_type' => array( + 'name' => 'card_type', + 'type' => CRM_Utils_Type::T_INT, + 'title' => ts('Card Type') , + 'description' => 'FK to accept_creditcard option group values', + 'table_name' => 'civicrm_financial_trxn', + 'entity' => 'FinancialTrxn', + 'bao' => 'CRM_Financial_DAO_FinancialTrxn', + 'html' => array( + 'type' => 'Select', + ) , + 'pseudoconstant' => array( + 'optionGroupName' => 'accept_creditcard', + 'optionEditPath' => 'civicrm/admin/options/accept_creditcard', + ) + ) , 'financial_trxn_check_number' => array( 'name' => 'check_number', 'type' => CRM_Utils_Type::T_STRING, @@ -385,6 +413,18 @@ class CRM_Financial_DAO_FinancialTrxn extends CRM_Core_DAO { 'type' => 'Text', ) , ) , + 'financial_trxn_pan_truncation' => array( + 'name' => 'pan_truncation', + 'type' => CRM_Utils_Type::T_INT, + 'title' => ts('Pan Truncation') , + 'description' => 'Last 4 digits of credit card', + 'table_name' => 'civicrm_financial_trxn', + 'entity' => 'FinancialTrxn', + 'bao' => 'CRM_Financial_DAO_FinancialTrxn', + 'html' => array( + 'type' => 'Text', + ) , + ) , ); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']); } diff --git a/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl index 8531cc906b..03a47793e2 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl @@ -7,3 +7,8 @@ UPDATE civicrm_navigation SET url = REPLACE(url, 'civicrm/tag', 'civicrm/tag/edi -- CRM-19815, CRM-19830 update references to check_number to reflect unique name UPDATE civicrm_uf_field SET field_name = 'contribution_check_number' WHERE field_name = 'check_number'; UPDATE civicrm_mapping_field SET name = 'contribution_check_number' WHERE name = 'check_number'; + +-- CRM-20158 +ALTER TABLE `civicrm_financial_trxn` + ADD card_type INT( 10 ) UNSIGNED NULL DEFAULT NULL COMMENT 'FK to accept_creditcard option group values' AFTER payment_instrument_id, + ADD pan_truncation INT UNSIGNED NULL COMMENT 'Last 4 digits of credit card.' AFTER check_number; diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml index eb4dba07df..e6f31fd132 100644 --- a/xml/schema/Financial/FinancialTrxn.xml +++ b/xml/schema/Financial/FinancialTrxn.xml @@ -232,6 +232,20 @@ payment_instrument_id 4.3 + + card_type + financial_trxn_card_type + Card Type + int unsigned + FK to accept_creditcard option group values + + accept_creditcard + + + Select + + 4.7 + check_number financial_trxn_check_number @@ -250,4 +264,16 @@ check_number 4.3 + + pan_truncation + financial_trxn_pan_truncation + Pan Truncation + int unsigned + + Text + 4 + + Last 4 digits of credit card + 4.7 + -- 2.25.1