Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,6 @@ public void trackEvent(String name, ReadableMap dataFields) {
public void updateCart(ReadableArray items) {
IterableLogger.v(TAG, "UpdateCart API");

JSONObject dataFieldsJson = null;

try {
if (dataFields != null) {
dataFieldsJson = Serialization.convertMapToJson(dataFields);
}
} catch (JSONException e) {
IterableLogger.e(TAG, "Failed converting JSON to object");
}

IterableApi.getInstance().updateCart(Serialization.commerceItemsFromReadableArray(items));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ static List<CommerceItem> commerceItemsFromReadableArray(ReadableArray array) {
}

static CommerceItem commerceItemFromMap(JSONObject itemMap) throws JSONException {

String[] categories = null;
JSONArray categoriesArray = itemMap.optJSONArray("categories");

if (categoriesArray != null) {
for (int i = 0; i < categoriesArray.length(); i++) {
if (categories == null) {
Expand All @@ -92,6 +92,7 @@ static CommerceItem commerceItemFromMap(JSONObject itemMap) throws JSONException
categories[i] = categoriesArray.getString(i);
}
}

return new CommerceItem(itemMap.getString("id"),
itemMap.getString("name"),
itemMap.getDouble("price"),
Expand All @@ -100,7 +101,8 @@ static CommerceItem commerceItemFromMap(JSONObject itemMap) throws JSONException
itemMap.optString("description", null),
itemMap.optString("url", null),
itemMap.optString("imageUrl", null),
categories
categories,
itemMap.optJSONObject("dataFields")
);
}

Expand Down
4 changes: 3 additions & 1 deletion ios/RNIterableAPI/Serialization.swift
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ extension CommerceItem {
let url = dict["url"] as? String
let imageUrl = dict["imageUrl"] as? String
let categories = dict["categories"] as? [String]
let dataFields = dict["dataFields"] as? [AnyHashable: Any]

return CommerceItem(id: id,
name: name,
Expand All @@ -99,7 +100,8 @@ extension CommerceItem {
description: description,
url: url,
imageUrl: imageUrl,
categories: categories)
categories: categories,
dataFields: dataFields)
}
}

Expand Down
4 changes: 3 additions & 1 deletion ts/Iterable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,9 @@ class IterableCommerceItem {
url?: string
imageUrl?: string
categories?: Array<string>
dataFields?: any

constructor(id: string, name: string, price: number, quantity: number, sku?: string, description?: string, url?: string, imageUrl?: string, categories?: Array<string>) {
constructor(id: string, name: string, price: number, quantity: number, sku?: string, description?: string, url?: string, imageUrl?: string, categories?: Array<string>, dataFields?: any | undefined) {
this.id = id
this.name = name
this.price = price
Expand All @@ -181,6 +182,7 @@ class IterableCommerceItem {
this.url = url
this.imageUrl = imageUrl
this.categories = categories
this.dataFields = dataFields
}
}

Expand Down