Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-13 00:45:29 -04:00
Code Issues Projects Releases Packages Wiki Activity

change 'cash by mail' to 'pay by mail'

Browse source
This commit is contained in:
woodser 2023-05-14 11:51:21 -04:00
parent 29706339ef
commit 1257072211
32 changed files with 200 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/haveno/core/offer/Offer.java
View file

@ -372,8 +372,8 @@ public class Offer implements NetworkPayload, PersistablePayload {
public String getExtraInfo() {
if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.F2F_EXTRA_INFO))
return getExtraDataMap().get(OfferPayload.F2F_EXTRA_INFO);
else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.CASH_BY_MAIL_EXTRA_INFO))
return getExtraDataMap().get(OfferPayload.CASH_BY_MAIL_EXTRA_INFO);
else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.PAY_BY_MAIL_EXTRA_INFO))
return getExtraDataMap().get(OfferPayload.PAY_BY_MAIL_EXTRA_INFO);
else
return "";
}

2
core/src/main/java/haveno/core/offer/OfferPayload.java
View file

@ -95,7 +95,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
// Only used in payment method F2F
public static final String F2F_CITY = "f2fCity";
public static final String F2F_EXTRA_INFO = "f2fExtraInfo";
public static final String CASH_BY_MAIL_EXTRA_INFO = "cashByMailExtraInfo";
public static final String PAY_BY_MAIL_EXTRA_INFO = "payByMailExtraInfo";
// Comma separated list of ordinal of a haveno.common.app.Capability. E.g. ordinal of
// Capability.SIGNED_ACCOUNT_AGE_WITNESS is 11 and Capability.MEDIATION is 12 so if we want to signal that maker

8
core/src/main/java/haveno/core/offer/OfferUtil.java
View file

