cordova-plugin-insider 1.2.2 → 1.4.0

package/.github/workflows/insider-cordova-SDK_release.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       version_name:
         required: true
-        description: The new version name of the SDK to be released (1.0.0)
+        description: The new version name of the SDK to be released (1.3.0)
 
 jobs:
   release:
@@ -30,32 +30,6 @@ jobs:
           npm publish
           text=":iphone: Cordova SDK is published with version: ${{ github.event.inputs.version_name }}"
           ./slack_notifier.sh mob-deployment mob-sdk-releaser "$text"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          SLACK_NOTIFIER_AUTH_KEY: ${{ secrets.SLACK_NOTIFIER_AUTH_KEY }}
-
-  release-nh:
-    needs: release
-    name: Create NH Release
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: develop-nh
-
-      - name: Publish Cordova SDK
-        uses: actions/setup-node@v3.2.0
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-        run: | 
-          npm ci
-          npm test
-          npm publish
-          text=":iphone: Cordova NH SDK is published with version: ${{ github.event.inputs.version_name }}-nh"
-          ./slack_notifier.sh mob-deployment mob-sdk-releaser "$text"
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           SLACK_NOTIFIER_AUTH_KEY: ${{ secrets.SLACK_NOTIFIER_AUTH_KEY }}

package/.github/workflows/release_task_merger.yml

@@ -5,11 +5,11 @@ on:
     inputs:
       version_name:
         required: true
-        description: The new version name of the SDK to be released (1.0.0)
+        description: The new version name of the SDK to be released (1.3.0)
 
 jobs:
   sdk_releaser:
