cry-klikvet-logic 1.0.222 → 1.0.224

package/dist/smsNaroceniNaDan.mjs

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Mongo } from "cry-db";
 import { arrayToObject } from "cry-helpers";
 import dayjs from "./dayjs.mjs";
@@ -16,49 +7,50 @@ const SMS_DNI_PREJ = 3;
  * Iz baze nabere podatke o naročenih pacientih,
  * katerim je potrebno poslati SMS sporočilo na nek dan.
  */
-export function smsNaroceniNaDan({ tenant, dan, resend }) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        let mongo = new Mongo(tenant);
-        let nastavitve = (yield mongo.findOne("nastavitve", {}));
-        if (!nastavitve)
-            return [];
-        if (!nastavitve.opomnikiNarocanje)
-            return [];
-        let naDan = dayjs(dan).add((_a = nastavitve.opomnikiDniPredNarocanje) !== null && _a !== void 0 ? _a : SMS_DNI_PREJ, "day");
-        let query = {
-            datum: {
-                $gte: naDan.startOf("day").toDate(),
-                $lte: naDan.endOf("day").toDate(),
-            },
-            opomnikPoslji: true,
-            opomnikStevilka: { $exists: true },
-            smsOddaja_id: { $exists: false },
-            sprejet: { $exists: false },
-            _deleted: { $exists: false },
-        };
-        if (resend) {
-            console.log("resending SMSes for ", tenant);
-            delete query.smsOddaja_id;
-            query.smsOddaja_napaka = { $exists: true };
-        }
-        let naroceni = yield mongo.find("naroceni", query);
-        if (!naroceni.length)
-            return [];
-        let pacienti = arrayToObject(yield mongo.find("pacienti", { _id: { $in: naroceni.map(n => n.pacient_id) } }, { project: { ime: true, vrsta: true, spol: true, mrtev: true, stranka_id: true, _deleted: true } }), "_id");
-        let lokacije = arrayToObject(yield mongo.find("lokacije", { _id: { $in: naroceni.map(n => n.lokacija_id) } }, { project: { ime: true, naslov: true, telefon: true } }), "_id");
-        let res = naroceni.map(narocen => {
-            return Object.assign({ narocen, pacient: pacienti[narocen.pacient_id] }, smsNarocenBesedilo({
+export async function smsNaroceniNaDan({ tenant, dan, resend }) {
+    let mongo = new Mongo(tenant);
+    let nastavitve = (await mongo.findOne("nastavitve", {}));
+    if (!nastavitve)
+        return [];
+    if (!nastavitve.opomnikiNarocanje)
+        return [];
+    let naDan = dayjs(dan).add(nastavitve.opomnikiDniPredNarocanje ?? SMS_DNI_PREJ, "day");
+    let query = {
+        datum: {
+            $gte: naDan.startOf("day").toDate(),
+            $lte: naDan.endOf("day").toDate(),
+        },
+        opomnikPoslji: true,
+        opomnikStevilka: { $exists: true },
+        smsOddaja_id: { $exists: false },
+        sprejet: { $exists: false },
+        _deleted: { $exists: false },
+    };
+    if (resend) {
+        console.log("resending SMSes for ", tenant);
+        delete query.smsOddaja_id;
+        query.smsOddaja_napaka = { $exists: true };
+    }
+    let naroceni = await mongo.find("naroceni", query);
+    if (!naroceni.length)
+        return [];
+    let pacienti = arrayToObject(await mongo.find("pacienti", { _id: { $in: naroceni.map(n => n.pacient_id) } }, { project: { ime: true, vrsta: true, spol: true, mrtev: true, stranka_id: true, _deleted: true } }), "_id");
+    let lokacije = arrayToObject(await mongo.find("lokacije", { _id: { $in: naroceni.map(n => n.lokacija_id) } }, { project: { ime: true, naslov: true, telefon: true } }), "_id");
+    let res = naroceni.map(narocen => {
+        return {
+            narocen,
+            pacient: pacienti[narocen.pacient_id],
+            ...smsNarocenBesedilo({
                 narocen,
                 pacient: pacienti[narocen.pacient_id],
                 lokacija: lokacije[narocen.lokacija_id],
                 nastavitve: nastavitve,
-            }));
-        }).filter(p => (p === null || p === void 0 ? void 0 : p.pacient) && !p.pacient.mrtev && !p.pacient._deleted && !p.pacient.oddan);
-        let stranke = arrayToObject(yield mongo.find("stranke", { _id: { $in: res.map(r => r.pacient.stranka_id) } }, { project: { gdprSoglasjeNacin: 1 } }), "_id");
-        res = res.filter(r => stranke[r.pacient.stranka_id].gdprSoglasjeNacin !== "ne poda");
-        return res;
-    });
+            }),
+        };
+    }).filter(p => p?.pacient && !p.pacient.mrtev && !p.pacient._deleted && !p.pacient.oddan);
+    let stranke = arrayToObject(await mongo.find("stranke", { _id: { $in: res.map(r => r.pacient.stranka_id) } }, { project: { gdprSoglasjeNacin: 1 } }), "_id");
+    res = res.filter(r => stranke[r.pacient.stranka_id].gdprSoglasjeNacin !== "ne poda");
+    return res;
 }
 // (async () => {
 //     let ret = await smsNaroceniNaDan({ tenant: 'zvitorepka', dan: new Date(), resend: true });

