Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-20276, CRM-20257, CRM-20259, CRM-20260, CRM-20262 : Sale Tax issues #10172

Closed
wants to merge 7 commits into from

Conversation

$this->assertEquals($taxAmount, 0, 'Amount does not match.');
}

/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do proper docblock

@colemanw
Copy link
Member

colemanw commented Apr 17, 2017

@Monish are these new functions called from anywhere? I would prefer to review/merge a complete PR that has the functions being used.

@colemanw
Copy link
Member

@monishdeb tests are failing with this in the console:

PHP Fatal error:  Call to undefined method CRM_Contribute_BAO_Contribution::calcluateFinancialItemAmount()

I've merged 2 other PRs into this one but perhaps it's still not complete? What's missing?

'previous_line_total' => CRM_Utils_Array::value('line_total', CRM_Utils_Array::value($fieldValues['id'], $previousLineItem)),
'item_amount' => $itemAmount,
);
$amount = self::calcluateFinancialItemAmount($params, $amountParams, $context, $fieldValues);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@colemanw its a typo calculateFinancialItemAmount instead of calcluateFinancialItemAmount

@monishdeb monishdeb changed the title CRM-19585: added function to Calculate Tax for each item when Financial Type is changed CRM-20276, CRM-20257, CRM-20259, CRM-20260, CRM-20262 : Sale Tax issues Apr 27, 2017
@monishdeb
Copy link
Member Author

The commits of PR
#9682
#9683
#9684
#9685

are included in this PR with some additional changes

@monishdeb monishdeb force-pushed the CRM-19585-8 branch 4 times, most recently from deaf750 to 8f6592f Compare April 28, 2017 07:13
@JoeMurray
Copy link
Contributor

Jenkins, please retest.

@JoeMurray
Copy link
Contributor

@monishdeb @colemanw can we push this forward? What needs to be done to get this merged? Monish, could you start by getting it to pass all tests?

pradpnayak and others added 7 commits June 19, 2017 23:57
…r contribution is changed.

----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
…for contribution like Amount, FT, PI

----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
@monishdeb
Copy link
Member Author

monishdeb commented Jun 19, 2017

@JoeMurray I have now rebased the PR. Earlier, it took me time to understand the code and tried to fix the related test build failures, but without any success. So I discussed with @pradpnayak and he agrees to take a look at it.

@colemanw
Copy link
Member

@monishdeb @pradpnayak this still has failing tests.
@JoeMurray

@colemanw colemanw added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Jul 11, 2017
@colemanw
Copy link
Member

Labelling WIP due to failing tests.

@JoeMurray
Copy link
Contributor

@monishdeb @pradpnayak please update to get it to pass tests.

@monishdeb
Copy link
Member Author

@pradpnayak I am unable to fix the related test build failures. Can you please take a look?

@eileenmcnaughton
Copy link
Contributor

@monishdeb I'm pretty sure this needs a replacement PR - that may have already happened & this has just not been closed. It's unclear what this is trying to fix

@monishdeb
Copy link
Member Author

Agree with you. Will create replacement PR(s) addressing issues respectively. Closing this for now.

@monishdeb monishdeb closed this Nov 29, 2017
@monishdeb monishdeb deleted the CRM-19585-8 branch December 21, 2017 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants