Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(website): various improvements (navbar, currency cookie, styling) #613

Merged
merged 5 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AdminUser } from '@socialincome/shared/src/types/AdminUser';
import { AdminUser } from '@socialincome/shared/src/types/admin-user';
import algoliasearch from 'algoliasearch';
import {
Authenticator,
Expand Down
4 changes: 2 additions & 2 deletions admin/src/actions/CreateDonationCertificatesAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import {
Select,
Typography,
} from '@mui/material';
import { DEFAULT_REGION } from '@socialincome/shared/src/firebase';
import { User } from '@socialincome/shared/src/types/user';
import { getFunctions, httpsCallable } from 'firebase/functions';
import { CollectionActionsProps, useAuthController, useSnackbarController } from 'firecms';
import _ from 'lodash';
import React from 'react';
import { CreateDonationCertificatesFunctionProps } from '../../../functions/src/webhooks/admin/donation-certificates/DonationCertificateHandler';
import { DEFAULT_REGION } from '../../../shared/src/firebase';
import { User } from '../../../shared/src/types/User';

const style = {
position: 'absolute' as 'absolute',
Expand Down
4 changes: 2 additions & 2 deletions admin/src/actions/InviteWhatsappAction.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Box, Button, Modal, Typography } from '@mui/material';
import { DEFAULT_REGION } from '@socialincome/shared/src/firebase';
import { Recipient } from '@socialincome/shared/src/types/recipient';
import { getFunctions, httpsCallable } from 'firebase/functions';
import { CollectionActionsProps, useAuthController, useSnackbarController } from 'firecms';
import React from 'react';
import { TwilioOutgoingMessageFunctionProps } from '../../../functions/src/webhooks/twilio/TwilioOutgoingMessageHandler';
import { DEFAULT_REGION } from '../../../shared/src/firebase';
import { Recipient } from '../../../shared/src/types/Recipient';

const STYLE = {
position: 'absolute' as 'absolute',
Expand Down
4 changes: 2 additions & 2 deletions admin/src/actions/PaymentProcessAction.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Box, Button, CircularProgress, Modal, Tooltip, Typography } from '@mui/material';
import { DatePicker } from '@mui/x-date-pickers/DatePicker';
import { DEFAULT_REGION } from '@socialincome/shared/src/firebase';
import { PaymentProcessTaskType } from '@socialincome/shared/src/types/Payment';
import { toPaymentDate } from '@socialincome/shared/src/types/Recipient';
import { PaymentProcessTaskType } from '@socialincome/shared/src/types/payment';
import { toPaymentDate } from '@socialincome/shared/src/types/recipient';
import { downloadStringAsFile } from '@socialincome/shared/src/utils/html';
import { getFunctions, httpsCallable } from 'firebase/functions';
import { useSnackbarController } from 'firecms';
Expand Down
4 changes: 2 additions & 2 deletions admin/src/collections/Admins.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ADMIN_USER_FIRESTORE_PATH, AdminUser } from '@socialincome/shared/src/types/AdminUser';
import { PARTNER_ORGANISATION_FIRESTORE_PATH } from '@socialincome/shared/src/types/PartnerOrganisation';
import { ADMIN_USER_FIRESTORE_PATH, AdminUser } from '@socialincome/shared/src/types/admin-user';
import { PARTNER_ORGANISATION_FIRESTORE_PATH } from '@socialincome/shared/src/types/partner-organisation';
import { buildProperties } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/Contributions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
Contribution,
ContributionSourceKey,
StatusKey,
} from '@socialincome/shared/src/types/Contribution';
} from '@socialincome/shared/src/types/contribution';
import { buildProperties } from 'firecms';
import { EntityCollection } from 'firecms/dist/types/collections';
import { buildAuditedCollection } from './shared';
Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/DonationCertificate.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
DONATION_CERTIFICATE_FIRESTORE_PATH,
DonationCertificate,
} from '@socialincome/shared/src/types/DonationCertificate';
} from '@socialincome/shared/src/types/donation-certificate';
import { AdditionalFieldDelegate, buildProperties } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/Messages.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Email, MESSAGE_FIRESTORE_PATH, TwilioMessage } from '@socialincome/shared/src/types/Message';
import { Email, MESSAGE_FIRESTORE_PATH, TwilioMessage } from '@socialincome/shared/src/types/message';
import { buildProperties } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand Down
6 changes: 3 additions & 3 deletions admin/src/collections/OperationalExpenses.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
OPERATIONAL_EXPENSE_FIRESTORE_PATH,
OperationalExpense,
} from '@socialincome/shared/src/types/OperationalExpense';
} from '@socialincome/shared/src/types/operational-expense';
import { buildProperties } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand All @@ -13,11 +13,11 @@ export const operationalExpensesCollection = buildAuditedCollection<OperationalE
icon: 'LocalAtm',
description: 'Add operational costs for transparency page',
initialSort: ['created', 'desc'],
permissions: ({ authController }) => ({
permissions: {
edit: true,
create: true,
delete: true,
}),
},
properties: buildProperties<OperationalExpense>({
name: {
dataType: 'string',
Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/PartnerOrganisations.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
PARTNER_ORGANISATION_FIRESTORE_PATH,
PartnerOrganisation,
} from '@socialincome/shared/src/types/PartnerOrganisation';
} from '@socialincome/shared/src/types/partner-organisation';
import { buildProperties } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand Down
4 changes: 2 additions & 2 deletions admin/src/collections/Payments.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MESSAGE_FIRESTORE_PATH } from '@socialincome/shared/src/types/Message';
import { Payment, PAYMENT_FIRESTORE_PATH, PaymentStatus } from '@socialincome/shared/src/types/Payment';
import { MESSAGE_FIRESTORE_PATH } from '@socialincome/shared/src/types/message';
import { Payment, PAYMENT_FIRESTORE_PATH, PaymentStatus } from '@socialincome/shared/src/types/payment';
import { buildProperties, EnumValues } from 'firecms';
import { buildAuditedCollection } from './shared';

Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/Users.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { USER_FIRESTORE_PATH, User, UserReferralSource } from '@socialincome/shared/src/types/User';
import { USER_FIRESTORE_PATH, User, UserReferralSource } from '@socialincome/shared/src/types/user';
import { AdditionalFieldDelegate, buildProperties } from 'firecms';
import { CreateDonationCertificatesAction } from '../actions/CreateDonationCertificatesAction';
import { buildContributionsCollection } from './Contributions';
Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/recipients/Recipients.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Recipient,
calcFinalPaymentDate,
calcPaymentsLeft,
} from '@socialincome/shared/src/types/Recipient';
} from '@socialincome/shared/src/types/recipient';
import { toDateTime } from '@socialincome/shared/src/utils/date';
import { AdditionalFieldDelegate, buildProperties } from 'firecms';
import { EntityCollection, PropertiesOrBuilders } from 'firecms/dist/types';
Expand Down
4 changes: 2 additions & 2 deletions admin/src/collections/recipients/RecipientsPayments.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Payment } from '@socialincome/shared/src/types/Payment';
import { RECIPIENT_FIRESTORE_PATH, Recipient, RecipientProgramStatus } from '@socialincome/shared/src/types/Recipient';
import { Payment } from '@socialincome/shared/src/types/payment';
import { RECIPIENT_FIRESTORE_PATH, Recipient, RecipientProgramStatus } from '@socialincome/shared/src/types/recipient';
import { getMonthIDs } from '@socialincome/shared/src/utils/date';
import {
AdditionalFieldDelegate,
Expand Down
4 changes: 2 additions & 2 deletions admin/src/collections/recipients/RecipientsProperties.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PARTNER_ORGANISATION_FIRESTORE_PATH } from '@socialincome/shared/src/types/PartnerOrganisation';
import { RecipientMainLanguage, RecipientProgramStatus } from '@socialincome/shared/src/types/Recipient';
import { PARTNER_ORGANISATION_FIRESTORE_PATH } from '@socialincome/shared/src/types/partner-organisation';
import { RecipientMainLanguage, RecipientProgramStatus } from '@socialincome/shared/src/types/recipient';
import { Property, StringProperty } from 'firecms/dist/types/properties';

