renamed subcription service to billing service
This commit is contained in:
parent
f6cc73c91b
commit
0e062c1093
|
@ -3,9 +3,7 @@ import React, { useEffect, useState } from 'react';
|
|||
import { slide as Menu } from 'react-burger-menu';
|
||||
import ConfirmDialog from 'components/ConfirmDialog';
|
||||
import Spinner from 'react-bootstrap/Spinner';
|
||||
import subscriptionService, {
|
||||
Subscription,
|
||||
} from 'services/subscriptionService';
|
||||
import billingService, { Subscription } from 'services/billingService';
|
||||
import constants from 'utils/strings/constants';
|
||||
import { logoutUser } from 'services/userService';
|
||||
import { getData, LS_KEYS } from 'utils/storage/localStorage';
|
||||
|
@ -49,7 +47,7 @@ export default function Sidebar(props: Props) {
|
|||
if (!isOpen) {
|
||||
return;
|
||||
}
|
||||
const usage = await subscriptionService.getUsage();
|
||||
const usage = await billingService.getUsage();
|
||||
|
||||
SetUsage(usage);
|
||||
setSubscription(getUserSubscription());
|
||||
|
@ -68,7 +66,7 @@ export default function Sidebar(props: Props) {
|
|||
setConfirmModalView(false);
|
||||
setIsOpen(false);
|
||||
try {
|
||||
await subscriptionService.cancelSubscription();
|
||||
await billingService.cancelSubscription();
|
||||
} catch (e) {
|
||||
props.setBannerMessage({
|
||||
message: constants.SUBSCRIPTION_CANCEL_FAILED,
|
||||
|
|
|
@ -2,10 +2,7 @@ import React, { useState } from 'react';
|
|||
import { Modal, Spinner } from 'react-bootstrap';
|
||||
import constants from 'utils/strings/constants';
|
||||
import styled from 'styled-components';
|
||||
import subscriptionService, {
|
||||
Plan,
|
||||
Subscription,
|
||||
} from 'services/subscriptionService';
|
||||
import billingService, { Plan, Subscription } from 'services/billingService';
|
||||
import { getData, LS_KEYS } from 'utils/storage/localStorage';
|
||||
import {
|
||||
convertBytesToGBs,
|
||||
|
@ -56,9 +53,9 @@ function PlanSelector(props: Props) {
|
|||
if (isUserRenewingPlan(plan, subscription)) {
|
||||
return;
|
||||
}
|
||||
await subscriptionService.updateSubscription(plan.stripeID);
|
||||
await billingService.updateSubscription(plan.stripeID);
|
||||
} else {
|
||||
await subscriptionService.buySubscription(plan.stripeID);
|
||||
await billingService.buySubscription(plan.stripeID);
|
||||
}
|
||||
bannerMessage = {
|
||||
message: constants.SUBSCRIPTION_UPDATE_SUCCESS,
|
||||
|
|
|
@ -25,7 +25,7 @@ import {
|
|||
import constants from 'utils/strings/constants';
|
||||
import AlertBanner from './components/AlertBanner';
|
||||
import { Alert, Button, Jumbotron } from 'react-bootstrap';
|
||||
import subscriptionService from 'services/subscriptionService';
|
||||
import billingService from 'services/billingService';
|
||||
import PlanSelector from './components/PlanSelector';
|
||||
import { hasRenewingPaidPlan } from 'utils/billingUtil';
|
||||
|
||||
|
@ -180,8 +180,8 @@ export default function Gallery(props: Props) {
|
|||
data
|
||||
);
|
||||
const favItemIds = await getFavItemIds(data);
|
||||
await subscriptionService.updatePlans();
|
||||
await subscriptionService.syncSubscription();
|
||||
await billingService.updatePlans();
|
||||
await billingService.syncSubscription();
|
||||
|
||||
setCollections(nonEmptyCollections);
|
||||
if (isUpdated) {
|
||||
|
|
|
@ -2,9 +2,7 @@ import Container from 'components/Container';
|
|||
import router from 'next/router';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Button, Spinner } from 'react-bootstrap';
|
||||
import subscriptionService, {
|
||||
Subscription,
|
||||
} from 'services/subscriptionService';
|
||||
import billingService, { Subscription } from 'services/billingService';
|
||||
import constants from 'utils/strings/constants';
|
||||
|
||||
export default function SuccessRedirect() {
|
||||
|
@ -14,7 +12,7 @@ export default function SuccessRedirect() {
|
|||
const sessionId = urlParams.get('session_id');
|
||||
if (sessionId) {
|
||||
(async () => {
|
||||
const subscription = await subscriptionService.verifySubscription(
|
||||
const subscription = await billingService.verifySubscription(
|
||||
sessionId
|
||||
);
|
||||
setSubscription(subscription);
|
||||
|
@ -28,7 +26,7 @@ export default function SuccessRedirect() {
|
|||
<>
|
||||
<h1>Your payment succeeded</h1>
|
||||
<h4>
|
||||
{constants.PAID_SUBSCRIPTION_INFO(
|
||||
{constants.RENEWAL_ACTIVE_SUBSCRIPTION_INFO(
|
||||
subscription?.expiryTime
|
||||
)}
|
||||
</h4>
|
||||
|
|
|
@ -24,7 +24,7 @@ export interface Plan {
|
|||
stripeID: string;
|
||||
}
|
||||
export const FREE_PLAN = 'free';
|
||||
class SubscriptionService {
|
||||
class billingService {
|
||||
private stripe;
|
||||
constructor() {
|
||||
let publishableKey = process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY;
|
||||
|
@ -168,4 +168,4 @@ class SubscriptionService {
|
|||
}
|
||||
}
|
||||
|
||||
export default new SubscriptionService();
|
||||
export default new billingService();
|
|
@ -1,4 +1,4 @@
|
|||
import { FREE_PLAN, Plan, Subscription } from 'services/subscriptionService';
|
||||
import { FREE_PLAN, Plan, Subscription } from 'services/billingService';
|
||||
import { getData, LS_KEYS } from './storage/localStorage';
|
||||
|
||||
export function convertBytesToGBs(bytes, precision?): string {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { Subscription } from 'services/subscriptionService';
|
||||
import { Subscription } from 'services/billingService';
|
||||
import { template } from './vernacularStrings';
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue