Skip to content

Commit

Permalink
Merge pull request #484 from compucorp/CIWEMB-345-handle-membership-p…
Browse files Browse the repository at this point in the history
…ayment-plan

CIWEMB-345: Handle payment plan in test mode
  • Loading branch information
ahed-compucorp authored Aug 7, 2023
2 parents a0b7239 + 9544fdd commit 685e053
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ private function setLastContribution() {
'fee_amount', 'total_amount', 'payment_instrument_id', 'is_test',
'tax_amount', 'contribution_recur_id', 'financial_type_id', 'receive_date',
],
'is_test' => $this->currentRecurContribution['is_test'] ?? 0,
'contribution_recur_id' => $this->currentRecurContribution['id'],
'options' => ['limit' => 1, 'sort' => 'id DESC'],
])['values'][0];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ class CRM_MembershipExtras_Test_Entity_PaymentPlanMembershipOrder {

public $paymentSchemeId;

public $isTest;

}
4 changes: 3 additions & 1 deletion CRM/MembershipExtras/Test/Fabricator/PaymentPlanOrder.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static function fabricate(PaymentPlanMembershipOrderEntity $paymentPlanMe
* @throws CiviCRM_API3_Exception
*/
private static function updatePaymentPlanMissingParams() {
self::$paymentPlanMembershipOrder->isTest = self::$paymentPlanMembershipOrder->isTest ?? 0;
if (empty(self::$paymentPlanMembershipOrder->contactId)) {
self::$paymentPlanMembershipOrder->contactId = CRM_MembershipExtras_Test_Fabricator_Contact::fabricate()['id'];
}
Expand Down Expand Up @@ -133,7 +134,7 @@ private static function createRecurringContribution() {
'frequency_interval' => $frequencyInterval,
'installments' => $instalments,
'contribution_status_id' => self::$paymentPlanMembershipOrder->paymentPlanStatus,
'is_test' => 0,
'is_test' => self::$paymentPlanMembershipOrder->isTest,
'auto_renew' => isset(self::$paymentPlanMembershipOrder->autoRenew) ? self::$paymentPlanMembershipOrder->autoRenew : 1,
'cycle_day' => CRM_MembershipExtras_Service_CycleDayCalculator::calculate(self::$paymentPlanMembershipOrder->paymentPlanStartDate, $frequencyUnit),
'payment_processor_id' => self::$paymentPlanMembershipOrder->paymentProcessor,
Expand Down Expand Up @@ -298,6 +299,7 @@ private static function createFirstInstalment($recurringContribution, &$lineItem
'payment_instrument_id' => self::$paymentPlanMembershipOrder->paymentMethod,
'financial_type_id' => self::$paymentPlanMembershipOrder->financialType,
'contribution_status_id' => self::$paymentPlanMembershipOrder->paymentPlanStatus,
'is_test' => self::$paymentPlanMembershipOrder->isTest,
];
$contribution = ContributionFabricator::fabricate($params);

Expand Down

0 comments on commit 685e053

Please sign in to comment.