Merge pull request #24 from evotor/develop

Discounts WIP

Author: thenixan

app/build.gradle

@@ -1,8 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-apply plugin: 'maven-publish'
-
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
@@ -26,30 +24,4 @@ dependencies {
 }
 repositories {
     mavenCentral()
-}
-
-
-publishing {
-    publications {
-
-        maven(MavenPublication) {
-            groupId 'ru.evotor'
-            artifactId "integration-library"
-            version "1.0.16-dev"
-            artifact "${project.buildDir}/outputs/aar/${project.archivesBaseName}-release.aar"
-
-            //generate pom nodes for dependencies
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-                configurations.compile.allDependencies.each { dependency ->
-                    if (dependency.group) {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
 }

app/src/main/java/ru/evotor/framework/core/action/command/edit_positions_command/EditPositionsCommand.java

@@ -0,0 +1,77 @@
+package ru.evotor.framework.core.action.command.open_receipt_command;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Parcelable;
+
+import java.util.List;
+import java.util.Objects;
+
+import ru.evotor.framework.Utils;
+import ru.evotor.framework.core.ICanStartActivity;
+import ru.evotor.framework.core.IntegrationManagerCallback;
+import ru.evotor.framework.core.IntegrationManagerImpl;
+import ru.evotor.framework.core.action.datamapper.ChangesMapper;
+import ru.evotor.framework.core.action.event.receipt.changes.IChange;
+import ru.evotor.framework.core.action.event.receipt.changes.position.PositionAdd;
+
+/**
+ * Created by a.kuznetsov on 26/04/2017.
+ */
+
+public class OpenReceiptCommand {
+
+    public static final String NAME = "evo.v2.receipt.sell.openReceipt";
+    private static final String KEY_CHANGES = "changes";
+
+    public static OpenReceiptCommand create(Bundle bundle) {
+        Parcelable[] changesParcelable = bundle.getParcelableArray(KEY_CHANGES);
+        return new OpenReceiptCommand(Utils.filterByClass(
+                ChangesMapper.INSTANCE.create(changesParcelable),
+                PositionAdd.class
+        ));
+    }
+
+    private final List<PositionAdd> changes;
+
+    public OpenReceiptCommand(List<PositionAdd> changes) {
+        this.changes = changes;
+    }
+
+    public void process(final Context context, final ICanStartActivity activityStarter, IntegrationManagerCallback callback) {
+        Objects.requireNonNull(activityStarter);
+        Objects.requireNonNull(context);
+
+        List<ComponentName> componentNameList = IntegrationManagerImpl.convertImplicitIntentToExplicitIntent(NAME, context.getApplicationContext());
+        if (componentNameList == null || componentNameList.isEmpty()) {
+            return;
+        }
+        new IntegrationManagerImpl(context.getApplicationContext())
+                .call(OpenReceiptCommand.NAME,
+
+                        componentNameList.get(0),
+                        this.toBundle(),
+                        activityStarter,
+                        callback,
+                        new Handler(Looper.getMainLooper())
+                );
+    }
+
+    public Bundle toBundle() {
+        Bundle bundle = new Bundle();
+        Parcelable[] changesParcelable = new Parcelable[changes.size()];
+        for (int i = 0; i < changesParcelable.length; i++) {
+            IChange change = changes.get(i);
+            changesParcelable[i] = ChangesMapper.INSTANCE.toBundle(change);
+        }
+        bundle.putParcelableArray(KEY_CHANGES, changesParcelable);
+        return bundle;
+    }
+
+    public List<PositionAdd> getChanges() {
+        return changes;
+    }
+}

app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommand.java

@@ -1,4 +1,4 @@
-package ru.evotor.framework.core.action.command.edit_positions_command;
+package ru.evotor.framework.core.action.command.open_receipt_command;
 
 import android.os.Bundle;
 
@@ -8,17 +8,18 @@
  * Created by a.kuznetsov on 26/04/2017.
  */
 
-public class EditPositionsCommandResult {
+public class OpenReceiptCommandResult {
 
     private static final String KEY_RESULT = "result";
     private static final String KEY_ERROR_CODE = "errorCode";
 
     public static final int ERROR_CODE_OK = 0;
+    public static final int ERROR_CODE_RECEIPT_IS_ALREADY_OPEN = -1;
 
-    public static EditPositionsCommandResult create(Bundle bundle) {
+    public static OpenReceiptCommandResult create(Bundle bundle) {
         String resultName = bundle.getString(KEY_RESULT);
 
-        return new EditPositionsCommandResult(
+        return new OpenReceiptCommandResult(
                 Utils.safeValueOf(Result.class, resultName, Result.UNKNOWN),
                 bundle.getInt(KEY_ERROR_CODE, ERROR_CODE_OK)
         );
@@ -27,7 +28,7 @@ public static EditPositionsCommandResult create(Bundle bundle) {
     private final Result result;
     private final int errorCode;
 
-    public EditPositionsCommandResult(
+    public OpenReceiptCommandResult(
             Result result,
             int errorCode
     ) {

…_command/EditPositionsCommandResult.java …pt_command/OpenReceiptCommandResult.javaapp/src/main/java/ru/evotor/framework/core/action/command/edit_positions_command/EditPositionsCommandResult.java renamed to app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommandResult.java app/src/main/java/ru/evotor/framework/core/action/command/edit_positions_command/EditPositionsCommandResult.java renamed to app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommandResult.java

@@ -0,0 +1,33 @@
+package ru.evotor.framework.core.action.event.receipt.discount;
+
+import android.os.Bundle;
+
+import java.math.BigDecimal;
+
+public class ReceiptDiscountEvent {
+    private static final String TAG = "ReceiptDiscountEvent";
+
+    public static final String NAME = "evo.v2.receipt.sell.receiptDiscount";
+    private static final String KEY_DISCOUNT = "discount";
+
+    public static ReceiptDiscountEvent create(Bundle bundle) {
+        BigDecimal discount = new BigDecimal(bundle.getString(KEY_DISCOUNT, "0"));
+        return new ReceiptDiscountEvent(discount);
+    }
+
+    private BigDecimal discount;
+
+    public ReceiptDiscountEvent(BigDecimal discount) {
+        this.discount = discount;
+    }
+
+    public Bundle toBundle() {
+        Bundle result = new Bundle();
+        result.putString(KEY_DISCOUNT, discount.toPlainString());
+        return result;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+}

app/src/main/java/ru/evotor/framework/core/action/event/receipt/discount/ReceiptDiscountEvent.java

@@ -0,0 +1,13 @@
+package ru.evotor.framework.core.action.event.receipt.discount;
+
+import ru.evotor.framework.core.IntegrationActivity;
+
+public class ReceiptDiscountEventActivity extends IntegrationActivity {
+    public void setIntegrationResult(ReceiptDiscountEventResult result) {
+        setIntegrationResult(result == null ? null : result.toBundle());
+    }
+
+    public ReceiptDiscountEvent getEvent() {
+        return ReceiptDiscountEvent.create(getSourceBundle());
+    }
+}

app/src/main/java/ru/evotor/framework/core/action/event/receipt/discount/ReceiptDiscountEventActivity.java

@@ -0,0 +1,19 @@
+package ru.evotor.framework.core.action.event.receipt.discount;
+
+import android.os.Bundle;
+
+import ru.evotor.framework.core.action.processor.ActionProcessor;
+
+public abstract class ReceiptDiscountEventProcessor extends ActionProcessor {
+    public ReceiptDiscountEventProcessor() {
+        super(ReceiptDiscountEvent.NAME);
+    }
+
+    @Override
+    public void process(Bundle bundle, Callback callback) {
+        call(ReceiptDiscountEvent.create(bundle), callback);
+    }
+
+    public abstract void call(ReceiptDiscountEvent event, Callback callback);
+}
+

app/src/main/java/ru/evotor/framework/core/action/event/receipt/discount/ReceiptDiscountEventProcessor.java

@@ -0,0 +1,50 @@
+package ru.evotor.framework.core.action.event.receipt.discount;
+
+import android.os.Bundle;
+
+import java.math.BigDecimal;
+
+import ru.evotor.framework.Utils;
+
+public class ReceiptDiscountEventResult {
+
+    private static final String KEY_RESULT = "result";
+    private static final String KEY_DISCOUNT = "discount";
+
+    public static ReceiptDiscountEventResult create(Bundle bundle) {
+        String resultName = bundle.getString(KEY_RESULT);
+        BigDecimal discount = new BigDecimal(bundle.getString(KEY_DISCOUNT, "0"));
+        return new ReceiptDiscountEventResult(
+                Utils.safeValueOf(Result.class, resultName, Result.UNKNOWN),
+                discount
+        );
+    }
+
+    private final Result result;
+    private final BigDecimal discount;
+
+    public ReceiptDiscountEventResult(Result result, BigDecimal discount) {
+        this.result = result;
+        this.discount = discount;
+    }
+
+    public Bundle toBundle() {
+        Bundle bundle = new Bundle();
+        bundle.putString(KEY_RESULT, result.name());
+        bundle.putString(KEY_DISCOUNT, discount.toPlainString());
+        return bundle;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public enum Result {
+        OK,
+        UNKNOWN;
+    }
+}