package/dist/smsNaroceniNaDan.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"smsNaroceniNaDan.mjs","sourceRoot":"","sources":["../src/smsNaroceniNaDan.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"smsNaroceniNaDan.mjs","sourceRoot":"","sources":["../src/smsNaroceniNaDan.mts"],"names":[],"mappings":"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"}

package/dist/spremembaZalogeZaObdobje.mjs

@@ -1,100 +1,87 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Repo } from "cry-db";
 import { arrayToObject } from "cry-helpers";
 import dayjs from "./dayjs.mjs";
 import { idjiArtiklovKiImajoLahkoZalogo } from "./idjiArtiklovKiImajoLahkoZalogo.mjs";
 import { vsaSkladiscaLokacij } from "./vseSkladiscaLokacij.mjs";
-export function spremembaZalogeZaObdobje(spec) {
-    var _a, _b, _c, _d, _e, _f;
-    return __awaiter(this, void 0, void 0, function* () {
-        spec.odDne = dayjs(spec.odDne).startOf("day").toDate();
-        spec.doDne = dayjs(spec.doDne).endOf("day").toDate();
-        const allTimeCriteria = [
-            { datum: { $gte: spec.odDne } },
-            { datum: { $lt: spec.doDne } },
-        ];
-        // match št.računa and time criteria
-        let $match = { $and: allTimeCriteria };
-        if (spec.lokacije && !((_a = spec.skladisca) === null || _a === void 0 ? void 0 : _a.length)) {
-            spec.skladisca = yield vsaSkladiscaLokacij(spec.lokacije, spec.tenant);
-        }
-        if ((_b = spec.skladisca) === null || _b === void 0 ? void 0 : _b.length)
-            $match.skladisce_id = { $in: spec.skladisca };
-        if ((_c = spec.kategorije) === null || _c === void 0 ? void 0 : _c.length)
-            $match.kategorija = { $in: spec.kategorije };
-        if ((_d = spec.vrste) === null || _d === void 0 ? void 0 : _d.length)
-            $match.vrstaDogodka = { $in: spec.vrste };
-        if ((_e = spec.razenVrst) === null || _e === void 0 ? void 0 : _e.length)
-            $match.vrstaDogodka = { $nin: spec.razenVrst };
-        if (spec.samoArtikliKiImajoLahkoSedajZalogo) {
-            // samo artikli, ki lahko imajo zalogo
-            let mozni = yield idjiArtiklovKiImajoLahkoZalogo(spec.tenant, spec.samoKonsignacija);
-            $match.artikel_id = { $in: mozni };
-        }
-        let _id = {};
-        let proj = { _id: 0, sprememba: 1 };
-        if (spec.poDokumentih) {
-            _id.dokument_id = "$dokument_id";
-            _id.partner_id = "$partner_id";
-            _id.datum = "$datum";
-            proj.dokument_id = "$_id.dokument_id";
-            proj.partner_id = "$_id.partner_id";
-            proj.datum = "$_id.datum";
-            spec.poVrstah = true;
-            spec.poSkladiscih = true;
-        }
-        if (spec.poVrstah) {
-            _id.vrsta = "$vrstaDogodka";
-            proj.vrsta = "$_id.vrsta";
-        }
-        if (spec.poKategorijah) {
-            _id.kategorija = "$kategorija";
-            proj.kategorija = "$_id.kategorija";
-        }
-        if (spec.poSkladiscih || ((_f = spec.skladisca) === null || _f === void 0 ? void 0 : _f.length)) {
-            _id.skladisce_id = "$skladisce_id";
-            proj.skladisce_id = "$_id.skladisce_id";
-        }
-        let repo = new Repo("spremembaZaloge", spec.tenant);
-        let spremembe = yield repo.aggregate([
-            { $match },
-            {
-                $group: {
-                    _id,
-                    sprememba: { $sum: "$vrednostZaloge.sprememba" },
-                },
+export async function spremembaZalogeZaObdobje(spec) {
+    spec.odDne = dayjs(spec.odDne).startOf("day").toDate();
+    spec.doDne = dayjs(spec.doDne).endOf("day").toDate();
+    const allTimeCriteria = [
+        { datum: { $gte: spec.odDne } },
+        { datum: { $lt: spec.doDne } },
+    ];
+    // match št.računa and time criteria
+    let $match = { $and: allTimeCriteria };
+    if (spec.lokacije && !(spec.skladisca?.length)) {
+        spec.skladisca = await vsaSkladiscaLokacij(spec.lokacije, spec.tenant);
+    }
+    if (spec.skladisca?.length)
+        $match.skladisce_id = { $in: spec.skladisca };
+    if (spec.kategorije?.length)
+        $match.kategorija = { $in: spec.kategorije };
+    if (spec.vrste?.length)
+        $match.vrstaDogodka = { $in: spec.vrste };
+    if (spec.razenVrst?.length)
+        $match.vrstaDogodka = { $nin: spec.razenVrst };
+    if (spec.samoArtikliKiImajoLahkoSedajZalogo) {
+        // samo artikli, ki lahko imajo zalogo
+        let mozni = await idjiArtiklovKiImajoLahkoZalogo(spec.tenant, spec.samoKonsignacija);
+        $match.artikel_id = { $in: mozni };
+    }
+    let _id = {};
+    let proj = { _id: 0, sprememba: 1 };
+    if (spec.poDokumentih) {
+        _id.dokument_id = "$dokument_id";
+        _id.partner_id = "$partner_id";
+        _id.datum = "$datum";
+        proj.dokument_id = "$_id.dokument_id";
+        proj.partner_id = "$_id.partner_id";
+        proj.datum = "$_id.datum";
+        spec.poVrstah = true;
+        spec.poSkladiscih = true;
+    }
+    if (spec.poVrstah) {
+        _id.vrsta = "$vrstaDogodka";
+        proj.vrsta = "$_id.vrsta";
+    }
+    if (spec.poKategorijah) {
+        _id.kategorija = "$kategorija";
+        proj.kategorija = "$_id.kategorija";
+    }
+    if (spec.poSkladiscih || spec.skladisca?.length) {
+        _id.skladisce_id = "$skladisce_id";
+        proj.skladisce_id = "$_id.skladisce_id";
+    }
+    let repo = new Repo("spremembaZaloge", spec.tenant);
+    let spremembe = await repo.aggregate([
+        { $match },
+        {
+            $group: {
+                _id,
+                sprememba: { $sum: "$vrednostZaloge.sprememba" },
             },
-            { $project: proj, },
-        ]);
-        yield repo.close();
-        if (spec.poDokumentih) {
-            let idjiBlag = spremembe.filter((s) => s.vrsta !== "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => a.toString());
-            let idjiRac = spremembe.filter((s) => s.vrsta == "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => a.toString());
-            let repoB = new Repo("blagovnice", spec.tenant);
-            let repoR = new Repo("racuni", spec.tenant);
-            let blagovnice = yield repoB.find({ _id: { $in: idjiBlag } }, { project: { dokumentDobavitelja: 1 }, sort: { datum: 1 } });
-            let racuni = yield repoR.find({ _id: { $in: idjiRac } }, { project: { stevilka: 1 }, sort: { datum: 1 } });
-            let blagObj = arrayToObject(blagovnice, "_id");
-            let racObj = arrayToObject(racuni, "_id");
-            yield repoB.close();
-            yield repoR.close();
-            spremembe.forEach((s) => {
-                var _a, _b;
-                let dokument = ((_a = blagObj[s.dokument_id]) === null || _a === void 0 ? void 0 : _a.dokumentDobavitelja) || ((_b = racObj[s.dokument_id]) === null || _b === void 0 ? void 0 : _b.stevilka);
-                if (dokument)
-                    s.dokument = dokument;
-            });
-        }
-        return spremembe;
-    });
+        },
+        { $project: proj, },
+    ]);
+    await repo.close();
+    if (spec.poDokumentih) {
+        let idjiBlag = spremembe.filter((s) => s.vrsta !== "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => a.toString());
+        let idjiRac = spremembe.filter((s) => s.vrsta == "prodaja").map((s) => s.dokument_id).filter(a => a).map(a => a.toString());
+        let repoB = new Repo("blagovnice", spec.tenant);
+        let repoR = new Repo("racuni", spec.tenant);
+        let blagovnice = await repoB.find({ _id: { $in: idjiBlag } }, { project: { dokumentDobavitelja: 1 }, sort: { datum: 1 } });
+        let racuni = await repoR.find({ _id: { $in: idjiRac } }, { project: { stevilka: 1 }, sort: { datum: 1 } });
+        let blagObj = arrayToObject(blagovnice, "_id");
+        let racObj = arrayToObject(racuni, "_id");
+        await repoB.close();
+        await repoR.close();
+        spremembe.forEach((s) => {
+            let dokument = blagObj[s.dokument_id]?.dokumentDobavitelja || racObj[s.dokument_id]?.stevilka;
+            if (dokument)
+                s.dokument = dokument;
+        });
+    }
+    return spremembe;
 }
 // (async function go() {
 //     let vzd = await spremembaZalogeZaObdobje({

package/dist/spremembaZalogeZaObdobje.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"spremembaZalogeZaObdobje.mjs","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spremembaZalogeZaObdobje.mjs","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.mts"],"names":[],"mappings":"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"}

package/dist/spremeniZalogo.mjs

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { ObjectID } from './ObjectId.mjs';
 import { preracunajPorabo, vpisiSprememboZaloge } from "./preracunajZalogo.mjs";
 import { razpisiDatum } from './razpisiDatum.mjs';
@@ -41,138 +32,140 @@ export function knjiziPoEnotiNabave(vrsta) {
 //     return d
 // }
 var artikliBlagovnice = {};
-export function naloziArtikleBlagovnice(blagovnca, mongo) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let ids = blagovnca.postavke.map(p => p.artikel_id);
-        artikliBlagovnice = {};
-        try {
-            artikliBlagovnice = arrayToObject(yield mongo.find("artikli", { _id: { $in: ids }, _deleted: { $ne: "hack" } }), "_id");
-        }
-        catch (err) {
-            console.error("naloziArtikleBlagovnice: ", err);
-        }
-    });
+export async function naloziArtikleBlagovnice(blagovnca, mongo) {
+    let ids = blagovnca.postavke.map(p => p.artikel_id);
+    artikliBlagovnice = {};
+    try {
+        artikliBlagovnice = arrayToObject(await mongo.find("artikli", { _id: { $in: ids }, _deleted: { $ne: "hack" } }), "_id");
+    }
+    catch (err) {
+        console.error("naloziArtikleBlagovnice: ", err);
+    }
 }
-export function poisciArtikel(_id, mongo, errorText) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let artikel = (artikliBlagovnice[_id])
-            ||
-                (yield mongo.findOne("artikli", { _id, _deleted: { $ne: "hack" } }));
-        if (!artikel) {
-            console.error(errorText);
-            return null;
-        }
-        if (artikel.vodenjeZaloge === "brez")
-            return null;
-        return artikel;
-    });
+export async function poisciArtikel(_id, mongo, errorText) {
+    let artikel = (artikliBlagovnice[_id])
+        ||
+            await mongo.findOne("artikli", { _id, _deleted: { $ne: "hack" } });
+    if (!artikel) {
+        console.error(errorText);
+        return null;
+    }
+    if (artikel.vodenjeZaloge === "brez")
+        return null;
+    return artikel;
 }
