-fix typos
This commit is contained in:
parent
0a604ee3ea
commit
d00f7a4a01
@ -1 +1 @@
|
|||||||
Subproject commit 23538677f6c6be2a62f38dc6137ecdd1c76b7b15
|
Subproject commit 355a3172699b96f1040edcb577c07a681802b3ae
|
@ -78,7 +78,7 @@ msgstr ""
|
|||||||
|
|
||||||
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1026
|
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1026
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Waiting the bank to create the operaion..."
|
msgid "Waiting the bank to create the operation..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1044
|
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1044
|
||||||
|
@ -10,9 +10,9 @@ This project generate 5 templates for the merchant backend:
|
|||||||
* RequestPayment
|
* RequestPayment
|
||||||
* ShowOrderDetails
|
* ShowOrderDetails
|
||||||
|
|
||||||
This pages are to be serve from the merchant-backend service and will be queried for browser that may or may not have javascript enabled, so we are going to do server side rendering.
|
This pages are to be serve from the merchant-backend service and will be queried for browser that may or may not have JavaScript enabled, so we are going to do server side rendering.
|
||||||
The merchant-backend service is currently supporting mustache library for server side rendering.
|
The merchant-backend service is currently supporting mustache library for server side rendering.
|
||||||
We also want the be able to create a more interactive design if the browser have javascript enabled, so the pages will be serve with all the infromation in the html but also in javascript.
|
We also want the be able to create a more interactive design if the browser have JavaScript enabled, so the pages will be serve with all the information in the HTML but also in JavaScript.
|
||||||
|
|
||||||
In this scenario, we are using jsx to build the template of the page that will be build-time rendered into the mustache template. This template can the be deployed into a merchant-backend that will complete the information before send it to the browser.
|
In this scenario, we are using jsx to build the template of the page that will be build-time rendered into the mustache template. This template can the be deployed into a merchant-backend that will complete the information before send it to the browser.
|
||||||
|
|
||||||
@ -22,9 +22,7 @@ The building process can be executed with `pnpm build`
|
|||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
|
|
||||||
This project is using a javascript implementation of mustache that can be executed with the command `pnpm render-examples`.
|
This project is using a JavaScript implementation of mustache that can be executed with the command `pnpm render-examples`.
|
||||||
This script will take the pages previously built in `dist/pages` directory and the examples definition in the `src/pages/[exampleName].examples.ts` files and render a to-be-sent-to-the-user page like the merchant would do.
|
This script will take the pages previously built in `dist/pages` directory and the examples definition in the `src/pages/[exampleName].examples.ts` files and render a to-be-sent-to-the-user page like the merchant would do.
|
||||||
This examples will be saved invidivualy into directory `dist/examples` and should be opened with your testing browser.
|
This examples will be saved invidivualy into directory `dist/examples` and should be opened with your testing browser.
|
||||||
Testing should be done with javascript enabled and javascript disabled, both should look ok.
|
Testing should be done with JavaScript enabled and JavaScript disabled, both should look ok.
|
||||||
|
|
||||||
|
|
||||||
|
@ -38,8 +38,8 @@ export function mergeRefunds(prev: MerchantBackend.Orders.RefundDetails[], cur:
|
|||||||
let tail;
|
let tail;
|
||||||
|
|
||||||
if (prev.length === 0 || //empty list
|
if (prev.length === 0 || //empty list
|
||||||
cur.timestamp.t_s === 'never' || //current doesnt have timestamp
|
cur.timestamp.t_s === 'never' || //current does not have timestamp
|
||||||
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt have timestamp
|
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does not have timestamp
|
||||||
cur.reason !== tail.reason || //different reason
|
cur.reason !== tail.reason || //different reason
|
||||||
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference
|
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
|
|||||||
return value !== null && value !== undefined;
|
return value !== null && value !== undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function buildActions<T extends WithId>(intances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
|
export function buildActions<T extends WithId>(instances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
|
||||||
return selected.map(id => intances.find(i => i.id === id))
|
return selected.map(id => instances.find(i => i.id === id))
|
||||||
.filter(notEmpty)
|
.filter(notEmpty)
|
||||||
.map(id => ({ element: id, type: action }))
|
.map(id => ({ element: id, type: action }))
|
||||||
}
|
}
|
||||||
|
@ -175,10 +175,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
|
|||||||
return value !== null && value !== undefined;
|
return value !== null && value !== undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildActions(intances: MerchantBackend.Instances.Instance[], selected: string[], action: 'DELETE'): Actions[] {
|
function buildActions(instances: MerchantBackend.Instances.Instance[], selected: string[], action: 'DELETE'): Actions[] {
|
||||||
return selected.map(id => intances.find(i => i.id === id))
|
return selected.map(id => instances.find(i => i.id === id))
|
||||||
.filter(notEmpty)
|
.filter(notEmpty)
|
||||||
.map(id => ({ element: id, type: action }))
|
.map(id => ({ element: id, type: action }))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -38,8 +38,8 @@ export function mergeRefunds(prev: MerchantBackend.Orders.RefundDetails[], cur:
|
|||||||
let tail;
|
let tail;
|
||||||
|
|
||||||
if (prev.length === 0 || //empty list
|
if (prev.length === 0 || //empty list
|
||||||
cur.timestamp.t_s === 'never' || //current doesnt have timestamp
|
cur.timestamp.t_s === 'never' || //current does not have timestamp
|
||||||
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt have timestamp
|
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does not have timestamp
|
||||||
cur.reason !== tail.reason || //different reason
|
cur.reason !== tail.reason || //different reason
|
||||||
cur.pending !== tail.pending || //different pending state
|
cur.pending !== tail.pending || //different pending state
|
||||||
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference
|
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference
|
||||||
|
@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
|
|||||||
return value !== null && value !== undefined;
|
return value !== null && value !== undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function buildActions<T extends WithId>(intances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
|
export function buildActions<T extends WithId>(instances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
|
||||||
return selected.map(id => intances.find(i => i.id === id))
|
return selected.map(id => instances.find(i => i.id === id))
|
||||||
.filter(notEmpty)
|
.filter(notEmpty)
|
||||||
.map(id => ({ element: id, type: action }))
|
.map(id => ({ element: id, type: action }))
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ import { useNotifications } from '../../src/hooks/notifications';
|
|||||||
|
|
||||||
jest.useFakeTimers()
|
jest.useFakeTimers()
|
||||||
|
|
||||||
test('notification should disapear after timeout', () => {
|
test('notification should disappear after timeout', () => {
|
||||||
jest.spyOn(global, 'setTimeout');
|
jest.spyOn(global, 'setTimeout');
|
||||||
|
|
||||||
const timeout = 1000
|
const timeout = 1000
|
||||||
|
@ -852,7 +852,7 @@ export interface ExchangeListItem {
|
|||||||
permanent: boolean;
|
permanent: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Information about the last error that occured when trying
|
* Information about the last error that occurred when trying
|
||||||
* to update the exchange info.
|
* to update the exchange info.
|
||||||
*/
|
*/
|
||||||
lastUpdateErrorInfo?: OperationErrorInfo;
|
lastUpdateErrorInfo?: OperationErrorInfo;
|
||||||
|
Loading…
Reference in New Issue
Block a user