-    if: github.actor == 'sonerdm' || github.actor == 'MahammadMD' || github.actor == 'melih-useinsider'
+    if: github.actor == 'sonerdm' || github.actor == 'melih-useinsider'
     name: Trigger mobile-devops repository task merger
     runs-on: ubuntu-latest
     steps:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-insider",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "description": "A plugin that you can use Insider SDK with Cordova and Ionic",
   "cordova_name": "Insider Cordova Plugin",
   "cordova": {

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-insider" version="1.2.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-insider" version="1.4.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Insider</name>
     <description>Insider Cordova Plugin</description>
     <keywords>insider,cordova,cordova-ios,cordova-android</keywords>
@@ -71,8 +71,8 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="InsiderMobile" spec="12.5.0" />
-                <pod name="InsiderHybrid" spec="1.1.2" />
+                <pod name="InsiderMobile" spec="12.5.4" />
+                <pod name="InsiderHybrid" spec="1.4.0" />
             </pods>
         </podspec>
 

package/release_version.sh

@@ -4,24 +4,34 @@ NEW_CV_VERSION_NAME=$1
 
 packagejson_file_path="package.json"
 gradle_file_path="src/android/build-extras.gradle"
+pluginxml_file_path="plugin.xml"
+constants_file_path="www/Constants.js"
 
 CURRENT_CV_SDK_VERSION=$(sed -n 3p $packagejson_file_path | cut -d '"' -f 4)
 
-
 CURRENT_ANDROID_VERSION=$(sed -n 22p $gradle_file_path | awk '{print $2}' | awk -F : '{print $3}' | cut -d "'" -f 1)
 CURRENT_ANDROID_HYBRID_VERSION=$(sed -n 23p $gradle_file_path | awk '{print $2}' | awk -F : '{print $3}' | cut -d "'" -f 1)
 
+CURRENT_iOS_VERSION=$(sed -n 74p $pluginxml_file_path | awk '{print $3}' | cut -d '"' -f 2)
+CURRENT_iOS_HYBRID_VERSION=$(sed -n 75p $pluginxml_file_path | awk '{print $3}' | cut -d '"' -f 2)
+
 LATEST_iOS_VERSION=$(aws s3 ls s3://mobilesdk.useinsider.com/iOS/ --recursive | sort | tail -n 1 | awk '{print $4}' | awk -F / '{print $2}')
 LATEST_iOS_HYBRID_VERSION=$(aws s3 ls s3://mobilesdk.useinsider.com/iOSHybrid/ --recursive | sort | tail -n 1 | awk '{print $4}' | awk -F / '{print $2}')
 
 LATEST_ANDROID_VERSION=$(aws s3 ls s3://mobilesdk.useinsider.com/android/com/useinsider/insider/ --recursive | sort | tail -n 1 | awk '{print $4}' | awk -F / '{print $5}' | cut -d "-" -f 1)
 LATEST_ANDROID_HYBRID_VERSION=$(aws s3 ls s3://mobilesdk.useinsider.com/android/com/useinsider/insiderhybrid/ --recursive | sort | tail -n 1 | awk '{print $4}' | awk -F / '{print $5}')
 
-# # Set new version in package.json
-# sed -i "s/$CURRENT_CV_SDK_VERSION/$NEW_CV_VERSION_NAME/" $packagejson_file_path
+# Set new version in plugin.xml
+sed -i "s/$CURRENT_CV_SDK_VERSION/$NEW_CV_VERSION_NAME/" $pluginxml_file_path
+
+# Set new sdk version in Constant.js
+sed -i "s/$CURRENT_CV_SDK_VERSION/$NEW_CV_VERSION_NAME/" $constants_file_path
+
+# Set new version in package.json
+sed -i "s/$CURRENT_CV_SDK_VERSION/$NEW_CV_VERSION_NAME/" $packagejson_file_path
 
-# # Set new version in podspec
-# sed -i "s/$CURRENT_iOS_VERSION/$LATEST_iOS_VERSION/;s/$CURRENT_iOS_HYBRID_VERSION/$LATEST_iOS_HYBRID_VERSION/" $podspec_file_path
+# Set new version in plugin.xml for ios
+sed -i "s/$CURRENT_iOS_VERSION/$LATEST_iOS_VERSION/;s/$CURRENT_iOS_HYBRID_VERSION/$LATEST_iOS_HYBRID_VERSION/" $pluginxml_file_path
 
-# # Set new version in build.gradle
-# sed -i "s/$CURRENT_ANDROID_VERSION/$LATEST_ANDROID_VERSION/;s/$CURRENT_ANDROID_HYBRID_VERSION/$LATEST_ANDROID_HYBRID_VERSION/" $gradle_file_path
+# Set new version in build.gradle
+sed -i "s/$CURRENT_ANDROID_VERSION/$LATEST_ANDROID_VERSION/;s/$CURRENT_ANDROID_HYBRID_VERSION/$LATEST_ANDROID_HYBRID_VERSION/" $gradle_file_path

package/src/android/Constants.java

@@ -38,4 +38,5 @@ class Constants {
     static final String VOUCHER_DISCOUNT = "voucher_discount";
     static final String PROMOTION_NAME = "promotion_name";
     static final String PROMOTION_DISCOUNT = "promotion_discount";
+    static final String GROUP_CODE = "groupcode";
 }

package/src/android/InsiderPlugin.java

@@ -273,6 +273,32 @@ public class InsiderPlugin extends CordovaPlugin {
                         }
                     }
                 });
+            } else if (action.equals("getSmartRecommendationWithProductIDs")) {
+                if (args.get(0) == null || args.get(1) == null || args.get(2) == null || args.get(3) == null)
+                    return false;
+
+                cordova.getThreadPool().execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String[] productIDs = (CDVUtils.convertJSONToArrayList(args.get(0).toString())).toArray(new String[0]);
+
+                            Insider.Instance.getSmartRecommendationWithProductIDs(productIDs,
+                                    args.getInt(1),
+                                    args.getString(2),
+                                    args.getString(3),
+                                    new RecommendationEngine.SmartRecommendation() {
+                                        @Override
+                                        public void loadRecommendationData(JSONObject jsonObject) {
+                                            callbackSuccess(callbackContext, jsonObject.toString());
+                                        }
+                                    });
+                        } catch (JSONException e) {
+                            callbackFailure(callbackContext, "ERROR:" + e.toString());
+                            e.printStackTrace();
+                        }
+                    }
+                });
             } else if (action.equals(InsiderHybridMethods.CLICK_SMART_RECOMMENDATION_PRODUCT)) {
                 if (args.get(0) == null || args.get(1) == null || args.get(2) == null)
                     return false;
@@ -770,6 +796,9 @@ public class InsiderPlugin extends CordovaPlugin {
                     case Constants.PROMOTION_DISCOUNT:
                         product.setPromotionDiscount((double) value);
                         break;
+                    case Constants.GROUP_CODE:
+                        product.setGroupCode((String) value);
+                        break;
                     default:
                         setProductCustomAttribute(product, entry.getKey(), value);
                         break;

package/src/android/build-extras.gradle

@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.useinsider:insider:13.4.2'
-    implementation 'com.useinsider:insiderhybrid:1.1.4'
+    implementation 'com.useinsider:insider:13.6.0'
+    implementation 'com.useinsider:insiderhybrid:1.1.6'
 
     implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'

package/src/ios/InsiderPlugin.h

@@ -30,6 +30,7 @@
 - (void) cartCleared:(CDVInvokedUrlCommand *)command;
 - (void) getSmartRecommendation:(CDVInvokedUrlCommand *)command;
 - (void) getSmartRecommendationWithProduct:(CDVInvokedUrlCommand *)command;
+- (void) getSmartRecommendationWithProductIDs:(CDVInvokedUrlCommand *)command;
 - (void) clickSmartRecommendationProduct:(CDVInvokedUrlCommand *)command;
 - (void) getMessageCenterData:(CDVInvokedUrlCommand *)command;
 - (void) setGender:(CDVInvokedUrlCommand *)command;

package/src/ios/InsiderPlugin.m

@@ -390,6 +390,20 @@
     }
 }
 