-export function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let artikel = (artikliBlagovnice[_id]) || (yield mongo.findOne("artikli", { _id }));
-        if (!artikel) {
-            console.error(errorText);
-            return { artikel: null, faktorRazknjizbe: 0 };
-        }
-        if (artikel.vodenjeZaloge === "brez")
+export async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText) {
+    let artikel = (artikliBlagovnice[_id]) || (await mongo.findOne("artikli", { _id }));
+    if (!artikel) {
+        console.error(errorText);
+        return { artikel: null, faktorRazknjizbe: 0 };
+    }
+    if (artikel.vodenjeZaloge === "brez")
+        return { artikel: null, faktorRazknjizbe: 0 };
+    if (artikel.vodenjeZaloge === "tam") {
+        if (!artikel.razknjiziZalogo) {
+            console.error(`artikel ${_id} preusmeja na neobstoječi => ${artikel.razknjiziZalogo}`);
             return { artikel: null, faktorRazknjizbe: 0 };
-        if (artikel.vodenjeZaloge === "tam") {
-            if (!artikel.razknjiziZalogo) {
-                console.error(`artikel ${_id} preusmeja na neobstoječi => ${artikel.razknjiziZalogo}`);
-                return { artikel: null, faktorRazknjizbe: 0 };
-            }
-            return poisciInPreusmeriArtikel(artikel.razknjiziZalogo, faktorRazknjizbe * (artikel.faktorRazknjizbe || 1), mongo, errorText);
         }
-        return { artikel, faktorRazknjizbe };
-    });
+        return poisciInPreusmeriArtikel(artikel.razknjiziZalogo, faktorRazknjizbe * (artikel.faktorRazknjizbe || 1), mongo, errorText);
+    }
+    return { artikel, faktorRazknjizbe };
 }
-export function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nbc, mongo, artikel, blagovnica) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let faktor = knjiziPoEnotiNabave(blagovnica.vrsta) ? (postavka.enotaFaktor || 1) : 1;
-        // novo
-        faktor = postavka.enotaFaktor || 1;
-        let sprememba = preracunajPorabo({
-            vrstaSpremembe: blagovniDogodek === "vnos" ? 1 /* VrstaSpremembeZaloge.NABAVA */ : -1 /* VrstaSpremembeZaloge.PORABA */,
-            zaloga,
-            kolicina: postavka.kolicina * faktor,
-            stara_nbc,
-        });
-        zaloga = vpisiSprememboZaloge(zaloga, sprememba);
-        yield mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
-            nbc: stara_nbc,
-            zaloga: sprememba.zaloga.nova,
-            vrednost: sprememba.vrednostZaloge.nova,
-        });
-        let datum = new Date(new Date().valueOf());
-        let datumDokumenta = new Date(blagovnica.datum);
-        yield mongo.insert("spremembaZaloge", Object.assign(Object.assign({ _id: new ObjectID().toHexString(), datum: datum }, razpisiDatum(datum)), { datumDokumenta, artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id, dokument_id: blagovnica._id, vrstaSpremembe: sprememba.vrstaSpremembe, vrstaDogodka: blagovniDogodek, kategorija: artikel.kategorija, 
-            //partner_id: blagovnica.?._id,
-            zaloga: sprememba.zaloga, vrednostZaloge: sprememba.vrednostZaloge, nbc: { stara: stara_nbc, nova: stara_nbc, sprememba: 0 }, dst: artikel.dstIn || artikel.dst }));
-        // if (Math.abs(round2(zaloga.vrednost - sprememba.vrednostZaloge.nova)) > .2)
-        //     console.log(blagovniDogodek," razlika zaloge", artikel._id, (artikel as any).naziv, zaloga.vrednost, "-", sprememba.vrednostZaloge.nova, "=", zaloga.vrednost - sprememba.vrednostZaloge.nova)
-        return zaloga;
+export async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nbc, mongo, artikel, blagovnica) {
+    let faktor = knjiziPoEnotiNabave(blagovnica.vrsta) ? (postavka.enotaFaktor || 1) : 1;
+    // novo
+    faktor = postavka.enotaFaktor || 1;
+    let sprememba = preracunajPorabo({
+        vrstaSpremembe: blagovniDogodek === "vnos" ? 1 /* VrstaSpremembeZaloge.NABAVA */ : -1 /* VrstaSpremembeZaloge.PORABA */,
+        zaloga,
+        kolicina: postavka.kolicina * faktor,
+        stara_nbc,
     });
-}
-export function ignorirajNarocilo(blagovnica, mongo) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.error("Ignoriram spremembo zaloge na podlagi naročila ", blagovnica._id);
-        // prevent compiler error:
-        mongo.findOne("artikli", { noop: 1 });
-        return false;
+    zaloga = vpisiSprememboZaloge(zaloga, sprememba);
+    await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
+        nbc: stara_nbc,
+        zaloga: sprememba.zaloga.nova,
+        vrednost: sprememba.vrednostZaloge.nova,
+    });
+    let datum = new Date(new Date().valueOf());
+    let datumDokumenta = new Date(blagovnica.datum);
+    await mongo.insert("spremembaZaloge", {
+        _id: new ObjectID().toHexString(),
+        datum: datum,
+        ...razpisiDatum(datum),
+        datumDokumenta,
+        artikel_id: artikel._id,
+        skladisce_id: zaloga.skladisce_id,
+        dokument_id: blagovnica._id,
+        vrstaSpremembe: sprememba.vrstaSpremembe,
+        vrstaDogodka: blagovniDogodek,
+        kategorija: artikel.kategorija,
+        //partner_id: blagovnica.?._id,
+        zaloga: sprememba.zaloga,
+        vrednostZaloge: sprememba.vrednostZaloge,
+        nbc: { stara: stara_nbc, nova: stara_nbc, sprememba: 0 },
+        dst: artikel.dstIn || artikel.dst,
     });
+    // if (Math.abs(round2(zaloga.vrednost - sprememba.vrednostZaloge.nova)) > .2)
+    //     console.log(blagovniDogodek," razlika zaloge", artikel._id, (artikel as any).naziv, zaloga.vrednost, "-", sprememba.vrednostZaloge.nova, "=", zaloga.vrednost - sprememba.vrednostZaloge.nova)
+    return zaloga;
 }
-export function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!blagovnica)
-            return;
-        if (blagovnica.razknjizena)
-            return;
-        if (blagovnica.razknjizbaPreskocena)
-            return;
-        if (blagovnica.vrsta === "naročilo")
-            return;
-        if (blagovnica.navidezniPrevzem)
-            return;
-        if (opts && opts.pustiNbcInventure === undefined)
-            opts.pustiNbcInventure = (blagovnica.vrsta === "inventura" && !dayjs(blagovnica.datumDokumenta).isSame(new Date(), "day"));
-        // let inTransaction = mongo.inTransaction && await mongo.inTransaction()
-        try {
-            // if (!inTransaction)
-            //     await mongo.startTransaction()
-            let actions = {
-                dobava: () => spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo),
-                poraba: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                prevzem: () => spremeniZalogoZaPrevzem(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                odpis: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                izdaja: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                vračilo: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                iznos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                vnos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                inventura: () => spremeniZalogoZaInventuro(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo, opts),
-                prenos: () => spremeniZalogoZaPrenos(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
-                "naročilo": () => ignorirajNarocilo(blagovnica, mongo),
-            };
-            if (!actions[blagovnica.vrsta])
-                throw new Error(`ni funkcije za knjižbo blagovnice ${blagovnica.vrsta} ${blagovnica._id}`);
-            let update = {
-                razknjizena: new Date()
-            };
-            let vpisaliSmoSerijeNaPostavke = yield actions[blagovnica.vrsta](blagovnica, mongo);
-            if (vpisaliSmoSerijeNaPostavke) {
-                update.postavke = blagovnica.postavke;
-                if (blagovnica.vrsta === "prevzem" && blagovnica.serijskeVpisaneNaNapravo)
-                    update.serijskeVpisaneNaNapravo = blagovnica.serijskeVpisaneNaNapravo;
-            }
-            yield mongo.upsert("blagovnice", { _id: blagovnica._id }, update);
-            // if (!inTransaction)
-            //     await mongo.commitTransaction()
-        }
-        catch (err) {
-            console.error("napaka knjižbe blagovnice", err.message || err, err);
-            // if (!inTransaction)
-            //     await mongo.abortTransaction()
+export async function ignorirajNarocilo(blagovnica, mongo) {
+    console.error("Ignoriram spremembo zaloge na podlagi naročila ", blagovnica._id);
+    // prevent compiler error:
+    mongo.findOne("artikli", { noop: 1 });
+    return false;
+}
+export async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo, opts) {
+    if (!blagovnica)
+        return;
+    if (blagovnica.razknjizena)
+        return;
+    if (blagovnica.razknjizbaPreskocena)
+        return;
+    if (blagovnica.vrsta === "naročilo")
+        return;
+    if (blagovnica.navidezniPrevzem)
+        return;
+    if (opts && opts.pustiNbcInventure === undefined)
+        opts.pustiNbcInventure = (blagovnica.vrsta === "inventura" && !dayjs(blagovnica.datumDokumenta).isSame(new Date(), "day"));
+    // let inTransaction = mongo.inTransaction && await mongo.inTransaction()
+    try {
+        // if (!inTransaction)
+        //     await mongo.startTransaction()
+        let actions = {
+            dobava: () => spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo),
+            poraba: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            prevzem: () => spremeniZalogoZaPrevzem(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            odpis: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            izdaja: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            vračilo: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            iznos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            vnos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            inventura: () => spremeniZalogoZaInventuro(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo, opts),
+            prenos: () => spremeniZalogoZaPrenos(blagovnica, nastavitve.razknjizbaZdravil, nastavitve.razknjizbaIzdelkov, !!nastavitve.spremljamoSerijske, mongo),
+            "naročilo": () => ignorirajNarocilo(blagovnica, mongo),
+        };
+        if (!actions[blagovnica.vrsta])
+            throw new Error(`ni funkcije za knjižbo blagovnice ${blagovnica.vrsta} ${blagovnica._id}`);
+        let update = {
+            razknjizena: new Date()
+        };
+        let vpisaliSmoSerijeNaPostavke = await actions[blagovnica.vrsta](blagovnica, mongo);
+        if (vpisaliSmoSerijeNaPostavke) {
+            update.postavke = blagovnica.postavke;
+            if (blagovnica.vrsta === "prevzem" && blagovnica.serijskeVpisaneNaNapravo)
+                update.serijskeVpisaneNaNapravo = blagovnica.serijskeVpisaneNaNapravo;
         }
-    });
+        await mongo.upsert("blagovnice", { _id: blagovnica._id }, update);
+        // if (!inTransaction)
+        //     await mongo.commitTransaction()
+    }
+    catch (err) {
+        console.error("napaka knjižbe blagovnice", err.message || err, err);
+        // if (!inTransaction)
+        //     await mongo.abortTransaction()
+    }
 }
 // (async function () {
 //     let mongo = new Mongo("max")