fixed quotation

# Conflicts:
#	public/userarea/import_insert.php
#	public/userarea/mapping_template_xls_scheme2.php
#	public/userarea/process_import_xls2.php

.env

@@ -1,45 +0,0 @@
-APP_ENV=production
-APP_DEBUG=true
-APP_KEY=base64:C+sutHm6xP5sE4QXhoZFhYjArlVN11s2mDU1F8beUkM=
-APP_URL=http://vanguard.test
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST="localhost"
-DB_DATABASE="trfcertest"
-DB_USERNAME="solocla"
-DB_PASSWORD="!Massarosa2"
-DB_PREFIX="auth_"
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_DRIVER=sync
-SESSION_DRIVER=database
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=mail
-MAIL_FROM_NAME=Vanguard
-MAIL_FROM_ADDRESS=vanguard@test.dev
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-# Credenziali API VisualLims
-API_BASE_URL=https://93.43.5.102/limsapi
-API_USERNAME=WebApiUser
-API_PASSWORD=webapiuser01

.env.example

@@ -1,16 +1,16 @@
 APP_ENV=production
-APP_DEBUG=false
-APP_KEY=
+APP_DEBUG=true
+APP_KEY=base64:C+sutHm6xP5sE4QXhoZFhYjArlVN11s2mDU1F8beUkM=
 APP_URL=http://vanguard.test
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=localhost
-DB_DATABASE=vanguard
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-DB_PREFIX=vg_
+DB_HOST="localhost"
+DB_DATABASE="xxxx"
+DB_USERNAME="xxxx"
+DB_PASSWORD="xxxxx"
+DB_PREFIX="auth_"
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -39,3 +39,10 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
+# Credenziali API VisualLims
+SIMULATE_EXPORT_LIMS=true
+API_BASE_URL=https://bvcpsitaly-elims.com/limsapi
+API_USERNAME=WebApiUser
+API_PASSWORD=webapiuser01
+
+BASE_URL=http://localhost:8000/userarea/

.gitignore

@@ -1,34 +1,59 @@
 .DS_Store
+
 /node_modules
