From ec260016d3c07b102f3b32bec6195fe16a1fd3e2 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@yahoo.com>
Date: Fri, 29 Sep 2017 15:30:28 -0500
Subject: [PATCH] Task sort payment fixes (#9104)

* Added sorting to dated filter

* Validated payment data type
---
 website/client/components/tasks/column.vue | 7 ++++++-
 website/server/libs/googlePayments.js      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/website/client/components/tasks/column.vue b/website/client/components/tasks/column.vue
index 5ad4a54a36..55701dc5e9 100644
--- a/website/client/components/tasks/column.vue
+++ b/website/client/components/tasks/column.vue
@@ -159,6 +159,7 @@
 
 <script>
 import Task from './task';
+import sortBy from 'lodash/sortBy';
 import { mapState, mapActions } from 'client/libs/store';
 import { shouldDo } from 'common/script/cron';
 import inAppRewards from 'common/script/libs/inAppRewards';
@@ -203,7 +204,7 @@ export default {
         label: 'todos',
         filters: [
           {label: 'remaining', filter: t => !t.completed, default: true}, // active
-          {label: 'scheduled', filter: t => !t.completed && t.date},
+          {label: 'scheduled', filter: t => !t.completed && t.date, sort: t => t.date},
           {label: 'complete2', filter: t => t.completed},
         ],
       },
@@ -316,6 +317,10 @@ export default {
         this.loadCompletedTodos();
       }
       this.activeFilters[type] = filter;
+
+      if (filter.sort) {
+        this.tasks[`${type}s`] = sortBy(this.tasks[`${type}s`], filter.sort);
+      }
     },
     setColumnBackgroundVisibility () {
       this.$nextTick(() => {
diff --git a/website/server/libs/googlePayments.js b/website/server/libs/googlePayments.js
index 6214da97a8..2f201cffd2 100644
--- a/website/server/libs/googlePayments.js
+++ b/website/server/libs/googlePayments.js
@@ -35,7 +35,7 @@ api.verifyGemPurchase = async function verifyGemPurchase (user, receipt, signatu
   let isValidated = iap.isValidated(googleRes);
   if (!isValidated) throw new NotAuthorized(this.constants.RESPONSE_INVALID_RECEIPT);
 
-  let receiptObj = JSON.parse(testObj.data); // passed as a string
+  let receiptObj = typeof testObj.data === 'string' ? JSON.parse(testObj.data) : testObj.data; // passed as a string
   let token = receiptObj.token || receiptObj.purchaseToken;
 
   let existingReceipt = await IapPurchaseReceipt.findOne({
@@ -106,7 +106,7 @@ api.subscribe = async function subscribe (sku, user, receipt, signature, headers
     signature,
   };
 
-  let receiptObj = JSON.parse(receipt); // passed as a string
+  let receiptObj = typeof receipt === 'string' ? JSON.parse(receipt) : receipt; // passed as a string
   let token = receiptObj.token || receiptObj.purchaseToken;
 
   let existingUser = await User.findOne({