Skip to content

Naprawa logiki generowania sekcji Szczegóły #73

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.

Sign up for GitHub

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

Open
SPodjasek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Naprawa logiki generowania sekcji Szczegóły #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 42 additions & 7 deletions src/lib-public/generators/FA3/Szczegoly.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,34 +214,69 @@ describe(generateSzczegoly.name, () => {

describe('ceny labels', () => {
it('should add "netto" label when P_11 exists in FaWiersz', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValue([]);
vi.mocked(PDFFunctions.getTable).mockReturnValueOnce([{}]).mockReturnValueOnce([]);

vi.mocked(PDFFunctions.hasColumnsValue).mockImplementation((column: string) => column === 'P_11');
vi.mocked(PDFFunctions.hasColumnsValue)
.mockImplementationOnce((column: string) => column === 'P_11')
.mockReturnValueOnce(false);

generateSzczegoly(mockFaVat);

expect(PDFFunctions.createLabelText).toHaveBeenCalledWith('Faktura wystawiona w cenach: ', 'netto');
});

it('should add "netto" label when P_11 exists in ZamowienieWiersz', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValue([]);
vi.mocked(PDFFunctions.getTable).mockReturnValueOnce([]).mockReturnValueOnce([{}]);

vi.mocked(PDFFunctions.hasColumnsValue).mockImplementation((column: string) => column === 'P_11');
vi.mocked(PDFFunctions.hasColumnsValue)
.mockReturnValueOnce(false)
.mockImplementationOnce((column: string) => column === 'P_11');

generateSzczegoly(mockFaVat);

expect(PDFFunctions.createLabelText).toHaveBeenCalledWith('Faktura wystawiona w cenach: ', 'netto');
});

it('should add "brutto" label when P_11 does not exist', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValue([]);
vi.mocked(PDFFunctions.hasColumnsValue).mockReturnValue(false);
it('should add "brutto" label when P_11A exist in FaWiersz', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValueOnce([{}]).mockReturnValueOnce([]);

vi.mocked(PDFFunctions.hasColumnsValue)
.mockReturnValueOnce(false)
.mockReturnValueOnce(false)
.mockImplementationOnce((column: string) => column === 'P_11A')
.mockReturnValueOnce(false);

generateSzczegoly(mockFaVat);

expect(PDFFunctions.createLabelText).toHaveBeenCalledWith('Faktura wystawiona w cenach: ', 'brutto');
});

it('should add "brutto" label when P_11A exist in ZamowienieWiersz', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValueOnce([]).mockReturnValueOnce([{}]);

vi.mocked(PDFFunctions.hasColumnsValue)
.mockReturnValueOnce(false)
.mockReturnValueOnce(false)
.mockReturnValueOnce(false)
.mockImplementationOnce((column: string) => column === 'P_11A');

generateSzczegoly(mockFaVat);

expect(PDFFunctions.createLabelText).toHaveBeenCalledWith('Faktura wystawiona w cenach: ', 'brutto');
});

it('should not add "brutto" or "netto" label when there are no FaWiersz and no ZamowienieWiersz', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValue([]);

generateSzczegoly(mockFaVat);

expect(PDFFunctions.createLabelText).not.toHaveBeenCalledWith(
'Faktura wystawiona w cenach: ',
'brutto'
);
expect(PDFFunctions.createLabelText).not.toHaveBeenCalledWith('Faktura wystawiona w cenach: ', 'netto');
});

it('should add currency code label', () => {
vi.mocked(PDFFunctions.getTable).mockReturnValue([]);

Expand Down
26 changes: 15 additions & 11 deletions src/lib-public/generators/FA3/Szczegoly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,16 @@ export function generateSzczegoly(faVat: Fa): Content[] {
const cenyLabel1: Content[] = [];
const cenyLabel2: Content[] = [];

if (!(faWiersze.length > 0 || zamowieniaWiersze.length > 0)) {
if (faWiersze.length > 0 || zamowieniaWiersze.length > 0) {
const Any_P_11 = hasColumnsValue('P_11', faWiersze) || hasColumnsValue('P_11', zamowieniaWiersze);
const Any_P_11A = hasColumnsValue('P_11A', faWiersze) || hasColumnsValue('P_11A', zamowieniaWiersze);

if (Any_P_11) {
cenyLabel1.push(createLabelText('Faktura wystawiona w cenach: ', 'netto'));
} else {
} else if (Any_P_11A) {
cenyLabel1.push(createLabelText('Faktura wystawiona w cenach: ', 'brutto'));
}
} else {
cenyLabel2.push(createLabelText('Kod waluty: ', faVat.KodWaluty));
}

Expand Down Expand Up @@ -164,17 +166,19 @@ function generateFakturaZaliczkowa(fakturaZaliczkowaData: ObjectKeysOfFP[] | und
return [];
}
const fakturaZaliczkowa = getTable(fakturaZaliczkowaData) as unknown as FA3FakturaZaliczkowaData[];
const fakturaZaliczkowaMapped = fakturaZaliczkowa.map(item => {
const fakturaZaliczkowaMapped = fakturaZaliczkowa.map((item) => {
const fp =
(
'NrFaZaliczkowej' in item && item.NrFaZaliczkowej
) ? item.NrFaZaliczkowej : ('NrKSeFFaZaliczkowej' in item ? item.NrKSeFFaZaliczkowej : undefined );

return{
...item,
NrFaZaliczkowej : fp ?? { _text: ''},
'NrFaZaliczkowej' in item && item.NrFaZaliczkowej
? item.NrFaZaliczkowej
: 'NrKSeFFaZaliczkowej' in item
? item.NrKSeFFaZaliczkowej
: undefined;

return {
...item,
NrFaZaliczkowej: fp ?? { _text: '' },
};
})
});
const table: Content[] = [];

const fakturaZaliczkowaHeader: HeaderDefine[] = [
Expand Down