Merge pull request #137 from BuildFire/points-issue

fix(point-issue) update the equation for the perItemsPurchased

Author: mas-iota

widget/app.services.js

@@ -129,12 +129,17 @@
           return deferred.promise;
         };
 
-        var addLoyaltyPoints = function (userId, userToken, loyaltyUnqiueId, passcode, amount) {
+        var addLoyaltyPoints = function (userId, userToken, loyaltyUnqiueId, passcode, amount, points) {
           var deferred = $q.defer();
           if (!loyaltyUnqiueId) {
             deferred.reject(new Error('Undefined application'));
           }
-          $http.get(getProxyServerUrl() + '/api/loyaltyUserAddPoint/' + userId + '?userToken=' + encodeURIComponent(userToken) + '&loyaltyUnqiueId=' + loyaltyUnqiueId + '&redemptionPasscode=' + passcode + '&purchaseAmount=' + amount)
+
+          var url = getProxyServerUrl() + '/api/loyaltyUserAddPoint/' + userId + '?userToken=' + encodeURIComponent(userToken) + '&loyaltyUnqiueId=' + loyaltyUnqiueId + '&redemptionPasscode=' + passcode + '&purchaseAmount=' + amount;
+          if (points !== undefined) {
+            url += '&points=' + points;
+          }
+          $http.get(url)
             .success(function (response) {
               if (response)
                 deferred.resolve(response);
@@ -146,7 +151,6 @@
             });
           return deferred.promise;
         };
-
         var validatePasscode = function (userToken, loyaltyUnqiueId, passcode) {
           var deferred = $q.defer();
           if (!loyaltyUnqiueId) {

widget/controllers/userDataAccess/points.limit.controller.js

@@ -13,11 +13,17 @@ const saveUserDailyPoints = (obj,callback) =>{
     })
 }
 
-const checkIfUserDailyLimitExceeded = (currentView, WidgetCode, callback) =>{
+const checkIfUserDailyLimitExceeded = (currentView, WidgetCode,purchaseOptionValue, callback) =>{
     if(currentView.amount > WidgetCode.application.dailyLimit) return callback({code:2103});
     getUserDailyPoints((err,r) =>{
         if(err) return callback(err);
-        var pointsAwarded = (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit;
+        var pointsAwarded =null;
+        if (purchaseOptionValue === 'perMoneySpent'){
+            pointsAwarded = (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit;
+        }
+        else {
+            pointsAwarded = currentView.amount + WidgetCode.application.pointsPerVisit;
+        }
         var date = new Date().toLocaleDateString();
         let pointsObj = new pointsLimit({
             pointsAwarded: pointsAwarded,
@@ -31,4 +37,4 @@ const checkIfUserDailyLimitExceeded = (currentView, WidgetCode, callback) =>{
             saveUserDailyPoints(pointsObj,(err,r) =>err ? callback(err) :  callback(null,r));
         }
     })
-}
+}

widget/controllers/widget.code.controller.js

@@ -42,8 +42,16 @@
         WidgetCode.addPoints = function () {
           var success = function (result) {
             Buildfire.spinner.hide();
-            $rootScope.$broadcast('POINTS_ADDED', {points: (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit});
-            var pointsAwarded = (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit;
+            var pointsAwarded
+            var purchaseOptionValue =  WidgetCode.application.settings.value;
+            if(purchaseOptionValue === 'perMoneySpent'){
+              $rootScope.$broadcast('POINTS_ADDED', {points: (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit});
+              pointsAwarded = (currentView.amount * WidgetCode.application.pointsPerDollar) + WidgetCode.application.pointsPerVisit;
+            }
+            else {
+              $rootScope.$broadcast('POINTS_ADDED', {points: currentView.amount + WidgetCode.application.pointsPerVisit});
+              pointsAwarded = currentView.amount + WidgetCode.application.pointsPerVisit;
+            }
             ViewStack.push({
               template: 'Awarded',
               pointsAwarded: pointsAwarded
@@ -70,7 +78,8 @@
 
           };
           Buildfire.spinner.show();
-          checkIfUserDailyLimitExceeded(currentView, WidgetCode, function (err, res) {
+          var purchaseOptionValue =  WidgetCode.application.settings.value;
+          checkIfUserDailyLimitExceeded(currentView, WidgetCode, purchaseOptionValue, function (err, res) {
             if (err) return error(err);
             buildfire.auth.getCurrentUser(function (err, user) {
               if (user) {
@@ -123,7 +132,8 @@
                   }
 
                 } else {
-                  LoyaltyAPI.addLoyaltyPoints(WidgetCode.currentLoggedInUser._id, WidgetCode.currentLoggedInUser.userToken, `${WidgetCode.context.appId}_${WidgetCode.context.instanceId}`, WidgetCode.passcode, currentView.amount).then(success, error);
+                  LoyaltyAPI.addLoyaltyPoints(WidgetCode.currentLoggedInUser._id, WidgetCode.currentLoggedInUser.userToken, `${WidgetCode.context.appId}_${WidgetCode.context.instanceId}`, WidgetCode.passcode, currentView.amount, res.data.pointsAwarded
+                  ).then(success, error);
                 }
               }
             })