Skip to content

STDEV-10442 Добавил userUuid в Receipt.Header #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rein-d wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

STDEV-10442 Добавил userUuid в Receipt.Header #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public final class ReceiptHeaderMapper {

private static final String KEY_RECEIPT_UUID = "receiptUuid";
private static final String KEY_BASE_RECEIPT_UUID = "baseReceiptUuid";
private static final String KEY_USER_UUID = "userUuid";
private static final String KEY_RECEIPT_NUMBER = "receiptNumber";
private static final String KEY_RECEIPT_TYPE = "receiptType";
private static final String KEY_RECEIPT_DATE = "receiptDate";
Expand Down Expand Up @@ -41,6 +42,7 @@ public static Receipt.Header from(@Nullable Bundle bundle) {
return new Receipt.Header(
receiptUuid,
baseReceiptUuid,
bundle.getString(KEY_USER_UUID),
receiptNumber,
Utils.safeValueOf(Receipt.Type.class, receiptType, null),
date,
Expand All @@ -58,6 +60,7 @@ public static Bundle toBundle(@Nullable Receipt.Header header) {
Bundle bundle = new Bundle();
bundle.putString(KEY_RECEIPT_UUID, header.getUuid());
bundle.putString(KEY_BASE_RECEIPT_UUID, header.getBaseReceiptUuid());
bundle.putString(KEY_USER_UUID, header.getUserUuid());
bundle.putString(KEY_RECEIPT_NUMBER, header.getNumber());
bundle.putString(KEY_RECEIPT_TYPE, header.getType().name());

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/ru/evotor/framework/receipt/Receipt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ data class Receipt
* Uuid чека-основания
*/
val baseReceiptUuid: String?,
/**
* Uuid кассира
*/
val userUuid: String?,
/**
* Номер чека. Может быть null для еще незакрытого чека
*/
Expand Down Expand Up @@ -166,4 +170,4 @@ data class Receipt
})
}
}
}
}
1 change: 1 addition & 0 deletions src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ object ReceiptApi {
return Receipt.Header(
uuid = cursor.getString(cursor.getColumnIndex(ReceiptHeaderTable.COLUMN_UUID)),
baseReceiptUuid = cursor.optString(ReceiptHeaderTable.COLUMN_BASE_RECEIPT_UUID),
userUuid = cursor.optString(ReceiptHeaderTable.COLUMN_USER_UUID),
number = cursor.optString(ReceiptHeaderTable.COLUMN_NUMBER),
type = Utils.safeValueOf(Receipt.Type::class.java, cursor.getString(cursor.getColumnIndex(ReceiptHeaderTable.COLUMN_TYPE)), null)
?: return null,
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ru.evotor.framework.receipt
object ReceiptHeaderTable {
const val COLUMN_UUID = "UUID"
const val COLUMN_BASE_RECEIPT_UUID = "BASE_RECEIPT_UUID"
const val COLUMN_USER_UUID = "USER_UUID"
const val COLUMN_NUMBER = "NUMBER"
const val COLUMN_TYPE = "TYPE"
const val COLUMN_DATE = "DATE"
Expand Down