Merge pull request #67 from xcam/master

ReceiptAPI

Author: thenixan

app/build.gradle

@@ -19,6 +19,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
@@ -32,17 +35,17 @@ repositories {
 }
 
 task sourceJar(type: Jar) {
+    classifier "sources"
     from android.sourceSets.main.java.srcDirs
-    classifier "source"
 }
 
 publishing {
     publications {
 
-        maven(MavenPublication) {
+        mavenKotlin(MavenPublication) {
             groupId 'ru.evotor'
             artifactId "integration-library"
-            version "1.0.59-dev"
+            version "1.0.88-dev"
             artifact(sourceJar)
             artifact "${project.buildDir}/outputs/aar/${project.archivesBaseName}-release.aar"
 

app/src/main/java/ru/evotor/framework/Cursor.kt

@@ -0,0 +1,9 @@
+package ru.evotor.framework
+
+import android.database.Cursor
+
+
+abstract class Cursor<T>(cursor: Cursor) : android.database.Cursor by cursor {
+
+    abstract fun getValue(): T
+}

app/src/main/java/ru/evotor/framework/KotlinUtils.kt

@@ -13,15 +13,15 @@ inline fun <T> Iterable<T>.sumByBigDecimal(selector: (T) -> BigDecimal): BigDeci
     return sum
 }
 
-inline fun <reified T : kotlin.Enum<T>> safeValueOf(type: String?): T? {
+inline fun <reified T : kotlin.Enum<T>> safeValueOf(type: String?, default: T? = null): T? {
     if (type == null) {
-        return null
+        return default
     }
 
     try {
         return java.lang.Enum.valueOf(T::class.java, type)
     } catch (e: IllegalArgumentException) {
-        return null
+        return default
     }
 }
 

app/src/main/java/ru/evotor/framework/payment/PaymentSystemApi.kt

@@ -15,20 +15,20 @@ object PaymentSystemApi {
     fun getPaymentSystems(context: Context): List<Pair<PaymentSystem, List<PaymentAccount>>> {
         val paymentSystemList = mutableListOf<Pair<PaymentSystem, MutableList<PaymentAccount>>>()
 
-        val cursor: Cursor? = context.contentResolver.query(PaymentTable.URI, null, null, null, null)
+        val cursor: Cursor? = context.contentResolver.query(PaymentSystemTable.URI, null, null, null, null)
 
         if (cursor != null) {
             try {
                 while (cursor.moveToNext()) {
                     val paymentSystem = PaymentSystem(
-                            Utils.safeValueOf(PaymentType::class.java, cursor.getString(cursor.getColumnIndex(PaymentTable.ROW_PAYMENT_TYPE)), PaymentType.UNKNOWN),
-                            cursor.getString(cursor.getColumnIndex(PaymentTable.ROW_PAYMENT_SYSTEM_USER_DESCRIPTION)),
-                            cursor.getString(cursor.getColumnIndex(PaymentTable.PAYMENT_SYSTEM_ID))
+                            Utils.safeValueOf(PaymentType::class.java, cursor.getString(cursor.getColumnIndex(PaymentSystemTable.COLUMN_PAYMENT_TYPE)), PaymentType.UNKNOWN),
+                            cursor.getString(cursor.getColumnIndex(PaymentSystemTable.COLUMN_PAYMENT_SYSTEM_USER_DESCRIPTION)),
+                            cursor.getString(cursor.getColumnIndex(PaymentSystemTable.COLUMN_PAYMENT_SYSTEM_ID))
                     )
 
                     val paymentAccount = PaymentAccount(
-                            cursor.getString(cursor.getColumnIndex(PaymentTable.ROW_ACCOUNT_USER_DESCRIPTION)),
-                            cursor.getString(cursor.getColumnIndex(PaymentTable.ROW_ACCOUNT_ID))
+                            cursor.getString(cursor.getColumnIndex(PaymentSystemTable.COLUMN_ACCOUNT_USER_DESCRIPTION)),
+                            cursor.getString(cursor.getColumnIndex(PaymentSystemTable.COLUMN_ACCOUNT_ID))
                     )
 
                     var inList = false

app/src/main/java/ru/evotor/framework/payment/PaymentSystemTable.kt

@@ -0,0 +1,12 @@
+package ru.evotor.framework.payment
+
+import android.net.Uri
+
+object PaymentSystemTable {
+    @JvmField val URI = Uri.withAppendedPath(PaymentSystemApi.BASE_URI, "paymentSystems")
+    const val COLUMN_PAYMENT_SYSTEM_ID = "PAYMENT_SYSTEM_ID"
+    const val COLUMN_PAYMENT_SYSTEM_USER_DESCRIPTION = "PAYMENT_SYSTEM_USER_DESCRIPTION"
+    const val COLUMN_PAYMENT_TYPE = "PAYMENT_TYPE"
+    const val COLUMN_ACCOUNT_ID = "ACCOUNT_ID"
+    const val COLUMN_ACCOUNT_USER_DESCRIPTION = "ACCOUNT_USER_DESCRIPTION"
+}

app/src/main/java/ru/evotor/framework/payment/PaymentTable.kt

@@ -0,0 +1,34 @@
+package ru.evotor.framework.receipt
+
+import ru.evotor.framework.payment.PaymentSystem
+import java.math.BigDecimal
+
+/**
+ * Оплата
+ */
+data class Payment(
+        /**
+         * Uuid
+         */
+        val uuid: String,
+        /**
+         * Сумма денег принятых от клиента
+         */
+        val value: BigDecimal,
+        /**
+         * Платежная система
+         */
+        val system: PaymentSystem?,
+        /**
+         * Идентификатор цели платежа
+         */
+        val purposeIdentifier: String?,
+        /**
+         * Идентификатор аккаунта
+         */
+        val accountId: String?,
+        /**
+         * Описание аккаунта
+         */
+        val accountUserDescription: String?
+)

app/src/main/java/ru/evotor/framework/receipt/Payment.kt

@@ -0,0 +1,11 @@
+package ru.evotor.framework.receipt
+
+object PaymentTable {
+    const val COLUMN_UUID = "PAYMENT_UUID"
+    const val COLUMN_VALUE = "PAYMENT_VALUE"
+    const val COLUMN_PURPOSED_IDENTIFIER = "PAYMENT_PURPOSED_IDENTIFIER"
+    const val COLUMN_ACCOUNT_ID = "PAYMENT_ACCOUNT_ID"
+    const val COLUMN_ACCOUNT_USER_DESCRIPTION = "PAYMENT_ACCOUNT_USER_DESCRIPTION"
+    const val COLUMN_VALUE_BY_PRINT_GROUP = "PAYMENT_VALUE_BY_PRINT_GROUP"
+    const val COLUMN_CHANGE_BY_PRINT_GROUP = "PAYMENT_CHANGE_BY_PRINT_GROUP"
+}

app/src/main/java/ru/evotor/framework/receipt/PaymentTable.kt

@@ -4,18 +4,27 @@ import android.net.Uri
 
 object PositionTable {
     @JvmField val URI = Uri.withAppendedPath(ReceiptApi.BASE_URI, "position")
-    const val ROW_POSITION_UUID = "POSITION_UUID"
-    const val ROW_PARENT_POSITION_UUID = "PARENT_POSITION_UUID"
-    const val ROW_PRODUCT_UUID = "PRODUCT_UUID"
-    const val ROW_PRODUCT_CODE = "PRODUCT_CODE"
-    const val ROW_PRODUCT_TYPE = "PRODUCT_TYPE"
-    const val ROW_NAME = "NAME"
-    const val ROW_MEASURE_NAME = "MEASURE_NAME"
-    const val ROW_MEASURE_PRECISION = "MEASURE_PRECISION"
-    const val ROW_PRICE = "PRICE"
-    const val ROW_BARCODE = "BARCODE"
-    const val ROW_QUANTITY = "QUANTITY"
-    const val ROW_ALCOHOL_BY_VOLUME = "ALCOHOL_BY_VOLUME"
-    const val ROW_ALCOHOL_PRODUCT_KIND_CODE = "ALCOHOL_PRODUCT_KIND_CODE"
-    const val ROW_TARE_VOLUME = "TARE_VOLUME"
+    const val COLUMN_POSITION_UUID = "POSITION_UUID"
+    const val COLUMN_PARENT_POSITION_UUID = "PARENT_POSITION_UUID"
+    const val COLUMN_PRODUCT_UUID = "PRODUCT_UUID"
+    const val COLUMN_PRODUCT_CODE = "PRODUCT_CODE"
+    const val COLUMN_PRODUCT_TYPE = "PRODUCT_TYPE"
+    const val COLUMN_NAME = "NAME"
+    const val COLUMN_MEASURE_NAME = "MEASURE_NAME"
+    const val COLUMN_MEASURE_PRECISION = "MEASURE_PRECISION"
+    const val COLUMN_PRICE = "PRICE"
+    const val COLUMN_PRICE_WITH_DISCOUNT_POSITION = "PRICE_WITH_DISCOUNT_POSITION"
+    const val COLUMN_BARCODE = "BARCODE"
+    const val COLUMN_QUANTITY = "QUANTITY"
+    const val COLUMN_ALCOHOL_BY_VOLUME = "ALCOHOL_BY_VOLUME"
+    const val COLUMN_ALCOHOL_PRODUCT_KIND_CODE = "ALCOHOL_PRODUCT_KIND_CODE"
+    const val COLUMN_TARE_VOLUME = "TARE_VOLUME"
+    const val COLUMN_MARK = "MARK"
+    const val COLUMN_EXTRA_KEYS = "EXTRA_KEYS"
+
+    object ExtraKeyJSONKeys {
+        const val KEY_IDENTITY = "identity"
+        const val KEY_APP_ID = "appId"
+        const val KEY_DESCRIPTION = "description"
+    }
 }

app/src/main/java/ru/evotor/framework/receipt/PositionTable.kt

@@ -0,0 +1,11 @@
+package ru.evotor.framework.receipt
+
+object PrintGroupSubTable {
+    const val COLUMN_IDENTIFIER = "PRINT_GROUP_IDENTIFIER"
+    const val COLUMN_TYPE = "PRINT_GROUP_TYPE"
+    const val COLUMN_ORG_NAME = "PRINT_GROUP_ORG_NAME"
+    const val COLUMN_ORG_INN = "PRINT_GROUP_ORG_INN"
+    const val COLUMN_ORG_ADDRESS = "PRINT_GROUP_ORG_ADDRESS"
+    const val COLUMN_TAXATION_SYSTEM = "PRINT_GROUP_TAXATION_SYSTEM"
+
+}