@7365admin1/core 2.36.0 → 2.36.1
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.
- package/CHANGELOG.md +6 -0
- package/dist/index.js +13 -20
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +13 -20
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
package/dist/index.js
CHANGED
|
@@ -31076,18 +31076,16 @@ function useSiteUnitBillingRepo() {
|
|
|
31076
31076
|
const endDate = new Date(dateTo);
|
|
31077
31077
|
endDate.setHours(23, 59, 59, 999);
|
|
31078
31078
|
dateExpr = {
|
|
31079
|
-
|
|
31080
|
-
$
|
|
31081
|
-
|
|
31082
|
-
{ $lte: ["$issueDate", endDate] }
|
|
31083
|
-
]
|
|
31079
|
+
issueDate: {
|
|
31080
|
+
$gte: startDate,
|
|
31081
|
+
$lte: endDate
|
|
31084
31082
|
}
|
|
31085
31083
|
};
|
|
31086
31084
|
}
|
|
31087
31085
|
const query = {
|
|
31088
31086
|
status,
|
|
31089
|
-
...import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(unitId) },
|
|
31090
|
-
...import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
|
|
31087
|
+
...unitId && import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(unitId) },
|
|
31088
|
+
...site && import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
|
|
31091
31089
|
...dateExpr
|
|
31092
31090
|
};
|
|
31093
31091
|
try {
|
|
@@ -37188,16 +37186,13 @@ function useStatementOfAccountService() {
|
|
|
37188
37186
|
if (user) {
|
|
37189
37187
|
value.createdByName = user.name;
|
|
37190
37188
|
}
|
|
37191
|
-
let unit_billings = await getUnitBillingBySite(
|
|
37192
|
-
|
|
37193
|
-
|
|
37194
|
-
|
|
37195
|
-
|
|
37196
|
-
|
|
37197
|
-
|
|
37198
|
-
},
|
|
37199
|
-
session
|
|
37200
|
-
);
|
|
37189
|
+
let unit_billings = await getUnitBillingBySite({
|
|
37190
|
+
status: "active",
|
|
37191
|
+
site: value.site.toString() ?? "",
|
|
37192
|
+
dateFrom,
|
|
37193
|
+
dateTo,
|
|
37194
|
+
unitId: value.unitId?.toString() ?? ""
|
|
37195
|
+
});
|
|
37201
37196
|
if (!unit_billings || unit_billings.length === 0) {
|
|
37202
37197
|
return unit_billings;
|
|
37203
37198
|
}
|
|
@@ -40701,8 +40696,7 @@ function useOccurrenceEntryService() {
|
|
|
40701
40696
|
updateOccurrenceEntryById: _updateOccurrenceEntryById,
|
|
40702
40697
|
getOccurrenceEntryById: _getOccurrenceEntryById,
|
|
40703
40698
|
getOccurrenceEntryByBookId: _getOccurrenceEntryByBookId,
|
|
40704
|
-
updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId
|
|
40705
|
-
deleteOccurrenceEntryById: _deleteOccurrenceEntryById
|
|
40699
|
+
updateOccurrenceEntryByBookId: _updateOccurrenceEntryByBookId
|
|
40706
40700
|
} = useOccurrenceEntryRepo();
|
|
40707
40701
|
const {
|
|
40708
40702
|
getOccurrenceBookById: _getOccurrenceBookById,
|
|
@@ -40778,7 +40772,6 @@ function useOccurrenceEntryService() {
|
|
|
40778
40772
|
totalInput: book.totalInput + 1
|
|
40779
40773
|
});
|
|
40780
40774
|
await _add(value);
|
|
40781
|
-
await _deleteOccurrenceEntryById(id);
|
|
40782
40775
|
await session?.commitTransaction();
|
|
40783
40776
|
return "Successfully updated daily occurrence entry.";
|
|
40784
40777
|
} catch (error) {
|