Merge branch 'develop' into feature/subpage-for-teams

Author: tobihagemann

assets/js/androidkey.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class AndroidLicense {

assets/js/cardpayments.js

@@ -1,20 +1,14 @@
 "use strict";
 
-const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
-const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'}; // live
-const STRIPE_PHP_URL = 'https://api.cryptomator.org/stripe/prepare_payment.php';
-
-//const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
-//const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'}; // test
-//const STRIPE_PHP_URL = 'http://localhost/stripe/prepare_payment.php';
+const STRIPE_PHP_URL = BASE_API_URL + '/stripe/prepare_payment.php';
 
 class OneTimePayment {
 
   /**
    * Initializes the one-time payments helper and stores a references to the status object that can be observed by AlpineJS
    * @param {Object} status 
    * @param {boolean} status.validCardNum Whether the Stripe input field considers the credit card number valid
-   * @param {string} status.captcha The captcha (if reCAPTCHA validation finished) or null
+   * @param {string} status.captcha The captcha (if captcha validation finished) or null
    * @param {string} status.errorMessage An error message or null
    * @param {boolean} status.inProgress Whether an async payment task is currently running
    * @param {boolean} status.success Whether the payment succeeded
@@ -127,21 +121,13 @@ class OneTimePayment {
     this._status.success = false;
     this._status.errorMessage = error.message;
     this._status.inProgress = false;
-    if (grecaptcha) {
-      this._status.captcha = '';
-      grecaptcha.reset();
-    }
   }
 
   onPaymentSucceeded() {
     console.info('Stripe payment succeeded!');
     this._status.success = true;
     this._status.errorMessage = '';
     this._status.inProgress = false;
-    if (grecaptcha) {
-      this._status.captcha = '';
-      grecaptcha.reset();
-    }
   }
 
 }

assets/js/store.dev.js renamed to assets/js/const.dev.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const BASE_API_URL = 'http://localhost';
 const PADDLE_ENABLE_SANDBOX = true;
 const PADDLE_VENDOR_ID = 1385;
 const PADDLE_DESKTOP_PRODUCT_IDS = [54582, 54583, 54584];
@@ -8,3 +9,5 @@ const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 23141;
 const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 42235;
 const PADDLE_PRICES_URL = 'https://sandbox-checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'http://localhost:8787/api';
+const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
+const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'};

assets/js/store.prod.js renamed to assets/js/const.prod.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const BASE_API_URL = 'https://api.cryptomator.org';
 const PADDLE_ENABLE_SANDBOX = false;
 const PADDLE_VENDOR_ID = 39223;
 const PADDLE_DESKTOP_PRODUCT_IDS = [840163, 840164, 840165];
@@ -8,3 +9,5 @@ const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 770132;
 const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 807339;
 const PADDLE_PRICES_URL = 'https://checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'https://store.cryptomator.org/api';
+const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
+const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'};

assets/js/customerportal.js

@@ -1,8 +1,6 @@
 "use strict";
 
-const REQUEST_CUSTOMER_PORTAL_URL = 'https://api.cryptomator.org/stripe/request_customer_portal.php';
-
-// const REQUEST_CUSTOMER_PORTAL_URL = 'http://localhost/stripe/request_customer_portal.php';
+const REQUEST_CUSTOMER_PORTAL_URL = BASE_API_URL + '/stripe/request_customer_portal.php';
 
 class CustomerPortal {
 

assets/js/desktopkey.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 
 class DesktopLicense {

assets/js/hubdemo.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 const REQUEST_HUB_DEMO_URL = STORE_API_URL + '/hub/request-demo';
 
 class HubDemo {

assets/js/hubmanaged.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 // requires newsletter.js
 const REQUEST_HUB_MANAGED_URL = STORE_API_URL + '/hub/request-managed';
 const VALIDATE_HUB_MANAGED_REQUEST_URL = STORE_API_URL + '/hub/validate-managed-request';

assets/js/hubpricing.js

@@ -1,7 +1,5 @@
 "use strict";
 
-// requires store.js
-
 class HubPricing {
 
   constructor(data) {

assets/js/hubsubscription.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// requires store.js
 const BILLING_PORTAL_SESSION_URL = STORE_API_URL + '/hub/billing-portal-session';
 const CUSTOM_BILLING_URL = STORE_API_URL + '/hub/custom-billing';
 const GENERATE_PAY_LINK_URL = STORE_API_URL + '/hub/generate-pay-link';