Browse Source

disable account plan for nonpayment

tags/v0.1.6
Jonathan Cobb 5 years ago
parent
commit
d72ae7c56f
2 changed files with 3 additions and 2 deletions
  1. +1
    -0
      bubble-server/src/main/java/bubble/service/bill/BillingService.java
  2. +2
    -2
      bubble-server/src/test/resources/models/tests/payment/recurring_billing.json

+ 1
- 0
bubble-server/src/main/java/bubble/service/bill/BillingService.java View File

@@ -92,6 +92,7 @@ public class BillingService extends SimpleDaemon {
final long unpaidStart = plan.getPeriod().periodMillis(bill.getPeriodStart()); final long unpaidStart = plan.getPeriod().periodMillis(bill.getPeriodStart());
final int unpaidDays = Days.daysBetween(new DateTime(unpaidStart), new DateTime(now())).getDays(); final int unpaidDays = Days.daysBetween(new DateTime(unpaidStart), new DateTime(now())).getDays();
if (unpaidDays > MAX_UNPAID_DAYS_BEFORE_STOP) { if (unpaidDays > MAX_UNPAID_DAYS_BEFORE_STOP) {
accountPlanDAO.update(accountPlan.setEnabled(false));
final BubbleNetwork network = networkDAO.findByUuid(accountPlan.getNetwork()); final BubbleNetwork network = networkDAO.findByUuid(accountPlan.getNetwork());
try { try {
networkService.stopNetwork(network); networkService.stopNetwork(network);


+ 2
- 2
bubble-server/src/test/resources/models/tests/payment/recurring_billing.json View File

@@ -431,7 +431,7 @@
"comment": "verify plan is no longer enabled", "comment": "verify plan is no longer enabled",
"request": { "uri": "me/plans/{{accountPlan.uuid}}" }, "request": { "uri": "me/plans/{{accountPlan.uuid}}" },
"response": { "response": {
"check": [ {"condition": "json.getStatus().disabled()"} ]
"check": [ {"condition": "json.disabled()"} ]
} }
}, },


@@ -490,7 +490,7 @@
"comment": "verify plan has been re-enabled", "comment": "verify plan has been re-enabled",
"request": { "uri": "me/plans/{{accountPlan.uuid}}" }, "request": { "uri": "me/plans/{{accountPlan.uuid}}" },
"response": { "response": {
"check": [ {"condition": "json.getStatus().enabled()"} ]
"check": [ {"condition": "json.enabled()"} ]
} }
}, },




Loading…
Cancel
Save