From 433c73c9d3346a2bdd96505843fd746af8c02de4 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sat, 10 Nov 2018 16:03:25 +0100
Subject: [PATCH] paypal: restore url after purchase

---
 website/client/components/payments/buyGemsModal.vue |  4 ++--
 website/client/components/settings/subscription.vue |  2 +-
 website/client/libs/userlocalManager.js             |  9 +++++++++
 website/client/mixins/payments.js                   | 10 +++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/website/client/components/payments/buyGemsModal.vue b/website/client/components/payments/buyGemsModal.vue
index 8c32e26d02..c6d98c1f23 100644
--- a/website/client/components/payments/buyGemsModal.vue
+++ b/website/client/components/payments/buyGemsModal.vue
@@ -75,7 +75,7 @@
               .card-body
                 .mx-auto(v-html='icons.creditCard', style='"height: 56px; width: 159px; margin-top: 1em;"')
             .card.text-center.payment-method
-              a.card-body.paypal(:href='paypalCheckoutLink', target='_blank')
+              a.card-body.paypal(@click="openPaypal(paypalCheckoutLink)")
                 img(src='~assets/images/paypal.png')
             .card.text-center.payment-method(@click="amazonPaymentsInit({type: 'single'})")
               .card-body.amazon
@@ -158,7 +158,7 @@
                 .card-body(@click='showStripe({subscription: subscriptionPlan})')
                   .mx-auto(v-html='icons.creditCard', style='"height: 56px; width: 159px; margin-top: 1em;"')
               .card.text-center.payment-method
-                a.card-body.paypal(:href='paypalSubscriptionLink', target='_blank')
+                a.card-body.paypal(@click="openPaypal(paypalSubscriptionLink)")
                   img(src='~assets/images/paypal.png')
               .card.text-center.payment-method
                 .card-body.amazon(@click="amazonPaymentsInit({type: 'subscription', subscription: subscriptionPlan})")
diff --git a/website/client/components/settings/subscription.vue b/website/client/components/settings/subscription.vue
index c71ef673d8..82a9f1c63d 100644
--- a/website/client/components/settings/subscription.vue
+++ b/website/client/components/settings/subscription.vue
@@ -77,7 +77,7 @@
             .col-md-4
               button.purchase.btn.btn-primary(@click='showStripe({subscription:subscription.key, coupon:subscription.coupon})', :disabled='!subscription.key') {{ $t('card') }}
             .col-md-4
-              a.purchase(:href='paypalPurchaseLink', :disabled='!subscription.key', target='_blank')
+              a.purchase(@click="openPaypal(paypalPurchaseLink)", :disabled='!subscription.key')
                 img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png', :alt="$t('paypal')")
             .col-md-4
               a.btn.btn-secondary.purchase(@click="payWithAmazon()")
diff --git a/website/client/libs/userlocalManager.js b/website/client/libs/userlocalManager.js
index 1c2f00343a..da3e30489a 100644
--- a/website/client/libs/userlocalManager.js
+++ b/website/client/libs/userlocalManager.js
@@ -14,6 +14,9 @@ const CONSTANTS = {
     COSTUME_TAB: 'costume-tab',
     EQUIPMENT_TAB: 'equipment-tab',
   },
+  savedAppStateValues: {
+    SAVED_APP_STATE: 'saved-app-state',
+  },
 };
 
 function setLocalSetting (key, value) {
@@ -24,8 +27,14 @@ function getLocalSetting (key) {
   return localStorage.getItem(key);
 }
 
+function removeLocalSetting (key) {
+  return localStorage.removeItem(key);
+}
+
+
 export {
   CONSTANTS,
   getLocalSetting,
   setLocalSetting,
+  removeLocalSetting,
 };
diff --git a/website/client/mixins/payments.js b/website/client/mixins/payments.js
index 71078350fc..250eeee67d 100644
--- a/website/client/mixins/payments.js
+++ b/website/client/mixins/payments.js
@@ -6,12 +6,12 @@ import { mapState } from 'client/libs/store';
 import encodeParams from 'client/libs/encodeParams';
 import notificationsMixin from 'client/mixins/notifications';
 import * as Analytics from 'client/libs/analytics';
+import { CONSTANTS, setLocalSetting } from 'client/libs/userlocalManager';
 
 export default {
   mixins: [notificationsMixin],
   computed: {
     ...mapState(['credentials']),
-    // @TODO refactor into one single computed property
     paypalCheckoutLink () {
       return '/paypal/checkout';
     },
@@ -41,6 +41,14 @@ export default {
       let gift = this.encodeGift(data.giftedTo, data.gift);
       const url = `/paypal/checkout?gift=${gift}`;
 
+      this.openPaypal(url);
+    },
+    openPaypal (url) {
+      const appState = {
+        path: this.$route.fullPath,
+        paymentMethod: 'paypal',
+      };
+      setLocalSetting(CONSTANTS.savedAppStateValues.SAVED_APP_STATE, JSON.stringify(appState));
       window.open(url, '_blank');
     },
     showStripe (data) {