Merge pull request #97 from Affordall/1008

1008

Author: xcam

app/build.gradle

@@ -57,7 +57,7 @@ publishing {
         mavenKotlin(MavenPublication) {
             groupId 'ru.evotor'
             artifactId "integration-library"
-            version "1.0.109-dev"
+            version "1.0.110-dev"
             artifact(sourceJar)
             artifact(javadocJar)
             artifact "${project.buildDir}/outputs/aar/${project.archivesBaseName}-release.aar"

app/src/main/java/ru/evotor/framework/core/action/datamapper/TaxNumberMapper.java

@@ -27,7 +27,7 @@ public static Bundle toBundle(@Nullable TaxNumber taxNumber) {
             return null;
         }
         Bundle bundle = new Bundle();
-        bundle.putString(KEY_TAX_NUMBER, taxNumber.getValue().toPlainString());
+        bundle.putString(KEY_TAX_NUMBER, taxNumber.name());
 
         return bundle;
     }

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

@@ -477,7 +477,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.name);
         dest.writeString(this.measureName);
         dest.writeInt(this.measurePrecision);
-        dest.writeInt(this.taxNumber == null ? TaxNumber.NO_VAT.ordinal() : this.taxNumber.ordinal());
+        dest.writeInt(this.taxNumber == null ? -1 : this.taxNumber.ordinal());
         dest.writeSerializable(this.price);
         dest.writeSerializable(this.priceWithDiscountPosition);
         dest.writeSerializable(this.quantity);
@@ -500,7 +500,7 @@ protected Position(Parcel in) {
         this.measureName = in.readString();
         this.measurePrecision = in.readInt();
         int tmpTaxNumber = in.readInt();
-        this.taxNumber = tmpTaxNumber == TaxNumber.NO_VAT.ordinal() ? TaxNumber.NO_VAT : TaxNumber.values()[tmpTaxNumber];
+        this.taxNumber = tmpTaxNumber == -1 ? null : TaxNumber.values()[tmpTaxNumber];
         this.price = (BigDecimal) in.readSerializable();
         this.priceWithDiscountPosition = (BigDecimal) in.readSerializable();
         this.quantity = (BigDecimal) in.readSerializable();