Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-25 01:41:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename 'cash by atm' to 'cash at atm'

Browse source
This commit is contained in:
woodser 2023-06-05 11:25:39 -04:00
parent 9fffd74ddb
commit ec49e2f327
11 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/haveno/core/payment/CashByAtmAccount.java → core/src/main/java/haveno/core/payment/CashAtAtmAccount.java
View file

@ -20,14 +20,14 @@ package haveno.core.payment;
import haveno.core.api.model.PaymentAccountFormField;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.payload.CashByAtmAccountPayload;
import haveno.core.payment.payload.CashAtAtmAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import lombok.NonNull;
import java.util.List;
public final class CashByAtmAccount extends PaymentAccount {
public final class CashAtAtmAccount extends PaymentAccount {
public static final List<TradeCurrency> SUPPORTED_CURRENCIES = CurrencyUtil.getAllFiatCurrencies();
@ -35,13 +35,13 @@ public final class CashByAtmAccount extends PaymentAccount {
PaymentAccountFormField.FieldId.EXTRA_INFO
);
public CashByAtmAccount() {
super(PaymentMethod.CASH_BY_ATM);
public CashAtAtmAccount() {
super(PaymentMethod.CASH_AT_ATM);
}
@Override
protected PaymentAccountPayload createPayload() {
return new CashByAtmAccountPayload(paymentMethod.getId(), id);
return new CashAtAtmAccountPayload(paymentMethod.getId(), id);
}
@Override
@ -55,10 +55,10 @@ public final class CashByAtmAccount extends PaymentAccount {
}
public void setExtraInfo(String extraInfo) {
((CashByAtmAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
((CashAtAtmAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
}
public String getExtraInfo() {
return ((CashByAtmAccountPayload) paymentAccountPayload).getExtraInfo();
return ((CashAtAtmAccountPayload) paymentAccountPayload).getExtraInfo();
}
}

4
core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
View file

@ -76,8 +76,8 @@ public class PaymentAccountFactory {
return new F2FAccount();
case PaymentMethod.PAY_BY_MAIL_ID:
return new PayByMailAccount();
case PaymentMethod.CASH_BY_ATM_ID:
return new CashByAtmAccount();
case PaymentMethod.CASH_AT_ATM_ID:
return new CashAtAtmAccount();
case PaymentMethod.PROMPT_PAY_ID:
return new PromptPayAccount();
case PaymentMethod.ADVANCED_CASH_ID:

14
core/src/main/java/haveno/core/payment/payload/CashByAtmAccountPayload.java → core/src/main/java/haveno/core/payment/payload/CashAtAtmAccountPayload.java
View file

@ -35,10 +35,10 @@ import java.util.Map;
@Setter
@Getter
@Slf4j
public final class CashByAtmAccountPayload extends PaymentAccountPayload {
public final class CashAtAtmAccountPayload extends PaymentAccountPayload {
private String extraInfo = "";
public CashByAtmAccountPayload(String paymentMethod, String id) {
public CashAtAtmAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id);
}
@ -47,7 +47,7 @@ public final class CashByAtmAccountPayload extends PaymentAccountPayload {
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
private CashByAtmAccountPayload(String paymentMethod, String id,
private CashAtAtmAccountPayload(String paymentMethod, String id,
String extraInfo,
long maxTradePeriod,
Map<String, String> excludeFromJsonDataMap) {
@ -61,15 +61,15 @@ public final class CashByAtmAccountPayload extends PaymentAccountPayload {
@Override
public Message toProtoMessage() {
return getPaymentAccountPayloadBuilder()
.setCashByAtmAccountPayload(protobuf.CashByAtmAccountPayload.newBuilder()
.setCashAtAtmAccountPayload(protobuf.CashAtAtmAccountPayload.newBuilder()
.setExtraInfo(extraInfo))
.build();
}
public static CashByAtmAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new CashByAtmAccountPayload(proto.getPaymentMethodId(),
public static CashAtAtmAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new CashAtAtmAccountPayload(proto.getPaymentMethodId(),
proto.getId(),
proto.getCashByAtmAccountPayload().getExtraInfo(),
proto.getCashAtAtmAccountPayload().getExtraInfo(),
proto.getMaxTradePeriod(),
new HashMap<>(proto.getExcludeFromJsonDataMap()));
}

12
core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
View file

@ -31,7 +31,7 @@ import haveno.core.payment.AmazonGiftCardAccount;
import haveno.core.payment.AustraliaPayidAccount;
import haveno.core.payment.BizumAccount;
import haveno.core.payment.CapitualAccount;
import haveno.core.payment.CashByAtmAccount;
import haveno.core.payment.CashAtAtmAccount;
import haveno.core.payment.PayByMailAccount;
import haveno.core.payment.CashDepositAccount;
import haveno.core.payment.CelPayAccount;
@ -163,7 +163,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static final String AMAZON_GIFT_CARD_ID = "AMAZON_GIFT_CARD";
public static final String BLOCK_CHAINS_INSTANT_ID = "BLOCK_CHAINS_INSTANT";
public static final String PAY_BY_MAIL_ID = "PAY_BY_MAIL";
public static final String CASH_BY_ATM_ID = "CASH_BY_ATM";
public static final String CASH_AT_ATM_ID = "CASH_AT_ATM";
public static final String CAPITUAL_ID = "CAPITUAL";
public static final String CELPAY_ID = "CELPAY";
public static final String MONESE_ID = "MONESE";
@ -226,7 +226,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static PaymentMethod AMAZON_GIFT_CARD;
public static PaymentMethod BLOCK_CHAINS_INSTANT;
public static PaymentMethod PAY_BY_MAIL;
public static PaymentMethod CASH_BY_ATM;
public static PaymentMethod CASH_AT_ATM;
public static PaymentMethod CAPITUAL;
public static PaymentMethod CELPAY;
public static PaymentMethod MONESE;
@ -274,7 +274,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
// Global
CASH_DEPOSIT = new PaymentMethod(CASH_DEPOSIT_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashDepositAccount.SUPPORTED_CURRENCIES)),
PAY_BY_MAIL = new PaymentMethod(PAY_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PayByMailAccount.SUPPORTED_CURRENCIES)),
CASH_BY_ATM = new PaymentMethod(CASH_BY_ATM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashByAtmAccount.SUPPORTED_CURRENCIES)),
CASH_AT_ATM = new PaymentMethod(CASH_AT_ATM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashAtAtmAccount.SUPPORTED_CURRENCIES)),
MONEY_GRAM = new PaymentMethod(MONEY_GRAM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(MoneyGramAccount.SUPPORTED_CURRENCIES)),
WESTERN_UNION = new PaymentMethod(WESTERN_UNION_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(WesternUnionAccount.SUPPORTED_CURRENCIES)),
NATIONAL_BANK = new PaymentMethod(NATIONAL_BANK_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(NationalBankAccount.SUPPORTED_CURRENCIES)),
@ -566,12 +566,12 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
}
public static boolean isRoundedForAtmCash(String id) {
return id.equals(PaymentMethod.CASH_BY_ATM_ID) ||
return id.equals(PaymentMethod.CASH_AT_ATM_ID) ||
id.equals(PaymentMethod.HAL_CASH_ID);
}
public static boolean isFixedPriceOnly(String id) {
return id.equals(PaymentMethod.CASH_BY_ATM_ID) ||
return id.equals(PaymentMethod.CASH_AT_ATM_ID) ||
id.equals(PaymentMethod.HAL_CASH_ID);
}
}

6
core/src/main/java/haveno/core/proto/CoreProtoResolver.java
View file

@ -30,7 +30,7 @@ import haveno.core.payment.payload.AustraliaPayidAccountPayload;
import haveno.core.payment.payload.BizumAccountPayload;
import haveno.core.payment.payload.CapitualAccountPayload;
import haveno.core.payment.payload.CashAppAccountPayload;
import haveno.core.payment.payload.CashByAtmAccountPayload;
import haveno.core.payment.payload.CashAtAtmAccountPayload;
import haveno.core.payment.payload.PayByMailAccountPayload;
import haveno.core.payment.payload.CashDepositAccountPayload;
import haveno.core.payment.payload.CelPayAccountPayload;
@ -202,8 +202,8 @@ public class CoreProtoResolver implements ProtoResolver {
return USPostalMoneyOrderAccountPayload.fromProto(proto);
case PAY_BY_MAIL_ACCOUNT_PAYLOAD:
return PayByMailAccountPayload.fromProto(proto);
case CASH_BY_ATM_ACCOUNT_PAYLOAD:
return CashByAtmAccountPayload.fromProto(proto);
case CASH_AT_ATM_ACCOUNT_PAYLOAD:
return CashAtAtmAccountPayload.fromProto(proto);
case PROMPT_PAY_ACCOUNT_PAYLOAD:
return PromptPayAccountPayload.fromProto(proto);
case ADVANCED_CASH_ACCOUNT_PAYLOAD:

8
core/src/main/resources/i18n/displayStrings.properties
View file

@ -2950,11 +2950,11 @@ Any special terms/conditions; \n\
Any other details.
payment.tradingRestrictions=Please review the maker's terms and conditions.\n\
If you do not meet the requirements do not take this trade.
payment.cashByAtm.info=Cash at ATM: Cardless withdraw at ATM using code\n\n\
payment.cashAtAtm.info=Cash at ATM: Cardless withdraw at ATM using code\n\n\
1. List your accepted banks, regions, or other terms.\n\n\
2. Chat with your peer trader to coordinate a time and share the withdraw code.\n\n\
If you cannot complete the transaction as specified in your trade contract, you may lose some (or all) of your security deposit.
payment.cashByAtm.extraInfo.prompt=Please state on your offers: \n\n\
payment.cashAtAtm.extraInfo.prompt=Please state on your offers: \n\n\
Your accepted banks / locations; \n\
Any special terms/conditions; \n\
Any other details.
@ -3009,7 +3009,7 @@ SPECIFIC_BANKS=Transfers with specific banks
US_POSTAL_MONEY_ORDER=US Postal Money Order
CASH_DEPOSIT=Cash Deposit
PAY_BY_MAIL=Pay By Mail
CASH_BY_ATM=Cash by ATM
CASH_AT_ATM=Cash at ATM
MONEY_GRAM=MoneyGram
WESTERN_UNION=Western Union
F2F=Face to face (in person)
@ -3029,7 +3029,7 @@ CASH_DEPOSIT_SHORT=Cash Deposit
# suppress inspection "UnusedProperty"
PAY_BY_MAIL_SHORT=Pay By Mail
# suppress inspection "UnusedProperty"
CASH_BY_ATM_SHORT=Cash By ATM
CASH_AT_ATM_SHORT=Cash At ATM
# suppress inspection "UnusedProperty"
MONEY_GRAM_SHORT=MoneyGram
# suppress inspection "UnusedProperty"