+- (void)getSmartRecommendationWithProductIDs:(CDVInvokedUrlCommand *)command {
+    @try {
+        [self.commandDelegate runInBackground:^{
+            if (![command.arguments objectAtIndex:0] || ![command.arguments objectAtIndex:1] || ![command.arguments objectAtIndex:2] || ![command.arguments objectAtIndex:3]) return;
+
+            [Insider getSmartRecommendationWithProductIDs:[command.arguments objectAtIndex:0] recommendationID:[[command.arguments objectAtIndex:1] intValue] locale:[command.arguments objectAtIndex:2]  currency:[command.arguments objectAtIndex:3] smartRecommendation:^(NSDictionary *recommendation) {
+                [self sendSuccessResultWithDictionary:recommendation andCommand:command];
+            }];
+        }];
+    } @catch (NSException *e) {
+        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    }
+}
+
 - (void)clickSmartRecommendationProduct:(CDVInvokedUrlCommand *)command {
     @try {
         dispatch_async(dispatch_get_main_queue(), ^{

package/types/InsiderPlugin.d.ts

@@ -19,6 +19,7 @@ interface InsiderPlugin {
     getMessageCenterData(limit: number, startDate: Date, endDate: Date): Promise <any>;
     getSmartRecommendation(recommendationID: number, locale: string, currency: string): Promise <any>;
     getSmartRecommendationWithProduct(product: object, recommendationID: number, locale: string): Promise <any>;
+    getSmartRecommendationWithProductIDs(product: Array<string>, recommendationID: number, locale: string): Promise <any>;
     clickSmartRecommendationProduct(product: object, recommendationID: number);
     getContentStringWithName(variableName: string, defaultValue: any, contentOptimizerDataType: number): Promise <any>;
     getContentBoolWithName(variableName: string, defaultValue: boolean, contentOptimizerDataType: number): Promise <any>;

package/types/Product.d.ts

@@ -9,6 +9,7 @@ export interface Product {
     setPromotionDiscount(promotionDiscount: number):Product;
     setStock(setStock: number):Product;
     setQuantity(quantity: number):Product;
+    setGroupCode(groupCode: string):Product;
     setCustomAttributeWithString(key: string, value: string):Product;
     setCustomAttributeWithInt(key: string, value: number):Product;
     setCustomAttributeWithBoolean(key: string, value: boolean):Product;

package/www/Constants.js

@@ -42,6 +42,7 @@ module.exports = {
     GET_MESSAGE_CENTER_DATA: 'getMessageCenterData',
     GET_SMART_RECOMMENDATION: 'getSmartRecommendation',
     GET_SMART_RECOMMENDATION_WITH_PRODUCT: 'getSmartRecommendationWithProduct',
+    GET_SMART_RECOMMENDATION_WITH_PRODUCT_IDS: 'getSmartRecommendationWithProductIDs',
     CLICK_SMART_RECOMMENDATION_PRODUCT: 'clickSmartRecommendationProduct',
     GET_CONTENT_STRING_WITH_NAME: 'getContentStringWithName',
     GET_CONTENT_BOOL_WITH_NAME: 'getContentBoolWithName',
@@ -76,11 +77,12 @@ module.exports = {
     VOUCHER_DISCOUNT: 'voucher_discount',
     PROMOTION_NAME: 'promotion_name',
     PROMOTION_DISCOUNT: 'promotion_discount',
+    GROUP_CODE: 'groupcode',
     // Error
     PUT_ERROR_LOG: 'putErrorLog',
     // Platform
     ANDROID: 'android',
     IOS: 'ios',
     // SDK Version
-    SDK_VERSION: 'CDV-1.2.2',
+    SDK_VERSION: 'CDV-1.4.0',
 };

package/www/InsiderPlugin.js

@@ -150,6 +150,18 @@ class InsiderPlugin {
         }
     }
 
+    getSmartRecommendationWithProductIDs = (productIDs, recommendationID, locale, currency) => {
+        if (productIDs === null || recommendationID === null || locale === null || currency === null) return;
+
+        productIDs = productIDs.filter(value => value != null && typeof value == "string" && value.trim());
+
+        try {
+            return Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.GET_SMART_RECOMMENDATION_WITH_PRODUCT_IDS, [productIDs, recommendationID, locale, currency]);
+        } catch (error) {
+            Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.PUT_ERROR_LOG, [Utils.generateJSONErrorString(error)]);
+        }
+    }
+
     clickSmartRecommendationProduct = (product, recommendationID) => {
         if (product === null || recommendationID === null) return;
 

package/www/Product.js

@@ -66,6 +66,18 @@ class Product {
         return this;
     }
 
+    setGroupCode(groupCode) {
+        if (!groupCode) { Utils.showWarning(this.constructor.name + '-groupCode'); return this; }
+
+        try {
+            this.productOptMap[InsiderConstants.GROUP_CODE] = groupCode;
+        } catch (error) {
+            Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.PUT_ERROR_LOG, [Utils.generateJSONErrorString(error)]);
+        }
+
+        return this;
+    }
+
     setSalePrice(salePrice) {
         if (salePrice === null|| Utils.isEmpty(salePrice)){ Utils.showWarning(this.constructor.name + '-salePrice'); return this;}