isite 2022.3.5 → 2022.3.8

package/apps/client-side/app.js

@@ -192,10 +192,32 @@ module.exports = function (site) {
         res.download(site.dir + '/../../uploads/' + req.params.category + '/files/' + req.params.name);
     });
 
-    site.onPOST('/x-api/convert', (req, res) => {
+    site.getTLV = function (name, value) {
+        value = site.utf8.encode(value);
+        return Buffer.concat([Buffer.from([name], 'utf8'), Buffer.from([value.length], 'utf8'), Buffer.from(value, 'utf8')]);
+    };
+    site.onPOST('/x-api/zakat', (req, res) => {
+        let obj = req.data || {};
+        let value = [];
+        if (obj.name) {
+            value.push(site.getTLV('1', obj.name));
+        }
+        if (obj.vat_number) {
+            value.push(site.getTLV('2', obj.vat_number));
+        }
+        if (obj.time) {
+            value.push(site.getTLV('3', obj.time));
+        }
+        if (obj.total) {
+            value.push(site.getTLV('4', obj.total));
+        }
+        if (obj.vat_total) {
+            value.push(site.getTLV('5', obj.vat_total));
+        }
+        value = Buffer.concat([...value]).toString('base64');
         res.json({
             done: true,
-            value: Buffer.from(req.data.text, 'utf8').toString('hex'),
+            value: value,
         });
     });
 };

package/apps/client-side/site_files/js/site.js

@@ -1137,6 +1137,14 @@
         return site.toBase64(value);
     };
 
+    site.zakat2 = function (obj, callback) {
+        fetch('/x-api/zakat', { method: 'POST', body: JSON.stringify(obj) })
+            .then((res) => res.json())
+            .then((data) => {
+                callback(data);
+            });
+    };
+
     site.barcode = function (options) {
         if (!options || !options.selector || !options.text) {
             console.error('qrcode need {selector , text}');
@@ -1163,7 +1171,7 @@
                 height: options.height || 256,
                 colorDark: options.colorDark || '#000000',
                 colorLight: options.colorLight || '#ffffff',
-                correctLevel: options.correctLevel || QRCode.CorrectLevel.L,
+                correctLevel: options.correctLevel || QRCode.CorrectLevel.H,
             });
         }
     };

package/index.js

@@ -16,6 +16,7 @@ module.exports = function init(options) {
     ____0.querystring = require('querystring');
     ____0.formidable = require('formidable');
     ____0.mv = require('mv');
+    ____0.utf8 = require('utf8');
     ____0.request = ____0.fetch = ____0.x0ftox = require('node-fetch');
     ____0.$ = ____0.cheerio = require('cheerio');
     ____0.md5 = ____0.hash = ____0.x0md50x = require('md5');

package/lib/words.js

@@ -77,7 +77,7 @@ module.exports = function init(____0) {
         return response;
     };
 
-    words.addList = function (list, db = true) {
+    words.addList = function (list, db = false) {
         if (typeof list === 'string') {
             ____0.readFile(list, (err, data) => {
                 if (!err) {
@@ -104,7 +104,7 @@ module.exports = function init(____0) {
     };
 
     words.addApp = function (app_path) {
-        words.addList(app_path + '/site_files/json/words.json');
+        words.addList(app_path + '/site_files/json/words.json' , false);
     };
 
     ____0.on(____0.strings[9], () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2022.03.05",
+  "version": "2022.03.08",
   "description": "Create Enterprise Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {
@@ -43,6 +43,7 @@
     "mongodb": "^4.2.2",
     "mv": "^2.1.1",
     "node-fetch": "^2.6.1",
+    "utf8": "^3.0.0",
     "ws": "^8.2.3",
     "xlsx": "^0.17.4"
   }