From 036981f16edaeaadd01b2acc9e8ada32fcfc277b Mon Sep 17 00:00:00 2001 From: fbarachino Date: Wed, 24 Jul 2024 08:51:39 +0000 Subject: [PATCH] Risolto piccole problematiche ai file e installato libreria milon/barcode per generazione barcodes --- composer.json | 1 + composer.lock | 187 +++++++----------- resources/views/admin.blade.php | 4 +- .../views/anagrafica/altrocontatto.blade.php | 2 +- resources/views/anagrafica/list.blade.php | 12 +- resources/views/auto/detail.blade.php | 68 +++---- resources/views/auto/detailpdf.blade.php | 66 +++---- resources/views/auto/list.blade.php | 18 +- resources/views/components/chartGas.blade.php | 2 +- resources/views/components/charts.blade.php | 4 +- resources/views/components/menu.blade.php | 32 +-- resources/views/components/usermenu.blade.php | 2 +- .../views/conti/categorie/list.blade.php | 4 +- .../views/conti/documenti/gendoc.blade.php | 6 +- .../views/conti/documenti/insert.blade.php | 6 +- .../views/conti/movimenti/list.blade.php | 16 +- resources/views/conti/movimenti/new.blade.php | 6 +- resources/views/conti/report/list.blade.php | 8 +- resources/views/conti/tags/list.blade.php | 6 +- resources/views/letture/enel/list.blade.php | 12 +- resources/views/letture/gas/list.blade.php | 4 +- resources/views/progetti/dettaglio.blade.php | 6 +- resources/views/progetti/list.blade.php | 8 +- resources/views/tasks/list.blade.php | 6 +- 24 files changed, 226 insertions(+), 260 deletions(-) diff --git a/composer.json b/composer.json index 6fd50e4..007f420 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "laravel/tinker": "^2.5", "laravel/ui": "^3.4", "laraveldaily/laravel-charts": "^0.1.29", + "milon/barcode": "^11.0", "nesbot/carbon": "^2.71", "pcloud/pcloud-php-sdk": "^3.0", "rap2hpoutre/fast-excel": "^3.2", diff --git a/composer.lock b/composer.lock index 1e5e851..abd3bb3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], -<<<<<<< HEAD - "content-hash": "687cd004c9e85a059f97bef99a50fbef", - "packages": [ - { - "name": "asm89/stack-cors", - "version": "v2.2.0", - "source": { - "type": "git", - "url": "https://github.com/asm89/stack-cors.git", - "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea" - }, - "dist": { - "type": "zip", -======= - "content-hash": "c58658999463fa4485159d5f4dde1d96", + "content-hash": "00d6550702f98e31543eea85f7e7e646", "packages": [ { "name": "almasaeed2010/adminlte", @@ -73,7 +59,6 @@ }, "dist": { "type": "zip", ->>>>>>> devel "url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea", "reference": "50f57105bad3d97a43ec4a485eb57daf347eafea", "shasum": "" @@ -176,18 +161,6 @@ }, { "name": "aws/aws-sdk-php", -<<<<<<< HEAD - "version": "3.306.0", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dc228b55a4224fe3160a0a2ca430b80c5348d943", - "reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943", -======= "version": "3.308.1", "source": { "type": "git", @@ -198,7 +171,6 @@ "type": "zip", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bf5f1221d4c5c67d3213150fb91dfb5ce627227b", "reference": "bf5f1221d4c5c67d3213150fb91dfb5ce627227b", ->>>>>>> devel "shasum": "" }, "require": { @@ -278,28 +250,6 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", -<<<<<<< HEAD - "source": "https://github.com/aws/aws-sdk-php/tree/3.306.0" - }, - "time": "2024-05-06T18:11:49+00:00" - }, - { - "name": "barryvdh/laravel-dompdf", - "version": "v2.1.1", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "cb37868365f9b937039d316727a1fced1e87b31c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c", - "reference": "cb37868365f9b937039d316727a1fced1e87b31c", - "shasum": "" - }, - "require": { - "dompdf/dompdf": "^2.0.3", -======= "source": "https://github.com/aws/aws-sdk-php/tree/3.308.1" }, "time": "2024-05-22T18:05:56+00:00" @@ -320,7 +270,6 @@ }, "require": { "dompdf/dompdf": "^2.0.7", ->>>>>>> devel "illuminate/support": "^6|^7|^8|^9|^10|^11", "php": "^7.2 || ^8.0" }, @@ -368,11 +317,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-dompdf/issues", -<<<<<<< HEAD - "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1" -======= "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.2.0" ->>>>>>> devel }, "funding": [ { @@ -384,11 +329,7 @@ "type": "github" } ], -<<<<<<< HEAD - "time": "2024-03-15T12:48:39+00:00" -======= "time": "2024-04-25T13:16:04+00:00" ->>>>>>> devel }, { "name": "box/spout", @@ -1305,8 +1246,6 @@ "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" }, "time": "2023-11-17T15:01:25+00:00" -<<<<<<< HEAD -======= }, { "name": "firebase/php-jwt", @@ -1370,7 +1309,6 @@ "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" }, "time": "2024-05-18T18:05:11+00:00" ->>>>>>> devel }, { "name": "fruitcake/laravel-cors", @@ -1453,17 +1391,6 @@ "time": "2022-02-23T14:25:13+00:00" }, { -<<<<<<< HEAD - "name": "graham-campbell/result-type", - "version": "v1.1.2", - "source": { - "type": "git", - "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" - }, - "dist": { - "type": "zip", -======= "name": "google/apiclient", "version": "v2.16.0", "source": { @@ -1646,7 +1573,6 @@ }, "dist": { "type": "zip", ->>>>>>> devel "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", "shasum": "" @@ -2023,8 +1949,6 @@ } ], "time": "2023-12-03T20:05:35+00:00" -<<<<<<< HEAD -======= }, { "name": "jeroennoten/laravel-adminlte", @@ -2084,7 +2008,6 @@ "source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.11.0" }, "time": "2024-03-18T14:42:51+00:00" ->>>>>>> devel }, { "name": "laravel-notification-channels/telegram", @@ -3360,6 +3283,80 @@ }, "time": "2024-03-31T07:05:07+00:00" }, + { + "name": "milon/barcode", + "version": "v11.0.0", + "source": { + "type": "git", + "url": "https://github.com/milon/barcode.git", + "reference": "1f4031adb52146bb7fbe88ef42214011376f9cbe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/milon/barcode/zipball/1f4031adb52146bb7fbe88ef42214011376f9cbe", + "reference": "1f4031adb52146bb7fbe88ef42214011376f9cbe", + "shasum": "" + }, + "require": { + "illuminate/support": "^7.0|^8.0|^9.0|^10.0 | ^11.0", + "php": "^7.3 | ^8.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Milon\\Barcode\\BarcodeServiceProvider" + ], + "aliases": { + "DNS1D": "Milon\\Barcode\\Facades\\DNS1DFacade", + "DNS2D": "Milon\\Barcode\\Facades\\DNS2DFacade" + } + } + }, + "autoload": { + "psr-0": { + "Milon\\Barcode": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Nuruzzaman Milon", + "email": "contact@milon.im" + } + ], + "description": "Barcode generator like Qr Code, PDF417, C39, C39+, C39E, C39E+, C93, S25, S25+, I25, I25+, C128, C128A, C128B, C128C, 2-Digits UPC-Based Extention, 5-Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI (Variation of Plessey code)", + "keywords": [ + "CODABAR", + "CODE 128", + "CODE 39", + "barcode", + "datamatrix", + "ean", + "laravel", + "pdf417", + "qr code", + "qrcode" + ], + "support": { + "issues": "https://github.com/milon/barcode/issues", + "source": "https://github.com/milon/barcode/tree/v11.0.0" + }, + "funding": [ + { + "url": "https://paypal.me/nuruzzamanmilon", + "type": "custom" + }, + { + "url": "https://github.com/milon", + "type": "github" + } + ], + "time": "2024-02-28T18:14:32+00:00" + }, { "name": "monolog/monolog", "version": "2.9.3", @@ -3907,17 +3904,6 @@ "time": "2022-01-27T09:35:39+00:00" }, { -<<<<<<< HEAD - "name": "phenx/php-font-lib", - "version": "0.5.6", - "source": { - "type": "git", - "url": "https://github.com/dompdf/php-font-lib.git", - "reference": "a1681e9793040740a405ac5b189275059e2a9863" - }, - "dist": { - "type": "zip", -======= "name": "paragonie/constant_time_encoding", "version": "v2.7.0", "source": { @@ -4082,7 +4068,6 @@ }, "dist": { "type": "zip", ->>>>>>> devel "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863", "reference": "a1681e9793040740a405ac5b189275059e2a9863", "shasum": "" @@ -4344,8 +4329,6 @@ "time": "2023-11-12T21:59:55+00:00" }, { -<<<<<<< HEAD -======= "name": "phpseclib/phpseclib", "version": "3.0.37", "source": { @@ -4505,7 +4488,6 @@ "time": "2021-02-03T23:26:27+00:00" }, { ->>>>>>> devel "name": "psr/clock", "version": "1.0.0", "source": { @@ -9775,18 +9757,6 @@ }, { "name": "mockery/mockery", -<<<<<<< HEAD - "version": "1.6.11", - "source": { - "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "81a161d0b135df89951abd52296adf97deb0723d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", - "reference": "81a161d0b135df89951abd52296adf97deb0723d", -======= "version": "1.6.12", "source": { "type": "git", @@ -9797,7 +9767,6 @@ "type": "zip", "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699", "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699", ->>>>>>> devel "shasum": "" }, "require": { @@ -9867,11 +9836,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, -<<<<<<< HEAD - "time": "2024-03-21T18:34:15+00:00" -======= "time": "2024-05-16T03:13:13+00:00" ->>>>>>> devel }, { "name": "myclabs/deep-copy", @@ -11654,5 +11619,5 @@ "php": "^7.3|^8.0|^8.3" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/resources/views/admin.blade.php b/resources/views/admin.blade.php index 85f6d1a..483d082 100644 --- a/resources/views/admin.blade.php +++ b/resources/views/admin.blade.php @@ -33,7 +33,7 @@