Skip to content

Commit c6a5d2f

Browse files
author
Василий Ерофеев
committed
STDEV-24098
Добавление новой ТГ FURSLP_MARKED
1 parent 06c0e4e commit c6a5d2f

File tree

5 files changed

+31
-3
lines changed

5 files changed

+31
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'org.jetbrains.dokka'
77

88
android {
99
namespace = "ru.evotor.integrations"
10-
def version = 39
10+
def version = 40
1111

1212
compileSdk 30
1313

src/main/java/ru/evotor/framework/features/FeaturesApi.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,11 @@ object FeaturesApi {
340340
* @return `true` если функция активна; `false` если функция не активна.
341341
*/
342342
fun isVat22Active(context: Context) = isFeatureActive(context, FeaturesContract.PATH_VAT22)
343+
344+
/**
345+
* Проверяет, активна ли функция "Маркировка меховых изделий (КМ)" на данном терминале
346+
*
347+
* @return `true` если функция активна; `false` если функция не активна.
348+
*/
349+
fun isFursLpMarkActive(context: Context) = isFeatureActive(context, FeaturesContract.PATH_FURSLP_MARK)
343350
}

src/main/java/ru/evotor/framework/features/provider/FeaturesContract.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ object FeaturesContract {
5252
const val PATH_PET_FOOD_MARK = "pet_food_marked"
5353
const val PATH_VEGETABLE_OIL_MARK = "vegetable_oil_marked"
5454
const val PATH_VAT22 = "vat22"
55+
const val PATH_FURSLP_MARK = "furslp_marked"
5556

5657
const val COLUMN_IS_ACTIVE = "is_active"
5758
}

src/main/java/ru/evotor/framework/inventory/ProductType.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,10 @@ public enum ProductType {
159159
/**
160160
* Растительные масла
161161
*/
162-
VEGETABLE_OIL_MARKED
163-
}
162+
VEGETABLE_OIL_MARKED,
163+
164+
/**
165+
* Меховые изделия (КМ)
166+
*/
167+
FURSLP_MARKED
168+
}

src/main/java/ru/evotor/framework/receipt/Position.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,6 +1753,19 @@ public Builder toVeterinaryMarked(
17531753
return this;
17541754
}
17551755

1756+
public Builder toFursLpMarked(
1757+
@NonNull Mark mark
1758+
) {
1759+
position.productType = ProductType.FURSLP_MARKED;
1760+
setAlcoParams(
1761+
null,
1762+
null,
1763+
null,
1764+
null
1765+
);
1766+
setFursLpParams(mark);
1767+
return this;
1768+
}
17561769

17571770
/**
17581771
* Частичная реализация для позиции доступна только если тип товара является одним из:
@@ -1908,6 +1921,8 @@ private void setBeerParams(Mark mark) {
19081921
position.mark = mark;
19091922
}
19101923

1924+
private void setFursLpParams(Mark mark) {position.mark = mark; }
1925+
19111926
public Builder setUuid(String uuid) {
19121927
position.uuid = uuid;
19131928
return this;

0 commit comments

Comments
 (0)