Merge request for some added features.

ProteansoftwareCapacitorSquare.podspec → DolanedCapacitorSquare.podspec

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name = 'ProteansoftwareCapacitorSquare'
+  s.name = 'DolanedCapacitorSquare'
   s.version = package['version']
   s.summary = package['description']
   s.license = package['license']

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Protean Software
+Copyright (c) 2023 Dolaned
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,23 +1,16 @@
-# @proteansoftware/capacitor-square
+# @dolaned/capacitor-square
 
 Integrate with Square Payments SDK
 
 | Package Version | Capacitor Version |
 |-----------------|-------------------|
-| 4.X             | 4.X               |
-| 3.X             | 3.X               |
+| 1.X             | 5.X               |
 
 ## Install
 
-Version 4.X is compatible with Capacitor 4.X
+Version 1.X is compatible with Capacitor 5.X
 ```bash
-npm install @proteansoftware/capacitor-square@V4
-npx cap sync
-```
-
-Version 3.X is compatible with Capacitor 3.X
-```bash
-npm install @proteansoftware/capacitor-square@V3
+npm install @dolaned/capacitor-square
 npx cap sync
 ```
 
@@ -28,7 +21,7 @@ App Initalisation - app.component.ts (Angular example)
 ```ts
 import { App } from "@capacitor/app";
 import { Platform } from "@ionic/angular";
-import { CapacitorSquare } from "@proteansoftware/capacitor-square";
+import { CapacitorSquare } from "@dolaned/capacitor-square";
 
 export class AppComponent {
   constructor(private platform: Platform) {
@@ -57,7 +50,7 @@ export class AppComponent {
 
 Payment flow
 ```ts
-import { CapacitorSquare } from "@proteansoftware/capacitor-square";
+import { CapacitorSquare } from "@dolaned/capacitor-square";
 
 //
 // Initalise the square plugin

android/build.gradle

@@ -18,7 +18,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    namespace "com.proteansoftware.capacitor.square"
+    namespace "com.dolaned.capacitor.square"
     compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22

android/src/main/java/com/proteansoftware/capacitor/square/CapacitorSquare.java → android/src/main/java/com/dolaned/capacitor/square/CapacitorSquare.java

@@ -1,4 +1,4 @@
-package com.proteansoftware.capacitor.square;
+package com.dolaned.capacitor.square;
 
 import android.content.Context;
 import android.content.Intent;
