taxtank-core 0.28.71 → 0.28.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,35 +1,40 @@
1
1
  import { AbstractForm } from '../abstract.form';
2
- import { SoleInvoiceItem } from '../../models';
3
- import { FormArray, FormControl, Validators } from '@angular/forms';
2
+ import { SoleInvoice, SoleInvoiceItem } from '../../models';
3
+ import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms';
4
4
  import { SoleInvoiceItemForm } from './sole-invoice-item.form';
5
5
  import { plainToClass } from 'class-transformer';
6
6
  import { SoleInvoiceTaxTypeEnum } from '../../db/Enums/sole-invoice-tax-type.enum';
7
- import merge from 'lodash/merge';
7
+ /**
8
+ * Form is divided into two groups, since the creation of Sole invoice takes place in two steps:
9
+ * a common invoice data and sole invoice items.
10
+ */
8
11
  export class SoleInvoiceForm extends AbstractForm {
9
12
  constructor(invoice, soleDetailsGST,
10
13
  // default template to be preselected
11
14
  defaultTemplate) {
12
15
  super({
13
- dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),
14
- dateTo: new FormControl(invoice.dateTo, Validators.required),
16
+ commonData: new FormGroup({
17
+ dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),
18
+ dateTo: new FormControl(invoice.dateTo, Validators.required),
19
+ payer: new FormControl(invoice.payer, Validators.required),
20
+ taxType: new FormControl(invoice.taxType, Validators.required),
21
+ bankAccount: new FormControl(invoice.bankAccount, Validators.required),
22
+ reference: new FormControl(invoice.reference)
23
+ }),
15
24
  items: new FormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item) => new SoleInvoiceItemForm(item))),
16
- payer: new FormControl(invoice.payer, Validators.required),
17
- taxType: new FormControl(invoice.taxType, Validators.required),
18
- bankAccount: new FormControl(invoice.bankAccount, Validators.required),
19
- reference: new FormControl(invoice.reference)
20
25
  }, invoice);
21
26
  this.invoice = invoice;
22
27
  this.soleDetailsGST = soleDetailsGST;
23
28
  this.defaultTemplate = defaultTemplate;
24
29
  // we need invoice template only for new invoices
25
30
  if (!invoice.id) {
26
- this.addControl('template', new FormControl(this.defaultTemplate));
31
+ (this.commonData).addControl('template', new FormControl(this.defaultTemplate));
27
32
  this.updateTemplateRelatedFields(this.defaultTemplate);
28
33
  }
29
34
  // invoice.taxType is always NONE ('No Tax') when soleDetails.isGST === false
30
35
  if (!this.soleDetailsGST) {
31
- this.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);
32
- this.get('taxType').disable();
36
+ this.commonData.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);
37
+ this.commonData.get('taxType').disable();
33
38
  // Items isGST is not available when invoice.taxType === NONE ('No Tax')
34
39
  this.items.controls.forEach((itemForm) => {
35
40
  this.disableItemGST(itemForm);
@@ -49,8 +54,8 @@ export class SoleInvoiceForm extends AbstractForm {
49
54
  this.listenItemChartAccountsChanges(itemForm);
50
55
  });
51
56
  }
52
- // nothing to listen if template field is not учшые (edit invoice case)
53
- if (this.contains('template')) {
57
+ // nothing to listen if template field is not exist (edit invoice case)
58
+ if ((this.commonData).contains('template')) {
54
59
  this.listenTemplateChanges();
55
60
  }
56
61
  }
@@ -67,15 +72,20 @@ export class SoleInvoiceForm extends AbstractForm {
67
72
  this.items.removeAt(index);
68
73
  }
69
74
  submit(data = {}) {
70
- // @TODO Alex TT-2190: move child custom forms submit to Abstract Form
71
- const items = this.items.controls.map((control) => control.submit());
72
- return super.submit(merge(data, { items }));
75
+ this.submitted = true;
76
+ this.markAllAsTouched();
77
+ if (!this.disabled && !this.valid) {
78
+ return null;
79
+ }
80
+ const invoiceInstance = this.currentValue;
81
+ this.onSubmit.emit(invoiceInstance);
82
+ return invoiceInstance;
73
83
  }
74
84
  /**
75
85
  * Update default values from selected invoice template
76
86
  */
