Konto

Beschreibung (Rechnung) - +

+ +

Beschreibung (Angebot) - +

@@ -105,12 +119,14 @@

+ - + + diff --git a/modules/products/form_product.js b/modules/products/form_product.js index 577d3c7..5cd4471 100644 --- a/modules/products/form_product.js +++ b/modules/products/form_product.js @@ -1,3 +1,7 @@ +var vatpercents = []; +var ptypes = []; +var units =[]; + function initpage(){ tinymce.init({ @@ -6,16 +10,77 @@ function initpage(){ menubar:false, statusbar: false, plugins: 'searchreplace autolink directionality visualblocks visualchars advlist lists textpattern', - toolbar: 'bold italic underline strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat', + toolbar: 'bold italic underline strikethrough | link | numlist bullist | removeformat', image_advtab: true, language: 'de', }); - + getvatpercents(); + gettypes(); + getunits(); + $(".dynselect").select2({tags: true,containerCssClass:"form-control input-group"}); if (mpref.cfg.id){ - // getinvoicedata(mpref.cfg.id); + getproductdata(mpref.cfg.id); // loadinvoicepositions(mpref.cfg.id); } else { //load default new invoice data } + console.log("product ID:",mpref.cfg.id); -} \ No newline at end of file +} + +function getproductdata(prid){ + var sql= "select * from products where id='"+ prid +"';"; + var pdata = appdb.dbquery(sql); + if (pdata.sqldata){ + for (var i in pdata.sqldata[0]){ + if ($("#" + i).prop("tagName") == "SELECT"){ + $("#" + i).val(pdata.sqldata[0][i]); + } else if ($("#" + i).prop("type") == "checkbox" ){ + if (pdata.sqldata[0][i] == '1'){ + $("#" + i).prop("checked","checked"); + } + } else if ($("#" + i).prop("tagName") == "INPUT" ) { + //console.log(i + ">=" + data.sqldata[0][i]); + $("#" + i).val(pdata.sqldata[0][i]); + } else { + $("#" + i).html(pdata.sqldata[0][i]); + } + + $("#" + i).val(pdata.sqldata[0][i]); + } + } +} + +function getvatpercents(){ + var sql = "SELECT DISTINCT(vatpercent),printf('%.2f',100 * vatpercent,'.',',') as vatpercenttext FROM products;"; + $("#vatpercent").html(""); + vatpercents = []; + var ldata = appdb.dbquery(sql); + //console.log(data.sqldata); + for (var i in ldata.sqldata){ + + $("#vatpercent").append(''); + } + +} + +function gettypes(){ + var sql = "SELECT DISTINCT(ptype) FROM products;"; + $("#ptype").html(""); + var ldata = appdb.dbquery(sql); + //console.log(data.sqldata); + for (var i in ldata.sqldata){ + $("#ptype").append(''); + } +} + +function getunits(){ + var sql = "SELECT DISTINCT(unit) FROM products;"; + $("#unit").html(""); + var ldata = appdb.dbquery(sql); + //console.log(data.sqldata); + for (var i in ldata.sqldata){ + $("#unit").append(''); + } + +} diff --git a/package-lock.json b/package-lock.json index 7b1783d..60ca877 100644 --- a/package-lock.json +++ b/package-lock.json @@ -230,12 +230,6 @@ "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==", "dev": true }, - "almond": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz", - "integrity": "sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA=", - "dev": true - }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -1725,7 +1719,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1749,13 +1744,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1772,19 +1769,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1915,7 +1915,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1929,6 +1930,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1945,6 +1947,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1953,13 +1956,15 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1980,6 +1985,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2068,7 +2074,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2082,6 +2089,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2177,7 +2185,8 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2219,6 +2228,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2240,6 +2250,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2288,13 +2299,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -2702,15 +2715,9 @@ "dev": true }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==", - "dev": true - }, - "jquery-mousewheel": { - "version": "3.1.13", - "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz", - "integrity": "sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU=", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==", "dev": true }, "jsbn": { @@ -4020,14 +4027,10 @@ } }, "select2": { - "version": "4.0.6-rc.1", - "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.6-rc.1.tgz", - "integrity": "sha1-qmwwOKfw8ukf+t448KIcFeGBMnY=", - "dev": true, - "requires": { - "almond": "~0.3.1", - "jquery-mousewheel": "~3.1.13" - } + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.7.tgz", + "integrity": "sha512-t46Z2nkEEYnBYdRpLNw5dj9qqO+YTiTlWKnpJ/B5e1Q3hPND00JRgcLJxYRzqpeLZd+ZkszkHEMagLKIfbTjVA==", + "dev": true }, "semver": { "version": "5.6.0", diff --git a/package.json b/package.json index d91c3f1..79b41a0 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "bootstrap-datepicker": "^1.8.0", "bootstrap-table": "^1.13.4", "electron": "^4.0.5", - "jquery": "^3.3.1", + "jquery": "^3.4.1", "pdfjs-dist": "^2.0.943", "popper.js": "^1.14.7", - "select2": "^4.0.6-rc.1", + "select2": "^4.0.7", "tinymce": "^5.0.1", "tinymce-i18n": "^19.2.11", "webpack": "^4.29.4" -- 2.39.5