Merge pull request #613 from evotor/rc_0.6.31

Rc 0.6.31

Author: adonixis

build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'org.jetbrains.dokka'
 
 android {
     namespace = "ru.evotor.integrations"
-    def version = 38
+    def version = 39
 
     compileSdk 30
 

src/main/java/ru/evotor/framework/core/action/datamapper/PositionMapper.java

@@ -98,6 +98,7 @@ public final class PositionMapper {
     private static final String KEY_IS_MARK_SKIPPED = "is_mark_skipped";
     private static final String KEY_SALE_BAN_TIME = "sale_ban_time";
     private static final String KEY_VETERINARY_ATTRIBUTE = "veterinary_attribute";
+    private static final String KEY_FORCE_TAX_NUMBER = "force_tax_number";
 
     @Nullable
     public static Position from(@Nullable Bundle bundle) {
@@ -178,6 +179,7 @@ public static Position from(@Nullable Bundle bundle) {
                 measureCode
         );
         VeterinaryAttribute veterinaryAttribute = VeterinaryAttribute.from(bundle.getBundle(KEY_VETERINARY_ATTRIBUTE));
+        Boolean forceTaxNumber = (Boolean) bundle.getSerializable(KEY_FORCE_TAX_NUMBER);
 
         Position.Builder builder = Position.Builder.copyFrom(new Position(
                 uuid,
@@ -212,6 +214,7 @@ public static Position from(@Nullable Bundle bundle) {
         builder.setIsMarkSkipped(isMarkSkipped);
         builder.setSaleBanTime(saleBanTime);
         builder.setVeterinaryAttribute(veterinaryAttribute);
+        builder.setForceTaxNumber(forceTaxNumber);
         return builder.build();
     }
 
@@ -300,6 +303,7 @@ public static Bundle toBundle(@Nullable Position position) {
         bundle.putSerializable(KEY_IS_MARK_SKIPPED, position.getIsMarkSkipped());
         bundle.putBundle(KEY_SALE_BAN_TIME, position.getSaleBanTime() != null ? position.getSaleBanTime().toBundle() : null);
         bundle.putBundle(KEY_VETERINARY_ATTRIBUTE, position.getVeterinaryAttribute() != null ? position.getVeterinaryAttribute().toBundle() : null);
+        bundle.putSerializable(KEY_FORCE_TAX_NUMBER, position.getForceTaxNumber());
         return bundle;
     }
 

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

@@ -40,10 +40,16 @@
  * Позиция чека.
  */
 public class Position implements Parcelable {
+    /**
+     * Разрешение для установки признака принудительного использования указанного НДС.
+     * Указывайте разрешение в манифесте приложения, в элементе `<uses-permission android:name="" />` до элемента `<application>`.
+     */
+    public static final String FORCE_TAX_NUMBER_SET_PERMISSION = "ru.evotor.permission.position.forceTaxNumber.SET";
+
     /**
      * Текущая версия объекта Position
      */
-    private static final int VERSION = 15;
+    private static final int VERSION = 16;
     /**
      * Магическое число для идентификации использования версионирования объекта.
      */
@@ -240,6 +246,12 @@ public class Position implements Parcelable {
     @Nullable
     private TimeRange saleBanTime;
 
+    /**
+     * Признак принудительного использования указанного НДС
+     */
+    @Nullable
+    private Boolean forceTaxNumber;
+
     public Position(
             String uuid,
             @Nullable String productUuid,
@@ -314,6 +326,7 @@ public Position(Position position) {
         this.isMarkSkipped = position.isMarkSkipped;
         this.saleBanTime = position.saleBanTime;
         this.veterinaryAttribute = position.veterinaryAttribute;
+        this.forceTaxNumber = position.forceTaxNumber;
     }
 
     /**
@@ -642,6 +655,11 @@ public MarksCheckingInfo getMarksCheckingInfo() {
         return marksCheckingInfo;
     }
 
+    @Nullable
+    public Boolean getForceTaxNumber() {
+        return forceTaxNumber;
+    }
+
     @Override
     public boolean equals(Object o) {
         return equals(o, false);
@@ -715,6 +733,8 @@ private boolean equals(Object o, boolean exceptQuantity) {
             return false;
         if (!Objects.equals(veterinaryAttribute, position.veterinaryAttribute))
             return false;
+        if (!Objects.equals(forceTaxNumber, position.forceTaxNumber))
+            return false;
         return Objects.equals(subPositions, position.subPositions);
     }
 
@@ -751,6 +771,7 @@ public int hashCode() {
         result = 31 * result + (isMarkSkipped != null ? isMarkSkipped.hashCode() : 0);
         result = 31 * result + (saleBanTime != null ? saleBanTime.hashCode() : 0);
         result = 31 * result + (veterinaryAttribute != null ? veterinaryAttribute.hashCode() : 0);
+        result = 31 * result + (forceTaxNumber != null ? forceTaxNumber.hashCode() : 0);
         return result;
     }
 
@@ -787,6 +808,7 @@ public String toString() {
                 ", isAgeLimited=" + isAgeLimited +
                 ", isMarkSkipped=" + isMarkSkipped +
                 ", veterinaryAttribute=" + veterinaryAttribute +
+                ", forceTaxNumber=" + forceTaxNumber +
                 '}';
     }
 
@@ -880,6 +902,7 @@ private void writeAdditionalFields(Parcel dest, int flags) {
         dest.writeSerializable(this.isMarkSkipped);
         dest.writeBundle(this.saleBanTime != null ? this.saleBanTime.toBundle() : null);
         dest.writeBundle(this.veterinaryAttribute != null ? this.veterinaryAttribute.toBundle() : null);
+        dest.writeSerializable(this.forceTaxNumber);
     }
 
     protected Position(Parcel in) {
@@ -989,6 +1012,9 @@ private void readAdditionalFields(Parcel in, String measureName, int measurePrec
         if (version >= 15) {
             readVeterinaryAttribute(in);
         }
+        if (version >= 16) {
+            this.forceTaxNumber = (Boolean) in.readSerializable();
+        }
         if (isVersionGreaterThanCurrent) {
             in.setDataPosition(startDataPosition + dataSize);
         }
@@ -2017,6 +2043,11 @@ public Builder setSaleBanTime(@Nullable TimeRange saleBanTime) {
             return this;
         }
 
+        public Builder setForceTaxNumber(@Nullable Boolean forceTaxNumber) {
+            position.forceTaxNumber = forceTaxNumber;
+            return this;
+        }
+
         public Position build() {
             return new Position(position);
         }

src/main/java/ru/evotor/framework/settings/SettingsApi.kt

@@ -8,6 +8,7 @@ import ru.evotor.framework.settings.SettingsProviderContracts.Companion.BASE_URI
 import ru.evotor.framework.settings.SettingsProviderContracts.Companion.DEPRECATED_BASE_URI
 import ru.evotor.framework.settings.SettingsProviderContracts.SLIPS_AMOUNT_PROVIDER
 import ru.evotor.framework.settings.SettingsProviderContracts.NEGATIVE_BALANCE_PROVIDER
+import ru.evotor.framework.settings.SettingsProviderContracts.VAT_20_PROVIDER
 
 /**
  * Настройки EvotorPos (раздел "Правила торговли").
@@ -35,6 +36,14 @@ object SettingsApi {
             getInt(columnIndex) != 0
         }
 
+    /**
+     * Включена ли опция "Разрешить НДС 20% в 2026 году".
+     */
+    fun isVat20Enabled(context: Context): Boolean? =
+        VAT_20_PROVIDER.runCursor(context) { columnIndex ->
+            getInt(columnIndex) != 0
+        }
+
     private fun <T> SettingsProviderContracts.runCursor(
         context: Context,
         baseUri: Uri = BASE_URI,

src/main/java/ru/evotor/framework/settings/SettingsProviderContracts.kt

@@ -23,6 +23,14 @@ enum class SettingsProviderContracts(
     NEGATIVE_BALANCE_PROVIDER(
         "NEGATIVE_BALANCE_PATH",
         "NEGATIVE_BALANCE_COLUMN"
+    ),
+
+    /**
+     * Опция "Разрешить НДС 20% в 2026 году".
+     */
+    VAT_20_PROVIDER(
+        "VAT_20_PATH",
+        "VAT_20_COLUMN"
     );
 
     @Suppress("MemberVisibilityCanBePrivate")