export const programStatusProperty: Property = {
Expand Down
2 changes: 1 addition & 1 deletion admin/src/collections/surveys/Surveys.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { SURVEY_FIRETORE_PATH, Survey } from '@socialincome/shared/src/types/survey';
import { EntityCollection } from 'firecms/dist/types/collections';
import { SURVEY_FIRETORE_PATH, Survey } from '../../../../shared/src/types/Survey';
import { buildAuditedCollection } from '../shared';
import {
accessEmailProperty,
Expand Down
4 changes: 2 additions & 2 deletions admin/src/collections/surveys/SurveysProperties.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RecipientMainLanguage } from '@socialincome/shared/src/types/Recipient';
import { SurveyQuestionnaire, SurveyStatus } from '@socialincome/shared/src/types/Survey';
import { RecipientMainLanguage } from '@socialincome/shared/src/types/recipient';
import { SurveyQuestionnaire, SurveyStatus } from '@socialincome/shared/src/types/survey';
import { DateProperty, MapProperty, Property, StringProperty } from 'firecms/dist/types/properties';

export const surveyStatusProperty: StringProperty = {
Expand Down
4 changes: 2 additions & 2 deletions admin/src/views/NextSurveysView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Button, Link, Popover, Typography } from '@mui/material';
import { DataGrid } from '@mui/x-data-grid';
import { Recipient } from '@socialincome/shared/src/types/Recipient';
import { Survey, SurveyStatus, getSurveyUrl } from '@socialincome/shared/src/types/Survey';
import { Recipient } from '@socialincome/shared/src/types/recipient';
import { Survey, SurveyStatus, getSurveyUrl } from '@socialincome/shared/src/types/survey';
import { toDate, toDateTime } from '@socialincome/shared/src/utils/date';
import {
QueryDocumentSnapshot,
Expand Down
4 changes: 2 additions & 2 deletions admin/src/views/PaymentsConfirmationView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Button, Link, Popover, Typography } from '@mui/material';
import { DataGrid } from '@mui/x-data-grid';
import { Payment, PaymentStatus } from '@socialincome/shared/src/types/Payment';
import { Recipient } from '@socialincome/shared/src/types/Recipient';
import { Payment, PaymentStatus } from '@socialincome/shared/src/types/payment';
import { Recipient } from '@socialincome/shared/src/types/recipient';
import { toDateTime } from '@socialincome/shared/src/utils/date';
import {
QueryDocumentSnapshot,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, test } from '@jest/globals';
import functions from 'firebase-functions-test';
import { FirestoreAdmin } from '../../../../shared/src/firebase/admin/FirestoreAdmin';
import { getOrInitializeFirebaseAdmin } from '../../../../shared/src/firebase/admin/app';
import { EXCHANGE_RATES_PATH, ExchangeRates, ExchangeRatesEntry } from '../../../../shared/src/types/ExchangeRates';
import { EXCHANGE_RATES_PATH, ExchangeRates, ExchangeRatesEntry } from '../../../../shared/src/types/exchange-rates';
import { ExchangeRateImporter, ExchangeRateResponse } from './ExchangeRateImporter';

describe('importExchangeRates', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import axios from 'axios';
import { logger } from 'firebase-functions';
import { DateTime } from 'luxon';
import { FirestoreAdmin } from '../../../../shared/src/firebase/admin/FirestoreAdmin';
import { EXCHANGE_RATES_PATH, ExchangeRates, ExchangeRatesEntry } from '../../../../shared/src/types/ExchangeRates';
import { EXCHANGE_RATES_PATH, ExchangeRates, ExchangeRatesEntry } from '../../../../shared/src/types/exchange-rates';
import { EXCHANGE_RATES_API } from '../../config';

export type ExchangeRateResponse = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
BANK_BALANCE_FIRESTORE_PATH,
BankBalance,
getIdFromBankBalance,
} from '../../../../shared/src/types/BankBalance';
} from '../../../../shared/src/types/bank-balance';
import { PostFinanceBalanceImporter } from './PostFinanceBalanceImporter';

