IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Minor fixes in coupon related

master
Preyea Regmi 4 years ago
parent
bc503e6dcf
commit
e9162ea470
7 changed files with 50 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
  3. 26
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java
  4. 23
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  5. 9
      app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
  6. 2
      app/src/main/res/layout/confirm_reward_redeem_bottom_sheet.xml
  7. 7
      app/src/main/res/layout/fragment_coupon_list.xml

BIN
.idea/caches/build_file_checksums.ser
View File

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
View File

@ -328,7 +328,7 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
@Override
protected void onSuccess(GenericResponseDataModel<Object> data) {
if (data.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
getUserRelatedData().subscribe(new UserInfoObserver(data.getMsg()));
getUserRelatedData().subscribe(new UserInfoObserver("You can now use free service charge coupon while sending money overseas."));
} else {
view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
}

26
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java
View File

@ -1,5 +1,7 @@
package com.gmeremit.online.gmeremittance_native.sendmoneyV2.model;
import android.util.Log;
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
@ -256,7 +258,17 @@ public class SendMoneyTransactionCompleteModel {
}
public String getCollAmount() {
return collAmount;
String formatted= collAmount;
Log.d("TransactionReceipt","Unformatted: "+formatted);
try {
formatted= Utils.formatCurrency(Utils.removeCommaFromAmount(collAmount.replaceAll("KRW", "")))+" KRW";
Log.d("TransactionReceipt","Formatted: "+formatted);
}
catch ( Exception e)
{
}
return formatted;
}
public void setCollAmount(String collAmount) {
@ -272,7 +284,17 @@ public class SendMoneyTransactionCompleteModel {
}
public String getServiceCharge() {
return serviceCharge;
String formatted= serviceCharge;
Log.d("TransactionReceipt","Unformatted: "+formatted);
try {
formatted= Utils.formatCurrency(Utils.removeCommaFromAmount(serviceCharge.replaceAll("KRW", "")))+" KRW";
Log.d("TransactionReceipt","Formatted: "+formatted);
}
catch ( Exception e)
{
}
return formatted;
}
public void setServiceCharge(String serviceCharge) {

23
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
View File

@ -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());
});

9
app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
View File

@ -555,10 +555,15 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:padding="@dimen/_8sdp"
android:paddingTop="@dimen/_8sdp"
android:paddingBottom="@dimen/_8sdp"
android:paddingEnd="@dimen/_8sdp"
android:paddingStart="@dimen/_17sdp"
android:textColor="@color/darkgray"
android:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
app:txtfontName="@string/semibold"
tools:text="Some really really long coupon name for testing the UI. Some really really long coupon name for testing the UI." />
</LinearLayout>
<!---->
<View

2
app/src/main/res/layout/confirm_reward_redeem_bottom_sheet.xml
View File

@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Is this information correct?"
android:text="@string/confirm_viewconroller_default_title_text"
android:textColor="@color/black"
android:textSize="@dimen/_14sdp"
app:layout_constraintEnd_toEndOf="parent"

7
app/src/main/res/layout/fragment_coupon_list.xml
View File

@ -34,9 +34,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="@dimen/_3sdp"
android:paddingEnd="@dimen/_3sdp"
android:gravity="center"
android:paddingStart="@dimen/_8sdp"
android:paddingEnd="@dimen/_8sdp"
android:gravity="start"
android:layout_gravity="center_vertical"
tools:text="0 coupon(s) possessed" />
@ -48,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:visibility="gone"
android:layout_gravity="center_vertical"
android:textColor="@color/colorPrimary"
android:text="@string/coupon_guideline_title_text" />

Write Preview
Loading…
Cancel
Save