Added productId to the properties of a purchase/item

livecodepanos · livecodepanos · commit 63319f3963f3 · 2014-02-21T17:42:42.000Z
diff --git a/engine/src/java/com/runrev/android/billing/amazon/AmazonBillingProvider.java b/engine/src/java/com/runrev/android/billing/amazon/AmazonBillingProvider.java
@@ -199,6 +199,8 @@ public void onActivityResult (int requestCode, int resultCode, Intent data)
     boolean addPurchaseReceiptToLocalInventory(Receipt receipt)
     {
         boolean success = true;
+        if (success)
+            success = setPurchaseProperty(receipt.getSku(), "productId", receipt.getSku());
         if (success)
             success = setPurchaseProperty(receipt.getSku(), "itemType", receipt.getItemType().toString());
         
diff --git a/engine/src/java/com/runrev/android/billing/google/GoogleBillingProvider.java b/engine/src/java/com/runrev/android/billing/google/GoogleBillingProvider.java
@@ -334,6 +334,8 @@ public String getPurchaseList()
     boolean addPurchaseToLocalInventory(Purchase purchase)
     {
         boolean success = true;
+		if (success)
+            success = setPurchaseProperty(purchase.getSku(), "productId", purchase.getSku());
         if (success)
             success = setPurchaseProperty(purchase.getSku(), "itemType", purchase.getItemType());
         
@@ -359,6 +361,8 @@ boolean addPurchaseToLocalInventory(Purchase purchase)
 	boolean loadKnownItemToLocalInventory(SkuDetails skuDetails)
 	{
 		boolean success = true;
+		if (success)
+            success = setPurchaseProperty(skuDetails.getSku(), "productId", skuDetails.getSku());
         if (success)
             success = setPurchaseProperty(skuDetails.getSku(), "itemType", skuDetails.getType());
         
diff --git a/engine/src/java/com/runrev/android/billing/samsung/SamsungBillingProvider.java b/engine/src/java/com/runrev/android/billing/samsung/SamsungBillingProvider.java
@@ -110,7 +110,11 @@ boolean loadBaseToLocalInventory(BaseVO baseVO)
         boolean success = true;
         //Log.d(TAG, "Base Item id is : " + baseVO.getItemId());
         //Log.d(TAG, "Base Item name is : " + baseVO.getItemName());
-
+        if (success)
+        {
+            success = setPurchaseProperty(baseVO.getItemId(), "productId", baseVO.getItemId());
+            //Log.d(TAG, "Base productId loaded successfully");
+        }
         if (success)
         {
             success = setPurchaseProperty(baseVO.getItemId(), "title", baseVO.getItemName());
diff --git a/engine/src/mblandroidstore.cpp b/engine/src/mblandroidstore.cpp
@@ -807,7 +807,8 @@ void MCStoreProductRequestResponseEvent::Dispatch()
     const char *t_subscriptionDurationUnit = nil;
     const char *t_subscriptionDurationMultiplier= nil;
     
-    t_product_id = m_product_id;
+    //t_product_id = m_product_id;
+    t_product_id = MCStoreGetPurchaseProperty(m_product_id, "productId");
     t_description = MCStoreGetPurchaseProperty(m_product_id, "description");
     t_title = MCStoreGetPurchaseProperty(m_product_id, "title");
     t_itemType = MCStoreGetPurchaseProperty(m_product_id, "itemType");
@@ -825,6 +826,12 @@ void MCStoreProductRequestResponseEvent::Dispatch()
         t_response = new MCVariableValue();
         
         MCVariableValue *t_element = nil;
+        
+        if (t_product_id != nil)
+        {
+            t_response->lookup_element(ep, "productId", t_element);
+            t_element->assign_string(MCString(t_product_id));
+        }
       
         if (t_price != nil)
         {

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,8 @@ public void onActivityResult (int requestCode, int resultCode, Intent data)`
`199`	`199`	`boolean addPurchaseReceiptToLocalInventory(Receipt receipt)`
`200`	`200`	`{`
`201`	`201`	`boolean success = true;`
	`202`	`+ if (success)`
	`203`	`+ success = setPurchaseProperty(receipt.getSku(), "productId", receipt.getSku());`
`202`	`204`	`if (success)`
`203`	`205`	`success = setPurchaseProperty(receipt.getSku(), "itemType", receipt.getItemType().toString());`
`204`	`206`