imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Revised the JavaScript OriginalLineItem class to store the form instead of the selector. The selector is only used in the constructor.

Browse Source
This commit is contained in:
依瑪貓 2023-04-03 14:57:51 +08:00
parent f3ae37a409
commit 78a9d7794c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/accounting/static/js/original-line-item-selector.js
View File

@ -194,10 +194,10 @@ class OriginalLineItemSelector {
class OriginalLineItem { class OriginalLineItem {
/** /**
* The original line item selector * The journal entry form
* @type {OriginalLineItemSelector} * @type {JournalEntryForm}
*/ */
#selector; #form;
/** /**
* The element * The element
@ -278,7 +278,7 @@ class OriginalLineItem {
* @param element {HTMLLIElement} the element * @param element {HTMLLIElement} the element
*/ */
constructor(selector, element) { constructor(selector, element) {
this.#selector = selector; this.#form = selector.lineItemEditor.form;
this.#element = element; this.#element = element;
this.id = element.dataset.id; this.id = element.dataset.id;
this.date = element.dataset.date; this.date = element.dataset.date;
@ -291,7 +291,7 @@ class OriginalLineItem {
this.netBalanceText = document.getElementById(`accounting-original-line-item-selector-option-${this.id}-net-balance`); this.netBalanceText = document.getElementById(`accounting-original-line-item-selector-option-${this.id}-net-balance`);
this.text = element.dataset.text; this.text = element.dataset.text;
this.#queryValues = JSON.parse(element.dataset.queryValues); this.#queryValues = JSON.parse(element.dataset.queryValues);
this.#element.onclick = () => this.#selector.lineItemEditor.saveOriginalLineItem(this); this.#element.onclick = () => selector.lineItemEditor.saveOriginalLineItem(this);
} }
/** /**
@ -332,7 +332,7 @@ class OriginalLineItem {
*/ */
isMatched(debitCredit, currencyCode, query = null) { isMatched(debitCredit, currencyCode, query = null) {
return this.netBalance.greaterThan(0) return this.netBalance.greaterThan(0)
&& this.date <= this.#selector.lineItemEditor.form.date && this.date <= this.#form.date
&& this.#isDebitCreditMatched(debitCredit) && this.#isDebitCreditMatched(debitCredit)
&& this.#currencyCode === currencyCode && this.#currencyCode === currencyCode
&& this.#isQueryMatched(query); && this.#isQueryMatched(query);