@ -28,7 +28,7 @@ import haveno.core.locale.Res;
import haveno.core.monetary.Price;
import haveno.core.monetary.TraditionalMoney;
import haveno.core.monetary.Volume;
import haveno.core.payment.CashByMailAccount;
import haveno.core.payment.PayByMailAccount;
import haveno.core.payment.F2FAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.provider.price.MarketPrice;
@ -58,7 +58,7 @@ import static haveno.common.util.MathUtils.roundDoubleToLong;
import static haveno.common.util.MathUtils.scaleUpByPowerOf10;
import static haveno.core.offer.OfferPayload.ACCOUNT_AGE_WITNESS_HASH;
import static haveno.core.offer.OfferPayload.CAPABILITIES;
import static haveno.core.offer.OfferPayload.CASH_BY_MAIL_EXTRA_INFO;
import static haveno.core.offer.OfferPayload.PAY_BY_MAIL_EXTRA_INFO;
import static haveno.core.offer.OfferPayload.F2F_CITY;
import static haveno.core.offer.OfferPayload.F2F_EXTRA_INFO;
import static haveno.core.offer.OfferPayload.REFERRAL_ID;
@ -199,8 +199,8 @@ public class OfferUtil {
extraDataMap.put(F2F_EXTRA_INFO, ((F2FAccount) paymentAccount).getExtraInfo());
}
if (paymentAccount instanceof CashByMailAccount) {
extraDataMap.put(CASH_BY_MAIL_EXTRA_INFO, ((CashByMailAccount) paymentAccount).getExtraInfo());
if (paymentAccount instanceof PayByMailAccount) {
extraDataMap.put(PAY_BY_MAIL_EXTRA_INFO, ((PayByMailAccount) paymentAccount).getExtraInfo());
}
extraDataMap.put(CAPABILITIES, Capabilities.app.toStringList());

22
core/src/main/java/haveno/core/payment/CashByMailAccount.java → core/src/main/java/haveno/core/payment/PayByMailAccount.java
View file

@ -20,24 +20,24 @@ 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.CashByMailAccountPayload;
import haveno.core.payment.payload.PayByMailAccountPayload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import lombok.NonNull;
import java.util.List;
public final class CashByMailAccount extends PaymentAccount {
public final class PayByMailAccount extends PaymentAccount {
public static final List<TradeCurrency> SUPPORTED_CURRENCIES = CurrencyUtil.getAllTraditionalCurrencies();
public CashByMailAccount() {
super(PaymentMethod.CASH_BY_MAIL);
public PayByMailAccount() {
super(PaymentMethod.PAY_BY_MAIL);
}
@Override
protected PaymentAccountPayload createPayload() {
return new CashByMailAccountPayload(paymentMethod.getId(), id);
return new PayByMailAccountPayload(paymentMethod.getId(), id);
}
@Override
@ -51,26 +51,26 @@ public final class CashByMailAccount extends PaymentAccount {
}
public void setPostalAddress(String postalAddress) {
((CashByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress);
((PayByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress);
}
public String getPostalAddress() {
return ((CashByMailAccountPayload) paymentAccountPayload).getPostalAddress();
return ((PayByMailAccountPayload) paymentAccountPayload).getPostalAddress();
}
public void setContact(String contact) {
((CashByMailAccountPayload) paymentAccountPayload).setContact(contact);
((PayByMailAccountPayload) paymentAccountPayload).setContact(contact);
}
public String getContact() {
return ((CashByMailAccountPayload) paymentAccountPayload).getContact();
return ((PayByMailAccountPayload) paymentAccountPayload).getContact();
}
public void setExtraInfo(String extraInfo) {
((CashByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
((PayByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
}
public String getExtraInfo() {
return ((CashByMailAccountPayload) paymentAccountPayload).getExtraInfo();
return ((PayByMailAccountPayload) paymentAccountPayload).getExtraInfo();
}
}

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

@ -74,8 +74,8 @@ public class PaymentAccountFactory {
return new HalCashAccount();
case PaymentMethod.F2F_ID:
return new F2FAccount();
case PaymentMethod.CASH_BY_MAIL_ID:
return new CashByMailAccount();
case PaymentMethod.PAY_BY_MAIL_ID:
return new PayByMailAccount();
case PaymentMethod.PROMPT_PAY_ID:
return new PromptPayAccount();
case PaymentMethod.ADVANCED_CASH_ID:

6
core/src/main/java/haveno/core/payment/PaymentAccountUtil.java
View file

@ -47,7 +47,7 @@ import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS;
import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS_INSTANT;
import static haveno.core.payment.payload.PaymentMethod.CAPITUAL_ID;
import static haveno.core.payment.payload.PaymentMethod.CASH_APP_ID;
import static haveno.core.payment.payload.PaymentMethod.CASH_BY_MAIL_ID;
import static haveno.core.payment.payload.PaymentMethod.PAY_BY_MAIL_ID;
import static haveno.core.payment.payload.PaymentMethod.CASH_DEPOSIT_ID;
import static haveno.core.payment.payload.PaymentMethod.CELPAY_ID;
import static haveno.core.payment.payload.PaymentMethod.CHASE_QUICK_PAY_ID;
@ -238,8 +238,8 @@ public class PaymentAccountUtil {
return SepaAccount.SUPPORTED_CURRENCIES;
case SEPA_INSTANT_ID:
return SepaInstantAccount.SUPPORTED_CURRENCIES;
case CASH_BY_MAIL_ID:
return CashByMailAccount.SUPPORTED_CURRENCIES;
case PAY_BY_MAIL_ID:
return PayByMailAccount.SUPPORTED_CURRENCIES;
case F2F_ID:
return F2FAccount.SUPPORTED_CURRENCIES;
case NATIONAL_BANK_ID:

18
core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java → core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java
View file

@ -35,12 +35,12 @@ import java.util.Map;
@Setter
@Getter
@Slf4j
public final class CashByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
public final class PayByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
private String postalAddress = "";
private String contact = "";
private String extraInfo = "";
public CashByMailAccountPayload(String paymentMethod, String id) {
public PayByMailAccountPayload(String paymentMethod, String id) {
super(paymentMethod, id);
}
@ -49,7 +49,7 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
private CashByMailAccountPayload(String paymentMethod, String id,
private PayByMailAccountPayload(String paymentMethod, String id,
String postalAddress,
String contact,
String extraInfo,
@ -67,19 +67,19 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem
@Override
public Message toProtoMessage() {
return getPaymentAccountPayloadBuilder()
.setCashByMailAccountPayload(protobuf.CashByMailAccountPayload.newBuilder()
.setPayByMailAccountPayload(protobuf.PayByMailAccountPayload.newBuilder()
.setPostalAddress(postalAddress)
.setContact(contact)
.setExtraInfo(extraInfo))
.build();
}
public static CashByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new CashByMailAccountPayload(proto.getPaymentMethodId(),
public static PayByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
return new PayByMailAccountPayload(proto.getPaymentMethodId(),
proto.getId(),
proto.getCashByMailAccountPayload().getPostalAddress(),
proto.getCashByMailAccountPayload().getContact(),
proto.getCashByMailAccountPayload().getExtraInfo(),
proto.getPayByMailAccountPayload().getPostalAddress(),
proto.getPayByMailAccountPayload().getContact(),
proto.getPayByMailAccountPayload().getExtraInfo(),
proto.getMaxTradePeriod(),
new HashMap<>(proto.getExcludeFromJsonDataMap()));
}

8
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.CashByMailAccount;
import haveno.core.payment.PayByMailAccount;
import haveno.core.payment.CashDepositAccount;
import haveno.core.payment.CelPayAccount;
import haveno.core.payment.ZelleAccount;
@ -161,7 +161,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static final String PIX_ID = "PIX";
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 CASH_BY_MAIL_ID = "CASH_BY_MAIL";
public static final String PAY_BY_MAIL_ID = "PAY_BY_MAIL";
public static final String CAPITUAL_ID = "CAPITUAL";
public static final String CELPAY_ID = "CELPAY";
public static final String MONESE_ID = "MONESE";
@ -223,7 +223,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
public static PaymentMethod PIX;
public static PaymentMethod AMAZON_GIFT_CARD;
public static PaymentMethod BLOCK_CHAINS_INSTANT;
public static PaymentMethod CASH_BY_MAIL;
public static PaymentMethod PAY_BY_MAIL;
public static PaymentMethod CAPITUAL;
public static PaymentMethod CELPAY;
public static PaymentMethod MONESE;
@ -270,7 +270,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)),
CASH_BY_MAIL = new PaymentMethod(CASH_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashByMailAccount.SUPPORTED_CURRENCIES)),
PAY_BY_MAIL = new PaymentMethod(PAY_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PayByMailAccount.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)),

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.CashByMailAccountPayload;
import haveno.core.payment.payload.PayByMailAccountPayload;
import haveno.core.payment.payload.CashDepositAccountPayload;
import haveno.core.payment.payload.CelPayAccountPayload;
import haveno.core.payment.payload.ChaseQuickPayAccountPayload;
@ -199,8 +199,8 @@ public class CoreProtoResolver implements ProtoResolver {
return HalCashAccountPayload.fromProto(proto);
case U_S_POSTAL_MONEY_ORDER_ACCOUNT_PAYLOAD:
return USPostalMoneyOrderAccountPayload.fromProto(proto);
case CASH_BY_MAIL_ACCOUNT_PAYLOAD:
return CashByMailAccountPayload.fromProto(proto);
case PAY_BY_MAIL_ACCOUNT_PAYLOAD:
return PayByMailAccountPayload.fromProto(proto);
case PROMPT_PAY_ACCOUNT_PAYLOAD:
return PromptPayAccountPayload.fromProto(proto);
case ADVANCED_CASH_ACCOUNT_PAYLOAD:

2
core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java
View file

@ -137,7 +137,7 @@ public final class TradeStatistics3 implements ProcessOncePersistableNetworkPayl
BLOCK_CHAINS_INSTANT,
TRANSFERWISE,
AMAZON_GIFT_CARD,
CASH_BY_MAIL,
PAY_BY_MAIL,
CAPITUAL,
PAYSERA,
PAXUM,