cry-klikvet-logic 1.0.225 → 1.0.226
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/dist/anonimizirajPodatke.mjs +423 -655
- package/dist/anonimizirajPodatke.mjs.map +1 -1
- package/dist/besediloKarence.mjs +13 -16
- package/dist/besediloKarence.mjs.map +1 -1
- package/dist/blagovnicaZaSpremembeZaloge.mjs +61 -64
- package/dist/blagovnicaZaSpremembeZaloge.mjs.map +1 -1
- package/dist/certs.mjs +13 -26
- package/dist/certs.mjs.map +1 -1
- package/dist/dopisiSerijskeNaNapravi.d.mts.map +1 -1
- package/dist/dopisiSerijskeNaNapravi.mjs +32 -65
- package/dist/dopisiSerijskeNaNapravi.mjs.map +1 -1
- package/dist/ensureIndexes.mjs +143 -159
- package/dist/ensureIndexes.mjs.map +1 -1
- package/dist/fmtDateRange.mjs +4 -5
- package/dist/fmtDateRange.mjs.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.mjs +12 -23
- package/dist/idjiArtiklovKiImajoLahkoZalogo.mjs.map +1 -1
- package/dist/karticaArtikla.mjs +126 -141
- package/dist/karticaArtikla.mjs.map +1 -1
- package/dist/koledar.mjs +24 -35
- package/dist/koledar.mjs.map +1 -1
- package/dist/maint/nastaviNbcArtiklomIzMpc.mjs +27 -58
- package/dist/maint/nastaviNbcArtiklomIzMpc.mjs.map +1 -1
- package/dist/maint/poisciNapakeVSpremembiZaloge.mjs +49 -60
- package/dist/maint/poisciNapakeVSpremembiZaloge.mjs.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.mjs +243 -338
- package/dist/maint/poknjiziVsoZgodovino.mjs.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs +16 -48
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs +14 -46
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs.map +1 -1
- package/dist/models/Serijske.d.mts +1 -1
- package/dist/models/Serijske.d.mts.map +1 -1
- package/dist/nazivStranke.mjs +1 -2
- package/dist/nazivStranke.mjs.map +1 -1
- package/dist/neuporabljeno.mjs +25 -59
- package/dist/neuporabljeno.mjs.map +1 -1
- package/dist/parseSerijaStr.d.mts +1 -1
- package/dist/parseSerijaStr.d.mts.map +1 -1
- package/dist/parseSerijaStr.mjs +12 -9
- package/dist/parseSerijaStr.mjs.map +1 -1
- package/dist/pobrisiZgodovinoNaDan.mjs +17 -28
- package/dist/pobrisiZgodovinoNaDan.mjs.map +1 -1
- package/dist/podatkiRejca.mjs +113 -124
- package/dist/podatkiRejca.mjs.map +1 -1
- package/dist/poisciSerijskeZaNapravo.mjs +20 -52
- package/dist/poisciSerijskeZaNapravo.mjs.map +1 -1
- package/dist/polnaInventura.mjs +110 -131
- package/dist/polnaInventura.mjs.map +1 -1
- package/dist/porabaZaDobavnico.mjs +16 -1
- package/dist/porabaZaDobavnico.mjs.map +1 -1
- package/dist/porabaZaObravnavo.mjs +22 -10
- package/dist/porabaZaObravnavo.mjs.map +1 -1
- package/dist/preveriKnjizenjeZalogeArtikla.mjs +97 -111
- package/dist/preveriKnjizenjeZalogeArtikla.mjs.map +1 -1
- package/dist/q-blagovnice.mjs +12 -24
- package/dist/q-blagovnice.mjs.map +1 -1
- package/dist/q-isciPoObravnavah.mjs +25 -36
- package/dist/q-isciPoObravnavah.mjs.map +1 -1
- package/dist/q-isciPoRacunih.mjs +26 -37
- package/dist/q-isciPoRacunih.mjs.map +1 -1
- package/dist/q-mojPromet.mjs +24 -35
- package/dist/q-mojPromet.mjs.map +1 -1
- package/dist/q-porabaZdravil.mjs +110 -113
- package/dist/q-porabaZdravil.mjs.map +1 -1
- package/dist/q-prodano.mjs +36 -47
- package/dist/q-prodano.mjs.map +1 -1
- package/dist/q-prodanoPorabljeno.mjs +47 -48
- package/dist/q-prodanoPorabljeno.mjs.map +1 -1
- package/dist/q-promet.mjs +24 -35
- package/dist/q-promet.mjs.map +1 -1
- package/dist/q-racunovodji.mjs +229 -239
- package/dist/q-racunovodji.mjs.map +1 -1
- package/dist/q-skupineIzdelkov.mjs +20 -31
- package/dist/q-skupineIzdelkov.mjs.map +1 -1
- package/dist/q-skupineStrank.mjs +20 -31
- package/dist/q-skupineStrank.mjs.map +1 -1
- package/dist/q-strankeKlasificiraj.mjs +58 -69
- package/dist/q-strankeKlasificiraj.mjs.map +1 -1
- package/dist/q-strankeZadnjiObiski.mjs +22 -33
- package/dist/q-strankeZadnjiObiski.mjs.map +1 -1
- package/dist/q-zakljucek-blagajne.mjs +135 -150
- package/dist/q-zakljucek-blagajne.mjs.map +1 -1
- package/dist/razknjiziBlagovnico.mjs +46 -57
- package/dist/razknjiziBlagovnico.mjs.map +1 -1
- package/dist/razknjiziDobavnico.mjs +47 -58
- package/dist/razknjiziDobavnico.mjs.map +1 -1
- package/dist/serije.d.mts +5 -5
- package/dist/serije.d.mts.map +1 -1
- package/dist/serije.mjs +76 -97
- package/dist/serije.mjs.map +1 -1
- package/dist/skladisceLokacije.mjs +10 -21
- package/dist/skladisceLokacije.mjs.map +1 -1
- package/dist/smsCepljen.mjs +19 -28
- package/dist/smsCepljen.mjs.map +1 -1
- package/dist/smsCepljenjaNaDan.mjs +60 -67
- package/dist/smsCepljenjaNaDan.mjs.map +1 -1
- package/dist/smsNarocen.mjs +18 -26
- package/dist/smsNarocen.mjs.map +1 -1
- package/dist/smsNaroceniNaDan.mjs +40 -48
- package/dist/smsNaroceniNaDan.mjs.map +1 -1
- package/dist/spremembaZalogeZaObdobje.mjs +78 -91
- package/dist/spremembaZalogeZaObdobje.mjs.map +1 -1
- package/dist/spremeniZalogo.mjs +125 -132
- package/dist/spremeniZalogo.mjs.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs +122 -140
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs.map +1 -1
- package/dist/spremeniZalogoZaDobavo.mjs +218 -221
- package/dist/spremeniZalogoZaDobavo.mjs.map +1 -1
- package/dist/spremeniZalogoZaInventuro.mjs +131 -136
- package/dist/spremeniZalogoZaInventuro.mjs.map +1 -1
- package/dist/spremeniZalogoZaPrenos.mjs +83 -114
- package/dist/spremeniZalogoZaPrenos.mjs.map +1 -1
- package/dist/spremeniZalogoZaPrevzem.mjs +69 -103
- package/dist/spremeniZalogoZaPrevzem.mjs.map +1 -1
- package/dist/strankaInfo.mjs +11 -22
- package/dist/strankaInfo.mjs.map +1 -1
- package/dist/support/poisciSpremembeMpc.js +26 -32
- package/dist/support/poisciSpremembeMpc.js.map +1 -1
- package/dist/test/dvojne-dobave.mjs +150 -163
- package/dist/test/dvojne-dobave.mjs.map +1 -1
- package/dist/test/memdb.mjs +29 -46
- package/dist/test/memdb.mjs.map +1 -1
- package/dist/test/mesane-enote.mjs +49 -62
- package/dist/test/mesane-enote.mjs.map +1 -1
- package/dist/test/prestavitev.mjs +108 -123
- package/dist/test/prestavitev.mjs.map +1 -1
- package/dist/test/serijske.mjs +303 -328
- package/dist/test/serijske.mjs.map +1 -1
- package/dist/test/sprememba-cene.mjs +213 -234
- package/dist/test/sprememba-cene.mjs.map +1 -1
- package/dist/test/sprememba-cene2.mjs +137 -154
- package/dist/test/sprememba-cene2.mjs.map +1 -1
- package/dist/test/sprememba-cene3.mjs +138 -155
- package/dist/test/sprememba-cene3.mjs.map +1 -1
- package/dist/test/sprememba-cene4.mjs +100 -115
- package/dist/test/sprememba-cene4.mjs.map +1 -1
- package/dist/test/sprememba-cene5.mjs +100 -115
- package/dist/test/sprememba-cene5.mjs.map +1 -1
- package/dist/test/sprememba-cene6.mjs +141 -158
- package/dist/test/sprememba-cene6.mjs.map +1 -1
- package/dist/test/tuja-zaloga.mjs +108 -123
- package/dist/test/tuja-zaloga.mjs.map +1 -1
- package/dist/test/zaloge.mjs +150 -173
- package/dist/test/zaloge.mjs.map +1 -1
- package/dist/test/zaloge2.mjs +160 -177
- package/dist/test/zaloge2.mjs.map +1 -1
- package/dist/types/DbFunctions.d.mts +1 -1
- package/dist/types/DbFunctions.d.mts.map +1 -1
- package/dist/types/ZalogaDbAccessor.d.mts +2 -2
- package/dist/types/ZalogaDbAccessor.d.mts.map +1 -1
- package/dist/types/nastavitve.d.mts +6 -6
- package/dist/types/nastavitve.d.mts.map +1 -1
- package/dist/updatePotrditevBrejosti.mjs +1 -1
- package/dist/updatePotrditevBrejosti.mjs.map +1 -1
- package/dist/updatePresusitve.mjs +1 -1
- package/dist/updatePresusitve.mjs.map +1 -1
- package/dist/updateStatusOsemenitve.mjs +1 -1
- package/dist/updateStatusOsemenitve.mjs.map +1 -1
- package/dist/vseSkladiscaLokacij.mjs +9 -20
- package/dist/vseSkladiscaLokacij.mjs.map +1 -1
- package/dist/vsotaDobavZaObdobje.mjs +35 -47
- package/dist/vsotaDobavZaObdobje.mjs.map +1 -1
- package/dist/zakljuciBlagovnico.mjs +46 -57
- package/dist/zakljuciBlagovnico.mjs.map +1 -1
- package/dist/zalogaDbAccessorInMem.d.mts +2 -2
- package/dist/zalogaDbAccessorInMem.d.mts.map +1 -1
- package/dist/zalogaDbAccessorInMem.mjs +58 -86
- package/dist/zalogaDbAccessorInMem.mjs.map +1 -1
- package/dist/zalogaNaDan.mjs +27 -59
- package/dist/zalogaNaDan.mjs.map +1 -1
- package/dist/zalogaNaDanIzracunana.mjs +36 -48
- package/dist/zalogaNaDanIzracunana.mjs.map +1 -1
- package/dist/zalogaPoDnevih.mjs +34 -36
- package/dist/zalogaPoDnevih.mjs.map +1 -1
- package/dist/zapisiPorabeZaDobavnice.mjs +61 -92
- package/dist/zapisiPorabeZaDobavnice.mjs.map +1 -1
- package/dist/zapisiPorabeZaObravnave.mjs +58 -89
- package/dist/zapisiPorabeZaObravnave.mjs.map +1 -1
- package/dist/zapisiPoraboZaObravnavo.mjs +51 -62
- package/dist/zapisiPoraboZaObravnavo.mjs.map +1 -1
- package/dist/zapisiZalogoPoDnevih.mjs +67 -110
- package/dist/zapisiZalogoPoDnevih.mjs.map +1 -1
- package/dist/zapisiZalogoPoDnevih_old.mjs +86 -140
- package/dist/zapisiZalogoPoDnevih_old.mjs.map +1 -1
- package/dist/zaracunajDobavnice.mjs +155 -193
- package/dist/zaracunajDobavnice.mjs.map +1 -1
- package/dist/zavarovanje.mjs +2 -4
- package/dist/zavarovanje.mjs.map +1 -1
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs +17 -30
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs.map +1 -1
- package/dist/zdruziOdprteRacune.mjs +34 -61
- package/dist/zdruziOdprteRacune.mjs.map +1 -1
- package/dist/zdruziPaciente.mjs +57 -85
- package/dist/zdruziPaciente.mjs.map +1 -1
- package/dist/zdruziStranke.mjs +143 -193
- package/dist/zdruziStranke.mjs.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
@@ -1,12 +1,3 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { findConsecutiveRanges, Log } from 'cry-helpers';
|
11
2
|
import { Repo } from "cry-db";
|
12
3
|
import { performance } from 'perf_hooks';
|
@@ -23,7 +14,7 @@ function createAggregationPipeline({ odDne, doDne, stevilka, rounding = 4, lokac
|
|
23
14
|
let match = { $match: { datum: { $gte: odDne, $lt: doDne } } };
|
24
15
|
if (stevilka)
|
25
16
|
match.$match.stevilka = new RegExp(stevilka, "g");
|
26
|
-
if (lokacije
|
17
|
+
if (lokacije?.length)
|
27
18
|
match.$match.lokacija_id = { $in: lokacije };
|
28
19
|
pipeline.push(match);
|
29
20
|
pipeline.push({ $unwind: "$placila" });
|
@@ -58,7 +49,7 @@ function createAggregationPipelineDavki({ odDne, doDne, stevilka, rounding = 4,
|
|
58
49
|
let match = { $match: { datum: { $gte: odDne, $lt: doDne } } };
|
59
50
|
if (stevilka)
|
60
51
|
match.$match.stevilka = new RegExp(stevilka, "g");
|
61
|
-
if (lokacije
|
52
|
+
if (lokacije?.length)
|
62
53
|
match.$match.lokacija_id = { $in: lokacije };
|
63
54
|
pipeline.push(match);
|
64
55
|
pipeline.push({ $unwind: "$davki" });
|
@@ -94,7 +85,7 @@ function createAggregationPipelinePoBlagajnikih({ odDne, doDne, stevilka, roundi
|
|
94
85
|
let match = { $match: { datum: { $gte: odDne, $lt: doDne } } };
|
95
86
|
if (stevilka)
|
96
87
|
match.$match.stevilka = new RegExp(stevilka, "g");
|
97
|
-
if (lokacije
|
88
|
+
if (lokacije?.length)
|
98
89
|
match.$match.lokacija_id = { $in: lokacije };
|
99
90
|
pipeline.push(match);
|
100
91
|
pipeline.push({ $unwind: "$placila" });
|
@@ -118,158 +109,152 @@ function createAggregationPipelinePoBlagajnikih({ odDne, doDne, stevilka, roundi
|
|
118
109
|
log.trace("aggregation pipeline created", pipeline);
|
119
110
|
return { pipeline, match: match.$match };
|
120
111
|
}
|
121
|
-
function execPipeline(pipeline, tenant) {
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
}
|
145
|
-
});
|
112
|
+
async function execPipeline(pipeline, tenant) {
|
113
|
+
if (!tenant)
|
114
|
+
throw new Error("q-prodano: must specify tenant");
|
115
|
+
let repo = new Repo('racuni', tenant);
|
116
|
+
try {
|
117
|
+
let start = performance.now();
|
118
|
+
let ret = await repo.aggregate(pipeline);
|
119
|
+
let end = performance.now();
|
120
|
+
await repo.close();
|
121
|
+
return {
|
122
|
+
ok: true,
|
123
|
+
data: ret,
|
124
|
+
executionMs: end - start,
|
125
|
+
};
|
126
|
+
}
|
127
|
+
catch (err) {
|
128
|
+
console.error(err);
|
129
|
+
log.error('q-prodano aggregation exec error', err);
|
130
|
+
return {
|
131
|
+
ok: false,
|
132
|
+
error: err,
|
133
|
+
};
|
134
|
+
}
|
146
135
|
}
|
147
|
-
function storniraniRacuni(match, tenant) {
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
136
|
+
async function storniraniRacuni(match, tenant) {
|
137
|
+
let repo = new Repo("racuni", tenant);
|
138
|
+
try {
|
139
|
+
let ret = await repo.find({
|
140
|
+
...match,
|
141
|
+
naslednjiRacun: { $exists: true }
|
142
|
+
}, {
|
143
|
+
sort: { datum: 1 },
|
144
|
+
project: {
|
145
|
+
_id: 1,
|
146
|
+
izdal: 1,
|
147
|
+
stevilka: 1,
|
148
|
+
dav: 1,
|
149
|
+
prc: 1,
|
150
|
+
mpc: 1,
|
151
|
+
stranka: 1,
|
152
|
+
predhodniRacun: 1,
|
153
|
+
opomba: 1,
|
154
|
+
pripis: 1,
|
155
|
+
davki: 1,
|
156
|
+
}
|
157
|
+
});
|
158
|
+
await repo.close();
|
159
|
+
return ret;
|
160
|
+
}
|
161
|
+
catch (err) {
|
162
|
+
console.error(err);
|
163
|
+
log.error('q-zakljucenBlagajne stornirani db access error', err);
|
164
|
+
return undefined;
|
165
|
+
}
|
176
166
|
}
|
177
|
-
function zaporedjaStevilk(match, tenant) {
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
{
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
regex: /-(\d*)$/, // Your regex pattern
|
189
|
-
},
|
190
|
-
},
|
191
|
-
blag: {
|
192
|
-
$regexFind: {
|
193
|
-
input: '$stevilka',
|
194
|
-
regex: /([\w\-]+)-\d*$/, // Your regex pattern
|
195
|
-
},
|
167
|
+
async function zaporedjaStevilk(match, tenant) {
|
168
|
+
let pipeline = [
|
169
|
+
{ $match: match },
|
170
|
+
{
|
171
|
+
$project: {
|
172
|
+
stevilka: 1,
|
173
|
+
stRacuna: 1,
|
174
|
+
st: {
|
175
|
+
$regexFind: {
|
176
|
+
input: '$stevilka',
|
177
|
+
regex: /-(\d*)$/, // Your regex pattern
|
196
178
|
},
|
197
179
|
},
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
st: { $toInt: { $arrayElemAt: ['$st.captures', 0] } },
|
204
|
-
blag: { $arrayElemAt: ['$blag.captures', 0] },
|
205
|
-
stRacuna: 1,
|
180
|
+
blag: {
|
181
|
+
$regexFind: {
|
182
|
+
input: '$stevilka',
|
183
|
+
regex: /([\w\-]+)-\d*$/, // Your regex pattern
|
184
|
+
},
|
206
185
|
},
|
207
186
|
},
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
_id: "$blag",
|
217
|
-
stevilke: {
|
218
|
-
$addToSet: "$st"
|
219
|
-
}
|
220
|
-
}
|
187
|
+
},
|
188
|
+
{
|
189
|
+
$project: {
|
190
|
+
_id: 0,
|
191
|
+
stevilka: 1,
|
192
|
+
st: { $toInt: { $arrayElemAt: ['$st.captures', 0] } },
|
193
|
+
blag: { $arrayElemAt: ['$blag.captures', 0] },
|
194
|
+
stRacuna: 1,
|
221
195
|
},
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
196
|
+
},
|
197
|
+
{
|
198
|
+
$sort: {
|
199
|
+
blag: 1,
|
200
|
+
st: 1,
|
201
|
+
}
|
202
|
+
},
|
203
|
+
{
|
204
|
+
$group: {
|
205
|
+
_id: "$blag",
|
206
|
+
stevilke: {
|
207
|
+
$addToSet: "$st"
|
228
208
|
}
|
229
209
|
}
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
}
|
238
|
-
}
|
210
|
+
},
|
211
|
+
{
|
212
|
+
$project: {
|
213
|
+
blagajna: "$_id",
|
214
|
+
stevilke: {
|
215
|
+
$sortArray: { input: "$stevilke", sortBy: 1 }
|
216
|
+
},
|
217
|
+
}
|
218
|
+
}
|
219
|
+
];
|
220
|
+
let repo = new Repo("racuni", tenant);
|
221
|
+
let ret = await repo.aggregate(pipeline);
|
222
|
+
return (ret || []).map(r => {
|
223
|
+
return {
|
224
|
+
blagajna: r.blagajna,
|
225
|
+
zaporedja: findConsecutiveRanges(r.stevilke, true)
|
226
|
+
};
|
239
227
|
});
|
240
228
|
}
|
241
|
-
function TRRRacuni(match, tenant) {
|
242
|
-
return
|
243
|
-
return yield vsiRacuni(match, tenant, true);
|
244
|
-
});
|
229
|
+
async function TRRRacuni(match, tenant) {
|
230
|
+
return await vsiRacuni(match, tenant, true);
|
245
231
|
}
|
246
|
-
function vsiRacuni(match, tenant, samoTrr = false) {
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
232
|
+
async function vsiRacuni(match, tenant, samoTrr = false) {
|
233
|
+
let repo = new Repo("racuni", tenant);
|
234
|
+
try {
|
235
|
+
let ret = await repo.find({
|
236
|
+
...match,
|
237
|
+
...(samoTrr
|
251
238
|
? { "placila.kategorija": "odloženo" }
|
252
|
-
: {})
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
}
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
}
|
239
|
+
: {})
|
240
|
+
}, {
|
241
|
+
sort: { datum: 1 },
|
242
|
+
project: {
|
243
|
+
postavke: 0,
|
244
|
+
}
|
245
|
+
});
|
246
|
+
await repo.close();
|
247
|
+
return ret;
|
248
|
+
}
|
249
|
+
catch (err) {
|
250
|
+
console.error(err);
|
251
|
+
log.error('q-zakljucenBlagajne stornirani db access error', err);
|
252
|
+
return undefined;
|
253
|
+
}
|
267
254
|
}
|
268
|
-
function sestevekPlacil(tenant, params) {
|
269
|
-
|
270
|
-
|
271
|
-
return yield execPipeline(pipeline.pipeline, tenant);
|
272
|
-
});
|
255
|
+
async function sestevekPlacil(tenant, params) {
|
256
|
+
let pipeline = createAggregationPipeline(params);
|
257
|
+
return await execPipeline(pipeline.pipeline, tenant);
|
273
258
|
}
|
274
259
|
export { createAggregationPipeline, createAggregationPipelineDavki, createAggregationPipelinePoBlagajnikih, execPipeline, storniraniRacuni, TRRRacuni, vsiRacuni, sestevekPlacil, zaporedjaStevilk, };
|
275
260
|
// (async function() {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"q-zakljucek-blagajne.mjs","sourceRoot":"","sources":["../src/q-zakljucek-blagajne.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"q-zakljucek-blagajne.mjs","sourceRoot":"","sources":["../src/q-zakljucek-blagajne.mts"],"names":[],"mappings":"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"}
|
@@ -1,66 +1,55 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { pobrisiZalogoNaDan } from "./pobrisiZgodovinoNaDan.mjs";
|
11
2
|
import { naloziArtikleBlagovnice, spremeniZalogoNaPodlagiBlagovnice } from "./spremeniZalogo.mjs";
|
12
3
|
import { zakljuciBlagovnico } from "./zakljuciBlagovnico.mjs";
|
13
4
|
import { aliRazknjizujemoNaLokaciji } from "./aliRazknjizujemoNaLokaciji.mjs";
|
14
|
-
export function razknjiziBlagovnico(_id, mongo) {
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
blagovnica.razknjizbaPreskocena = new Date();
|
45
|
-
return blagovnica;
|
46
|
-
}
|
47
|
-
// let jeZeRazknjizena = await mongo.findOne("spremembaZaloge", { dokument_id: _id });
|
48
|
-
// if (jeZeRazknjizena) {
|
49
|
-
// console.error(`razknjiziBlagovnico: je že v spremembi zaloge, nadaljujem po artiklih: ${_id}`)
|
50
|
-
// }
|
51
|
-
yield naloziArtikleBlagovnice(blagovnica, mongo);
|
52
|
-
yield spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo);
|
53
|
-
// await mongo.commitTransaction()
|
54
|
-
// ta je namenoma izven transakcije, da ne dela gužve
|
55
|
-
yield pobrisiZalogoNaDan(mongo, [blagovnica.datum]);
|
5
|
+
export async function razknjiziBlagovnico(_id, mongo) {
|
6
|
+
if (!_id)
|
7
|
+
throw new Error("razknjiziBlagovnico needs _id");
|
8
|
+
try {
|
9
|
+
let nastavitve = await mongo.findOne("nastavitve", {});
|
10
|
+
if (!nastavitve)
|
11
|
+
throw new Error("razknjiziBlagovnico: ne najdem nastavitev");
|
12
|
+
// await mongo.startTransaction();
|
13
|
+
let blagovnica = await zakljuciBlagovnico(_id, mongo);
|
14
|
+
if (!blagovnica)
|
15
|
+
throw new Error("razknjiziBlagovnico: ne najdem blagovnice: " + _id);
|
16
|
+
if (!blagovnica)
|
17
|
+
return;
|
18
|
+
if (blagovnica._deleted)
|
19
|
+
return;
|
20
|
+
if (blagovnica.razknjizena)
|
21
|
+
return;
|
22
|
+
if (blagovnica.razknjizbaPreskocena)
|
23
|
+
return;
|
24
|
+
if (blagovnica.vrsta === "naročilo")
|
25
|
+
return;
|
26
|
+
if (blagovnica.navidezniPrevzem)
|
27
|
+
return;
|
28
|
+
// preveri razknjižno na terenu
|
29
|
+
let lokacija = await mongo.findOne("lokacije", { _id: blagovnica.lokacija_id });
|
30
|
+
if (!lokacija)
|
31
|
+
throw new Error("razknjiziBlagovnico: ne najdem lokacije: " + blagovnica.lokacija_id);
|
32
|
+
if (!aliRazknjizujemoNaLokaciji(nastavitve, lokacija, blagovnica, blagovnica.vrsta)) {
|
33
|
+
await mongo.upsert("blagovnice", { _id }, { razknjizbaPreskocena: new Date() });
|
34
|
+
blagovnica.razknjizbaPreskocena = new Date();
|
56
35
|
return blagovnica;
|
57
36
|
}
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
37
|
+
// let jeZeRazknjizena = await mongo.findOne("spremembaZaloge", { dokument_id: _id });
|
38
|
+
// if (jeZeRazknjizena) {
|
39
|
+
// console.error(`razknjiziBlagovnico: je že v spremembi zaloge, nadaljujem po artiklih: ${_id}`)
|
40
|
+
// }
|
41
|
+
await naloziArtikleBlagovnice(blagovnica, mongo);
|
42
|
+
await spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo);
|
43
|
+
// await mongo.commitTransaction()
|
44
|
+
// ta je namenoma izven transakcije, da ne dela gužve
|
45
|
+
await pobrisiZalogoNaDan(mongo, [blagovnica.datum]);
|
46
|
+
return blagovnica;
|
47
|
+
}
|
48
|
+
catch (err) {
|
49
|
+
// await mongo.abortTransaction()
|
50
|
+
console.error(`napaka pri raznknižbi blagovnice ${_id}: ${err.message || err}`);
|
51
|
+
throw err;
|
52
|
+
}
|
64
53
|
}
|
65
54
|
// (async function () {
|
66
55
|
// let mongo = new Mongo("mozirje")
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"razknjiziBlagovnico.mjs","sourceRoot":"","sources":["../src/razknjiziBlagovnico.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"razknjiziBlagovnico.mjs","sourceRoot":"","sources":["../src/razknjiziBlagovnico.mts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AAGlG,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAA;AAE7E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,KAAuB;IAE1E,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAE1D,IAAI;QAEA,IAAI,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CAAa,YAAY,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;QAE7E,kCAAkC;QAElC,IAAI,UAAU,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,GAAG,GAAG,CAAC,CAAA;QAErF,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,IAAI,UAAU,CAAC,QAAQ;YAAE,OAAM;QAC/B,IAAI,UAAU,CAAC,WAAW;YAAE,OAAM;QAClC,IAAI,UAAU,CAAC,oBAAoB;YAAE,OAAM;QAC3C,IAAK,UAAU,CAAC,KAAa,KAAK,UAAU;YAAE,OAAM;QACpD,IAAK,UAAkB,CAAC,gBAAgB;YAAE,OAAO;QAEjD,+BAA+B;QAC/B,IAAI,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,UAAU,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAC,UAAU,CAAC,WAAW,CAAC,CAAA;QAClG,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE;YACjF,MAAM,KAAK,CAAC,MAAM,CAAa,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,oBAAoB,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5F,UAAU,CAAC,oBAAoB,GAAG,IAAI,IAAI,EAAE,CAAA;YAC5C,OAAO,UAAU,CAAA;SACpB;QAED,sFAAsF;QACtF,yBAAyB;QACzB,qGAAqG;QACrG,IAAI;QAEJ,MAAM,uBAAuB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,iCAAiC,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAEvE,kCAAkC;QAGlC,qDAAqD;QACrD,MAAM,kBAAkB,CAAC,KAAK,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAEpD,OAAO,UAAU,CAAA;KAEpB;IAAC,OAAO,GAAO,EAAE;QAEd,iCAAiC;QAEjC,OAAO,CAAC,KAAK,CAAC,oCAAoC,GAAG,KAAK,GAAG,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC,CAAA;QAC/E,MAAM,GAAG,CAAA;KACZ;AAEL,CAAC;AAED,uBAAuB;AACvB,uCAAuC;AACvC,oFAAoF;AAEpF,iFAAiF;AACjF,4EAA4E;AAE5E,wEAAwE;AACxE,wEAAwE;AAExE,8CAA8C;AAE9C,sBAAsB;AAGtB,OAAO"}
|
@@ -1,66 +1,55 @@
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
-
});
|
9
|
-
};
|
10
1
|
import { aliRazknjizujemoNaLokaciji } from "./aliRazknjizujemoNaLokaciji.mjs";
|
11
2
|
import { pobrisiZalogoNaDan } from "./pobrisiZgodovinoNaDan.mjs";
|
12
3
|
import { spremeniZalogoZaPorabo } from "./spremeniZalogoZaPrevzem.mjs";
|
13
|
-
export function razknjiziDobavnico(_id, mongo) {
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
console.error(`razknjiziDobavnico: je že v spremembi zaloge, nadaljujem po artiklih: ${_id}`);
|
24
|
-
}
|
25
|
-
let dobavnica = yield mongo.findOne("dobavnice", { _id, status: "izdana", });
|
26
|
-
if (!dobavnica) {
|
27
|
-
console.error("razknjiziDobavnico: ne najdem dobavnice " + _id);
|
28
|
-
return;
|
29
|
-
}
|
30
|
-
// preveri razknjižno na terenu
|
31
|
-
let lokacija = yield mongo.findOne("lokacije", { _id: dobavnica.lokacija_id });
|
32
|
-
if (!lokacija)
|
33
|
-
throw new Error("razknjiziDobavnico: ne najdem lokacije: " + dobavnica.lokacija_id);
|
34
|
-
if (!aliRazknjizujemoNaLokaciji(nastavitve, lokacija, dobavnica, "račun")) {
|
35
|
-
yield mongo.update("dobavnice", { _id }, { razknjizbaPreskocena: new Date() });
|
36
|
-
dobavnica.razknjizbaPreskocena = new Date();
|
37
|
-
return;
|
38
|
-
}
|
39
|
-
if (dobavnica.razknjizena || dobavnica.razknjizbaPreskocena)
|
40
|
-
return;
|
41
|
-
if (!dobavnica.poraba_id) {
|
42
|
-
let zdaj = new Date();
|
43
|
-
dobavnica.postavke.forEach(p => {
|
44
|
-
p.razknjizena = zdaj;
|
45
|
-
p.razknjizenaNaVrsta = "dobavnica";
|
46
|
-
p.razknjizenaNaId = _id;
|
47
|
-
p.neRazknjiziObIzdajiRacuna = true;
|
48
|
-
});
|
49
|
-
yield spremeniZalogoZaPorabo(dobavnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo, true);
|
50
|
-
yield pobrisiZalogoNaDan(mongo, [dobavnica.datum]);
|
51
|
-
yield mongo.upsert("dobavnice", { _id }, {
|
52
|
-
razknjizena: zdaj,
|
53
|
-
postavke: dobavnica.postavke
|
54
|
-
});
|
55
|
-
}
|
56
|
-
return dobavnica;
|
4
|
+
export async function razknjiziDobavnico(_id, mongo) {
|
5
|
+
if (!_id)
|
6
|
+
throw new Error("razknjiziDobavnico needs _id");
|
7
|
+
try {
|
8
|
+
let nastavitve = await mongo.findOne("nastavitve", {});
|
9
|
+
if (!nastavitve)
|
10
|
+
throw new Error("razknjiziDobavnico: ne najdem nastavitev");
|
11
|
+
let jeZeRazknjizena = await mongo.findOne("spremembaZaloge", { dokument_id: _id });
|
12
|
+
if (jeZeRazknjizena) {
|
13
|
+
console.error(`razknjiziDobavnico: je že v spremembi zaloge, nadaljujem po artiklih: ${_id}`);
|
57
14
|
}
|
58
|
-
|
59
|
-
|
60
|
-
console.error(
|
61
|
-
|
15
|
+
let dobavnica = await mongo.findOne("dobavnice", { _id, status: "izdana", });
|
16
|
+
if (!dobavnica) {
|
17
|
+
console.error("razknjiziDobavnico: ne najdem dobavnice " + _id);
|
18
|
+
return;
|
62
19
|
}
|
63
|
-
|
20
|
+
// preveri razknjižno na terenu
|
21
|
+
let lokacija = await mongo.findOne("lokacije", { _id: dobavnica.lokacija_id });
|
22
|
+
if (!lokacija)
|
23
|
+
throw new Error("razknjiziDobavnico: ne najdem lokacije: " + dobavnica.lokacija_id);
|
24
|
+
if (!aliRazknjizujemoNaLokaciji(nastavitve, lokacija, dobavnica, "račun")) {
|
25
|
+
await mongo.update("dobavnice", { _id }, { razknjizbaPreskocena: new Date() });
|
26
|
+
dobavnica.razknjizbaPreskocena = new Date();
|
27
|
+
return;
|
28
|
+
}
|
29
|
+
if (dobavnica.razknjizena || dobavnica.razknjizbaPreskocena)
|
30
|
+
return;
|
31
|
+
if (!dobavnica.poraba_id) {
|
32
|
+
let zdaj = new Date();
|
33
|
+
dobavnica.postavke.forEach(p => {
|
34
|
+
p.razknjizena = zdaj;
|
35
|
+
p.razknjizenaNaVrsta = "dobavnica";
|
36
|
+
p.razknjizenaNaId = _id;
|
37
|
+
p.neRazknjiziObIzdajiRacuna = true;
|
38
|
+
});
|
39
|
+
await spremeniZalogoZaPorabo(dobavnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo, true);
|
40
|
+
await pobrisiZalogoNaDan(mongo, [dobavnica.datum]);
|
41
|
+
await mongo.upsert("dobavnice", { _id }, {
|
42
|
+
razknjizena: zdaj,
|
43
|
+
postavke: dobavnica.postavke
|
44
|
+
});
|
45
|
+
}
|
46
|
+
return dobavnica;
|
47
|
+
}
|
48
|
+
catch (err) {
|
49
|
+
// await mongo.abortTransaction()
|
50
|
+
console.error(`napaka pri raznknižbi blagovnice ${_id}: ${err.message || err}`);
|
51
|
+
throw err;
|
52
|
+
}
|
64
53
|
}
|
65
54
|
// (async function () {
|
66
55
|
// let mongo = new Mongo("max")
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"razknjiziDobavnico.mjs","sourceRoot":"","sources":["../src/razknjiziDobavnico.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"razknjiziDobavnico.mjs","sourceRoot":"","sources":["../src/razknjiziDobavnico.mts"],"names":[],"mappings":"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"}
|