From: Yashodha Chaku Date: Wed, 2 Nov 2016 14:57:20 +0000 (+0530) Subject: Merge pull request #9337 from eileenmcnaughton/line_item X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b266f5650a8b19ec2413d81d2b5a1d5fab0f5e0;p=civicrm-core.git Merge pull request #9337 from eileenmcnaughton/line_item CRM-19583 show financial type of line items whenbackoffice users view… --- 1b266f5650a8b19ec2413d81d2b5a1d5fab0f5e0 diff --cc CRM/Contribute/Form/ContributionView.php index f21e4d219c,78ac04e1dc..0f282c97a3 --- a/CRM/Contribute/Form/ContributionView.php +++ b/CRM/Contribute/Form/ContributionView.php @@@ -151,16 -151,16 +151,17 @@@ class CRM_Contribute_Form_ContributionV } $lineItems = array(); + $displayLineItems = FALSE; if ($id) { - $lineItem = CRM_Price_BAO_LineItem::getLineItems($id, 'contribution', 1, TRUE, TRUE); - if (!empty($lineItem)) { - $lineItems[] = $lineItem; - } - + $lineItems = array(CRM_Price_BAO_LineItem::getLineItemsByContributionID(($id))); + $firstLineItem = reset($lineItems[0]); + $priceSet = civicrm_api3('PriceSet', 'getsingle', array('id' => $firstLineItem['price_set_id'], 'return' => 'is_quick_config, id')); + $displayLineItems = !$priceSet['is_quick_config']; } - $this->assign('lineItem', empty($lineItems) ? FALSE : $lineItems); + $this->assign('lineItem', $lineItems); + $this->assign('displayLineItems', $displayLineItems); $values['totalAmount'] = $values['total_amount']; + $this->assign('displayLineItemFinancialType', TRUE); //do check for campaigns if ($campaignId = CRM_Utils_Array::value('campaign_id', $values)) {