-/public/hot
-/public/storage
-/storage/*.key
 /vendor
+
 /.idea
 /.fleet
 /.vscode
 /.vagrant
-Homestead.json
-Homestead.yaml
-npm-debug.log
-yarn-error.log
-.env
-.phpunit.result.cache
-.php_cs.cache
-/documentation
-/.phpunit.cache
+
+/public/hot
+/public/storage
 /public/build
+
+/storage/*.key
+
+.env
 .env.backup
 .env.production
 auth.json
-# File di debug e temporanei JSON e log
+
+.phpunit.result.cache
+.php_cs.cache
+/.phpunit.cache
+
+npm-debug.log
+yarn-error.log
+
+/documentation
+
+# --- Runtime / Debug (userarea) ---
 /public/userarea/*.json
 /public/userarea/*.log
 /public/userarea/*.txt
-
-# File di log nella sottocartella class
+/public/userarea/*_response.json
+/public/userarea/customfield_values_response.json
+/public/userarea/error_log.txt
+/public/userarea/import_debug.log
+/public/userarea/last_url.txt
+/public/userarea/logaspi/
+/public/userarea/logs/api/
+/public/userarea/logs/api/**
+/public/userarea/photostrf/
 /public/userarea/class/*.log
+/public/userarea/class/curl_auth_debug.log
+/public/userarea/class/curl_request_debug.log
 
 # File XLSX temporanei importati
 /public/userarea/imported_trf/*.xlsx
 /public/userarea/xlstemplates/*.xlsx
+
+# Cartelle foto generate
+/public/photostrf/
+/public/photostrf/qrcodes/
+
+# Ignora tutti i log ovunque
+*.log
+
+public/userarea/cache/

app/Providers/AppServiceProvider.php

@@ -32,6 +32,17 @@ class AppServiceProvider extends ServiceProvider
         });
 
         \Illuminate\Pagination\Paginator::useBootstrap();
+
+        // Register Microsoft Socialite driver
+        $this->app->make('Laravel\Socialite\Contracts\Factory')->extend('microsoft', function ($app) {
+            $config = $app['config']['services.microsoft'];
+            return new \SocialiteProviders\Microsoft\Provider(
+                $app['request'],
+                $config['client_id'],
+                $config['client_secret'],
+                $config['redirect']
+            );
+        });
     }
 
     /**

app/Providers/EventServiceProvider.php

@@ -34,6 +34,9 @@ class EventServiceProvider extends ServiceProvider
         Verified::class => [
             ActivateUser::class,
         ],
+        \SocialiteProviders\Manager\SocialiteWasMapped::class => [
+            \SocialiteProviders\Microsoft\MicrosoftExtendSocialite::class,
+        ],
     ];
 
     /**

composer.json

@@ -38,12 +38,13 @@
         "laravel/fortify": "^1.21",
         "laravel/framework": "^11.0",
         "laravel/sanctum": "^4.0",
-        "laravel/socialite": "^5.0",
+        "laravel/socialite": "^5.16",
         "laravel/tinker": "^2.7",
         "laravel/ui": "^4.0",
         "phpmailer/phpmailer": "^6.9",
         "phpoffice/phpspreadsheet": "^4.1",
         "proengsoft/laravel-jsvalidation": "^4.0.0",
+        "socialiteproviders/microsoft": "^4.7",
         "spatie/laravel-query-builder": "^5.0",
         "vanguardapp/activity-log": "^6.0",
         "vanguardapp/announcements": "^6.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ef3e05e7260284f5b7c7b4b6f93b252b",
+    "content-hash": "9c4f1e3bc3ee2180211c055e70635aef",
     "packages": [
         {
             "name": "akaunting/laravel-setting",
@@ -2240,16 +2240,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.15.1",
+            "version": "v5.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029"
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
                 "shasum": ""
             },
             "require": {
@@ -2271,16 +2271,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Laravel\\Socialite\\SocialiteServiceProvider"
-                    ],
                     "aliases": {
                         "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
-                    }
+                    },
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -2308,7 +2308,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-06-28T20:09:34+00:00"
+            "time": "2024-09-03T09:46:57+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4980,6 +4980,131 @@
             ],
             "time": "2024-04-27T21:32:50+00:00"
         },
+        {
+            "name": "socialiteproviders/manager",
+            "version": "v4.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Manager.git",
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/8180ec14bef230ec2351cff993d5d2d7ca470ef4",
+                "reference": "8180ec14bef230ec2351cff993d5d2d7ca470ef4",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+                "laravel/socialite": "^5.5",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.2",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "SocialiteProviders\\Manager\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Manager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andy Wendt",
+                    "email": "andy@awendt.com"
+                },
+                {
+                    "name": "Anton Komarev",
+                    "email": "a.komarev@cybercog.su"
+                },
+                {
+                    "name": "Miguel Piedrafita",
+                    "email": "soy@miguelpiedrafita.com"
+                },
+                {
+                    "name": "atymic",
+                    "email": "atymicq@gmail.com",
+                    "homepage": "https://atymic.dev"
+                }
+            ],
+            "description": "Easily add new or override built-in providers in Laravel Socialite.",
+            "homepage": "https://socialiteproviders.com",
+            "keywords": [
+                "laravel",
+                "manager",
+                "oauth",
+                "providers",
+                "socialite"
+            ],
+            "support": {
+                "issues": "https://github.com/socialiteproviders/manager/issues",
+                "source": "https://github.com/socialiteproviders/manager"
+            },
+            "time": "2025-02-24T19:33:30+00:00"
+        },
+        {
+            "name": "socialiteproviders/microsoft",
+            "version": "4.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Microsoft.git",
+                "reference": "824ef97a4f6e3f363c21702b76676d54e8265573"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Microsoft/zipball/824ef97a4f6e3f363c21702b76676d54e8265573",
+                "reference": "824ef97a4f6e3f363c21702b76676d54e8265573",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "firebase/php-jwt": "^6.8",
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Microsoft\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Microsoft OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "laravel",
+                "microsoft",
+                "oauth",
+                "provider",
+                "socialite"
+            ],
+            "support": {
+                "docs": "https://socialiteproviders.com/microsoft",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2025-07-06T00:25:25+00:00"
+        },
         {
             "name": "spatie/laravel-package-tools",
             "version": "1.16.4",

config/app.php

@@ -228,6 +228,7 @@ return [
         Proengsoft\JsValidation\JsValidationServiceProvider::class,
         Anhskohbo\NoCaptcha\NoCaptchaServiceProvider::class,
         Laravel\Socialite\SocialiteServiceProvider::class,
+        \SocialiteProviders\Manager\ServiceProvider::class,
         Webpatser\Countries\CountriesServiceProvider::class,
         Intervention\Image\ImageServiceProvider::class,
         Jenssegers\Agent\AgentServiceProvider::class,

config/auth.php

@@ -11,9 +11,9 @@ return [
     |
     */
 
-  //  'social' => [
-    //    'providers' => ['facebook', 'twitter', 'google'],
-   // ],
+    'social' => [
+        'providers' => ['microsoft'],
+    ],
 
     /*
     |--------------------------------------------------------------------------

config/services.php

@@ -64,6 +64,12 @@ return [
         'redirect' => env('GOOGLE_CALLBACK_URI'),
     ],
 
+    'microsoft' => [
+        'client_id' => env('MICROSOFT_CLIENT_ID'),
+        'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
+        'redirect' => env('MICROSOFT_REDIRECT_URI'),
+    ],
+
     //   'authy' => [
     //       'key' => env('AUTHY_KEY'),
     //   ],

liquibase/liquibase.properties

@@ -0,0 +1,6 @@
+# DB LOCALE (Windows 11)
+url=jdbc:mysql://localhost:3306/trfcertest
+username=solocla
+password=!Massarosa2
+driver=com.mysql.cj.jdbc.Driver
+changeLogFile=liquibase/changelog/db.changelog-master.yaml

public/languages/en/general.php

@@ -32,3 +32,4 @@ $langdatatables = [
     "paginate_next" => "Next",
     "paginate_previous" => "Previous"
 ];
+$quotationstitle = "Quotations";