describe('importPostfinanceBalance', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
BANK_BALANCE_FIRESTORE_PATH,
BankBalance,
getIdFromBankBalance,
} from '../../../../shared/src/types/BankBalance';
} from '../../../../shared/src/types/bank-balance';
import { POSTFINANCE_EMAIL_PASSWORD, POSTFINANCE_EMAIL_USER } from '../../config';

export class PostFinanceBalanceImporter {
Expand Down
8 changes: 4 additions & 4 deletions functions/src/firebase.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { getOrInitializeFirebaseAdmin } from '../../shared/src/firebase/admin/app';
import { FirestoreAdmin } from '../../shared/src/firebase/admin/FirestoreAdmin';
import { ADMIN_USER_FIRESTORE_PATH, AdminUser } from '../../shared/src/types/AdminUser';
import { EXCHANGE_RATES_PATH, ExchangeRatesEntry } from '../../shared/src/types/ExchangeRates';
import { PARTNER_ORGANISATION_FIRESTORE_PATH, PartnerOrganisation } from '../../shared/src/types/PartnerOrganisation';
import { Recipient, RECIPIENT_FIRESTORE_PATH, RecipientProgramStatus } from '../../shared/src/types/Recipient';
import { ADMIN_USER_FIRESTORE_PATH, AdminUser } from '../../shared/src/types/admin-user';
import { EXCHANGE_RATES_PATH, ExchangeRatesEntry } from '../../shared/src/types/exchange-rates';
import { PARTNER_ORGANISATION_FIRESTORE_PATH, PartnerOrganisation } from '../../shared/src/types/partner-organisation';
import { Recipient, RECIPIENT_FIRESTORE_PATH, RecipientProgramStatus } from '../../shared/src/types/recipient';

export async function initializeGlobalTestData(projectId?: string) {
const firestoreAdmin = new FirestoreAdmin(getOrInitializeFirebaseAdmin({ projectId }));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
CONTRIBUTION_FIRESTORE_PATH,
ContributionSourceKey,
StatusKey,
} from '../../../../shared/src/types/Contribution';
import { USER_FIRESTORE_PATH, User } from '../../../../shared/src/types/User';
} from '../../../../shared/src/types/contribution';
import { USER_FIRESTORE_PATH, User } from '../../../../shared/src/types/user';

