Merge branch 'release/2.0.1'

app/lib/pdf/barcodeDecoder.ts

@@ -309,8 +309,21 @@ const decodeFromCanvas = async (canvas:HTMLCanvasElement): Promise<Array<DecodeR
 }
 
 /** Finds PDF417 code within a base64 encoded image and decodes it */
-export const decodeFromImage = async (imageBase64:string): Promise<DecodeResult[]|null> => {
+export const decodeFromImage = async (imageBase64:string): Promise<DecodeResult|null> => {
-    return(await decodeFromCanvas( await image2canvas(imageBase64) ));
+    const canvas = await image2canvas(imageBase64);
+
+    const hints = new Map();
+    hints.set(DecodeHintType.POSSIBLE_FORMATS, [ BarcodeFormat.PDF_417 ]);
+    hints.set(DecodeHintType.PURE_BARCODE, false);
+
+    const codeReader = new BrowserPDF417Reader(hints);
+    const result = await codeReader.decodeFromCanvas(canvas);
+    const hub3aText = result.getText();
+
+    return({
+        hub3aText,
+        billInfo: parseHubText(hub3aText)
+    });
 }
 
 /** Finds PDF417 code within a file and decodes it */

app/ui/BillEditForm.tsx

@@ -53,10 +53,10 @@ export const BillEditForm: FC<BillEditFormProps> = ({ location, bill }) => {
         // by converting it to `hub3aText`
         if (!hub3aText && bill?.barcodeImage) {
             decodeFromImage(bill.barcodeImage).then(results => {
-                if (results && results.length > 0) {
+                if (results) {
                     const {
                         hub3aText: decodedHub3aText,
-                    } = results[0];
+                    } = results;
 
                     setHub3aText(decodedHub3aText);
                 }

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "evidencija-rezija",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "2.0.0",
+      "version": "2.0.1",
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",

package.json

@@ -58,5 +58,5 @@
   "engines": {
     "node": ">=18.17.0"
   },
-  "version": "2.0.0"
+  "version": "2.0.1"
 }