Skip to content

Commit

Permalink
CF-672 Cherry pick from 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
filipocelka authored Sep 23, 2024
2 parents f8f4ef7 + b85ffe7 commit 66f7b98
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.generalbytes.batm.server.extensions;

public interface ICustomString {

/**
* @return Name of custom string.
*/
default String getName() {
return null;
}

/**
* @return Value of custom string.
*/
default String getValue() {
return null;
}

/**
* @return Language in the ISO standard (for example 'en' for English, 'de' for German, 'de_CH' for Swiss German etc.).
*/
default String getLanguage() {
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.math.BigDecimal;
import java.net.InetSocketAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -852,4 +853,17 @@ public static class EmbeddedEmailImage {
* @param serverTimeToUnlock The absolute datetime when the transaction should unlock.
*/
void unlockTransaction(String rid, Date serverTimeToUnlock);

/**
* Returns the list of custom strings.
*
* @param serialNumber Serial number of terminal or GB Safe.
* @param customStringName Name of custom string. If null, returns all custom strings of selected terminal or GB Safe.
* @return Values of the selected custom string in all available languages from the selected terminal or GB Safe.
* Returns an empty list if no custom string is found.
*/
default List<ICustomString> getCustomStrings(String serialNumber, String customStringName) {
return new ArrayList<>();
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*************************************************************************************
* Copyright (C) 2014-2020 GENERAL BYTES s.r.o. All rights reserved.
* Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved.
*
* This software may be distributed and modified under the terms of the GNU
* General Public License version 2 (GPL2) as published by the Free Software
Expand All @@ -17,6 +17,8 @@
************************************************************************************/
package com.generalbytes.batm.server.extensions;

import java.util.Set;

public interface IReceiptDetails {

String CUSTOM_DATA_RECEIPT_LANGUAGE = "receipt.language";
Expand Down Expand Up @@ -49,4 +51,9 @@ public interface IReceiptDetails {
*/
String getUserLanguage();

/**
* @return Methods used to send the receipt. It always contains at least one transfer method.
*/
Set<ReceiptTransferMethod> getTransferMethods();

}
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,16 @@ public interface ITransactionDetails {
* @return Payment type: CASH/PAYMENT_CARD
*/
String getPaymentType();

/**
* @return UUID of transaction.
*/
String getUuid();

/**
* Returns the name of the crypto setting used for the transaction.
* @return Name of crypto setting used for the transaction.
*/
String getNameOfCryptoSettingUsed();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*************************************************************************************
* Copyright (C) 2014-2024 GENERAL BYTES s.r.o. All rights reserved.
*
* This software may be distributed and modified under the terms of the GNU
* General Public License version 2 (GPL2) as published by the Free Software
* Foundation and appearing in the file GPL2.TXT included in the packaging of
* this file. Please note that GPL2 Section 2[b] requires that all works based
* on this software must also be made publicly available under the terms of
* the GPL2 ("Copyleft").
*
* Contact information
* -------------------
*
* GENERAL BYTES s.r.o.
* Web : http://www.generalbytes.com
*
************************************************************************************/
package com.generalbytes.batm.server.extensions;

public enum ReceiptTransferMethod {
SMS,
EMAIL
}

0 comments on commit 66f7b98

Please sign in to comment.