@@ -57,13 +57,23 @@ public Intent createChargeIntent(
             Integer totalAmount,
             CurrencyCode currencyCode,
             ArrayList<ChargeRequest.TenderType> restrictPaymentMethods,
-            @Nullable Integer autoReturnTimeout) {
+            @Nullable Integer autoReturnTimeout,
+            @Nullable String locationId,
+            @Nullable String note) {
         ChargeRequest.Builder request = new ChargeRequest.Builder(totalAmount, currencyCode);
 
         if (!restrictPaymentMethods.isEmpty()) {
             request.restrictTendersTo(restrictPaymentMethods);
         }
 
+        if(locationId != null) {
+            request.enforceBusinessLocation(locationId);
+        }
+
+        if(note != null) {
+            request.note(note);
+        }
+
         if (autoReturnTimeout != null) {
             request.autoReturn(autoReturnTimeout, autoReturnTimeout.equals(PosApi.AUTO_RETURN_NO_TIMEOUT) ? null : TimeUnit.MILLISECONDS);
         }

android/src/main/java/com/proteansoftware/capacitor/square/CapacitorSquarePlugin.java → android/src/main/java/com/dolaned/capacitor/square/CapacitorSquarePlugin.java

@@ -1,4 +1,4 @@
-package com.proteansoftware.capacitor.square;
+package com.dolaned.capacitor.square;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -68,6 +68,12 @@ public void startTransaction(PluginCall call) {
             return;
         }
 
+        String note = call.getString("note");
+        if (note != null && note.length() >= 500) {
+            call.reject("Note is too long.");
+            return;
+        }
+
         CurrencyCode currencyCode = implementation.parseCurrencyCode(currencyCodeString);
         if (currencyCode == null) {
             call.reject("currencyCode '" + currencyCodeString + "' is invalid");
@@ -111,12 +117,16 @@ public void startTransaction(PluginCall call) {
             return;
         }
 
+        String locationId = call.getString("locationId");
+
         try {
             Intent intent = implementation.createChargeIntent(
                     totalAmount,
                     currencyCode,
                     restrictPaymentMethods,
-                    autoReturnTimeout);
+                    autoReturnTimeout,
+                    locationId,
+                    note);
             startActivityForResult(call, intent, "chargeRequest");
         } catch (ActivityNotFoundException e) {
             implementation.openPointOfSalePlayStoreListing();
@@ -133,7 +143,9 @@ protected void chargeRequest(PluginCall call, ActivityResult result) {
         JSObject errorObject = new JSObject();
         try {
             if (call == null) {
-                errorObject.put("error", "could not retrieve saved call");
+                errorObject.put("status", "error");
+                errorObject.put("error_code", "NO_SAVED_CALL");
+                errorObject.put("errorDebugDescription", "could not retrieve saved call");
                 notifyListeners("transactionFailed", errorObject);
                 return;
             }
@@ -144,7 +156,7 @@ protected void chargeRequest(PluginCall call, ActivityResult result) {
                 Intent data = result.getData();
                 ChargeRequest.Success success = implementation.parseChargeSuccess(data);
                 JSObject resultData = new JSObject();
-                resultData.put("message", "Success");
+                resultData.put("status", "ok");
                 resultData.put("clientTransactionId", success.clientTransactionId);
                 resultData.put("serverTransactionId", success.serverTransactionId);
                 notifyListeners("transactionComplete", resultData);
@@ -153,13 +165,16 @@ protected void chargeRequest(PluginCall call, ActivityResult result) {
                 // Handle expected errors
                 Intent data = result.getData();
                 ChargeRequest.Error error = implementation.parseChargeError(data);
-                String errorMessage = "Error" + error.code + "\nclientTransactionId" + error.debugDescription;
-                errorObject.put("error", errorMessage);
+                errorObject.put("status", "error");
+                errorObject.put("error_code", error.code);
+                errorObject.put("errorDebugDescription", error.debugDescription);
                 notifyListeners("transactionFailed", errorObject);
                 call.resolve();
             }
         } catch (Exception e) {
-            errorObject.put("error", e.getMessage());
+            errorObject.put("status", "error");
+            errorObject.put("error_code", "EXCEPTION_ERROR");
+            errorObject.put("errorDebugDescription", e.getMessage());
             notifyListeners("transactionFailed", errorObject);
             call.resolve();
         }

ios/Plugin/CapacitorSquarePlugin.swift

@@ -44,6 +44,17 @@ public class CapacitorSquarePlugin: CAPPlugin {
             return;
         }
 
+        //add optional location id
+        let locationId = call.getString("locationId") ?? nil;
+
+        // handle a note 
+        let note = call.getString("note") ?? "";
+        if(note.count >= 500) {
+            call.reject("Note is too long");
+            return;
+        }
+
+
         let yourCallbackURL = URL(string: callbackUrl)!
 
         // Specify the amount of money to charge.
@@ -86,8 +97,8 @@ public class CapacitorSquarePlugin: CAPPlugin {
             request = try SCCAPIRequest(callbackURL: yourCallbackURL,
                                         amount: amount,
                                         userInfoString: nil,
-                                        locationID: nil,
-                                        notes: nil,
+                                        locationID: locationId,
+                                        notes: note,
                                         customerID: nil,
                                         supportedTenderTypes: supportedTenderTypes,
                                         clearsDefaultFees: false,