77
87
  listenTemplateChanges() {
78
- this.get('template').valueChanges.subscribe((template) => {
88
+ this.commonData.get('template').valueChanges.subscribe((template) => {
79
89
  this.updateTemplateRelatedFields(template);
80
90
  });
81
91
  }
@@ -83,7 +93,7 @@ export class SoleInvoiceForm extends AbstractForm {
83
93
  * GST is not available for items when invoice.taxType === NONE
84
94
  */
85
95
  listenTaxTypeChanges() {
86
- this.get('taxType').valueChanges.subscribe((type) => {
96
+ this.commonData.get('taxType').valueChanges.subscribe((type) => {
87
97
  this.items.controls.forEach((itemForm) => {
88
98
  const chartAccounts = itemForm.get('chartAccounts').value;
89
99
  // Item GST is available when invoice.taxType !== NONE ('No Tax')
@@ -96,18 +106,18 @@ export class SoleInvoiceForm extends AbstractForm {
96
106
  });
97
107
  }
98
108
  updateTemplateRelatedFields(template) {
99
- this.get('bankAccount').setValue(template.bankAccount);
100
- const dateFrom = this.get('dateFrom').value;
109
+ this.commonData.get('bankAccount').setValue(template.bankAccount);
110
+ const dateFrom = this.commonData.get('dateFrom').value;
101
111
  if (dateFrom) {
102
- this.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));
112
+ this.commonData.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));
103
113
  }
104
114
  // invoice.taxType is always 'No Tax' when soleDetails.isGST = false and not available for changing
105
115
  if (this.soleDetailsGST) {
106
- this.get('taxType').setValue(template.taxType);
116
+ this.commonData.get('taxType').setValue(template.taxType);
107
117
  }
108
118
  }
109
119
  /**
110
- * GST availability depends of chart accounts isGST flag
120
+ * GST availability depends on chart accounts isGST flag
111
121
  */
112
122
  listenItemChartAccountsChanges(itemForm) {
113
123
  itemForm.get('chartAccounts').valueChanges.subscribe((chartAccounts) => {
@@ -131,5 +141,15 @@ export class SoleInvoiceForm extends AbstractForm {
131
141
  itemForm.get('isGST').setValue(true);
132
142
  itemForm.get('isGST').enable();
133
143
  }
144
+ get commonData() {
145
+ return this.get('commonData');
146
+ }
147
+ /**
148
+ * Rewrite abstract form getter to flat "commonData" field, which is not in the class
149
+ */
150
+ get currentValue() {
151
+ const formRawValue = this.getRawValue();
152
+ return plainToClass(SoleInvoice, Object.assign({}, this.model, Object.assign(Object.assign({}, formRawValue.commonData), { items: formRawValue.items })));
153
+ }
134
154
  }
135
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sole-invoice.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/sole-invoice.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { SoleInvoice, SoleInvoiceItem, SoleInvoiceTemplate } from '../../models';\nimport { FormArray, FormControl, Validators } from '@angular/forms';\nimport { SoleInvoiceItemForm } from './sole-invoice-item.form';\nimport { plainToClass } from 'class-transformer';\nimport { IEventListener } from '../../interfaces/event-listener.interface';\nimport { SoleInvoiceTaxTypeEnum } from '../../db/Enums/sole-invoice-tax-type.enum';\nimport merge from 'lodash/merge';\nimport { ChartAccounts } from '../../models/chart-accounts/chart-accounts';\n\nexport class SoleInvoiceForm extends AbstractForm<SoleInvoice> implements IEventListener {\n  constructor(\n    private invoice: SoleInvoice,\n    private soleDetailsGST: boolean,\n    // default template to be preselected\n    private defaultTemplate: SoleInvoiceTemplate,\n  ) {\n    super({\n      dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),\n      dateTo: new FormControl(invoice.dateTo, Validators.required),\n      items: new FormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item: SoleInvoiceItem) => new SoleInvoiceItemForm(item))),\n      payer: new FormControl(invoice.payer, Validators.required),\n      taxType: new FormControl(invoice.taxType, Validators.required),\n      bankAccount: new FormControl(invoice.bankAccount, Validators.required),\n      reference: new FormControl(invoice.reference)\n    }, invoice);\n\n    // we need invoice template only for new invoices\n    if (!invoice.id) {\n      this.addControl('template', new FormControl(this.defaultTemplate));\n\n      this.updateTemplateRelatedFields(this.defaultTemplate);\n    }\n\n    // invoice.taxType is always NONE ('No Tax') when soleDetails.isGST === false\n    if (!this.soleDetailsGST) {\n      this.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);\n      this.get('taxType').disable();\n\n      // Items isGST is not available when invoice.taxType === NONE ('No Tax')\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        this.disableItemGST(itemForm);\n      });\n    }\n\n    this.listenEvents();\n  }\n\n  get items(): FormArray {\n    return this.get('items') as FormArray;\n  }\n\n  listenEvents(): void {\n    // no need to listen tax type and items chart accounts changes when soleDetails.isGST === false\n    // because invoice tax type always 'No Tax' in this case and not available for changing\n    if (this.soleDetailsGST) {\n      this.listenTaxTypeChanges();\n\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        this.listenItemChartAccountsChanges(itemForm);\n      });\n    }\n\n    // nothing to listen if template field is not учшые (edit invoice case)\n    if (this.contains('template')) {\n      this.listenTemplateChanges();\n    }\n  }\n\n  addItem(): void {\n    const itemForm: SoleInvoiceItemForm = new SoleInvoiceItemForm(plainToClass(SoleInvoiceItem, {}));\n    // no need to listen items chart accounts changes when soleDetails.isGST === false\n    // because invoice tax type always 'No Tax' in this case and not available for changing\n    if (this.soleDetailsGST) {\n      this.listenItemChartAccountsChanges(itemForm);\n    }\n\n    this.items.push(itemForm);\n  }\n\n  removeItem(index: number): void {\n    this.items.removeAt(index);\n  }\n\n  submit(data: object = {}): SoleInvoice {\n    // @TODO Alex TT-2190: move child custom forms submit to Abstract Form\n    const items: SoleInvoiceItem[] = this.items.controls.map((control: SoleInvoiceItemForm) => control.submit());\n\n    return super.submit(merge(data, {items}));\n  }\n\n  /**\n   * Update default values from selected invoice template\n   */\n  private listenTemplateChanges(): void {\n    this.get('template').valueChanges.subscribe((template: SoleInvoiceTemplate) => {\n      this.updateTemplateRelatedFields(template);\n    });\n  }\n\n  /**\n   * GST is not available for items when invoice.taxType === NONE\n   */\n  private listenTaxTypeChanges(): void {\n    this.get('taxType').valueChanges.subscribe((type: SoleInvoiceTaxTypeEnum) => {\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        const chartAccounts: ChartAccounts = itemForm.get('chartAccounts').value;\n\n        // Item GST is available when invoice.taxType !== NONE ('No Tax')\n        if (type !== SoleInvoiceTaxTypeEnum.NO_TAX && chartAccounts?.isGST ) {\n          this.enableItemGST(itemForm);\n          return;\n        }\n\n        this.disableItemGST(itemForm);\n      })\n    })\n  }\n\n  private updateTemplateRelatedFields(template: SoleInvoiceTemplate): void {\n    this.get('bankAccount').setValue(template.bankAccount);\n\n    const dateFrom: Date = this.get('dateFrom').value;\n    if (dateFrom) {\n      this.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));\n    }\n\n    // invoice.taxType is always 'No Tax' when soleDetails.isGST = false and not available for changing\n    if (this.soleDetailsGST) {\n      this.get('taxType').setValue(template.taxType);\n    }\n  }\n\n  /**\n   * GST availability depends of chart accounts isGST flag\n   */\n  private listenItemChartAccountsChanges(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('chartAccounts').valueChanges.subscribe((chartAccounts: ChartAccounts) => {\n      // item.isGST is available only when item.chartAccounts.isGST === true, soleDetails.isGST === true and invoice.taxType !== NONE ('No Tax')\n      if (this.soleDetailsGST && chartAccounts.isGST && !this.currentValue.isNoTax()) {\n        this.enableItemGST(itemForm);\n        return;\n      }\n\n      this.disableItemGST(itemForm);\n    });\n  }\n\n  private disableItemGST(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('isGST').setValue(false);\n    itemForm.get('isGST').disable();\n  }\n\n  /**\n   * Enable GST field for passed item form. Value is always true by default because only case when this field is enabled is\n   * when ChartAccounts.isGST === true, so we just use default value from chartAccounts.isGST\n   */\n  private enableItemGST(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('isGST').setValue(true);\n    itemForm.get('isGST').enable();\n  }\n}\n"]}
155
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sole-invoice.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/sole-invoice.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { SoleInvoice, SoleInvoiceItem, SoleInvoiceTemplate } from '../../models';\nimport { FormArray, FormControl, FormGroup, Validators } from '@angular/forms';\nimport { SoleInvoiceItemForm } from './sole-invoice-item.form';\nimport { plainToClass } from 'class-transformer';\nimport { IEventListener } from '../../interfaces/event-listener.interface';\nimport { SoleInvoiceTaxTypeEnum } from '../../db/Enums/sole-invoice-tax-type.enum';\nimport { ChartAccounts } from '../../models/chart-accounts/chart-accounts';\n\n/**\n * Form is divided into two groups, since the creation of Sole invoice takes place in two steps:\n * a common invoice data and sole invoice items.\n */\nexport class SoleInvoiceForm extends AbstractForm<SoleInvoice> implements IEventListener {\n  constructor(\n    private invoice: SoleInvoice,\n    private soleDetailsGST: boolean,\n    // default template to be preselected\n    private defaultTemplate: SoleInvoiceTemplate,\n  ) {\n    super({\n      commonData: new FormGroup({\n        dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),\n        dateTo: new FormControl(invoice.dateTo, Validators.required),\n        payer: new FormControl(invoice.payer, Validators.required),\n        taxType: new FormControl(invoice.taxType, Validators.required),\n        bankAccount: new FormControl(invoice.bankAccount, Validators.required),\n        reference: new FormControl(invoice.reference)\n      }),\n      items: new FormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item: SoleInvoiceItem) => new SoleInvoiceItemForm(item))),\n    }, invoice);\n\n    // we need invoice template only for new invoices\n    if (!invoice.id) {\n      (this.commonData).addControl('template', new FormControl(this.defaultTemplate));\n\n      this.updateTemplateRelatedFields(this.defaultTemplate);\n    }\n\n    // invoice.taxType is always NONE ('No Tax') when soleDetails.isGST === false\n    if (!this.soleDetailsGST) {\n      this.commonData.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);\n      this.commonData.get('taxType').disable();\n\n      // Items isGST is not available when invoice.taxType === NONE ('No Tax')\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        this.disableItemGST(itemForm);\n      });\n    }\n\n    this.listenEvents();\n  }\n\n  get items(): FormArray {\n    return this.get('items') as FormArray;\n  }\n\n  listenEvents(): void {\n    // no need to listen tax type and items chart accounts changes when soleDetails.isGST === false\n    // because invoice tax type always 'No Tax' in this case and not available for changing\n    if (this.soleDetailsGST) {\n      this.listenTaxTypeChanges();\n\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        this.listenItemChartAccountsChanges(itemForm);\n      });\n    }\n\n    // nothing to listen if template field is not exist (edit invoice case)\n    if ((this.commonData).contains('template')) {\n      this.listenTemplateChanges();\n    }\n  }\n\n  addItem(): void {\n    const itemForm: SoleInvoiceItemForm = new SoleInvoiceItemForm(plainToClass(SoleInvoiceItem, {}));\n    // no need to listen items chart accounts changes when soleDetails.isGST === false\n    // because invoice tax type always 'No Tax' in this case and not available for changing\n    if (this.soleDetailsGST) {\n      this.listenItemChartAccountsChanges(itemForm);\n    }\n\n    this.items.push(itemForm);\n  }\n\n  removeItem(index: number): void {\n    this.items.removeAt(index);\n  }\n\n  submit(data: object = {}): SoleInvoice {\n      this.submitted = true;\n      this.markAllAsTouched();\n\n      if (!this.disabled && !this.valid) {\n        return null;\n      }\n\n      const invoiceInstance: SoleInvoice = this.currentValue;\n\n      this.onSubmit.emit(invoiceInstance);\n      return invoiceInstance;\n  }\n\n  /**\n   * Update default values from selected invoice template\n   */\n  private listenTemplateChanges(): void {\n    this.commonData.get('template').valueChanges.subscribe((template: SoleInvoiceTemplate) => {\n      this.updateTemplateRelatedFields(template);\n    });\n  }\n\n  /**\n   * GST is not available for items when invoice.taxType === NONE\n   */\n  private listenTaxTypeChanges(): void {\n    this.commonData.get('taxType').valueChanges.subscribe((type: SoleInvoiceTaxTypeEnum) => {\n      this.items.controls.forEach((itemForm: SoleInvoiceItemForm) => {\n        const chartAccounts: ChartAccounts = itemForm.get('chartAccounts').value;\n\n        // Item GST is available when invoice.taxType !== NONE ('No Tax')\n        if (type !== SoleInvoiceTaxTypeEnum.NO_TAX && chartAccounts?.isGST ) {\n          this.enableItemGST(itemForm);\n          return;\n        }\n\n        this.disableItemGST(itemForm);\n      })\n    })\n  }\n\n  private updateTemplateRelatedFields(template: SoleInvoiceTemplate): void {\n    this.commonData.get('bankAccount').setValue(template.bankAccount);\n\n    const dateFrom: Date = this.commonData.get('dateFrom').value;\n    if (dateFrom) {\n      this.commonData.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));\n    }\n\n    // invoice.taxType is always 'No Tax' when soleDetails.isGST = false and not available for changing\n    if (this.soleDetailsGST) {\n      this.commonData.get('taxType').setValue(template.taxType);\n    }\n  }\n\n  /**\n   * GST availability depends on chart accounts isGST flag\n   */\n  private listenItemChartAccountsChanges(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('chartAccounts').valueChanges.subscribe((chartAccounts: ChartAccounts) => {\n      // item.isGST is available only when item.chartAccounts.isGST === true, soleDetails.isGST === true and invoice.taxType !== NONE ('No Tax')\n      if (this.soleDetailsGST && chartAccounts.isGST && !this.currentValue.isNoTax()) {\n        this.enableItemGST(itemForm);\n        return;\n      }\n\n      this.disableItemGST(itemForm);\n    });\n  }\n\n  private disableItemGST(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('isGST').setValue(false);\n    itemForm.get('isGST').disable();\n  }\n\n  /**\n   * Enable GST field for passed item form. Value is always true by default because only case when this field is enabled is\n   * when ChartAccounts.isGST === true, so we just use default value from chartAccounts.isGST\n   */\n  private enableItemGST(itemForm: SoleInvoiceItemForm): void {\n    itemForm.get('isGST').setValue(true);\n    itemForm.get('isGST').enable();\n  }\n\n  get commonData(): FormGroup {\n    return this.get('commonData') as FormGroup;\n  }\n\n  /**\n   * Rewrite abstract form getter to flat \"commonData\" field, which is not in the class\n   */\n  get currentValue(): SoleInvoice {\n    const formRawValue: any = this.getRawValue();\n\n    return plainToClass(SoleInvoice, Object.assign(\n      {},\n      this.model,\n      {...formRawValue.commonData, items: formRawValue.items}\n    ));\n  }\n}\n"]}
@@ -5,6 +5,24 @@ export class BasReport extends BasReportBase {
5
5
  get taxWithheldTotal() {
6
6
  return this.taxWithheldSalary + this.taxWithheldNoABN;
7
7
  }
8
+ get paygTaxInstalmentOwedToATO() {
9
+ return this.paygTaxInstalment > 0 ? this.paygTaxInstalment : 0;
10
+ }
11
+ get paygTaxInstalmentOwedByATO() {
12
+ return this.paygTaxInstalment < 0 ? Math.abs(this.paygTaxInstalment) : 0;
13
+ }
14
+ get fuelTaxCreditOwedToATO() {
15
+ return this.fuelTaxCredit < 0 ? this.fuelTaxCredit : 0;
16
+ }
17
+ get fuelTaxCreditOwedByATO() {
18
+ return this.fuelTaxCredit > 0 ? Math.abs(this.fuelTaxCredit) : 0;
19
+ }
20
+ get owesToATO() {
21
+ return this.incomeGST + this.taxWithheldTotal + this.paygTaxInstalmentOwedToATO + this.fuelTaxCreditOwedToATO;
22
+ }
23
+ get owedByATO() {
24
+ return this.expenseGST + this.paygTaxInstalmentOwedByATO + this.fuelTaxCreditOwedByATO;
25
+ }
8
26
  /**
9
27
  * GST payable to the ATO, or refundable from the ATO in case it's negative
10
28
  */
@@ -18,4 +36,4 @@ __decorate([
18
36
  __decorate([
19
37
  Type(() => Date)
20
38
  ], BasReport.prototype, "dateTo", void 0);
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzLXJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvc29sZS9iYXMtcmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsU0FBUyxJQUFJLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdFLE9BQU8sRUFBQyxJQUFJLEVBQUMsTUFBTSxtQkFBbUIsQ0FBQztBQUV2QyxNQUFNLE9BQU8sU0FBVSxTQUFRLGFBQWE7SUFPMUMsSUFBSSxnQkFBZ0I7UUFDbEIsT0FBTyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDO0lBQ3hELENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksR0FBRztRQUNMLE9BQU8sSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUNoSCxDQUFDO0NBQ0Y7QUFmQztJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7MkNBQ0Y7QUFHZjtJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7eUNBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCYXNSZXBvcnQgYXMgQmFzUmVwb3J0QmFzZSB9IGZyb20gXCIuLi8uLi9kYi9Nb2RlbHMvc29sZS9iYXMtcmVwb3J0XCI7XG5pbXBvcnQge1R5cGV9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcblxuZXhwb3J0IGNsYXNzIEJhc1JlcG9ydCBleHRlbmRzIEJhc1JlcG9ydEJhc2Uge1xuICBAVHlwZSgoKSA9PiBEYXRlKVxuICBkYXRlRnJvbTogRGF0ZTtcblxuICBAVHlwZSgoKSA9PiBEYXRlKVxuICBkYXRlVG86IERhdGU7XG5cbiAgZ2V0IHRheFdpdGhoZWxkVG90YWwoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy50YXhXaXRoaGVsZFNhbGFyeSArIHRoaXMudGF4V2l0aGhlbGROb0FCTjtcbiAgfVxuXG4gIC8qKlxuICAgKiBHU1QgcGF5YWJsZSB0byB0aGUgQVRPLCBvciByZWZ1bmRhYmxlIGZyb20gdGhlIEFUTyBpbiBjYXNlIGl0J3MgbmVnYXRpdmVcbiAgICovXG4gIGdldCBnc3QoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5pbmNvbWVHU1QgLSB0aGlzLmV4cGVuc2VHU1QgKyB0aGlzLnRheFdpdGhoZWxkVG90YWwgKyB0aGlzLnBheWdUYXhJbnN0YWxtZW50IC0gdGhpcy5mdWVsVGF4Q3JlZGl0O1xuICB9XG59XG4iXX0=
39
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzLXJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvc29sZS9iYXMtcmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsU0FBUyxJQUFJLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzdFLE9BQU8sRUFBQyxJQUFJLEVBQUMsTUFBTSxtQkFBbUIsQ0FBQztBQUV2QyxNQUFNLE9BQU8sU0FBVSxTQUFRLGFBQWE7SUFPMUMsSUFBSSxnQkFBZ0I7UUFDbEIsT0FBTyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDO0lBQ3hELENBQUM7SUFFRCxJQUFJLDBCQUEwQjtRQUM1QixPQUFPLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxJQUFJLDBCQUEwQjtRQUM1QixPQUFPLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQsSUFBSSxzQkFBc0I7UUFDeEIsT0FBTyxJQUFJLENBQUMsYUFBYSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFRCxJQUFJLHNCQUFzQjtRQUN4QixPQUFPLElBQUksQ0FBQyxhQUFhLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDWCxPQUFPLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQywwQkFBMEIsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUM7SUFDaEgsQ0FBQztJQUVELElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsMEJBQTBCLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDO0lBQ3pGLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksR0FBRztRQUNMLE9BQU8sSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUNoSCxDQUFDO0NBQ0Y7QUF2Q0M7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDOzJDQUNGO0FBR2Y7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDO3lDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQmFzUmVwb3J0IGFzIEJhc1JlcG9ydEJhc2UgfSBmcm9tIFwiLi4vLi4vZGIvTW9kZWxzL3NvbGUvYmFzLXJlcG9ydFwiO1xuaW1wb3J0IHtUeXBlfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5cbmV4cG9ydCBjbGFzcyBCYXNSZXBvcnQgZXh0ZW5kcyBCYXNSZXBvcnRCYXNlIHtcbiAgQFR5cGUoKCkgPT4gRGF0ZSlcbiAgZGF0ZUZyb206IERhdGU7XG5cbiAgQFR5cGUoKCkgPT4gRGF0ZSlcbiAgZGF0ZVRvOiBEYXRlO1xuXG4gIGdldCB0YXhXaXRoaGVsZFRvdGFsKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMudGF4V2l0aGhlbGRTYWxhcnkgKyB0aGlzLnRheFdpdGhoZWxkTm9BQk47XG4gIH1cblxuICBnZXQgcGF5Z1RheEluc3RhbG1lbnRPd2VkVG9BVE8oKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5wYXlnVGF4SW5zdGFsbWVudCA+IDAgPyB0aGlzLnBheWdUYXhJbnN0YWxtZW50IDogMDtcbiAgfVxuXG4gIGdldCBwYXlnVGF4SW5zdGFsbWVudE93ZWRCeUFUTygpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLnBheWdUYXhJbnN0YWxtZW50IDwgMCA/IE1hdGguYWJzKHRoaXMucGF5Z1RheEluc3RhbG1lbnQpIDogMDtcbiAgfVxuXG4gIGdldCBmdWVsVGF4Q3JlZGl0T3dlZFRvQVRPKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuZnVlbFRheENyZWRpdCA8IDAgPyB0aGlzLmZ1ZWxUYXhDcmVkaXQgOiAwO1xuICB9XG5cbiAgZ2V0IGZ1ZWxUYXhDcmVkaXRPd2VkQnlBVE8oKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5mdWVsVGF4Q3JlZGl0ID4gMCA/IE1hdGguYWJzKHRoaXMuZnVlbFRheENyZWRpdCkgOiAwO1xuICB9XG5cbiAgZ2V0IG93ZXNUb0FUTygpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLmluY29tZUdTVCArIHRoaXMudGF4V2l0aGhlbGRUb3RhbCArIHRoaXMucGF5Z1RheEluc3RhbG1lbnRPd2VkVG9BVE8gKyB0aGlzLmZ1ZWxUYXhDcmVkaXRPd2VkVG9BVE87XG4gIH1cblxuICBnZXQgb3dlZEJ5QVRPKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuZXhwZW5zZUdTVCArIHRoaXMucGF5Z1RheEluc3RhbG1lbnRPd2VkQnlBVE8gKyB0aGlzLmZ1ZWxUYXhDcmVkaXRPd2VkQnlBVE87XG4gIH1cblxuICAvKipcbiAgICogR1NUIHBheWFibGUgdG8gdGhlIEFUTywgb3IgcmVmdW5kYWJsZSBmcm9tIHRoZSBBVE8gaW4gY2FzZSBpdCdzIG5lZ2F0aXZlXG4gICAqL1xuICBnZXQgZ3N0KCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuaW5jb21lR1NUIC0gdGhpcy5leHBlbnNlR1NUICsgdGhpcy50YXhXaXRoaGVsZFRvdGFsICsgdGhpcy5wYXlnVGF4SW5zdGFsbWVudCAtIHRoaXMuZnVlbFRheENyZWRpdDtcbiAgfVxufVxuIl19
@@ -6,6 +6,7 @@ import merge from 'lodash/merge';
6
6
  import { map } from 'rxjs/operators';
7
7
  import { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';
8
8
  import { AppEvent } from '../../../../models/event/app-event';
9
+ import last from 'lodash/last';
9
10
  import * as i0 from "@angular/core";
10
11
  export class SoleInvoiceService extends RestService {
11
12
  constructor() {
@@ -30,6 +31,16 @@ export class SoleInvoiceService extends RestService {
30
31
  sendEmail(invoice) {
31
32
  return this.http.post(`${this.environment.apiV2}/${this.url}/${invoice.id}/send`, {});
32
33
  }
34
+ /**
35
+ * Return the next number from the last invoice.
36
+ * Basically needed to create a new invoice to show its number when the invoice has not yet been sent to the backend
37
+ */
38
+ getNewInvoiceNumber() {
39
+ if (!this.cache) {
40
+ return 0;
41
+ }
42
+ return last(this.cache).number + 1;
43
+ }
33
44
  }
34
45
  SoleInvoiceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
35
46
  SoleInvoiceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' });
@@ -39,4 +50,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
39
50
  providedIn: 'root'
40
51
  }]
41
52
  }] });
42
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1pbnZvaWNlLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvaHR0cC9zb2xlL3NvbGUtaW52b2ljZS9zb2xlLWludm9pY2Uuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsV0FBVyxFQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0saURBQWlELENBQUM7QUFFMUYsT0FBTyxLQUFLLE1BQU0sY0FBYyxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUNoRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7O0FBSzlELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxXQUF5QztJQUhqRjs7UUFJRSxlQUFVLEdBQXVCLFdBQVcsQ0FBQztRQUM3QyxRQUFHLEdBQVcsZUFBZSxDQUFDO1FBQzlCLFlBQU8sR0FBWSxJQUFJLENBQUM7S0F1QnpCO0lBckJDLFlBQVksQ0FBQyxPQUFvQixFQUFFLE1BQStCO1FBQ2hFLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFDLE1BQU0sRUFBQyxDQUFDLENBQUM7UUFDNUQsMENBQTBDO1FBQzFDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQsT0FBTyxDQUFDLE9BQW9CLEVBQUUsUUFBa0I7UUFDOUMsMENBQTBDO1FBQzFDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsdUJBQXVCLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQzthQUM1RixJQUFJLENBQ0gsR0FBRyxDQUFDLENBQUMsZ0JBQTZCLEVBQUUsRUFBRTtZQUNwQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFDLHNCQUFzQixFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUU5RyxPQUFPLGdCQUFnQixDQUFDO1FBQzFCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRUQsU0FBUyxDQUFDLE9BQW9CO1FBQzVCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN4RixDQUFDOztnSEF6QlUsa0JBQWtCO29IQUFsQixrQkFBa0IsY0FGakIsTUFBTTs0RkFFUCxrQkFBa0I7a0JBSDlCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi8uLi9yZXN0L3Jlc3Quc2VydmljZSc7XG5pbXBvcnQgeyBTb2xlSW52b2ljZSBhcyBTb2xlSW52b2ljZUJhc2UgfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9Nb2RlbHMvc29sZS9zb2xlLWludm9pY2UnO1xuaW1wb3J0IHsgU29sZUludm9pY2UsIERvY3VtZW50IH0gZnJvbSAnLi4vLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvc29sZS1pbnZvaWNlLXN0YXR1c2VzLmVudW0nO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IG1lcmdlIGZyb20gJ2xvZGFzaC9tZXJnZSc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBcHBFdmVudFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vbW9kZWxzL2V2ZW50L2FwcC1ldmVudC10eXBlLmVudW0nO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50JztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgU29sZUludm9pY2VTZXJ2aWNlIGV4dGVuZHMgUmVzdFNlcnZpY2U8U29sZUludm9pY2VCYXNlLCBTb2xlSW52b2ljZT4ge1xuICBtb2RlbENsYXNzOiB0eXBlb2YgU29sZUludm9pY2UgPSBTb2xlSW52b2ljZTtcbiAgdXJsOiBzdHJpbmcgPSAnc29sZS1pbnZvaWNlcyc7XG4gIGlzSHlkcmE6IGJvb2xlYW4gPSB0cnVlO1xuXG4gIHVwZGF0ZVN0YXR1cyhpbnZvaWNlOiBTb2xlSW52b2ljZSwgc3RhdHVzOiBTb2xlSW52b2ljZVN0YXR1c2VzRW51bSk6IE9ic2VydmFibGU8U29sZUludm9pY2U+IHtcbiAgICBjb25zdCB1cGRhdGVkSW52b2ljZSA9IE9iamVjdC5hc3NpZ24oe30sIGludm9pY2UsIHtzdGF0dXN9KTtcbiAgICAvLyB1c2UgaWQgb25seSB0byBhdm9pZCB1bmV4cGVjdGVkIGNoYW5nZXNcbiAgICByZXR1cm4gdGhpcy51cGRhdGUodXBkYXRlZEludm9pY2UpO1xuICB9XG5cbiAgcHVibGlzaChpbnZvaWNlOiBTb2xlSW52b2ljZSwgZG9jdW1lbnQ6IERvY3VtZW50KTogT2JzZXJ2YWJsZTxTb2xlSW52b2ljZT4ge1xuICAgIC8vIHVzZSBpZCBvbmx5IHRvIGF2b2lkIHVuZXhwZWN0ZWQgY2hhbmdlc1xuICAgIHJldHVybiB0aGlzLnVwZGF0ZShtZXJnZSh7fSwgaW52b2ljZSwgeyBkb2N1bWVudCwgc3RhdHVzOiBTb2xlSW52b2ljZVN0YXR1c2VzRW51bS5QRU5ESU5HIH0pKVxuICAgIC5waXBlKFxuICAgICAgbWFwKChwdWJsaXNoZWRJbnZvaWNlOiBTb2xlSW52b2ljZSkgPT4ge1xuICAgICAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2UuZGlzcGF0Y2gobmV3IEFwcEV2ZW50KEFwcEV2ZW50VHlwZUVudW0uU09MRV9JTlZPSUNFX1BVQkxJU0hFRCwgcHVibGlzaGVkSW52b2ljZSkpO1xuXG4gICAgICAgIHJldHVybiBwdWJsaXNoZWRJbnZvaWNlO1xuICAgICAgfSlcbiAgICApO1xuICB9XG5cbiAgc2VuZEVtYWlsKGludm9pY2U6IFNvbGVJbnZvaWNlKSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0KGAke3RoaXMuZW52aXJvbm1lbnQuYXBpVjJ9LyR7dGhpcy51cmx9LyR7aW52b2ljZS5pZH0vc2VuZGAsIHt9KTtcbiAgfVxufVxuIl19
53
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1pbnZvaWNlLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvaHR0cC9zb2xlL3NvbGUtaW52b2ljZS9zb2xlLWludm9pY2Uuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV0RCxPQUFPLEVBQUUsV0FBVyxFQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0saURBQWlELENBQUM7QUFFMUYsT0FBTyxLQUFLLE1BQU0sY0FBYyxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUNoRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDOUQsT0FBTyxJQUFJLE1BQU0sYUFBYSxDQUFDOztBQUsvQixNQUFNLE9BQU8sa0JBQW1CLFNBQVEsV0FBeUM7SUFIakY7O1FBSUUsZUFBVSxHQUF1QixXQUFXLENBQUM7UUFDN0MsUUFBRyxHQUFXLGVBQWUsQ0FBQztRQUM5QixZQUFPLEdBQVksSUFBSSxDQUFDO0tBbUN6QjtJQWpDQyxZQUFZLENBQUMsT0FBb0IsRUFBRSxNQUErQjtRQUNoRSxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBQyxNQUFNLEVBQUMsQ0FBQyxDQUFDO1FBQzVELDBDQUEwQztRQUMxQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELE9BQU8sQ0FBQyxPQUFvQixFQUFFLFFBQWtCO1FBQzlDLDBDQUEwQztRQUMxQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLHVCQUF1QixDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7YUFDNUYsSUFBSSxDQUNILEdBQUcsQ0FBQyxDQUFDLGdCQUE2QixFQUFFLEVBQUU7WUFDcEMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxzQkFBc0IsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFFOUcsT0FBTyxnQkFBZ0IsQ0FBQztRQUMxQixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUFvQjtRQUM1QixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLEdBQUcsSUFBSSxPQUFPLENBQUMsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDeEYsQ0FBQztJQUVEOzs7T0FHRztJQUNILG1CQUFtQjtRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNmLE9BQU8sQ0FBQyxDQUFDO1NBQ1Y7UUFFRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNyQyxDQUFDOztnSEFyQ1Usa0JBQWtCO29IQUFsQixrQkFBa0IsY0FGakIsTUFBTTs0RkFFUCxrQkFBa0I7a0JBSDlCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUmVzdFNlcnZpY2UgfSBmcm9tICcuLi8uLi9yZXN0L3Jlc3Quc2VydmljZSc7XG5pbXBvcnQgeyBTb2xlSW52b2ljZSBhcyBTb2xlSW52b2ljZUJhc2UgfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9Nb2RlbHMvc29sZS9zb2xlLWludm9pY2UnO1xuaW1wb3J0IHsgU29sZUludm9pY2UsIERvY3VtZW50IH0gZnJvbSAnLi4vLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvc29sZS1pbnZvaWNlLXN0YXR1c2VzLmVudW0nO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IG1lcmdlIGZyb20gJ2xvZGFzaC9tZXJnZSc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBcHBFdmVudFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vbW9kZWxzL2V2ZW50L2FwcC1ldmVudC10eXBlLmVudW0nO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50JztcbmltcG9ydCBsYXN0IGZyb20gJ2xvZGFzaC9sYXN0JztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgU29sZUludm9pY2VTZXJ2aWNlIGV4dGVuZHMgUmVzdFNlcnZpY2U8U29sZUludm9pY2VCYXNlLCBTb2xlSW52b2ljZT4ge1xuICBtb2RlbENsYXNzOiB0eXBlb2YgU29sZUludm9pY2UgPSBTb2xlSW52b2ljZTtcbiAgdXJsOiBzdHJpbmcgPSAnc29sZS1pbnZvaWNlcyc7XG4gIGlzSHlkcmE6IGJvb2xlYW4gPSB0cnVlO1xuXG4gIHVwZGF0ZVN0YXR1cyhpbnZvaWNlOiBTb2xlSW52b2ljZSwgc3RhdHVzOiBTb2xlSW52b2ljZVN0YXR1c2VzRW51bSk6IE9ic2VydmFibGU8U29sZUludm9pY2U+IHtcbiAgICBjb25zdCB1cGRhdGVkSW52b2ljZSA9IE9iamVjdC5hc3NpZ24oe30sIGludm9pY2UsIHtzdGF0dXN9KTtcbiAgICAvLyB1c2UgaWQgb25seSB0byBhdm9pZCB1bmV4cGVjdGVkIGNoYW5nZXNcbiAgICByZXR1cm4gdGhpcy51cGRhdGUodXBkYXRlZEludm9pY2UpO1xuICB9XG5cbiAgcHVibGlzaChpbnZvaWNlOiBTb2xlSW52b2ljZSwgZG9jdW1lbnQ6IERvY3VtZW50KTogT2JzZXJ2YWJsZTxTb2xlSW52b2ljZT4ge1xuICAgIC8vIHVzZSBpZCBvbmx5IHRvIGF2b2lkIHVuZXhwZWN0ZWQgY2hhbmdlc1xuICAgIHJldHVybiB0aGlzLnVwZGF0ZShtZXJnZSh7fSwgaW52b2ljZSwgeyBkb2N1bWVudCwgc3RhdHVzOiBTb2xlSW52b2ljZVN0YXR1c2VzRW51bS5QRU5ESU5HIH0pKVxuICAgIC5waXBlKFxuICAgICAgbWFwKChwdWJsaXNoZWRJbnZvaWNlOiBTb2xlSW52b2ljZSkgPT4ge1xuICAgICAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2UuZGlzcGF0Y2gobmV3IEFwcEV2ZW50KEFwcEV2ZW50VHlwZUVudW0uU09MRV9JTlZPSUNFX1BVQkxJU0hFRCwgcHVibGlzaGVkSW52b2ljZSkpO1xuXG4gICAgICAgIHJldHVybiBwdWJsaXNoZWRJbnZvaWNlO1xuICAgICAgfSlcbiAgICApO1xuICB9XG5cbiAgc2VuZEVtYWlsKGludm9pY2U6IFNvbGVJbnZvaWNlKSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0KGAke3RoaXMuZW52aXJvbm1lbnQuYXBpVjJ9LyR7dGhpcy51cmx9LyR7aW52b2ljZS5pZH0vc2VuZGAsIHt9KTtcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm4gdGhlIG5leHQgbnVtYmVyIGZyb20gdGhlIGxhc3QgaW52b2ljZS5cbiAgICogQmFzaWNhbGx5IG5lZWRlZCB0byBjcmVhdGUgYSBuZXcgaW52b2ljZSB0byBzaG93IGl0cyBudW1iZXIgd2hlbiB0aGUgaW52b2ljZSBoYXMgbm90IHlldCBiZWVuIHNlbnQgdG8gdGhlIGJhY2tlbmRcbiAgICovXG4gIGdldE5ld0ludm9pY2VOdW1iZXIoKTogbnVtYmVyIHtcbiAgICBpZiAoIXRoaXMuY2FjaGUpIHtcbiAgICAgIHJldHVybiAwO1xuICAgIH1cblxuICAgIHJldHVybiBsYXN0KHRoaXMuY2FjaGUpLm51bWJlciArIDE7XG4gIH1cbn1cbiJdfQ==
@@ -4202,6 +4202,24 @@ class BasReport extends BasReport$1 {
4202
4202
  get taxWithheldTotal() {
4203
4203
  return this.taxWithheldSalary + this.taxWithheldNoABN;
4204
4204
  }
4205
+ get paygTaxInstalmentOwedToATO() {
4206
+ return this.paygTaxInstalment > 0 ? this.paygTaxInstalment : 0;
4207
+ }
4208
+ get paygTaxInstalmentOwedByATO() {
4209
+ return this.paygTaxInstalment < 0 ? Math.abs(this.paygTaxInstalment) : 0;
4210
+ }
4211
+ get fuelTaxCreditOwedToATO() {
4212
+ return this.fuelTaxCredit < 0 ? this.fuelTaxCredit : 0;
4213
+ }
4214
+ get fuelTaxCreditOwedByATO() {
4215
+ return this.fuelTaxCredit > 0 ? Math.abs(this.fuelTaxCredit) : 0;
4216
+ }
4217
+ get owesToATO() {
4218
+ return this.incomeGST + this.taxWithheldTotal + this.paygTaxInstalmentOwedToATO + this.fuelTaxCreditOwedToATO;
4219
+ }
4220
+ get owedByATO() {
4221
+ return this.expenseGST + this.paygTaxInstalmentOwedByATO + this.fuelTaxCreditOwedByATO;
4222
+ }
4205
4223
  /**
4206
4224
  * GST payable to the ATO, or refundable from the ATO in case it's negative
4207
4225
  */
@@ -10484,6 +10502,16 @@ class SoleInvoiceService extends RestService {
10484
10502
  sendEmail(invoice) {
10485
10503
  return this.http.post(`${this.environment.apiV2}/${this.url}/${invoice.id}/send`, {});
10486
10504
  }
10505
+ /**
10506
+ * Return the next number from the last invoice.
10507
+ * Basically needed to create a new invoice to show its number when the invoice has not yet been sent to the backend
10508
+ */
10509
+ getNewInvoiceNumber() {
10510
+ if (!this.cache) {
10511
+ return 0;
10512
+ }
10513
+ return last(this.cache).number + 1;
10514
+ }
10487
10515
  }
10488
10516
  SoleInvoiceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
10489
10517
  SoleInvoiceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' });
@@ -16062,31 +16090,37 @@ class SoleInvoiceItemForm extends AbstractForm {
16062
16090
  }
16063
16091
  }
16064
16092
 
16093
+ /**
16094
+ * Form is divided into two groups, since the creation of Sole invoice takes place in two steps:
16095
+ * a common invoice data and sole invoice items.
16096
+ */
16065
16097
  class SoleInvoiceForm extends AbstractForm {
16066
16098
  constructor(invoice, soleDetailsGST,
16067
16099
  // default template to be preselected
16068
16100
  defaultTemplate) {
16069
16101
  super({
16070
- dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),
16071
- dateTo: new FormControl(invoice.dateTo, Validators.required),
16102
+ commonData: new FormGroup({
16103
+ dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),
16104
+ dateTo: new FormControl(invoice.dateTo, Validators.required),
16105
+ payer: new FormControl(invoice.payer, Validators.required),
16106
+ taxType: new FormControl(invoice.taxType, Validators.required),
16107
+ bankAccount: new FormControl(invoice.bankAccount, Validators.required),
16108
+ reference: new FormControl(invoice.reference)
16109
+ }),
16072
16110
  items: new FormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item) => new SoleInvoiceItemForm(item))),
16073
- payer: new FormControl(invoice.payer, Validators.required),
16074
- taxType: new FormControl(invoice.taxType, Validators.required),
16075
- bankAccount: new FormControl(invoice.bankAccount, Validators.required),
16076
- reference: new FormControl(invoice.reference)
16077
16111
  }, invoice);
16078
16112
  this.invoice = invoice;
16079
16113
  this.soleDetailsGST = soleDetailsGST;
16080
16114
  this.defaultTemplate = defaultTemplate;
16081
16115
  // we need invoice template only for new invoices
16082
16116
  if (!invoice.id) {
16083
- this.addControl('template', new FormControl(this.defaultTemplate));
16117
+ (this.commonData).addControl('template', new FormControl(this.defaultTemplate));
16084
16118
  this.updateTemplateRelatedFields(this.defaultTemplate);
16085
16119
  }
16086
16120
  // invoice.taxType is always NONE ('No Tax') when soleDetails.isGST === false
16087
16121
  if (!this.soleDetailsGST) {
16088
- this.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);
16089
- this.get('taxType').disable();
16122
+ this.commonData.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);
16123
+ this.commonData.get('taxType').disable();
16090
16124
  // Items isGST is not available when invoice.taxType === NONE ('No Tax')
16091
16125
  this.items.controls.forEach((itemForm) => {
16092
16126
  this.disableItemGST(itemForm);
@@ -16106,8 +16140,8 @@ class SoleInvoiceForm extends AbstractForm {
16106
16140
  this.listenItemChartAccountsChanges(itemForm);
16107
16141
  });
16108
16142
  }
16109
- // nothing to listen if template field is not учшые (edit invoice case)
16110
- if (this.contains('template')) {
16143
+ // nothing to listen if template field is not exist (edit invoice case)
16144
+ if ((this.commonData).contains('template')) {
16111
16145
  this.listenTemplateChanges();
16112
16146
  }
16113
16147
  }
@@ -16124,15 +16158,20 @@ class SoleInvoiceForm extends AbstractForm {
16124
16158
  this.items.removeAt(index);
16125
16159
  }
16126
16160
  submit(data = {}) {
16127
- // @TODO Alex TT-2190: move child custom forms submit to Abstract Form
16128
- const items = this.items.controls.map((control) => control.submit());
16129
- return super.submit(merge(data, { items }));
16161
+ this.submitted = true;
16162
+ this.markAllAsTouched();
16163
+ if (!this.disabled && !this.valid) {
16164
+ return null;
16165
+ }
16166
+ const invoiceInstance = this.currentValue;
16167
+ this.onSubmit.emit(invoiceInstance);
16168
+ return invoiceInstance;
16130
16169
  }
16131
16170
  /**
16132
16171
  * Update default values from selected invoice template
16133
16172
  */
16134
16173
  listenTemplateChanges() {
16135
- this.get('template').valueChanges.subscribe((template) => {
16174
+ this.commonData.get('template').valueChanges.subscribe((template) => {
16136
16175
  this.updateTemplateRelatedFields(template);
16137
16176
  });
16138
16177
  }
@@ -16140,7 +16179,7 @@ class SoleInvoiceForm extends AbstractForm {
16140
16179
  * GST is not available for items when invoice.taxType === NONE
16141
16180
  */
16142
16181
  listenTaxTypeChanges() {
16143
- this.get('taxType').valueChanges.subscribe((type) => {
16182
+ this.commonData.get('taxType').valueChanges.subscribe((type) => {
16144
16183
  this.items.controls.forEach((itemForm) => {
16145
16184
  const chartAccounts = itemForm.get('chartAccounts').value;
16146
16185
  // Item GST is available when invoice.taxType !== NONE ('No Tax')
@@ -16153,18 +16192,18 @@ class SoleInvoiceForm extends AbstractForm {
16153
16192
  });
16154
16193
  }
16155
16194
  updateTemplateRelatedFields(template) {
16156
- this.get('bankAccount').setValue(template.bankAccount);
16157
- const dateFrom = this.get('dateFrom').value;
16195
+ this.commonData.get('bankAccount').setValue(template.bankAccount);
16196
+ const dateFrom = this.commonData.get('dateFrom').value;
16158
16197
  if (dateFrom) {
16159
- this.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));
16198
+ this.commonData.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));
16160
16199
  }
16161
16200
  // invoice.taxType is always 'No Tax' when soleDetails.isGST = false and not available for changing
16162
16201
  if (this.soleDetailsGST) {
16163
- this.get('taxType').setValue(template.taxType);
16202
+ this.commonData.get('taxType').setValue(template.taxType);
16164
16203
  }
16165
16204
  }
16166
16205
  /**
16167
- * GST availability depends of chart accounts isGST flag
16206
+ * GST availability depends on chart accounts isGST flag
16168
16207
  */
16169
16208
  listenItemChartAccountsChanges(itemForm) {
16170
16209
  itemForm.get('chartAccounts').valueChanges.subscribe((chartAccounts) => {
@@ -16188,6 +16227,16 @@ class SoleInvoiceForm extends AbstractForm {
16188
16227
  itemForm.get('isGST').setValue(true);
16189
16228
  itemForm.get('isGST').enable();
16190
16229
  }
16230
+ get commonData() {
16231
+ return this.get('commonData');
16232
+ }
16233
+ /**
16234
+ * Rewrite abstract form getter to flat "commonData" field, which is not in the class
16235
+ */
16236
+ get currentValue() {
16237
+ const formRawValue = this.getRawValue();
16238
+ return plainToClass(SoleInvoice, Object.assign({}, this.model, Object.assign(Object.assign({}, formRawValue.commonData), { items: formRawValue.items })));
16239
+ }
16191
16240
  }
16192
16241
 
16193
16242
  class SoleInvoiceTemplateForm extends AbstractForm {