Browse Source

Referral code added and comma removed from all api related to txn

master
Preyea Regmi 6 years ago
parent
commit
ec80d044a5
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java
  3. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
  4. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Constants.java
  6. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java

BIN
.idea/caches/build_file_checksums.ser

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/exchange_rate/presenter/ExchangeRateV2Presenter.java

@ -61,7 +61,7 @@ public class ExchangeRateV2Presenter extends BasePresenter implements ExchangeRa
this.gateway.sendDataForForexCalculation(gateway.getAuth(),
sendCountryDefault,
gateway.getUserPreferredCurrency(),selectedCountryPaymentService.getCurrency(),
sendAmount,recipientAmount,selectedPaymentMode.getId(),calculateFlag,selectedCountryPaymentService.getCountry(),
Utils.removeCommaFromAmount(sendAmount),Utils.removeCommaFromAmount(recipientAmount),selectedPaymentMode.getId(),calculateFlag,selectedCountryPaymentService.getCountry(),
selectedCountryPaymentService.getCountryId())
.doOnSubscribe(disposable -> this.view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.doOnError((err) -> this.view.showProgressBar(false, ""))

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java

@ -106,7 +106,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
resendRelatedData.getRemitDetail().setCollAmt(Utils.removeSpecialCharacterAndDecimalFromCurrency(sendingAmount));
resendRelatedData.getRemitDetail().setExRate(selectedExRate);
resendRelatedData.getRemitDetail().setTpExRate(selectedExRate);
resendRelatedData.getRemitDetail().setPayoutAmt(recievingAmount);
resendRelatedData.getRemitDetail().setPayoutAmt(Utils.removeCommaFromAmount(recievingAmount));
resendRelatedData.getRemitDetail().setServiceCharge(transferFee);
resendRelatedData.getRemitDetail().setCalBy(shouldCalcByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER);
resendRelatedData.getRemitDetail().setForeXSESSIONID(forexId);
@ -208,8 +208,8 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney
@Override
public void getForex(String recieveAmount, String senderAmount, boolean shouldCaulatedByRecipient) {
resendRelatedData.getExRate().setCalcBy(shouldCaulatedByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER);
resendRelatedData.getExRate().setCAmount(senderAmount);
resendRelatedData.getExRate().setPAmount(recieveAmount);
resendRelatedData.getExRate().setCAmount(Utils.removeCommaFromAmount(senderAmount));
resendRelatedData.getExRate().setPAmount(Utils.removeCommaFromAmount(recieveAmount));
getExRateFromNetwork();
}

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java

@ -261,7 +261,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
sendMoneyAPIRequestBody.setpCurr(selectedSendingCurrency);
sendMoneyAPIRequestBody.setCollAmt(Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount));
sendMoneyAPIRequestBody.setCollCurr("KRW");
sendMoneyAPIRequestBody.setPayoutAmt(selectedRecievingAmount);
sendMoneyAPIRequestBody.setPayoutAmt(Utils.removeCommaFromAmount(selectedRecievingAmount));
sendMoneyAPIRequestBody.setTransferAmt(selectedTransferAmount);
sendMoneyAPIRequestBody.setServiceCharge(selectedTransferFee);
sendMoneyAPIRequestBody.setDiscount("");
@ -349,8 +349,8 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
return gateway.sendDataForForexCalculation(gateway.getAuth(), senderCountryId,
senderCurrency, recieverCurrency, senderAmount,
recieveAmount, paymentMethodId, calculationPreference, recipientCountryName,
senderCurrency, recieverCurrency, Utils.removeCommaFromAmount(senderAmount),
Utils.removeCommaFromAmount(recieveAmount), paymentMethodId, calculationPreference, recipientCountryName,
recipientCountryID, bankId, paymentPartnerId, gateway.getUserID(), selectedPaymentType.getType())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Constants.java

@ -127,7 +127,7 @@ public class Constants {
public static final String RECIPIENT_UPDATE = "RECIPIENT_UPDATE";
// User Request
public static final String USER_REQUEST_PAGE = "USER_REQUEST_PAGE";
public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "100000";
public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "1000000";
public static final String CALC_BY_RECIPEINT = "p";
public static final String CALC_BY_SENDER = "c";
public static final String SUCCESS_CODE_V2 = "0";

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java

@ -541,6 +541,12 @@ public class Utils {
return unformmatedCurrency.trim().replaceAll("[^\\d.]", "");
}
public static String removeCommaFromAmount(String unformmatedCurrency) {
if (unformmatedCurrency == null)
return null;
return unformmatedCurrency.trim().replaceAll(",", "");
}
public static boolean isIntentAvailable(Context context, String action) {
final PackageManager packageManager = context.getPackageManager();
final Intent intent = new Intent(action);

Loading…
Cancel
Save