cry-klikvet-logic 1.0.225 → 1.0.227
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 +436 -653
- package/dist/anonimizirajPodatke.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 -158
- package/dist/ensureIndexes.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 +245 -337
- package/dist/maint/poknjiziVsoZgodovino.mjs.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs +17 -48
- package/dist/maint/popraviNabaveCeneNaRacunih.mjs.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.mjs +15 -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/neuporabljeno.mjs +26 -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/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 +112 -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 +16 -1
- package/dist/porabaZaObravnavo.mjs.map +1 -1
- package/dist/preveriKnjizenjeZalogeArtikla.mjs +97 -110
- package/dist/preveriKnjizenjeZalogeArtikla.mjs.map +1 -1
- package/dist/q-blagovnice.mjs +12 -23
- 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 +25 -36
- package/dist/q-isciPoRacunih.mjs.map +1 -1
- package/dist/q-mojPromet.mjs +23 -34
- package/dist/q-mojPromet.mjs.map +1 -1
- package/dist/q-porabaZdravil.mjs +110 -110
- package/dist/q-porabaZdravil.mjs.map +1 -1
- package/dist/q-prodano.mjs +33 -44
- package/dist/q-prodano.mjs.map +1 -1
- package/dist/q-prodanoPorabljeno.mjs +47 -47
- 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 +132 -147
- 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 +75 -94
- 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 -27
- package/dist/smsCepljen.mjs.map +1 -1
- package/dist/smsCepljenjaNaDan.mjs +60 -66
- 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 -47
- package/dist/smsNaroceniNaDan.mjs.map +1 -1
- package/dist/spremembaZalogeZaObdobje.mjs +79 -90
- package/dist/spremembaZalogeZaObdobje.mjs.map +1 -1
- package/dist/spremeniZalogo.mjs +125 -132
- package/dist/spremeniZalogo.mjs.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs +123 -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 +132 -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 +70 -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 -46
- 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 -85
- package/dist/zalogaDbAccessorInMem.mjs.map +1 -1
- package/dist/zalogaNaDan.mjs +28 -59
- package/dist/zalogaNaDan.mjs.map +1 -1
- package/dist/zalogaNaDanIzracunana.mjs +36 -47
- package/dist/zalogaNaDanIzracunana.mjs.map +1 -1
- package/dist/zalogaPoDnevih.mjs +34 -35
- 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 +87 -140
- package/dist/zapisiZalogoPoDnevih_old.mjs.map +1 -1
- package/dist/zaracunajDobavnice.mjs +151 -184
- package/dist/zaracunajDobavnice.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 +39 -67
- package/dist/zdruziPaciente.mjs.map +1 -1
- package/dist/zdruziStranke.mjs +103 -148
- package/dist/zdruziStranke.mjs.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
@@ -1,19 +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
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
11
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
12
|
-
var m = o[Symbol.asyncIterator], i;
|
13
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
14
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
15
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
16
|
-
};
|
17
1
|
import { addToArray, arrayToObject, dedup } from "cry-helpers";
|
18
2
|
import { razpisiDatum } from "./index.mjs";
|
19
3
|
import { sestejRacun } from "./maint/popraviNabaveCeneNaRacunih.mjs";
|
@@ -70,182 +54,165 @@ function racunDobavnice({ dobavnica, samoZaGmid, racuni, odprtiRacuni, stranka,
|
|
70
54
|
racuni[key] = racun;
|
71
55
|
return racun;
|
72
56
|
}
|
73
|
-
export function zaracunajDobavnice(params) {
|
74
|
-
var _a,
|
75
|
-
var
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
57
|
+
export async function zaracunajDobavnice(params) {
|
58
|
+
var _a, _b, _c, _d;
|
59
|
+
var _e, _f;
|
60
|
+
let racuni = {};
|
61
|
+
let napake = [];
|
62
|
+
let zapisaniRacuni = [];
|
63
|
+
let zaracunaneDobavnice = [];
|
64
|
+
const batchNumber = Math.round(new Date().valueOf() / 1000);
|
65
|
+
const _ts = new Date().valueOf();
|
66
|
+
try {
|
67
|
+
let mongo = new Mongo(params.tenant, params.server);
|
68
|
+
mongo.useSoftDelete(true);
|
69
|
+
mongo.useRevisions(true);
|
70
|
+
mongo.useAuditing(true);
|
71
|
+
let nastavitve = await mongo.findOne("nastavitve", { _deleted: { $exists: false } });
|
72
|
+
let dobavnice = await mongo.find("dobavnice", { _id: { $in: params.dobavnice_ids } });
|
73
|
+
let idji_strank = dedup(dobavnice.map(d => d.stranka_id).filter(a => !!a));
|
74
|
+
let stranke = await mongo.find("stranke", { _id: { $in: idji_strank }, _deleted: { $ne: "hack" } });
|
75
|
+
if (!stranke)
|
76
|
+
throw new Error("zaracunajDobavnice - ne morem naložiti strank");
|
77
|
+
if (params.zaracunajPlacnikom) {
|
78
|
+
let idji_placnikov = dedup(stranke.map(s => s.placnik_id).filter(a => !!a));
|
79
|
+
let idji_placnikov_iz_dobavnice = dobavnice.map(d => d.placnik_id).filter(a => !!a);
|
80
|
+
let vsi_idji_placnikov = addToArray(...idji_placnikov, idji_strank, idji_placnikov_iz_dobavnice);
|
81
|
+
stranke = await mongo.find("stranke", { _id: { $in: vsi_idji_placnikov }, _deleted: { $ne: "hack" } });
|
82
|
+
}
|
83
|
+
if (!stranke)
|
84
|
+
throw new Error("zaracunajDobavnice - ne morem naložiti strank");
|
85
|
+
let odprtiRacuni = await mongo.find("odprtiRacuni", {
|
86
|
+
"stranka._id": { $in: dobavnice.map(d => d.stranka_id), },
|
87
|
+
idIzdanegaRacuna: { $exists: false },
|
88
|
+
_deleted: { $exists: false },
|
89
|
+
});
|
90
|
+
let strankeObj = arrayToObject(stranke, "_id");
|
91
|
+
let odprtiRacuniObj = arrayToObject(odprtiRacuni, "_id");
|
92
|
+
for await (let dobavnica of dobavnice) {
|
93
|
+
if (dobavnica.status === "zaračunana")
|
94
|
+
continue;
|
110
95
|
try {
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
continue;
|
117
|
-
try {
|
118
|
-
let zaStranko_id = dobavnica.stranka_id;
|
119
|
-
let placnik_id = params.zaracunajPlacnikom && (dobavnica.placnik_id || ((_g = strankeObj[dobavnica.stranka_id]) === null || _g === void 0 ? void 0 : _g.placnik_id));
|
120
|
-
let stranka = strankeObj[placnik_id || dobavnica.stranka_id];
|
121
|
-
if (!stranka) {
|
122
|
-
throw new Error(`zaracunajDobavnice: ne najdem stranke stranka_id: ${zaStranko_id}, placnik_id: ${placnik_id}`);
|
123
|
-
}
|
124
|
-
let samoZaGmidStranke = stranka === null || stranka === void 0 ? void 0 : stranka.zaracunajVsakGmidPosebej;
|
125
|
-
let racun = racunDobavnice({
|
126
|
-
dobavnica,
|
127
|
-
samoZaGmid: params.samoZaGmid || (samoZaGmidStranke && dobavnica.gmid),
|
128
|
-
racuni,
|
129
|
-
stranka,
|
130
|
-
lokacija_id: params.lokacija_id,
|
131
|
-
naprava_id: params.naprava_id,
|
132
|
-
izdal: params.izdal,
|
133
|
-
odprtiRacuni: odprtiRacuniObj,
|
134
|
-
zaStranko: (placnik_id && strankaRacuna(strankeObj[zaStranko_id])) || undefined,
|
135
|
-
});
|
136
|
-
racun.batchNumber = batchNumber;
|
137
|
-
dobavnica.postavke.forEach(p => {
|
138
|
-
racun.postavke || (racun.postavke = []);
|
139
|
-
racun.postavke.push(Object.assign(Object.assign({}, p), { neRazknjiziObIzdajiRacuna: true, terenNamen: dobavnica.namen, poDokumentu: "dobavnica " + dobavnica.stevilka, izPredracuna_id: dobavnica.izPredracuna_id, izPredracuna_st: dobavnica.izPredracuna_st, izDobavnice_id: dobavnica._id, izDobavnice_st: dobavnica.stevilka, zaStranko_id: (placnik_id && zaStranko_id) || undefined }));
|
140
|
-
});
|
141
|
-
racun.prometPripisi || (racun.prometPripisi = {});
|
142
|
-
(_l = racun.prometPripisi)[_m = dobavnica.izdal] || (_l[_m] = 0);
|
143
|
-
racun.prometPripisi[dobavnica.izdal] += dobavnica.prc || 0;
|
144
|
-
let spremebaDobavnice = {
|
145
|
-
_id: dobavnica._id,
|
146
|
-
status: "zaračunana",
|
147
|
-
zaracunanaDne: new Date(),
|
148
|
-
zaracunanaNaRacun: racun._id,
|
149
|
-
zaracunal: params.izdal,
|
150
|
-
batchNumber,
|
151
|
-
placnik_id: placnik_id || undefined,
|
152
|
-
zaracunano_placniku_id: placnik_id || undefined,
|
153
|
-
};
|
154
|
-
yield mongo.upsert("dobavnice", { _id: dobavnica._id }, spremebaDobavnice);
|
155
|
-
zaracunaneDobavnice.push(dobavnica._id);
|
156
|
-
}
|
157
|
-
catch (err) {
|
158
|
-
console.error("zaracunajDobavnice: ni uspelo za dobavnico ", dobavnica);
|
159
|
-
napake.push(`napaka pri dobavnici: ${dobavnica.stevilka || (dobavnica === null || dobavnica === void 0 ? void 0 : dobavnica._id)}: ${err.message || err}`);
|
160
|
-
}
|
96
|
+
let zaStranko_id = dobavnica.stranka_id;
|
97
|
+
let placnik_id = params.zaracunajPlacnikom && (dobavnica.placnik_id || ((_a = strankeObj[dobavnica.stranka_id]) === null || _a === void 0 ? void 0 : _a.placnik_id));
|
98
|
+
let stranka = strankeObj[placnik_id || dobavnica.stranka_id];
|
99
|
+
if (!stranka) {
|
100
|
+
throw new Error(`zaracunajDobavnice: ne najdem stranke stranka_id: ${zaStranko_id}, placnik_id: ${placnik_id}`);
|
161
101
|
}
|
102
|
+
let samoZaGmidStranke = stranka === null || stranka === void 0 ? void 0 : stranka.zaracunajVsakGmidPosebej;
|
103
|
+
let racun = racunDobavnice({
|
104
|
+
dobavnica,
|
105
|
+
samoZaGmid: params.samoZaGmid || (samoZaGmidStranke && dobavnica.gmid),
|
106
|
+
racuni,
|
107
|
+
stranka,
|
108
|
+
lokacija_id: params.lokacija_id,
|
109
|
+
naprava_id: params.naprava_id,
|
110
|
+
izdal: params.izdal,
|
111
|
+
odprtiRacuni: odprtiRacuniObj,
|
112
|
+
zaStranko: (placnik_id && strankaRacuna(strankeObj[zaStranko_id])) || undefined,
|
113
|
+
});
|
114
|
+
racun.batchNumber = batchNumber;
|
115
|
+
dobavnica.postavke.forEach(p => {
|
116
|
+
racun.postavke || (racun.postavke = []);
|
117
|
+
racun.postavke.push({
|
118
|
+
...p,
|
119
|
+
neRazknjiziObIzdajiRacuna: true,
|
120
|
+
terenNamen: dobavnica.namen,
|
121
|
+
poDokumentu: "dobavnica " + dobavnica.stevilka,
|
122
|
+
izPredracuna_id: dobavnica.izPredracuna_id,
|
123
|
+
izPredracuna_st: dobavnica.izPredracuna_st,
|
124
|
+
izDobavnice_id: dobavnica._id,
|
125
|
+
izDobavnice_st: dobavnica.stevilka,
|
126
|
+
zaStranko_id: (placnik_id && zaStranko_id) || undefined,
|
127
|
+
});
|
128
|
+
});
|
129
|
+
racun.prometPripisi || (racun.prometPripisi = {});
|
130
|
+
(_e = racun.prometPripisi)[_f = dobavnica.izdal] || (_e[_f] = 0);
|
131
|
+
racun.prometPripisi[dobavnica.izdal] += dobavnica.prc || 0;
|
132
|
+
let spremebaDobavnice = {
|
133
|
+
_id: dobavnica._id,
|
134
|
+
status: "zaračunana",
|
135
|
+
zaracunanaDne: new Date(),
|
136
|
+
zaracunanaNaRacun: racun._id,
|
137
|
+
zaracunal: params.izdal,
|
138
|
+
batchNumber,
|
139
|
+
placnik_id: placnik_id || undefined,
|
140
|
+
zaracunano_placniku_id: placnik_id || undefined,
|
141
|
+
};
|
142
|
+
await mongo.upsert("dobavnice", { _id: dobavnica._id }, spremebaDobavnice);
|
143
|
+
zaracunaneDobavnice.push(dobavnica._id);
|
162
144
|
}
|
163
|
-
catch (
|
164
|
-
|
165
|
-
|
166
|
-
if (!_o && !_a && (_b = dobavnice_1.return)) yield _b.call(dobavnice_1);
|
167
|
-
}
|
168
|
-
finally { if (e_1) throw e_1.error; }
|
145
|
+
catch (err) {
|
146
|
+
console.error("zaracunajDobavnice: ni uspelo za dobavnico ", dobavnica);
|
147
|
+
napake.push(`napaka pri dobavnici: ${dobavnica.stevilka || (dobavnica === null || dobavnica === void 0 ? void 0 : dobavnica._id)}: ${err.message || err}`);
|
169
148
|
}
|
149
|
+
}
|
150
|
+
for await (let racun of Object.values(racuni)) {
|
170
151
|
try {
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
// console.log("izdajNaDan ", dayjs(racun.izdajNaDan).format("DD.MM.YYYY"));
|
220
|
-
// console.log("valuta ", dayjs(racun.valuta).format("DD.MM.YYYY"));
|
221
|
-
let res = yield mongo.upsert("odprtiRacuni", { _id: racun._id }, Object.assign(Object.assign({}, racun), (params.dodatnaPoljaRacuna || {})));
|
222
|
-
if (res === null || res === void 0 ? void 0 : res._id)
|
223
|
-
zapisaniRacuni.push(res._id);
|
224
|
-
}
|
225
|
-
catch (err) {
|
226
|
-
napake.push(`napaka pri računu za dobavnico: ${racun.izDobavnice_st || (racun === null || racun === void 0 ? void 0 : racun._id)}: ${err.message || err}`);
|
227
|
-
}
|
228
|
-
}
|
152
|
+
sestejRacun(racun);
|
153
|
+
davkiRacuna(racun.postavke);
|
154
|
+
racun.izdal = params.izdal;
|
155
|
+
racun.datum = new Date();
|
156
|
+
racun.zbirnik = true;
|
157
|
+
racun.strniZbirnik = params.strniZbirnik;
|
158
|
+
let dni = parseInt(((_b = nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.valutaDni) === null || _b === void 0 ? void 0 : _b.toString()) || "30");
|
159
|
+
racun.valuta = (dni === 30 || dni === 31)
|
160
|
+
? dayjs(racun.datumStoritve || new Date()).add(1, "month").endOf("month").toDate()
|
161
|
+
: dayjs(racun.datumStoritve || new Date()).add(parseInt(((_c = nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.valutaDni) === null || _c === void 0 ? void 0 : _c.toString()) || "30"), "days").toDate();
|
162
|
+
// izračun plačil
|
163
|
+
let kritja = kritjaPoZavarovalnicah(racun.postavke) || [];
|
164
|
+
racun.placila =
|
165
|
+
params.brezPlacil
|
166
|
+
? []
|
167
|
+
: [
|
168
|
+
...Object.entries(kritja).map(([zavarovalnica, vsota]) => {
|
169
|
+
return {
|
170
|
+
kategorija: "zavarovanje",
|
171
|
+
nacin: zavarovalnica,
|
172
|
+
vsota
|
173
|
+
};
|
174
|
+
}),
|
175
|
+
{
|
176
|
+
kategorija: "odloženo",
|
177
|
+
nacin: "TRR",
|
178
|
+
vsota: racun.mpc - Object.values(kritja).reduce((p, c) => p + c, 0)
|
179
|
+
}
|
180
|
+
];
|
181
|
+
// datum računa ... če so vse dobavnice v preteklosti, prestavi datum na konec meseca
|
182
|
+
let zadnjiDatumDobavnic = new Date(Math.max(...dobavnice.map(d => (new Date(d.datumDokumenta || d.datum)).valueOf())));
|
183
|
+
let zaokroziNa = dayjs(new Date(zadnjiDatumDobavnic)).isBefore(dayjs().startOf("month"))
|
184
|
+
? "month" // konec meseca, če so vse dobavnice v preteklem mesecu
|
185
|
+
: "day"; // konec dneva, če so nekatere v tem mesecu
|
186
|
+
// premakni na zadnji dan meseca
|
187
|
+
let datumRacunaVal = Math.max(zadnjiDatumDobavnic.valueOf());
|
188
|
+
racun.datum = dayjs(datumRacunaVal).endOf(zaokroziNa).add(-16, "hours").toDate();
|
189
|
+
racun.izdajNaDan = racun.datum;
|
190
|
+
racun.datumStoritve = racun.datum;
|
191
|
+
razpisiDatum(racun.datum, racun);
|
192
|
+
racun.valuta = dayjs(racun.datum).add(parseInt(((_d = nastavitve === null || nastavitve === void 0 ? void 0 : nastavitve.valutaDni) === null || _d === void 0 ? void 0 : _d.toString()) || "30"), "days").toDate();
|
193
|
+
// console.log("datumStoritve ", dayjs(racun.datumStoritve).format("DD.MM.YYYY"));
|
194
|
+
// console.log("datum ", dayjs(racun.datum).format("DD.MM.YYYY"));
|
195
|
+
// console.log("izdajNaDan ", dayjs(racun.izdajNaDan).format("DD.MM.YYYY"));
|
196
|
+
// console.log("valuta ", dayjs(racun.valuta).format("DD.MM.YYYY"));
|
197
|
+
let res = await mongo.upsert("odprtiRacuni", { _id: racun._id }, { ...racun, ...(params.dodatnaPoljaRacuna || {}) });
|
198
|
+
if (res === null || res === void 0 ? void 0 : res._id)
|
199
|
+
zapisaniRacuni.push(res._id);
|
229
200
|
}
|
230
|
-
catch (
|
231
|
-
|
232
|
-
try {
|
233
|
-
if (!_p && !_d && (_e = _q.return)) yield _e.call(_q);
|
234
|
-
}
|
235
|
-
finally { if (e_2) throw e_2.error; }
|
201
|
+
catch (err) {
|
202
|
+
napake.push(`napaka pri računu za dobavnico: ${racun.izDobavnice_st || (racun === null || racun === void 0 ? void 0 : racun._id)}: ${err.message || err}`);
|
236
203
|
}
|
237
204
|
}
|
238
|
-
|
239
|
-
|
240
|
-
}
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
}
|
205
|
+
}
|
206
|
+
catch (err) {
|
207
|
+
napake.push(`napaka zaračunavanja: ${err.message || err}`);
|
208
|
+
}
|
209
|
+
return {
|
210
|
+
batchNumber,
|
211
|
+
napake,
|
212
|
+
racuni: zapisaniRacuni,
|
213
|
+
zaracunaneDobavnice,
|
214
|
+
cas: (new Date().valueOf() - _ts) / 1000,
|
215
|
+
};
|
249
216
|
}
|
250
217
|
// (async function () {
|
251
218
|
// let ids = [
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"zaracunajDobavnice.mjs","sourceRoot":"","sources":["../src/zaracunajDobavnice.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"zaracunajDobavnice.mjs","sourceRoot":"","sources":["../src/zaracunajDobavnice.mts"],"names":[],"mappings":"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"}
|
@@ -1,36 +1,23 @@
|
|
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 { Mongo } from "cry-db";
|
11
2
|
import { lahkoImaZalogo } from "./lahkoImaZalogo.mjs";
|
12
|
-
function idjiArtiklovKiImajoLahkoZalogo(tenant) {
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
return mozni;
|
23
|
-
});
|
3
|
+
async function idjiArtiklovKiImajoLahkoZalogo(tenant) {
|
4
|
+
let mongo = new Mongo(tenant);
|
5
|
+
let nastavitve = await mongo.findOne("nastavitve", {});
|
6
|
+
if (!nastavitve)
|
7
|
+
throw new Error(`idjiArtiklovKiImajoLahkoZalogo: ni nastavitev za tenant ${tenant}`);
|
8
|
+
// omejimo na artikle, ki imajo lahko zalogo
|
9
|
+
let artikli = await mongo.findAll("artikli", {});
|
10
|
+
let mozni = artikli.filter(a => !a._deleted && lahkoImaZalogo(a, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov)).map(a => a._id);
|
11
|
+
await mongo.close();
|
12
|
+
return mozni;
|
24
13
|
}
|
25
|
-
export function zbrisiZalogoArtiklovKiJeNeMorejoImeti(tenant) {
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
return res.n;
|
33
|
-
});
|
14
|
+
export async function zbrisiZalogoArtiklovKiJeNeMorejoImeti(tenant) {
|
15
|
+
let mongo = new Mongo(tenant);
|
16
|
+
let mozni = await idjiArtiklovKiImajoLahkoZalogo(tenant);
|
17
|
+
let res = await mongo.delete("zaloga", { artikel_id: { $nin: mozni } });
|
18
|
+
await mongo.delete("spremembaZaloge", { artikel_id: { $nin: mozni } });
|
19
|
+
await mongo.close();
|
20
|
+
return res.n;
|
34
21
|
}
|
35
22
|
// (async function go() {
|
36
23
|
// let n = await zbrisiZalogoArtiklovKiJeNeMorejoImeti("zvitorepka")
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs","sourceRoot":"","sources":["../src/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"zbrisiZalogoArtiklovKiJeNeMorejoImeti.mjs","sourceRoot":"","sources":["../src/zbrisiZalogoArtiklovKiJeNeMorejoImeti.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,KAAK,UAAU,8BAA8B,CAAC,MAAc;IAExD,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,UAAU,GAAG,MAAM,KAAK,CAAC,OAAO,CAAa,YAAY,EAAE,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,UAAU;QACX,MAAM,IAAI,KAAK,CAAC,2DAA2D,MAAM,EAAE,CAAC,CAAC;IAEzF,4CAA4C;IAC5C,IAAI,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,CAAU,SAAS,EAAE,EAAE,CAAC,CAAC;IAC1D,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,CAAC,CAAC,EAAE,UAAW,CAAC,iBAAiB,EAAE,UAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAEjJ,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;IACnB,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,MAAc;IACtE,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,KAAK,GAAG,MAAM,8BAA8B,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACvE,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACpB,OAAO,GAAG,CAAC,CAAW,CAAC;AAC3B,CAAC;AAGD,yBAAyB;AAEzB,wEAAwE;AACxE,0BAA0B;AAE1B,4BAA4B;AAC5B,sBAAsB;AAEtB,OAAO"}
|
@@ -1,67 +1,40 @@
|
|
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
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
11
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
12
|
-
var m = o[Symbol.asyncIterator], i;
|
13
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
14
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
15
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
16
|
-
};
|
17
1
|
import { sestejRacun } from "./maint/popraviNabaveCeneNaRacunih.mjs";
|
18
2
|
import { davkiRacuna } from "./davkiRacuna.mjs";
|
19
|
-
export function zdruziOdprteRacune(mongo, tenant, ids) {
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
racuni[
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
48
|
-
finally {
|
49
|
-
try {
|
50
|
-
if (!_d && !_a && (_b = popravki_1.return)) yield _b.call(popravki_1);
|
51
|
-
}
|
52
|
-
finally { if (e_1) throw e_1.error; }
|
53
|
-
}
|
54
|
-
return racuni[0];
|
55
|
-
});
|
3
|
+
export async function zdruziOdprteRacune(mongo, tenant, ids) {
|
4
|
+
mongo.setDb(tenant);
|
5
|
+
let racuni = await mongo.find("odprtiRacuni", { _id: { $in: ids } });
|
6
|
+
if (racuni.length < 2)
|
7
|
+
return false;
|
8
|
+
let popravki = [];
|
9
|
+
for (let i = 1; i < racuni.length; i++) {
|
10
|
+
racuni[0].postavke = [
|
11
|
+
...racuni[0].postavke,
|
12
|
+
...racuni[i].postavke,
|
13
|
+
];
|
14
|
+
popravki.push(racuni[i]._id.toString());
|
15
|
+
}
|
16
|
+
// popravi račun, ki ostaja
|
17
|
+
sestejRacun(racuni[0]);
|
18
|
+
racuni[0] = {
|
19
|
+
...racuni[0],
|
20
|
+
davki: davkiRacuna(racuni[0].postavke),
|
21
|
+
placila: [],
|
22
|
+
zdruzenIzOdprtih: popravki,
|
23
|
+
datum: new Date(),
|
24
|
+
};
|
25
|
+
await mongo.upsert("odprtiRacuni", { _id: racuni[0]._id }, racuni[0]);
|
26
|
+
for await (let izbris of popravki) {
|
27
|
+
await mongo.upsert("odprtiRacuni", { _id: izbris }, { zdruzenVOdprtega: racuni[0]._id, _deleted: new Date() });
|
28
|
+
await mongo.deleteOne("odprtiRacuni", { _id: izbris });
|
29
|
+
}
|
30
|
+
return racuni[0];
|
56
31
|
}
|
57
|
-
export function zdruziOdprteRacuneIsteStranke(mongo, tenant, stranka_id) {
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
: false;
|
64
|
-
});
|
32
|
+
export async function zdruziOdprteRacuneIsteStranke(mongo, tenant, stranka_id) {
|
33
|
+
mongo.setDb(tenant);
|
34
|
+
let racuni = await mongo.find("odprtiRacuni", { "stranka._id": stranka_id });
|
35
|
+
return (racuni === null || racuni === void 0 ? void 0 : racuni.length) > 1
|
36
|
+
? await zdruziOdprteRacune(mongo, tenant, racuni.map(r => r._id))
|
37
|
+
: false;
|
65
38
|
}
|
66
39
|
// (async function () {
|
67
40
|
// let db = "mozirje";
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"zdruziOdprteRacune.mjs","sourceRoot":"","sources":["../src/zdruziOdprteRacune.mts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"zdruziOdprteRacune.mjs","sourceRoot":"","sources":["../src/zdruziOdprteRacune.mts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,KAAY,EACZ,MAAc,EACd,GAAa;IAGb,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAQ,cAAc,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAEpC,IAAI,QAAQ,GAAc,EAAE,CAAA;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG;YACpB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ;YACrB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ;SACrB,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;KACxC;IAED,2BAA2B;IAC3B,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,CAAC,CAAC,CAAC,GAAG;QACX,GAAG,MAAM,CAAC,CAAC,CAAC;QACZ,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACtC,OAAO,EAAE,EAAE;QACX,gBAAgB,EAAE,QAAQ;QAC1B,KAAK,EAAE,IAAI,IAAI,EAAE;KACjB,CAAC;IAEF,MAAM,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtE,IAAI,KAAK,EAAE,IAAI,MAAM,IAAI,QAAQ,EAAE;QAClC,MAAM,KAAK,CAAC,MAAM,CAAQ,cAAc,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QACtH,MAAM,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;KACvD;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,KAAY,EAAE,MAAc,EAAE,UAAkB;IAEnG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAQ,cAAc,EAAE,EAAE,aAAa,EAAE,UAAU,EAAS,CAAC,CAAC;IAE3F,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC;QACxB,CAAC,CAAC,MAAM,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC,CAAC,KAAK,CAAC;AACV,CAAC;AAED,uBAAuB;AACvB,uBAAuB;AACvB,oBAAoB;AACpB,oGAAoG;AAEpG,sCAAsC;AACtC,yFAAyF;AACzF,4FAA4F;AAC5F,4BAA4B;AAE5B,mBAAmB;AAEnB,OAAO"}
|