// TODO: write tests
export class PostfinancePaymentsFileImporter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { withFile } from 'tmp-promise';
import { FirestoreAdmin } from '../../../../../shared/src/firebase/admin/FirestoreAdmin';
import { StorageAdmin } from '../../../../../shared/src/firebase/admin/StorageAdmin';
import { Entity } from '../../../../../shared/src/types';
import { Contribution, StatusKey } from '../../../../../shared/src/types/Contribution';
import { DonationCertificate } from '../../../../../shared/src/types/DonationCertificate';
import { User } from '../../../../../shared/src/types/User';
import { Contribution, StatusKey } from '../../../../../shared/src/types/contribution';
import { DonationCertificate } from '../../../../../shared/src/types/donation-certificate';
import { User } from '../../../../../shared/src/types/user';
import { Translator } from '../../../../../shared/src/utils/i18n';
import { sendEmail } from '../../../../../shared/src/utils/messaging/email';
import { renderTemplate } from '../../../../../shared/src/utils/templates';
Expand Down
4 changes: 2 additions & 2 deletions functions/src/webhooks/admin/payment-process/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as functions from 'firebase-functions';
import { DateTime } from 'luxon';
import { DEFAULT_REGION } from '../../../../../shared/src/firebase';
import { FirestoreAdmin } from '../../../../../shared/src/firebase/admin/FirestoreAdmin';
import { PaymentProcessTaskType } from '../../../../../shared/src/types/Payment';
import { toPaymentDate } from '../../../../../shared/src/types/Recipient';
import { PaymentProcessTaskType } from '../../../../../shared/src/types/payment';
import { toPaymentDate } from '../../../../../shared/src/types/recipient';
import { PaymentCSVTask } from './tasks/PaymentCSVTask';
import { PaymentTask } from './tasks/PaymentTask';
import { RegistrationCSVTask } from './tasks/RegistrationCSVTask';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import functionsTest from 'firebase-functions-test';
import { DateTime } from 'luxon';
import { PaymentProcessTaskType } from '../../../../../../shared/src/types/Payment';
import { toPaymentDate } from '../../../../../../shared/src/types/Recipient';
import { PaymentProcessTaskType } from '../../../../../../shared/src/types/payment';
import { toPaymentDate } from '../../../../../../shared/src/types/recipient';
import { initializeGlobalTestData } from '../../../../firebase';
import { runPaymentProcessTask } from '../../../index';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DateTime } from 'luxon';
import { PAYMENT_AMOUNT } from '../../../../../../shared/src/types/Payment';
import { PAYMENT_AMOUNT } from '../../../../../../shared/src/types/payment';
import { PaymentTask } from './PaymentTask';

export class PaymentCSVTask extends PaymentTask {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Recipient,
RECIPIENT_FIRESTORE_PATH,
RecipientProgramStatus,
} from '../../../../../../shared/src/types/Recipient';
} from '../../../../../../shared/src/types/recipient';
import QueryDocumentSnapshot = firestore.QueryDocumentSnapshot;

