|
|
@ -284,9 +284,7 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr |
|
|
|
List<CouponDTO> sortedCouponList = couponList.subList(1, couponList.size()); |
|
|
|
Collections.sort(sortedCouponList); |
|
|
|
onCouponSelected(sortedCouponList.get(0)); |
|
|
|
} |
|
|
|
catch (Exception e) |
|
|
|
{ |
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -430,12 +428,13 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr |
|
|
|
} |
|
|
|
|
|
|
|
private String getAppliedCollectionAmountIfAvailable() { |
|
|
|
AmountDetailSendMoneyFragment.CouponDetailViewDTO netAppliedData = calculateNetAppliedAmount(); |
|
|
|
if (netAppliedData == null) |
|
|
|
return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); |
|
|
|
else { |
|
|
|
return Utils.removeSpecialCharacterAndDecimalFromCurrency(netAppliedData.getAppliedAmount()); |
|
|
|
} |
|
|
|
return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); |
|
|
|
// AmountDetailSendMoneyFragment.CouponDetailViewDTO netAppliedData = calculateNetAppliedAmount(); |
|
|
|
// if (netAppliedData == null) |
|
|
|
// return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); |
|
|
|
// else { |
|
|
|
// return Utils.removeSpecialCharacterAndDecimalFromCurrency(netAppliedData.getAppliedAmount()); |
|
|
|
// } |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -604,7 +603,11 @@ public class SendMoneyV2Presenter extends BaseViewModel implements SendMoneyV2Pr |
|
|
|
userInfoModelV2.setAvailableBalance(sendMoneyResponse.getExtra()); |
|
|
|
userInfoModelV2.setYearlyLimit(sendMoneyResponse.getExtra2()); |
|
|
|
gateway.updateUserInfoInBatch(userInfoModelV2); |
|
|
|
view.showPopUpMessage(sendMoneyResponse.getMsg() + "\n(" + getStringfromStringId(R.string.estimated_earning_points_text) + ": " + sendMoneyResponse.getExtra2() + ")", CustomAlertDialog.AlertType.SUCCESS, alertType -> { |
|
|
|
String rewardpoint = Utils.formatCurrency(sendMoneyResponse.getExtra2()); |
|
|
|
String transferSucessMessage = getStringfromStringId(R.string.transfer_success_text); |
|
|
|
if (rewardpoint != null && rewardpoint.length() > 0) |
|
|
|
transferSucessMessage += "\n(" + getStringfromStringId(R.string.estimated_earning_points_text) + ": " + rewardpoint + ")"; |
|
|
|
view.showPopUpMessage(transferSucessMessage, CustomAlertDialog.AlertType.SUCCESS, alertType -> { |
|
|
|
view.updateFinalTransitionToValid(true); |
|
|
|
view.showReceiptOnTransactionComplete(sendMoneyResponse.getId()); |
|
|
|
}); |
|
|
|