From 86b25acee594e7221e55cb70c492bcee6d31bcc6 Mon Sep 17 00:00:00 2001 From: Saurabh Batra Date: Mon, 19 Oct 2015 13:08:33 +0530 Subject: [PATCH] Fixed indentation. --- CRM/Financial/Page/AJAX.php | 7 +++-- .../Financial/Page/AjaxBatchSummaryTest.php | 29 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php index 871da971f4..c03fd36a99 100644 --- a/CRM/Financial/Page/AJAX.php +++ b/CRM/Financial/Page/AJAX.php @@ -518,7 +518,7 @@ class CRM_Financial_Page_AJAX { public static function getBatchSummary() { $batchID = CRM_Utils_Type::escape($_REQUEST['batchID'], 'String'); $params = array('id' => $batchID); - + $batchSummary = makeBatchSummary($batchID, $params); CRM_Utils_JSON::output($batchSummary); @@ -533,9 +533,9 @@ class CRM_Financial_Page_AJAX { * @return array */ public static function makeBatchSummary($batchID, $params) { - $batchInfo = CRM_Batch_BAO_Batch::retrieve($params, $value); + $batchInfo = CRM_Batch_BAO_Batch::retrieve($params, $value); $batchTotals = CRM_Batch_BAO_Batch::batchTotals(array($batchID)); - $batchSummary = array( + $batchSummary = array( 'created_by' => CRM_Contact_BAO_Contact::displayName($batchInfo->created_id), 'status' => CRM_Core_PseudoConstant::getLabel('CRM_Batch_BAO_Batch', 'status_id', $batchInfo->status_id), 'description' => $batchInfo->description, @@ -549,4 +549,5 @@ class CRM_Financial_Page_AJAX { return $batchSummary; } + } diff --git a/tests/phpunit/CRM/Financial/Page/AjaxBatchSummaryTest.php b/tests/phpunit/CRM/Financial/Page/AjaxBatchSummaryTest.php index 6ec7b1e139..71442cfe79 100644 --- a/tests/phpunit/CRM/Financial/Page/AjaxBatchSummaryTest.php +++ b/tests/phpunit/CRM/Financial/Page/AjaxBatchSummaryTest.php @@ -30,20 +30,21 @@ require_once 'CiviTest/CiviUnitTestCase.php'; * Test for CRM_Financial_Page_Ajax class. */ class CRM_Financial_Page_AjaxBatchSummaryTest extends CiviUnitTestCase { - /** - * Test the makeBatchSummary function. - * - * We want to ensure changing the meethod of obtaining status and payment_instrument - * does not cause any regression. - */ - public function testMakeBatchSummary() { - $batch = $this->callAPISuccess('Batch', 'create', array('title' => 'test', 'status_id' => 'Open', 'payment_instrument_id' => 'Cash')); + /** + * Test the makeBatchSummary function. + * + * We want to ensure changing the method of obtaining status and payment_instrument + * does not cause any regression. + */ + public function testMakeBatchSummary() { + $batch = $this->callAPISuccess('Batch', 'create', array('title' => 'test', 'status_id' => 'Open', 'payment_instrument_id' => 'Cash')); - $batchID = $batch['id']; - $params = array('id' => $batchID); - $makeBatchSummary = CRM_Financial_Page_AJAX::makeBatchSummary($batchID,$params); + $batchID = $batch['id']; + $params = array('id' => $batchID); + $makeBatchSummary = CRM_Financial_Page_AJAX::makeBatchSummary($batchID, $params); + + $this->assertEquals('Open', $makeBatchSummary['status']); + $this->assertEquals('Cash', $makeBatchSummary['payment_instrument']); + } - $this->assertEquals('Open', $makeBatchSummary['status']); - $this->assertEquals('Cash', $makeBatchSummary['payment_instrument']); - } } -- 2.25.1