export abstract class PaymentTask {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import functionsTest from 'firebase-functions-test';
import { DateTime } from 'luxon';
import { PaymentProcessTaskType } from '../../../../../../shared/src/types/Payment';
import { toPaymentDate } from '../../../../../../shared/src/types/Recipient';
import { PaymentProcessTaskType } from '../../../../../../shared/src/types/payment';
import { toPaymentDate } from '../../../../../../shared/src/types/recipient';
import { initializeGlobalTestData } from '../../../../firebase';
import { runPaymentProcessTask } from '../../../index';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { DateTime } from 'luxon';
import { MessageInstance } from 'twilio/lib/rest/api/v2010/account/message';
import {} from '../../../../../../shared/src/types';
import { MESSAGE_FIRESTORE_PATH, MessageType, TwilioMessage } from '../../../../../../shared/src/types/Message';
import { PAYMENT_FIRESTORE_PATH, Payment } from '../../../../../../shared/src/types/Payment';
import { RECIPIENT_FIRESTORE_PATH, Recipient } from '../../../../../../shared/src/types/Recipient';
import { MESSAGE_FIRESTORE_PATH, MessageType, TwilioMessage } from '../../../../../../shared/src/types/message';
import { PAYMENT_FIRESTORE_PATH, Payment } from '../../../../../../shared/src/types/payment';
import { RECIPIENT_FIRESTORE_PATH, Recipient } from '../../../../../../shared/src/types/recipient';
import { sendSms } from '../../../../../../shared/src/utils/messaging/sms';
import { TWILIO_SENDER_PHONE, TWILIO_SID, TWILIO_TOKEN } from '../../../../config';
import { PaymentTask } from './PaymentTask';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import {
PAYMENT_FIRESTORE_PATH,
PaymentProcessTaskType,
PaymentStatus,
} from '../../../../../../shared/src/types/Payment';
} from '../../../../../../shared/src/types/payment';
import {
Recipient,
RECIPIENT_FIRESTORE_PATH,
RecipientProgramStatus,
toPaymentDate,
} from '../../../../../../shared/src/types/Recipient';
} from '../../../../../../shared/src/types/recipient';
import { toDateTime } from '../../../../../../shared/src/utils/date';
import { initializeGlobalTestData } from '../../../../firebase';
import { runPaymentProcessTask } from '../../../index';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
PAYMENT_FIRESTORE_PATH,
Payment,
PaymentStatus,
} from '../../../../../../shared/src/types/Payment';
import { RECIPIENT_FIRESTORE_PATH, RecipientProgramStatus } from '../../../../../../shared/src/types/Recipient';
} from '../../../../../../shared/src/types/payment';
import { RECIPIENT_FIRESTORE_PATH, RecipientProgramStatus } from '../../../../../../shared/src/types/recipient';
import { ExchangeRateImporter } from '../../../../cron/exchange-rate-import/ExchangeRateImporter';
import { PaymentTask } from './PaymentTask';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DateTime } from 'luxon';
import { toFirebaseAdminTimestamp } from '../../../../../shared/src/firebase/admin/utils';
import { ExchangeRates } from '../../../../../shared/src/types/ExchangeRates';
import { Payment, PaymentStatus } from '../../../../../shared/src/types/Payment';
import { ExchangeRates } from '../../../../../shared/src/types/exchange-rates';
import { Payment, PaymentStatus } from '../../../../../shared/src/types/payment';
import { PaymentsManager } from './PaymentsManager';

test('BatchAddCHFToPayments', async () => {
Expand Down
4 changes: 2 additions & 2 deletions functions/src/webhooks/admin/scripts/PaymentsManager.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FirestoreAdmin } from '../../../../../shared/src/firebase/admin/FirestoreAdmin';
import { ExchangeRates } from '../../../../../shared/src/types/ExchangeRates';
import { Payment, PAYMENT_FIRESTORE_PATH } from '../../../../../shared/src/types/Payment';
import { ExchangeRates } from '../../../../../shared/src/types/exchange-rates';
import { Payment, PAYMENT_FIRESTORE_PATH } from '../../../../../shared/src/types/payment';
import { ExchangeRateImporter } from '../../../cron/exchange-rate-import/ExchangeRateImporter';

export class PaymentsManager {
Expand Down
4 changes: 2 additions & 2 deletions functions/src/webhooks/admin/scripts/SurveyManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import {
Recipient,
RecipientMainLanguage,
RecipientProgramStatus,
} from '../../../../../shared/src/types/Recipient';
} from '../../../../../shared/src/types/recipient';
import {
SURVEY_FIRETORE_PATH,
Survey,
SurveyQuestionnaire,
SurveyStatus,
recipientSurveys,
} from '../../../../../shared/src/types/Survey';
} from '../../../../../shared/src/types/survey';
import { rndString } from '../../../../../shared/src/utils/crypto';
import { toDateTime } from '../../../../../shared/src/utils/date';

Expand Down
Loading
Loading