Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fetching order details #9

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"ignore_dirs": [
".git",
"node_modules"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ public void onServiceConnected(ServiceConnector connector) {
public void onServiceDisconnected(ServiceConnector connector) {
Log.i(RNCloverBridgeModule.TAG, "service disconnected: " + connector);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.os.RemoteException;
import android.util.DisplayMetrics;
import android.util.Log;
import java.util.Optional;
import android.view.WindowManager;

import com.clover.sdk.util.CloverAccount;
Expand All @@ -27,6 +28,7 @@
import com.clover.sdk.v1.printer.job.StaticReceiptPrintJob;
import com.clover.sdk.v3.order.Order;
import com.clover.sdk.v3.order.OrderConnector;
import com.clover.sdk.v3.order.OrderType;
import com.clover.sdk.v3.payments.Payment;
import com.clover.sdk.v3.scanner.BarcodeResult;
import com.facebook.react.bridge.ActivityEventListener;
Expand Down Expand Up @@ -110,7 +112,6 @@ public void run() {
try {
CloverAuth.AuthResult result = CloverAuth.authenticate(
getCurrentActivity(),
getAccount(),
forceValidateToken,
(long) timeout,
TimeUnit.MILLISECONDS
Expand All @@ -120,7 +121,7 @@ public void run() {
map.putString("authToken", result.authToken);
map.putString("message", result.errorMessage);
promise.resolve(map);
} catch (OperationCanceledException | AuthenticatorException | IOException e) {
} catch (Exception e) {
Log.e(TAG, "authentication_error", e);
promise.reject("authentication_error", e.getMessage());
}
Expand Down Expand Up @@ -197,6 +198,40 @@ public void voidPaymentRefund(ReadableMap options, Promise promise) {
bridgePaymentConnector.voidPaymentRefund(options, promise);
}

@ReactMethod
public void getOrder(final String orderId, final Promise promise) {
try {
OrderConnector orderConnector = new BridgeServiceConnector().getOrderConnector(mContext);
Order order = orderConnector.getOrder(orderId);

WritableMap responseMap = Arguments.createMap();
WritableMap orderMap = Arguments.createMap();
WritableMap orderTypeMap = Arguments.createMap();
OrderType orderType = order.getOrderType();

orderMap.putString("id", order.getId());
orderMap.putString("currency", order.getCurrency());
orderMap.putDouble("total", order.getTotal());
orderMap.putString("state", order.getState());
orderMap.putBoolean("testMode", order.getTestMode());
if (orderType != null) {
orderTypeMap.putString("id", orderType.getId());
orderTypeMap.putString("label", orderType.getLabel());
orderMap.putMap("type", orderTypeMap);
}

responseMap.putBoolean("success", true);
responseMap.putMap("order", orderMap);
promise.resolve(responseMap);
} catch (RemoteException | ClientException | ServiceException | BindingException e) {
Log.e(TAG, "", e);
promise.reject("order_error", e.getMessage());
} catch (NoSuchKeyException | UnexpectedNativeTypeException e) {
Log.e(TAG, "RN", e);
promise.reject("order_error", e.getMessage());
}
}

@ReactMethod
public void printPayment(ReadableMap options) {
try {
Expand Down
54 changes: 44 additions & 10 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,44 @@ interface MerchantResult extends Result {
merchant: Merchant;
}

interface OrderResult extends Result {
order: Order;
}

interface InventoryResult extends Result {
statusMessage?: String;
inventory: Inventory;
}

interface Inventory extends ObjectRef {
name: String;
quantity: Number;
price: Number;
sku: String;
barcode: String;
category: String;
taxRate: Number;
taxName: String;
taxable: Boolean;
}

interface Merchant extends ObjectRef {
name: String;
email: String;
location: MerchantLocation;
}

interface Order extends ObjectRef {
currency: String;
total: Number;
state: String;
testMode: String;
type: {
id: String;
label: String;
}
}

interface MerchantLocation {
country: String;
city: String;
Expand Down Expand Up @@ -64,7 +96,7 @@ interface Refund extends Transaction {
payment: ObjectRef;
}

interface Credit extends Transaction {
interface Credit extends Transaction {
order: ObjectRef;
tender: Tender;
}
Expand Down Expand Up @@ -94,15 +126,15 @@ interface VoidReason {
DEVELOPER_PAY_TIP_ADJUST_FAILED: String;
FAILED: String;
GIFTCARD_LOAD_FAILED: String;
NOT_APPROVED: String;
REJECT_DUPLICATE: String;
REJECT_OFFLINE: String;
NOT_APPROVED: String;
REJECT_DUPLICATE: String;
REJECT_OFFLINE: String;
REJECT_PARTIAL_AUTH: String;
REJECT_SIGNATURE: String;
TRANSPORT_ERROR: String;
USER_CANCEL: String;
USER_CUSTOMER_CANCEL: String;
USER_GIFTCARD_LOAD_CANCEL: String;
TRANSPORT_ERROR: String;
USER_CANCEL: String;
USER_CUSTOMER_CANCEL: String;
USER_GIFTCARD_LOAD_CANCEL: String;
}

interface TipMode {
Expand Down Expand Up @@ -224,6 +256,8 @@ declare const _default: {
* @returns {Promise} A promise that resolves to a MerchantResult.
*/
getMerchant: () => Promise<MerchantResult>;
getOrder: (orderId: string) => Promise<OrderResult>;
getInventoryItems: () => Promise<InventoryResult>;
enableCustomerMode: () => Void;
disableCustomerMode: () => Void;
print: (imagePath: String) => Promise<Object>;
Expand All @@ -245,7 +279,7 @@ declare const _default: {
// Payment Methods ///////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Readies the Clover Bridge for sending payment requests to Clover device. Must be called before calling any payment method and should be
* Readies the Clover Bridge for sending payment requests to Clover device. Must be called before calling any payment method and should be
* called as soon as possible.
* @param {String} raid Remote Application Id. Obtained from Clover App dashboard.
*/
Expand Down Expand Up @@ -295,4 +329,4 @@ declare const _default: {
EVENT: BridgeEvent
}

export default _default;
export default _default;
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ export default {
authenticate: (force = false, timeout = 10000) =>
RNCloverBridge.authenticate(force, timeout),
getMerchant: () => RNCloverBridge.getMerchant(),
getOrder: (orderId) => RNCloverBridge.getOrder(orderId),
getInventoryItems: () => RNCloverBridge.getInventoryItems(),
isFlex: () => RNCloverBridge.isFlex,
isMini: () => RNCloverBridge.isMini,
getSpaVersion: () => RNCloverBridge.getSpaVersion,
Expand Down