ticket migration

.gitea/workflows/release.yaml

@@ -1,115 +0,0 @@
-name: Build and Release FLUX (Multi-Platform)
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  # -----------------------------------------------------------------
-  # JOB 1: WINDOWS (Gira sul PC del collega appena si libera)
-  # -----------------------------------------------------------------
-  build-windows:
-    runs-on: windows-native
-    steps:
-      - name: Checkout del codice
-        uses: actions/checkout@v3
-
-      - name: Crea file .env
-        run: |
-          Set-Content -Path ".env" -Value "${{ secrets.ENV_FILE_CONTENT }}"
-
-      - name: Build Flutter Windows
-        run: flutter build windows --release
-
-      # 1. FIRMA DELL'ESEGUIBILE RAW
-      - name: Firma Eseguibile Flutter
-        run: |
-          # Cerca dinamicamente signtool.exe nell'SDK di Windows per non sbagliare percorso
-          $Signtool = (Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\signtool.exe" | Sort-Object FullName -Descending | Select-Object -First 1).FullName
-          
-          # Sostituisci il percorso con dove hai salvato fisicamente il file .pfx sul PC del runner!
-          & $Signtool sign /f "C:\flux_privato.pfx" /p "${{ secrets.PFX_PASSWORD }}" /fd SHA256 "build\windows\x64\runner\Release\flux.exe"
-
-      - name: Build Windows Installer
-        run: |
-          $TagVersion = "${{ github.ref_name }}".Substring(1)
-          & "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "/DMyAppVersion=$TagVersion" "win_installer.iss"
-
-      # 2. FIRMA DELL'INSTALLER GENERATO DA INNO SETUP
-      - name: Firma Installer
-        run: |
-          $Signtool = (Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\signtool.exe" | Sort-Object FullName -Descending | Select-Object -First 1).FullName
-          
-          & $Signtool sign /f "C:\flux_privato.pfx" /p "${{ secrets.PFX_PASSWORD }}" /fd SHA256 "build\windows\installer\FluxInstaller.exe"
-
-      # Nel dubbio usiamo l'action per caricare l'asset
-      - name: Upload Windows Asset
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: "build/windows/installer/FluxInstaller.exe"
-          api_key: ${{ secrets.MYRELEASE_TOKEN }}
-
-      - name: Pulisci Workspace Windows
-        if: always()
-        run: Remove-Item -Recurse -Force ./*
-
-  # -----------------------------------------------------------------
-  # JOB 2: ANDROID APK (Gira sul tuo MacBook)
-  # -----------------------------------------------------------------
-  build-android:
-    runs-on: macos-runner # <--- Etichetta del tuo Mac
-    steps:
-      - name: Checkout del codice
-        uses: actions/checkout@v3
-
-      # Logica Bash per Mac: usiamo le virgolette singole forti per evitare escape strani
-      - name: Crea file .env
-        run: |
-          cat << 'EOF' > .env
-          ${{ secrets.ENV_FILE_CONTENT }}
-          EOF
-
-      - name: Build Flutter APK
-        run: flutter build apk --release
-
-      # Carichiamo l'APK universale o quelli splittati nelle release di Gitea
-      - name: Upload Android Asset
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: "build/app/outputs/flutter-apk/app-release.apk"
-          api_key: ${{ secrets.MYRELEASE_TOKEN }}
-
-      - name: Aggiorna Link Android su Supabase
-        run: |
-          curl -X PATCH "https://pvqpjloswwvtfoxbkfbh.supabase.co/rest/v1/app_config?id=eq.49f18b19-2129-46c0-b690-a97db725b5a8" -H "apikey: ${{ secrets.SUPABASE_SERVICE_KEY }}" -H "Authorization: Bearer ${{ secrets.SUPABASE_SERVICE_KEY }}" -H "Content-Type: application/json" -d "{\"download_url\": \"https://gitea.catelli.it/brontomark/flux/releases/download/${{ github.ref_name }}/app-release.apk\"}"
-
-      - name: Aggiorna Link Windows su Supabase
-        run: |
-          curl -X PATCH "https://pvqpjloswwvtfoxbkfbh.supabase.co/rest/v1/app_config?id=eq.1f888b30-5cbf-4a16-820c-5036a3af0cf8" -H "apikey: ${{ secrets.SUPABASE_SERVICE_KEY }}" -H "Authorization: Bearer ${{ secrets.SUPABASE_SERVICE_KEY }}" -H "Content-Type: application/json" -d "{\"download_url\": \"https://gitea.catelli.it/brontomark/flux/releases/download/${{ github.ref_name }}/FluxInstaller.exe\"}"
-
-
-  # -----------------------------------------------------------------
-  # JOB 3: WEB & CLOUDFLARE DEPLOY (Gira sul tuo MacBook)
-  # -----------------------------------------------------------------
-  build-web:
-    runs-on: macos-runner # <--- Etichetta del tuo Mac
-    steps:
-      - name: Checkout del codice
-        uses: actions/checkout@v3
-
-      - name: Crea file .env
-        run: |
-          cat << 'EOF' > .env
-          ${{ secrets.ENV_FILE_CONTENT }}
-          EOF
-
-      - name: Build Flutter Web
-        run: flutter build web --release
-
-      # Sfruttiamo npx (incluso in Node.js) per lanciare wrangler al volo senza installarlo globalmente
-      # Sto assumendo che usi Cloudflare Pages che è perfetto per Flutter Web statico
-      - name: Deploy su Cloudflare Pages
-        env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        run: |
-          npx wrangler pages deploy build/web --project-name="flux" --branch="main"

.gitignore

@@ -6,7 +6,7 @@
 *.env
 .DS_Store
 .atom/
-.build/*
+.build/
 .buildlog/
 .history
 .svn/

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "deno.enable": true
-}

.wrangler/cache/pages.json

@@ -1,4 +0,0 @@
-{
-  "account_id": "6badf20faeef39fa5c99283f46f07508",
-  "project_name": "flux"
-}

.wrangler/cache/wrangler-account.json

@@ -1,6 +0,0 @@
-{
-  "account": {
-    "id": "6badf20faeef39fa5c99283f46f07508",
-    "name": "Marco@catelli.it's Account"
-  }
-}

analysis_options.yaml

@@ -7,10 +7,6 @@ analyzer:
     - "lib/l10n/*.dart"
     - "**/*.g.dart" # Già che ci siamo escludiamo tutti i file generati (tipo quelli di JsonSerializable)
     - "**/*.freezed.dart"
-    - "build/**"
-    - "ios/**"
-    - "macos/**"
-    - ".dart_tool/**"
 
 linter:
   rules:

android/app/google-services.json

@@ -1,13 +1,70 @@
 {
   "project_info": {
-    "project_number": "249756116297",
+    "project_number": "872447580790",
-    "project_id": "flux-87e49",
+    "project_id": "assistenza-catelli",
-    "storage_bucket": "flux-87e49.firebasestorage.app"
+    "storage_bucket": "assistenza-catelli.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:249756116297:android:a2c3d37323752069cf2698",
+        "mobilesdk_app_id": "1:872447580790:android:193235afcc2920ce5d9d57",
+        "android_client_info": {
+          "package_name": "com.catelli.scans2"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:9c6172d77b1d2cae5d9d57",
+        "android_client_info": {
+          "package_name": "com.catellisrl.assistenza"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:425d21710d7682005d9d57",
+        "android_client_info": {
+          "package_name": "com.catellisrl.catelli_energy_comparator"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:a1d8d57960451f935d9d57",
         "android_client_info": {
           "package_name": "com.catellisrl.flux"
         }
@@ -15,7 +72,7 @@
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyA6-uX6504B3yofeo7YQwfQaS0cCDoZnvY"
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
         }
       ],
       "services": {

android/app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
     <application
         android:label="flux"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -24,11 +24,11 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="flux_deep_link">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="flux" />
+                <data android:scheme="fluxapp" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

android/gradle.properties

@@ -1,6 +1,2 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-# This builtInKotlin flag was added automatically by Flutter migrator
-android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
-android.newDsl=false

firebase.json

@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:android:a2c3d37323752069cf2698","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:ios:fe9dadca7150da16cf2698","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:ios:fe9dadca7150da16cf2698","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"flux-87e49","configurations":{"android":"1:249756116297:android:a2c3d37323752069cf2698","ios":"1:249756116297:ios:fe9dadca7150da16cf2698","macos":"1:249756116297:ios:fe9dadca7150da16cf2698","web":"1:249756116297:web:7c652e51004414b7cf2698","windows":"1:249756116297:web:b094277c2fedb425cf2698"}}}}}}
+{"flutter":{"platforms":{"android":{"default":{"projectId":"assistenza-catelli","appId":"1:872447580790:android:a1d8d57960451f935d9d57","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"assistenza-catelli","configurations":{"android":"1:872447580790:android:a1d8d57960451f935d9d57","ios":"1:872447580790:ios:a87d56c718aa61e05d9d57","macos":"1:872447580790:ios:a87d56c718aa61e05d9d57","web":"1:872447580790:web:10745e7f9afb447d5d9d57","windows":"1:872447580790:web:3b1623eda6abdac75d9d57"}}}}}}

flutter_launcher_icons.yaml

@@ -1,34 +0,0 @@
-# flutter pub run flutter_launcher_icons
-flutter_launcher_icons:
-  image_path: "assets/icon/icon.png"
-
-  android: "launcher_icon"
-  image_path_android: "assets/icon/icon.png"
-  min_sdk_android: 21 # android min sdk min:16, default 21
-  # adaptive_icon_background: "assets/icon/background.png"
-  # adaptive_icon_foreground: "assets/icon/foreground.png"
-  # adaptive_icon_foreground_inset: 16
-  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
-
-  ios: true
-  image_path_ios: "assets/icon/icon.png"
-  remove_alpha_ios: true
-  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
-  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
-  # desaturate_tinted_to_grayscale_ios: true
-  background_color_ios: "#ffffff"
-
-  web:
-    generate: true
-    image_path: "assets/icon/icon.png"
-    background_color: "#FFFFFF"
-    theme_color: "#000000"
-
-  windows:
-    generate: true
-    image_path: "assets/icon/icon.png"
-    icon_size: 256 # min:48, max:256, default: 48
-
-  macos:
-    generate: true
-    image_path: "assets/icon/icon.png"

ios/Runner.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		101B9A4BF8F30D998DDC11D4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
@@ -68,7 +67,6 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AB44F93458B7D70EE383A3A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		BDDDA09E437D9C0E7B65B3B1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -128,7 +126,6 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				F5D002C3092D87755D552D32 /* Pods */,
 				6A991A28CCED9666CA172E00 /* Frameworks */,
-				D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -270,7 +267,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-				101B9A4BF8F30D998DDC11D4 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -547,7 +543,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -604,7 +600,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,122 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024x1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/Runner/GoogleService-Info.plist

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>API_KEY</key>
-	<string>AIzaSyAllwaoNyqHsZtqfMMo9DxVS6-q7yBwWow</string>
-	<key>GCM_SENDER_ID</key>
-	<string>249756116297</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.catellisrl.flux</string>
-	<key>PROJECT_ID</key>
-	<string>flux-87e49</string>
-	<key>STORAGE_BUCKET</key>
-	<string>flux-87e49.firebasestorage.app</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:249756116297:ios:fe9dadca7150da16cf2698</string>
-</dict>
-</plist>

lib/core/blocs/session/session_cubit.dart

@@ -1,15 +1,9 @@
-import 'dart:async';
-import 'dart:io';
-
 import 'package:equatable/equatable.dart';
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/data/core_repository.dart';
 import 'package:flux/features/company/models/company_model.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
-import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:collection/collection.dart'; // Per firstWhereOrNull
@@ -45,28 +39,35 @@ class SessionCubit extends Cubit<SessionState> {
     }
 
     try {
-      // Riportiamo lo stato su initial per far girare lo spinner se stiamo riprovando
+      // 1. CHI È QUESTO UTENTE? (Vediamo se ha un profilo staff, che sia Invitato o Admin)
-      emit(state.copyWith(status: SessionStatus.initial, errorMessage: null));
-
-      // WRAP DELLA LOGICA IN UN BLOCCO PROTETTO DA TIMEOUT (10 Secondi)
-      await Future(() async {
       StaffMemberModel? staff = await _repository.getStaffMemberByUserId(
         user.id,
       );
       CompanyModel? company;
-
       if (staff != null) {
+        // --- LA MAGIA DEL SENSORE ---
         if (staff.hasJoined == false) {
-            await _repository.updateStaffMember(staff.id!, {
+          // È la primissima volta che entra! Aggiorniamo il DB.
-              'has_joined': true,
+          await _repository.updateStaffMember(staff.id!, {'has_joined': true});
-            });
+          // Aggiorniamo anche il nostro modello in memoria per questa sessione
           staff = staff.copyWith(hasJoined: true);
         }
+
         company = await _repository.getCompanyById(staff.companyId);
       } else {
+        // È l'Admin in onboarding
         company = await _repository.getCompanyByOwnerId(user.id);
       }
+      // 1. Controllo Azienda
 
+      if (staff != null) {
+        // L'utente esiste già nel sistema! Carichiamo l'azienda per cui lavora
+        company = await _repository.getCompanyById(staff.companyId);
+      } else {
+        // L'utente non ha profilo. Probabilmente è l'Admin che ha appena
+        // fatto Sign Up e sta iniziando l'Onboarding
+        company = await _repository.getCompanyByOwnerId(user.id);
+      }
       if (company == null) {
         return emit(
           state.copyWith(
@@ -79,6 +80,7 @@ class SessionCubit extends Cubit<SessionState> {
         emit(state.copyWith(company: company));
       }
 
+      // 2. Controllo Negozi
       final stores = await _repository.getStoresByCompanyId(company.id!);
       if (stores.isEmpty) {
         return emit(
@@ -93,6 +95,7 @@ class SessionCubit extends Cubit<SessionState> {
         emit(state.copyWith(currentStore: stores.first));
       }
 
+      // 3. Controllo Staff (Paziente Zero)
       if (staff == null) {
         return emit(
           state.copyWith(
@@ -104,16 +107,21 @@ class SessionCubit extends Cubit<SessionState> {
         );
       }
 
+      // --- TUTTO COMPLETATO: LOGICA DEL NEGOZIO DI DEFAULT ---
+
+      // Leggiamo l'ultimo negozio dalle SharedPreferences
       final lastStoreId = _prefs.getString(_lastStoreKey);
+
+      // Cerchiamo quel negozio nella lista. Se non c'è (magari è stato eliminato), prendiamo il primo.
       final activeStore =
           stores.firstWhereOrNull((s) => s.id == lastStoreId) ?? stores.first;
 
+      // Se non avevamo il lastStoreId salvato, salviamolo ora
       if (lastStoreId != activeStore.id && activeStore.id != null) {
         await _prefs.setString(_lastStoreKey, activeStore.id!);
       }
 
-        setIsSingleUserMode(_prefs.getBool('isSingleUserMode') ?? false);
+      // 4. BENVENUTO A BORDO
-
       emit(
         state.copyWith(
           status: SessionStatus.authenticated,
@@ -121,111 +129,20 @@ class SessionCubit extends Cubit<SessionState> {
           company: company,
           currentStore: activeStore,
           currentStaffMember: staff,
-            onboardingStep: OnboardingStep.none,
+          onboardingStep: OnboardingStep.none, // Svuotiamo l'onboarding
         ),
       );
-
-        // FCM è fuori dall'await principale, quindi va bene così
-        _registerFcmToken(companyId: company.id!, staffId: staff.id!);
-      }).timeout(
-        const Duration(seconds: 10), // Tempo massimo concesso al server
-        onTimeout: () {
-          throw TimeoutException(
-            'Il server di FLUX non risponde. Controlla la connessione.',
-          );
-        },
-      );
-    } on TimeoutException catch (e) {
-      // 🎯 BINGO! IL TIMEOUT È SCATTATO
-      debugPrint("Timeout Inizializzazione: ${e.message}");
-      emit(
-        state.copyWith(status: SessionStatus.error, errorMessage: e.message),
-      );
     } catch (e) {
-      // Altri errori generici del DB o di rete
+      // Se esplode il database, non lasciamo l'app freezata in 'initial'
-      debugPrint("Errore Inizializzazione: $e");
       emit(
         state.copyWith(
-          status: SessionStatus.error,
+          status: SessionStatus
-          errorMessage: "Si è verificato un errore di connessione imprevisto.",
+              .unauthenticated, // O un nuovo stato SessionStatus.error
         ),
       );
     }
   }
 
-  Future<void> _registerFcmToken({
-    required String companyId,
-    required String staffId,
-  }) async {
-    // Scudo anti-crash per lo sviluppo su Linux / Windows
-    if (!kIsWeb &&
-        !Platform.isAndroid &&
-        !Platform.isIOS &&
-        !Platform.isMacOS) {
-      return;
-    }
-
-    try {
-      final messaging = FirebaseMessaging.instance;
-
-      // 1. Richiesta permessi di notifica
-      final settings = await messaging.requestPermission(
-        alert: true,
-        badge: true,
-        sound: true,
-      );
-
-      if (settings.authorizationStatus == AuthorizationStatus.authorized) {
-        String? fcmToken;
-        if (kIsWeb) {
-          fcmToken = await messaging.getToken(
-            vapidKey:
-                'BLMUr7crlRghEW6iWtRZ7Y0a74OPAMG9Oh37ewhVP3_5YD9e5RHUeO79sDys6P-7KjOz6I6HiaPqNndmatQlu3g',
-          );
-        } else {
-          fcmToken = await messaging.getToken();
-        }
-
-        if (fcmToken != null) {
-          final supabase = GetIt.I.get<SupabaseClient>();
-
-          // Determiniamo la piattaforma in modo sicuro per Linux
-          String osPlatform = 'web';
-          if (!kIsWeb) {
-            if (Platform.isAndroid) osPlatform = 'android';
-            if (Platform.isIOS) osPlatform = 'ios';
-            if (Platform.isMacOS) osPlatform = 'macos';
-          }
-
-          // 3. UPSERT su Supabase condizionato dal vincolo 'fcm_token'
-          await supabase.from('staff_devices').upsert(
-            {
-              'company_id': companyId,
-              'staff_id': staffId,
-              'fcm_token': fcmToken,
-              'os_platform': osPlatform,
-              'updated_at': DateTime.now().toIso8601String(),
-            },
-            onConflict:
-                'fcm_token', // Se il token esiste già, aggiorna questa riga!
-          );
-
-          debugPrint(
-            'Dispositivo registrato con successo su FLUX Cloud. Platform: $osPlatform',
-          );
-        }
-      } else {
-        debugPrint('Permesso push negato dall\'utente.');
-      }
-    } catch (e) {
-      debugPrint('Errore durante la registrazione del dispositivo: $e');
-    }
-  }
-
-  void updateCurrentCompany(CompanyModel newCompany) {
-    emit(state.copyWith(company: newCompany));
-  }
-
   // --- FUNZIONE EXTRA: CAMBIO NEGOZIO DALLA DASHBOARD ---
   Future<void> changeStore(StoreModel newStore) async {
     if (newStore.id != null) {
@@ -243,17 +160,4 @@ class SessionCubit extends Cubit<SessionState> {
   void setIsMobileDevice(bool isMobile) {
     emit(state.copyWith(isMobileDevice: isMobile));
   }
-
-  void setIsSingleUserMode(bool isSingleUser) {
-    emit(state.copyWith(isSingleUserMode: isSingleUser));
-  }
-
-  void updateCurrentStoreLocally(StoreModel updatedStore) {
-    // Verifichiamo che l'utente stia effettivamente lavorando nel negozio appena modificato
-    if (state.currentStore != null &&
-        state.currentStore!.id == updatedStore.id) {
-      // Emettiamo il nuovo stato sovrascrivendo solo il negozio corrente
-      emit(state.copyWith(currentStore: updatedStore));
-    }
-  }
 }

lib/core/blocs/session/session_state.dart

@@ -6,7 +6,6 @@ enum SessionStatus {
   unauthenticated,
   onboardingRequired,
   authenticated,
-  error,
 }
 
 /// Definisce lo step esatto dell'onboarding (Paranoia Mode)
@@ -26,8 +25,6 @@ class SessionState extends Equatable {
   final StaffMemberModel? currentStaffMember;
   final OnboardingStep onboardingStep;
   final bool isMobileDevice;
-  final bool isSingleUserMode;
-  final String? errorMessage;
 
   const SessionState({
     this.status = SessionStatus.initial,
@@ -37,8 +34,6 @@ class SessionState extends Equatable {
     this.currentStaffMember,
     this.onboardingStep = OnboardingStep.none,
     this.isMobileDevice = false,
-    this.isSingleUserMode = false,
-    this.errorMessage,
   });
 
   /// Metodo per creare una copia dello stato modificando solo i campi necessari
@@ -50,8 +45,6 @@ class SessionState extends Equatable {
     StaffMemberModel? currentStaffMember,
     OnboardingStep? onboardingStep,
     bool? isMobileDevice,
-    bool? isSingleUserMode,
-    String? errorMessage,
   }) {
     return SessionState(
       status: status ?? this.status,
@@ -61,8 +54,6 @@ class SessionState extends Equatable {
       currentStaffMember: currentStaffMember ?? this.currentStaffMember,
       onboardingStep: onboardingStep ?? this.onboardingStep,
       isMobileDevice: isMobileDevice ?? this.isMobileDevice,
-      isSingleUserMode: isSingleUserMode ?? this.isSingleUserMode,
-      errorMessage: errorMessage ?? this.errorMessage,
     );
   }
 
@@ -75,8 +66,6 @@ class SessionState extends Equatable {
     currentStaffMember,
     onboardingStep,
     isMobileDevice,
-    isSingleUserMode,
-    errorMessage,
   ];
 
   // Helper rapidi per la UI

lib/core/data/constants.dart

@@ -0,0 +1,2 @@
+const String resetPasswordUrl =
+    'https://flux-web-invite.marco-6ba.workers.dev/';

lib/core/data/core_repository.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/foundation.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/features/company/models/company_model.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
@@ -16,7 +15,7 @@ class CoreRepository {
   Future<CompanyModel?> getCompanyByOwnerId(String userId) async {
     try {
       final response = await _supabase
-          .from(Tables.companies)
+          .from('company')
           .select()
           .eq('user_id', userId) // <-- Assicurati di avere questo campo nel DB!
           .maybeSingle();
@@ -32,7 +31,7 @@ class CoreRepository {
   Future<CompanyModel?> getCompanyById(String companyId) async {
     try {
       final response = await _supabase
-          .from(Tables.companies)
+          .from('company')
           .select()
           .eq('id', companyId)
           .maybeSingle();
@@ -47,7 +46,7 @@ class CoreRepository {
   Future<List<StoreModel>> getStoresByCompanyId(String companyId) async {
     try {
       final response = await _supabase
-          .from(Tables.stores)
+          .from('store')
           .select()
           .eq('company_id', companyId)
           .eq('is_active', true) // Buona pratica
@@ -63,7 +62,7 @@ class CoreRepository {
   Future<StaffMemberModel?> getStaffMemberByUserId(String userId) async {
     try {
       final response = await _supabase
-          .from(Tables.staffMembers)
+          .from('staff_member')
           .select()
           .eq('user_id', userId)
           .maybeSingle();
@@ -81,7 +80,7 @@ class CoreRepository {
   Future<CompanyModel> createCompany(CompanyModel company) async {
     try {
       final response = await _supabase
-          .from(Tables.companies)
+          .from('company')
           .insert(company.toMap())
           .select()
           .single();
@@ -95,7 +94,7 @@ class CoreRepository {
   Future<StoreModel> createStore(StoreModel store) async {
     try {
       final response = await _supabase
-          .from(Tables.stores)
+          .from('store')
           .insert(store.toMap())
           .select()
           .single();
@@ -109,12 +108,12 @@ class CoreRepository {
   Future<StaffMemberModel> createStaffMember(StaffMemberModel staff) async {
     try {
       final response = await _supabase
-          .from(Tables.staffMembers)
+          .from('staff_member')
           .insert(staff.toMap())
           .select()
           .single();
       final StaffMemberModel staffMember = StaffMemberModel.fromMap(response);
-      await _supabase.from(Tables.staffInStores).insert({
+      await _supabase.from('staff_in_stores').insert({
         'staff_member_id': staffMember.id,
         'store_id': GetIt.I.get<SessionCubit>().state.currentStore!.id,
       });
@@ -127,7 +126,7 @@ class CoreRepository {
 
   // Assegna un membro a un negozio
   Future<void> assignStaffToStore(String staffId, String storeId) async {
-    await _supabase.from(Tables.staffInStores).insert({
+    await _supabase.from('staff_in_stores').insert({
       'staff_member_id': staffId,
       'store_id': storeId,
     });
@@ -137,6 +136,6 @@ class CoreRepository {
     String staffId,
     Map<String, dynamic> data,
   ) async {
-    await _supabase.from(Tables.staffMembers).update(data).eq('id', staffId);
+    await _supabase.from('staff_member').update(data).eq('id', staffId);
   }
 }

lib/core/enums_and_consts/consts.dart

@@ -1,28 +0,0 @@
-class Tables {
-  static const String appConfig = 'app_config';
-  static const String attachments = 'attachments';
-  static const String brands = 'brands';
-  static const String campaigns = 'campaigns';
-  static const String companies = 'companies';
-  static const String customers = 'customers';
-  static const String documentSequences = 'document_sequences';
-  static const String models = 'models';
-  static const String notes = 'notes';
-  static const String noteCollaborators = 'note_collaborators';
-  static const String operations = 'operations';
-  static const String providerLocations = 'provider_locations';
-  static const String providers = 'providers';
-  static const String providersInStores = 'providers_in_stores';
-  static const String shippingDocuments = 'shipping_documents';
-  static const String staffInStores = 'staff_in_stores';
-  static const String staffMembers = 'staff_members';
-  static const String stores = 'stores';
-  static const String tasks = 'tasks';
-  static const String taskAssignments = 'task_assignments';
-  static const String taskReminders = 'task_reminders';
-  static const String tickets = 'tickets';
-  static const String trackings = 'trackings';
-}
-
-const String resetPasswordUrl =
-    'https://flux-web-invite.marco-6ba.workers.dev/';

lib/core/layout/app_shell.dart

@@ -1,401 +1,97 @@
 import 'package:flutter/material.dart';
-import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/utils/extensions.dart';
 import 'package:go_router/go_router.dart';
 
-// ==========================================
-// 1. IL GUSCIO (QUELLO CHE PASSI AL ROUTER)
-// ==========================================
 class AppShell extends StatelessWidget {
   final Widget child;
 
   const AppShell({super.key, required this.child});
 
+  // Calcoliamo l'indice attivo in base all'URL corrente!
+  int _calculateSelectedIndex(BuildContext context) {
+    final String location = GoRouterState.of(context).uri.path;
+    if (location.startsWith('/master-data')) return 1;
+    if (location.startsWith('/settings')) return 2;
+    return 0; // Default: Dashboard
+  }
+
+  void _onItemTapped(int index, BuildContext context) {
+    switch (index) {
+      case 0:
+        context.go('/');
+        break;
+      case 1:
+        context.go('/master-data');
+        break;
+      case 2:
+        context.go('/settings');
+        break;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    // Breakpoint a 900px: sotto è Mobile/Tablet (Drawer), sopra è Desktop (Sidebar)
+    final currentIndex = _calculateSelectedIndex(context);
-    final isDesktop = MediaQuery.sizeOf(context).width >= 900;
+    // Breakpoint: se lo schermo è più largo di 600px, usiamo la Rail laterale
-    final currentPath = GoRouterState.of(context).uri.path;
+    final isDesktop = MediaQuery.sizeOf(context).width >= 600;
 
     return Scaffold(
-      // Su mobile usiamo un'AppBar minimale per avere il bottone "Hamburger" nativo
-      appBar: isDesktop
-          ? null
-          : AppBar(
-              title: const Text(
-                "FLUX",
-                style: TextStyle(fontWeight: FontWeight.bold),
-              ),
-              centerTitle: true,
-              elevation: 0,
-              backgroundColor: Theme.of(context).colorScheme.surface,
-              surfaceTintColor: Colors.transparent,
-            ),
-      drawer: isDesktop
-          ? null
-          : Drawer(
-              // Su mobile inietta il menu qui!
-              child: AppMenu(currentPath: currentPath, isDrawer: true),
-            ),
       body: isDesktop
           ? Row(
               children: [
-                // Su desktop inietta il menu a sinistra!
+                NavigationRail(
-                AppMenu(currentPath: currentPath, isDrawer: false),
+                  selectedIndex: currentIndex,
+                  onDestinationSelected: (index) =>
+                      _onItemTapped(index, context),
+                  labelType: NavigationRailLabelType.all,
+                  destinations: [
+                    NavigationRailDestination(
+                      icon: Icon(Icons.dashboard_outlined),
+                      selectedIcon: Icon(Icons.dashboard),
+                      label: Text(context.l10n.commonDashboard),
+                    ),
+                    NavigationRailDestination(
+                      icon: Icon(Icons.folder_special_outlined),
+                      selectedIcon: Icon(Icons.folder_special),
+                      label: Text(context.l10n.commonMasterData),
+                    ),
+                    NavigationRailDestination(
+                      icon: Icon(Icons.settings_outlined),
+                      selectedIcon: Icon(Icons.settings),
+                      label: Text(context.l10n.commonSettings),
+                    ),
+                  ],
+                ),
                 const VerticalDivider(thickness: 1, width: 1),
+                // Il contenuto della pagina
                 Expanded(child: child),
               ],
             )
-          : child, // Su mobile il child prende tutto lo schermo sotto l'AppBar
+          : child, // Su mobile il contenuto prende tutto lo schermo...
-    );
+      // ... e mettiamo la barra in basso!
-  }
+      bottomNavigationBar: isDesktop
-}
+          ? null
-
+          : NavigationBar(
-class AppMenu extends StatefulWidget {
+              selectedIndex: currentIndex,
-  final String currentPath; // Lo usiamo ancora per capire cosa accendere
+              onDestinationSelected: (index) => _onItemTapped(index, context),
-  final bool isDrawer;
+              destinations: [
-
+                NavigationDestination(
-  const AppMenu({super.key, required this.currentPath, required this.isDrawer});
+                  icon: Icon(Icons.dashboard_outlined),
-
+                  selectedIcon: Icon(Icons.dashboard),
-  @override
+                  label: context.l10n.commonDashboard,
-  State<AppMenu> createState() => _AppMenuState();
-}
-
-class _AppMenuState extends State<AppMenu> {
-  bool _isCollapsed = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final bool effectivelyCollapsed = _isCollapsed && !widget.isDrawer;
-
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 200),
-      curve: Curves.easeInOut,
-      width: effectivelyCollapsed ? 72 : 260,
-      child: SafeArea(
-        child: Column(
-          children: [
-            // --- HEADER ---
-            Container(
-              height: 80,
-              padding: const EdgeInsets.symmetric(horizontal: 20.0),
-              alignment: effectivelyCollapsed
-                  ? Alignment.center
-                  : Alignment.centerLeft,
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Icon(Icons.bolt, color: theme.colorScheme.primary, size: 32),
-                  if (!effectivelyCollapsed) ...[
-                    const SizedBox(width: 12),
-                    TextButton(
-                      onPressed: () {
-                        if (widget.isDrawer) Navigator.pop(context);
-                        context.goNamed(Routes.home);
-                      },
-                      child: Text(
-                        "FLUX",
-                        style: theme.textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.bold,
                 ),
+                NavigationDestination(
+                  icon: Icon(Icons.folder_special_outlined),
+                  selectedIcon: Icon(Icons.folder_special),
+                  label: context.l10n.commonMasterData,
                 ),
+                NavigationDestination(
+                  icon: Icon(Icons.settings_outlined),
+                  selectedIcon: Icon(Icons.settings),
+                  label: context.l10n.commonSettings,
                 ),
               ],
-                ],
-              ),
-            ),
-
-            // --- VOCI DI MENU ---
-            Expanded(
-              child: SingleChildScrollView(
-                scrollDirection: Axis.horizontal,
-                physics: const NeverScrollableScrollPhysics(),
-                child: SizedBox(
-                  width: effectivelyCollapsed ? 72 : 260,
-                  child: ListView(
-                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                    children: [
-                      _buildRouteItem(
-                        title: 'Dashboard',
-                        icon: Icons.dashboard_outlined,
-                        routeName: Routes.home,
-                        pathToCheck:
-                            '/', // Il path da controllare per colorarlo
-                        isCollapsed: effectivelyCollapsed,
-                      ),
-                      const SizedBox(height: 8),
-                      // --- SEZIONE OPERATIVA ---
-                      _buildHierarchicalItem(
-                        title: 'Operatività',
-                        icon: Icons.work_outline,
-                        basePathToCheck: '/',
-                        isCollapsed: effectivelyCollapsed,
-                        subItems: [
-                          _SubMenuItem(
-                            'Operazioni',
-                            Routes.operations,
-                            '/operations',
-                          ),
-                          _SubMenuItem(
-                            'Assistenza',
-                            Routes.tickets,
-                            '/tickets',
-                          ),
-                          _SubMenuItem('Tasks', Routes.tasks, '/tasks'),
-                          _SubMenuItem('Sticky Notes', Routes.notes, '/notes'),
-                        ],
-                      ),
-
-                      const SizedBox(height: 8),
-
-                      // --- IL MENU GERARCHICO (ANAGRAFICHE) ---
-                      _buildHierarchicalItem(
-                        title: context.l10n.commonMasterData,
-                        icon: Icons.folder_special_outlined,
-                        basePathToCheck:
-                            '/master-data', // Se il path inizia così, espandi
-                        isCollapsed: effectivelyCollapsed,
-                        subItems: [
-                          _SubMenuItem(
-                            "Clienti",
-                            Routes.customers,
-                            '/master-data/customers',
-                          ),
-                          _SubMenuItem(
-                            "Fornitori",
-                            Routes.providers,
-                            '/master-data/providers',
-                          ),
-                          _SubMenuItem(
-                            "Prodotti",
-                            Routes.products,
-                            '/master-data/products',
-                          ),
-                        ],
-                      ),
-
-                      const SizedBox(height: 8),
-                      _buildRouteItem(
-                        title: context.l10n.commonSettings,
-                        icon: Icons.settings_outlined,
-                        routeName: Routes.settings,
-                        pathToCheck: '/settings',
-                        isCollapsed: effectivelyCollapsed,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-
-            // --- PULSANTE TOGGLE (Solo Desktop) ---
-            if (!widget.isDrawer)
-              Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: IconButton(
-                  tooltip: _isCollapsed ? 'Espandi Menu' : 'Riduci Menu',
-                  icon: Icon(
-                    _isCollapsed
-                        ? Icons.keyboard_double_arrow_right
-                        : Icons.keyboard_double_arrow_left,
-                    color: theme.iconTheme.color?.withValues(alpha: 0.5),
-                  ),
-                  onPressed: () {
-                    setState(() {
-                      _isCollapsed = !_isCollapsed;
-                    });
-                  },
-                ),
-              ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  // ==========================================
-  // WIDGET HELPER AGGIORNATI
-  // ==========================================
-
-  Widget _buildRouteItem({
-    required String title,
-    required IconData icon,
-    required String routeName,
-    required String pathToCheck,
-    required bool isCollapsed,
-  }) {
-    final isSelected = widget.currentPath == pathToCheck;
-    final theme = Theme.of(context);
-
-    if (isCollapsed) {
-      return Tooltip(
-        message: title,
-        preferBelow: false,
-        child: InkWell(
-          onTap: () {
-            if (widget.isDrawer) Navigator.pop(context);
-            context.goNamed(routeName); // <--- goNamed!
-          },
-          borderRadius: BorderRadius.circular(8),
-          child: Container(
-            height: 48,
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: isSelected
-                  ? theme.colorScheme.primaryContainer.withValues(alpha: 0.4)
-                  : Colors.transparent,
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: Icon(
-              icon,
-              color: isSelected ? theme.colorScheme.primary : null,
-            ),
-          ),
-        ),
-      );
-    }
-
-    return ListTile(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-      selectedTileColor: theme.colorScheme.primaryContainer.withValues(
-        alpha: 0.4,
-      ),
-      selected: isSelected,
-      leading: Icon(icon, color: isSelected ? theme.colorScheme.primary : null),
-      title: Text(
-        title,
-        style: TextStyle(
-          fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
-        ),
-        maxLines: 1,
-        overflow: TextOverflow.clip,
-      ),
-      onTap: () {
-        if (widget.isDrawer) Navigator.pop(context);
-        context.goNamed(routeName); // <--- goNamed!
-      },
-    );
-  }
-
-  Widget _buildHierarchicalItem({
-    required String title,
-    required IconData icon,
-    required String basePathToCheck,
-    required bool isCollapsed,
-    required List<_SubMenuItem> subItems,
-  }) {
-    final isSelected = subItems.any(
-      (item) => widget.currentPath.startsWith(item.pathToCheck),
-    );
-    final theme = Theme.of(context);
-
-    if (isCollapsed) {
-      return PopupMenuButton<String>(
-        tooltip: title,
-        offset: const Offset(60, 0),
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-        onSelected: (routeName) {
-          // Il routeName arriva dal value del menu
-          if (widget.isDrawer) Navigator.pop(context);
-          context.goNamed(routeName); // <--- goNamed!
-        },
-        itemBuilder: (context) => subItems
-            .map(
-              (item) => PopupMenuItem(
-                value: item
-                    .routeName, // Passiamo il nome della rotta (Routes.customers)
-                child: Text(
-                  item.title,
-                  style: TextStyle(
-                    fontWeight: widget.currentPath == item.pathToCheck
-                        ? FontWeight.bold
-                        : FontWeight.normal,
-                    color: widget.currentPath == item.pathToCheck
-                        ? theme.colorScheme.primary
-                        : null,
-                  ),
-                ),
-              ),
-            )
-            .toList(),
-        child: Container(
-          height: 48,
-          alignment: Alignment.center,
-          decoration: BoxDecoration(
-            color: isSelected
-                ? theme.colorScheme.primaryContainer.withValues(alpha: 0.4)
-                : Colors.transparent,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: Icon(
-            icon,
-            color: isSelected ? theme.colorScheme.primary : null,
-          ),
-        ),
-      );
-    }
-
-    return Theme(
-      data: theme.copyWith(dividerColor: Colors.transparent),
-      child: ExpansionTile(
-        initiallyExpanded: isSelected,
-        maintainState: true,
-        tilePadding: const EdgeInsets.symmetric(horizontal: 16),
-        leading: Icon(
-          icon,
-          color: isSelected ? theme.colorScheme.primary : null,
-        ),
-        title: Text(
-          title,
-          style: TextStyle(
-            fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
-          ),
-          maxLines: 1,
-          overflow: TextOverflow.clip,
-        ),
-        children: subItems.map((item) {
-          final isSubSelected = widget.currentPath == item.pathToCheck;
-          return Padding(
-            padding: const EdgeInsets.only(left: 32.0, bottom: 4.0),
-            child: ListTile(
-              dense: true,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-              ),
-              selectedTileColor: theme.colorScheme.primaryContainer.withValues(
-                alpha: 0.2,
-              ),
-              selected: isSubSelected,
-              title: Text(
-                item.title,
-                style: TextStyle(
-                  fontWeight: isSubSelected
-                      ? FontWeight.bold
-                      : FontWeight.normal,
-                  color: isSubSelected
-                      ? theme.colorScheme.primary
-                      : theme.textTheme.bodyMedium?.color,
-                ),
-                maxLines: 1,
-                overflow: TextOverflow.clip,
-              ),
-              onTap: () {
-                if (widget.isDrawer) Navigator.pop(context);
-                context.goNamed(item.routeName); // <--- goNamed!
-              },
-            ),
-          );
-        }).toList(),
             ),
     );
   }
 }
-
-// Struttura dati per le voci dei sottomenu aggiornata
-class _SubMenuItem {
-  final String title;
-  final String routeName; // Es: Routes.customers
-  final String pathToCheck; // Es: '/master-data/customers'
-  _SubMenuItem(this.title, this.routeName, this.pathToCheck);
-}

lib/core/routes/app_router.dart

@@ -4,113 +4,62 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/data/core_repository.dart';
 import 'package:flux/core/layout/app_shell.dart';
-import 'package:flux/core/routes/routes.dart';
+import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/core/widgets/image_upload/blocs/image_upload_cubit.dart';
+import 'package:flux/core/widgets/set_password_screen.dart';
-import 'package:flux/core/widgets/image_upload/ui/image_upload_screen.dart';
-import 'package:flux/core/widgets/image_upload/ui/upload_success_screen.dart';
 import 'package:flux/features/auth/ui/auth_screen.dart';
-import 'package:flux/features/auth/ui/set_password_screen.dart';
+import 'package:flux/features/customers/blocs/customer_files_bloc.dart';
-import 'package:flux/features/company/bloc/company_settings_cubit.dart';
+import 'package:flux/features/customers/blocs/customers_cubit.dart';
-import 'package:flux/features/company/ui/company_settings_screen.dart';
-import 'package:flux/features/customers/blocs/customer_form_cubit.dart';
-import 'package:flux/features/customers/blocs/customers_list_cubit.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
 import 'package:flux/features/customers/ui/customer_detail_screen.dart';
-import 'package:flux/features/customers/ui/customer_form_screen.dart';
+import 'package:flux/features/customers/ui/customer_mobile_upload_screen.dart';
-import 'package:flux/features/customers/ui/customers_list_screen.dart';
+import 'package:flux/features/customers/ui/customers_content.dart';
-import 'package:flux/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart';
-import 'package:flux/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_cubit.dart';
-import 'package:flux/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_cubit.dart';
-import 'package:flux/features/home/dashboard_task_list/blocs/dashboard_task_list_cubit.dart';
 import 'package:flux/features/home/ui/home_screen.dart';
 import 'package:flux/features/master_data/master_data_hub_content.dart';
 import 'package:flux/features/master_data/products/blocs/product_cubit.dart';
 import 'package:flux/features/master_data/products/ui/products_screen.dart';
-import 'package:flux/features/master_data/providers/blocs/provider_form_cubit.dart';
+import 'package:flux/features/master_data/providers/blocs/provider_cubit.dart';
-import 'package:flux/features/master_data/providers/blocs/provider_list_cubit.dart';
+import 'package:flux/features/master_data/providers/ui/providers_master_data_screen.dart';
-import 'package:flux/features/master_data/providers/models/provider_model.dart';
-import 'package:flux/features/master_data/providers/ui/provider_form_screen.dart';
-import 'package:flux/features/master_data/providers/ui/provider_list_screen.dart';
 import 'package:flux/features/master_data/staff/blocs/staff_cubit.dart';
-import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/master_data/staff/ui/staff_screen.dart';
-import 'package:flux/features/master_data/store/bloc/store_cubit.dart';
 import 'package:flux/features/master_data/store/ui/stores_screen.dart';
-import 'package:flux/features/notes/models/note_model.dart';
-import 'package:flux/features/notes/ui/notes_form_screen.dart';
-import 'package:flux/features/notes/ui/notes_list_screen.dart';
 import 'package:flux/features/onboarding/blocs/onboarding_cubit.dart';
 import 'package:flux/features/onboarding/ui/onboarding_screen.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
+import 'package:flux/features/operations/blocs/operation_files_bloc.dart';
-import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:flux/features/operations/ui/operation_form_screen.dart';
-import 'package:flux/features/operations/ui/operation_list_screen.dart';
+import 'package:flux/features/operations/ui/operation_mobile_upload_screen.dart';
-import 'package:flux/features/settings/blocs/reminder_defaults_cubit.dart';
+import 'package:flux/features/operations/ui/operations_screen.dart';
-import 'package:flux/features/settings/ui/reminder_settings_screen.dart';
-import 'package:flux/features/settings/ui/settings_screen.dart';
-import 'package:flux/features/settings/ui/theme_settings_view.dart';
-import 'package:flux/features/tasks/blocs/task_form_cubit.dart';
-import 'package:flux/features/tasks/blocs/task_list_cubit.dart';
-import 'package:flux/features/tasks/models/task_model.dart';
-import 'package:flux/features/tasks/ui/task_form_screen.dart';
-import 'package:flux/features/tasks/ui/task_list_screen.dart';
-import 'package:flux/features/tickets/blocs/ticket_form_cubit.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:flux/features/tickets/ui/ticket_form_screen.dart';
-import 'package:flux/features/tickets/ui/ticket_list_screen.dart';
-import 'package:flux/features/tickets/ui/ticket_workspace/ticket_workspace_screen.dart';
-import 'package:flux/features/tracking/blocs/tracking_cubit.dart';
-import 'package:flux/features/tracking/models/tracking_model.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
+// Nota: Dovrai creare questi placeholder o file per non avere errori di compilazione
+// import 'package:flux/features/master_data/master_data_hub_screen.dart';
+// import 'package:flux/features/master_data/staff/ui/staff_screen.dart';
+// import 'package:flux/features/master_data/store/ui/stores_screen.dart';
+
 class AppRouter {
-  // 1. CREIAMO LA CHIAVE GLOBALE DEL NAVIGATORE
-  static final GlobalKey<NavigatorState> rootNavigatorKey =
-      GlobalKey<NavigatorState>();
-  static String? pendingRoute;
   static GoRouter createRouter(SessionCubit sessionCubit) {
     return GoRouter(
-      navigatorKey: rootNavigatorKey,
       initialLocation: '/',
       refreshListenable: GoRouterRefreshStream(sessionCubit.stream),
-
       redirect: (context, state) {
         final sessionState = sessionCubit.state;
         final isGoingToLogin = state.matchedLocation == '/login';
         final isGoingToOnboarding = state.matchedLocation == '/onboarding';
         final isGoingToSetPassword = state.matchedLocation == '/set-password';
 
-        // 1. LA PASSATOIA VIP (DEVE ESSERE IN CIMA)
-        // Usiamo state.uri.path perché state.matchedLocation a volte fa i capricci coi deep link iniziali
-        final isPublicRoute = state.uri.path.startsWith('/upload');
-
-        if (isPublicRoute) {
-          // Ritorna null esplicitamente per dire al router "Rimani qui e non fare altri controlli"
-          return null;
-        }
-
-        // 2. CONTROLLO INIZIALE
-        // Se la sessione sta ancora caricando la primissima volta (es. splash screen logico)
         if (sessionState.status == SessionStatus.initial) return null;
 
-        // 3. UTENTE NON LOGGATO (Ma ci arriva solo se non è su /upload)
         if (sessionState.status == SessionStatus.unauthenticated) {
-          // Se sta già andando alle uniche altre pagine pubbliche, lascialo andare
           if (isGoingToLogin || isGoingToSetPassword) return null;
-          // Altrimenti bloccalo e mandalo al login
           return '/login';
         }
 
-        // 4. UTENTE LOGGATO MA DEVE COMPLETARE L'ONBOARDING
         if (sessionState.status == SessionStatus.onboardingRequired) {
           return isGoingToOnboarding ? null : '/onboarding';
         }
 
-        // 5. UTENTE PERFETTAMENTE LOGGATO E OPERATIVO
         if (sessionState.status == SessionStatus.authenticated) {
-          // Se per sbaglio cerca di tornare al login o all'onboarding, ributtalo in dashboard
           if (isGoingToLogin || isGoingToOnboarding) return '/';
           return null;
         }
@@ -121,17 +70,14 @@ class AppRouter {
         // --- ROTTE DI SERVIZIO (FUORI DALLA SHELL) ---
         GoRoute(
           path: '/login',
-          name: Routes.login,
           builder: (context, state) => const AuthScreen(),
         ),
         GoRoute(
           path: '/set-password',
-          name: Routes.setPassword,
           builder: (context, state) => const SetPasswordScreen(),
         ),
         GoRoute(
           path: '/onboarding',
-          name: Routes.onboarding,
           builder: (context, state) => BlocProvider(
             create: (context) => OnboardingCubit(
               GetIt.I.get<SessionCubit>(),
@@ -145,464 +91,143 @@ class AppRouter {
         ShellRoute(
           builder: (context, state, child) => AppShell(child: child),
           routes: [
-            // ==========================================
             // 1. DASHBOARD
-            // ==========================================
+            GoRoute(path: '/', builder: (context, state) => const HomeScreen()),
-            GoRoute(
-              path: '/',
-              name: Routes.home,
-              builder: (context, state) {
-                return MultiBlocProvider(
-                  providers: [
-                    BlocProvider<DashboardStoreOperationListCubit>(
-                      create: (context) => DashboardStoreOperationListCubit(
-                        companyId: sessionCubit.state.company?.id,
-                        storeId: sessionCubit.state.currentStore?.id,
-                      ),
-                    ),
-                    BlocProvider<DashboardTaskListCubit>(
-                      create: (context) => DashboardTaskListCubit(
-                        companyId: sessionCubit.state.company?.id,
-                        staffId: sessionCubit.state.currentStaffMember?.id,
-                      ),
-                    ),
-                    BlocProvider<DashboardStoreTicketListCubit>(
-                      create: (context) => DashboardStoreTicketListCubit(
-                        companyId: sessionCubit.state.company?.id,
-                        storeId: sessionCubit.state.currentStore?.id,
-                      ),
-                    ),
-                    BlocProvider<DashboardNoteListCubit>(
-                      create: (context) => DashboardNoteListCubit(
-                        companyId: sessionCubit.state.company?.id,
-                        staffId: sessionCubit.state.currentStaffMember?.id,
-                      ),
-                    ),
-                  ],
-                  child: const HomeScreen(),
-                );
-              },
-            ),
 
-            // ==========================================
             // 2. HUB ANAGRAFICHE E SOTTO-ROTTE
-            // ==========================================
             GoRoute(
               path: '/master-data',
-              name: Routes.masterData,
               builder: (context, state) => const MasterDataHubScreen(),
               routes: [
                 GoRoute(
-                  path:
+                  path: 'products', // Diventa /master-data/products
-                      'customers', // Niente slash iniziale per le sottorotte! -> /master-data/customers
-                  name: Routes.customers,
-                  builder: (context, state) => const CustomersListScreen(),
-                ),
-                GoRoute(
-                  path: 'providers', // -> /master-data/providers
-                  name: Routes.providers,
-                  builder: (context, state) => const ProviderListScreen(),
-                ),
-                GoRoute(
-                  path: 'products', // -> /master-data/products
-                  name: Routes.products,
                   builder: (context, state) {
                     context.read<ProductsCubit>().refreshCubit();
+
                     return const ProductsScreen();
                   },
                 ),
                 GoRoute(
-                  path: 'staff', // -> /master-data/staff
+                  path: 'staff', // Diventa /master-data/staff
-                  name: Routes.staff,
                   builder: (context, state) => const StaffScreen(),
                 ),
                 GoRoute(
-                  path:
+                  path: 'stores', // Diventa /master-data/stores
-                      'stores', // Sistemata l'inversione path/name -> /master-data/stores
+                  builder: (context, state) => const StoresScreen(),
-                  name: Routes.stores,
-                  builder: (context, state) {
-                    context.read<ProviderListCubit>().loadAllProviders();
-                    context.read<StoreCubit>().loadStores();
-                    return const StoresScreen();
-                  },
                 ),
                 GoRoute(
-                  path: 'company-settings', // -> /master-data/company-settings
+                  path: 'providers', // Diventa /master-data/providers
-                  name: Routes.companySettings,
+                  builder: (context, state) =>
-                  builder: (context, state) => BlocProvider(
+                      const ProvidersMasterDataScreen(),
-                    create: (context) => CompanySettingsCubit(),
-                    child: const CompanySettingsScreen(),
-                  ),
                 ),
               ],
             ),
 
-            // ==========================================
             // 3. IMPOSTAZIONI
-            // ==========================================
             GoRoute(
               path: '/settings',
-              name: Routes.settings,
+              builder: (context, state) => Scaffold(
-              builder: (context, state) => const SettingsScreen(),
+                appBar: AppBar(title: Text(context.l10n.commonSettings)),
-              routes: [
+                body: Center(
-                GoRoute(
+                  child: ElevatedButton.icon(
-                  path: 'themeSettings', // -> /settings/themeSettings
+                    onPressed: () => context.read<SessionCubit>().signOut(),
-                  name: Routes.themeSettings,
+                    icon: const Icon(Icons.logout),
-                  builder: (context, state) => const ThemeSettingsView(),
+                    label: const Text("Esci da FLUX"),
-                ),
+                  ),
-                GoRoute(
-                  path: 'reminderSettings',
-                  name: Routes.reminderSettings,
-                  builder: (context, state) =>
-                      BlocProvider<ReminderDefaultsCubit>(
-                        create: (context) => ReminderDefaultsCubit(),
-
-                        child: const ReminderSettingsScreen(),
                 ),
               ),
-              ],
             ),
-
-            // ==========================================
-            // 4. SCHERMATE PRINCIPALI EXTRA NELLA SHELL
-            // (Accessibili ad es. dalla dashboard, mantengono la sidebar)
-            // ==========================================
             GoRoute(
               path: '/operations',
-              name: Routes.operations,
+              builder: (context, state) => const OperationsScreen(),
-              builder: (context, state) => const OperationListScreen(),
             ),
             GoRoute(
-              path: '/tickets',
+              path: '/customers',
-              name: Routes.tickets,
+              builder: (context, state) =>
-              builder: (context, state) => const TicketListScreen(),
+                  const CustomersContent(), // O come si chiama il tuo widget della lista!
-            ),
-            GoRoute(
-              path: '/notes',
-              name: Routes.notes,
-              builder: (context, state) => const NotesListScreen(),
-            ),
-            GoRoute(
-              path: '/tasks',
-              name: Routes.tasks,
-              builder: (context, state) {
-                // 1. Recuperiamo lo stato della sessione per le dipendenze
-                final sessionState = context.read<SessionCubit>().state;
-
-                // Sicurezza: Se per qualche motivo non abbiamo l'azienda,
-                // qui potresti reindirizzare o gestire l'errore
-                final companyId = sessionState.company?.id;
-                if (companyId == null) {
-                  return const Scaffold(
-                    body: Center(child: Text("Errore: Azienda non trovata")),
-                  );
-                }
-
-                // 2. Iniettiamo il Cubit con tutto ciò che gli serve
-                return BlocProvider(
-                  create: (context) => TaskListCubit(
-                    currentCompanyId: companyId,
-                    currentStoreId: sessionState
-                        .currentStore
-                        ?.id, // Opzionale: filtra per negozio se l'utente è "dentro" uno store
-                  ),
-                  child: const TaskListScreen(),
-                );
-              },
             ),
           ],
         ),
 
         // --- DETTAGLI E OPERATIVITÀ (FUORI DALLA SHELL - TUTTO SCHERMO) ---
         GoRoute(
-          path: '/providers/form',
+          path: '/customer/:id',
-          name: Routes.providerForm,
-          builder: (context, state) {
-            // Estraiamo il fornitore (se stiamo modificando e non creando)
-            final existingProvider = state.extra as ProviderModel?;
-
-            return BlocProvider<ProviderFormCubit>(
-              // Inizializziamo un Cubit NUOVO ogni volta che apriamo il form
-              create: (context) => ProviderFormCubit(),
-              child: ProviderFormScreen(existingProvider: existingProvider),
-            );
-          },
-        ),
-        GoRoute(
-          // Il path sarà es. /tickets/form/123 oppure /tickets/form/new
-          path: '/tickets/form/:id',
-          name: Routes.ticketForm,
-          builder: (context, state) {
-            // 1. Leggiamo l'ID dall'URL
-            final String pathId = state.pathParameters['id'] ?? 'new';
-
-            // 2. CAST DA NINJA (Aggiungi i punti interrogativi!)
-            final record =
-                state.extra
-                    as ({StaffMemberModel? createdBy, TicketModel? ticket})?;
-
-            // 3. LOGICA SOBRIA
-            final String? realTicketId;
-
-            if (pathId == 'new') {
-              realTicketId = null;
-            } else if (record?.ticket?.id != null) {
-              // <-- Parentesi TONDE per la condizione, GRAFFE per il blocco!
-              realTicketId = record!.ticket!.id;
-            } else {
-              realTicketId = pathId;
-            }
-            if (realTicketId != null) {
-              context.read<TrackingCubit>().loadTrackings(
-                realTicketId,
-                TrackingParentType.ticket,
-              );
-            }
-            context.read<CustomersListCubit>().loadCustomers();
-            context.read<ProductsCubit>().loadModels();
-            context.read<ProductsCubit>().loadBrands();
-
-            return MultiBlocProvider(
-              providers: [
-                BlocProvider(
-                  create: (context) => AttachmentsBloc(
-                    parentType: AttachmentParentType.ticket,
-                    parentId: realTicketId,
-                  ),
-                ),
-                BlocProvider(
-                  create: (context) => TicketFormCubit(
-                    // Passiamo il creatore e l'eventuale ticket esistente presi dal Record!
-                    createdBy: record?.createdBy,
-                    existingTicket: record?.ticket,
-                  ),
-                ),
-              ],
-
-              child: TicketFormScreen(
-                ticketId: realTicketId,
-                existingTicket: record?.ticket,
-              ),
-            );
-          },
-        ),
-        GoRoute(
-          path: '/tickets/workspace/:id',
-          name: Routes.ticketWorkspace,
-          builder: (context, state) {
-            // 1. Recuperiamo il Cubit vivo dall'extra
-            final formCubit = state.extra as TicketFormCubit?;
-
-            // 2. Controllo di sicurezza (fondamentale per Flutter Web)
-            if (formCubit != null) {
-              return BlocProvider.value(
-                value: formCubit,
-                child: const TicketWorkspaceScreen(),
-              );
-            } else {
-              // SCENARIO REFRESH WEB:
-              // Se l'utente preme F5 del browser mentre è nel banco da lavoro,
-              // l'extra viene distrutto e diventa null.
-              // In questo caso, gli diciamo elegantemente che la sessione è persa
-              // e lo invitiamo a tornare indietro, oppure restituisci direttamente
-              // un blocco di redirect!
-              return const Scaffold(
-                body: Center(
-                  child: Text(
-                    'Sessione di lavoro scaduta. Torna alla lista e riapri il ticket.',
-                  ),
-                ),
-              );
-            }
-          },
-        ),
-        GoRoute(
-          path: '/upload-success',
-          name: Routes.uploadSuccess,
-          builder: (context, state) => const UploadSuccessScreen(),
-        ),
-        GoRoute(
-          path: '/customer/details/:id',
-          name: Routes.customerDetails,
           builder: (context, state) {
             final customer = state.extra as CustomerModel;
             return BlocProvider(
-              create: (context) => AttachmentsBloc(
+              create: (context) => CustomerFilesBloc(customer.id!),
-                parentType: AttachmentParentType.customer,
-                parentId: customer.id,
-              ),
               child: CustomerDetailScreen(customer: customer),
             );
           },
         ),
         GoRoute(
-          path: '/customer/form/:id',
+          path: '/customer/:id/upload',
-          name: Routes.customerForm,
           builder: (context, state) {
-            final String pathId = state.pathParameters['id'] ?? 'new';
+            final customerId = state.pathParameters['id']!;
-            final String? realCustomerId;
+            final customerName = state.uri.queryParameters['name'] ?? 'Cliente';
-            if (pathId == 'new') {
-              realCustomerId = null;
-            } else {
-              realCustomerId = pathId;
-            }
-            final customer = state.extra as CustomerModel?;
-
             return BlocProvider(
-              create: (context) => CustomerFormCubit(
+              create: (context) => CustomerFilesBloc(customerId),
-                existingCustomer: customer,
+              child: CustomerMobileUploadScreen(
-                customerId: realCustomerId,
+                customerId: customerId,
-              ),
+                customerName: customerName,
-              child: CustomerFormScreen(
-                customer: customer,
-                customerId: realCustomerId,
               ),
             );
           },
         ),
-
         GoRoute(
-          path: '/operations/form/:id',
+          path: '/operation-form',
-          name: Routes.operationForm,
+          name: 'operation-form',
           builder: (context, state) {
-            final String pathId = state.pathParameters['id'] ?? 'new';
+            final existingOperation = state.extra as OperationModel?;
-
+            final operationId = state.uri.queryParameters['operationId'];
-            final record =
-                state.extra
-                    as ({
-                      StaffMemberModel? createdBy,
-                      OperationModel? operation,
-                    })?;
-
-            final String? realOperationId;
-            if (pathId == 'new') {
-              realOperationId = null;
-            } else if (record?.operation?.id != null) {
-              realOperationId = record!.operation!.id;
-            } else {
-              realOperationId = pathId;
-            }
             final currentStoreId = GetIt.I
                 .get<SessionCubit>()
                 .state
                 .currentStore!
                 .id!;
-            context.read<CustomersListCubit>().loadCustomers();
+            context.read<CustomersCubit>().loadCustomers();
-            context.read<ProviderListCubit>().loadProviders(currentStoreId);
+            context.read<ProvidersCubit>().loadActiveProvidersForStore(
+              currentStoreId,
+            );
             context.read<ProductsCubit>().loadModels();
             context.read<ProductsCubit>().loadBrands();
-            return MultiBlocProvider(
+            context.read<StaffCubit>().loadStaffForStore(currentStoreId);
-              providers: [
+
-                BlocProvider(
+            return BlocProvider(
-                  create: (context) => AttachmentsBloc(
+              create: (context) => OperationFilesBloc(
-                    parentId: realOperationId,
+                operationId: operationId ?? existingOperation?.id,
-                    parentType: AttachmentParentType.operation,
               ),
-                ),
-                BlocProvider(
-                  create: (context) => OperationFormCubit(
-                    createdBy: record?.createdBy,
-                    existingOperation: record?.operation,
-                  ),
-                ),
-              ],
               child: OperationFormScreen(
-                operationId: realOperationId,
+                operationId: operationId ?? existingOperation?.id,
-                existingOperation: record?.operation,
+                existingOperation: existingOperation,
-              ),
-            );
-          },
-        ),
-
-        GoRoute(
-          path: '/upload/:type/:id',
-          name: Routes.upload,
-          builder: (context, state) {
-            final typeString = state.pathParameters['type']!;
-            final id = state.pathParameters['id']!;
-            final companyId = state.uri.queryParameters['companyId']!;
-
-            // Trasformiamo la stringa dell'URL nel nostro amato Enum!
-            final parentType = AttachmentParentType.values.firstWhere(
-              (e) => e.name == typeString,
-              orElse: () =>
-                  AttachmentParentType.ticket, // Fallback di sicurezza
-            );
-
-            // Creiamo il BLoC "al volo" solo per questa schermata
-            return MultiBlocProvider(
-              providers: [
-                BlocProvider<AttachmentsBloc>(
-                  create: (context) =>
-                      AttachmentsBloc(parentId: id, parentType: parentType),
-                ),
-                BlocProvider(create: (context) => ImageUploadCubit()),
-              ],
-
-              child: ImageUploadScreen(
-                title: 'Caricamento Rapido',
-                companyId: companyId,
               ),
             );
           },
         ),
         GoRoute(
-          path: '/notes/edit/:id',
+          path: '/operation/:id/upload',
-          name: Routes.noteForm,
           builder: (context, state) {
-            final id = state.pathParameters['id']!;
+            final operationId = state.pathParameters['id']!;
-            final NoteModel note = state.extra as NoteModel;
+            final operationName =
-
+                state.uri.queryParameters['name'] ?? 'Pratica';
-            // Creiamo il BLoC "al volo" solo per questa schermata
+            final currentStoreId = GetIt.I
-            return MultiBlocProvider(
+                .get<SessionCubit>()
-              providers: [
+                .state
-                BlocProvider<AttachmentsBloc>(
+                .currentStore!
-                  create: (context) => AttachmentsBloc(
+                .id!;
-                    parentId: id,
+            context.read<CustomersCubit>().loadCustomers();
-                    parentType: AttachmentParentType.note,
+            context.read<ProvidersCubit>().loadActiveProvidersForStore(
-                  ),
+              currentStoreId,
-                ),
-              ],
-
-              child: NoteFormScreen(note: note),
             );
-          },
+            context.read<ProductsCubit>().loadModels();
+            context.read<ProductsCubit>().loadBrands();
+            context.read<StaffCubit>().loadStaffForStore(currentStoreId);
+            return BlocProvider(
+              create: (context) => OperationFilesBloc(operationId: operationId),
+              child: OperationMobileUploadScreen(
+                operationId: operationId,
+                operationName: operationName,
               ),
-        GoRoute(
-          path: '/tasks/form/:id',
-          name: Routes.taskForm,
-          builder: (context, state) {
-            final String pathId = state.pathParameters['id'] ?? 'new';
-            final TaskModel? task = state.extra as TaskModel?;
-            final String? realTaskId;
-            if (pathId == 'new') {
-              realTaskId = null;
-            } else if (task?.id != null) {
-              realTaskId = task!.id;
-            } else {
-              realTaskId = pathId;
-            }
-
-            List<StaffMemberModel>? preloadedStaff;
-            try {
-              preloadedStaff = context.read<StaffCubit>().state.allStaff;
-            } catch (_) {
-              preloadedStaff = null; // Fallback se la rotta è isolata
-            }
-
-            // Creiamo il BLoC "al volo" solo per questa schermata
-            return MultiBlocProvider(
-              providers: [
-                BlocProvider<TaskFormCubit>(
-                  create: (context) => TaskFormCubit(
-                    existingTask: task,
-                    initialTaskId: realTaskId,
-                    allStaff: preloadedStaff,
-                  ),
-                ),
-              ],
-
-              child: TaskFormScreen(),
             );
           },
         ),

lib/core/routes/routes.dart

@@ -1,30 +0,0 @@
-class Routes {
-  static const String login = 'login';
-  static const String setPassword = 'set-password';
-  static const String onboarding = 'onboarding';
-  static const String home = 'home';
-  static const String masterData = 'master-data';
-  static const String products = 'products';
-  static const String companySettings = 'company-settings';
-  static const String staff = 'staff';
-  static const String stores = 'stores';
-  static const String providers = 'providers';
-  static const String providerForm = 'provider-form';
-  static const String settings = 'settings';
-  static const String themeSettings = 'themeSettings';
-  static const String operations = 'operations';
-  static const String customers = 'customers';
-  static const String tickets = 'tickets';
-  static const String ticketForm = 'ticket-form';
-  static const String operationForm = 'operation-form';
-  static const String uploadSuccess = 'upload-success';
-  static const String customerForm = 'customer-form';
-  static const String customerDetails = 'customer-details';
-  static const String upload = 'upload';
-  static const String ticketWorkspace = 'ticket-workspace';
-  static const String noteForm = 'note-form';
-  static const String notes = 'notes';
-  static const String tasks = 'tasks';
-  static const String taskForm = 'task-form';
-  static const String reminderSettings = 'reminder-settings';
-}

lib/core/services/notification_service.dart

@@ -1,36 +0,0 @@
-import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flux/core/routes/app_router.dart';
-import 'package:go_router/go_router.dart';
-
-// Chiamala dopo l'autenticazione o nel main()
-Future<void> setupInteractedMessage() async {
-  // CASO A: L'app era completamente CHIUSA e viene aperta tappando la notifica
-  RemoteMessage? initialMessage = await FirebaseMessaging.instance
-      .getInitialMessage();
-  if (initialMessage != null) {
-    _handleNotificationTap(initialMessage);
-  }
-
-  // CASO B: L'app era in BACKGROUND (minimizzata) e l'utente tappa la notifica
-  FirebaseMessaging.onMessageOpenedApp.listen(_handleNotificationTap);
-}
-
-void _handleNotificationTap(RemoteMessage message) {
-  final eventType = message.data['eventType'];
-  final referenceId = message.data['referenceId'];
-
-  if (eventType == 'task_assigned' && referenceId != null) {
-    final routePath = '/tasks/form/$referenceId';
-    final context = AppRouter.rootNavigatorKey.currentContext;
-
-    if (context != null) {
-      // Scenario A: App già aperta, naviga all'istante
-      context.push(routePath);
-    } else {
-      // Scenario B: App chiusa. Il contesto non c'è ancora, congeliamo la rotta!
-      debugPrint("App in fase di avvio. Congelo la rotta: $routePath");
-      AppRouter.pendingRoute = routePath;
-    }
-  }
-}

lib/core/theme/bloc/theme_bloc.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flux/core/enums_and_consts/enums.dart';
+import 'package:flux/core/enums/enums.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/core/utils/debouncer.dart

@@ -1,18 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-
-class Debouncer {
-  final int milliseconds;
-  Timer? _timer;
-
-  Debouncer({required this.milliseconds});
-
-  void run(VoidCallback action) {
-    _timer?.cancel();
-    _timer = Timer(Duration(milliseconds: milliseconds), action);
-  }
-
-  void dispose() {
-    _timer?.cancel();
-  }
-}

lib/core/utils/version_check_service.dart

@@ -1,94 +0,0 @@
-import 'dart:io';
-import 'package:flutter/foundation.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
-
-class VersionCheckService {
-  Future<String?> checkForceUpdate() async {
-    try {
-      // 1. Capiamo su che piattaforma sta girando l'app in questo istante
-      String currentPlatform = _getCurrentPlatform();
-
-      // 2. Recuperiamo SOLO la riga corrispondente alla nostra piattaforma
-      final dbResponse = await Supabase.instance.client
-          .from('app_config')
-          .select('min_version, download_url')
-          .eq('platform', currentPlatform)
-          .maybeSingle(); // Usiamo maybeSingle così se non c'è la riga non crasha
-
-      if (dbResponse == null) {
-        return null; // Nessuna regola per questa piattaforma
-      }
-
-      String minVersionFromDb = dbResponse['min_version'] as String;
-      String downloadUrl = dbResponse['download_url'] as String;
-
-      // 3. Recuperiamo la versione locale di Flutter
-      PackageInfo packageInfo = await PackageInfo.fromPlatform();
-      String localVersionRaw = packageInfo.version;
-
-      // 🥷 TRUCCO 1: Pulizia totale dai build number (+37) o tag "v"
-      String cleanLocal = localVersionRaw
-          .split('+')
-          .first
-          .replaceAll('v', '')
-          .trim();
-      String cleanDb = minVersionFromDb
-          .split('+')
-          .first
-          .replaceAll('v', '')
-          .trim();
-
-      // 🥷 TRUCCO 2: Confronto Semantico Reale
-      if (_isVersionLower(current: cleanLocal, minimum: cleanDb)) {
-        // Ritorna il link VERO per questa specifica piattaforma preso dal CSV!
-        return downloadUrl;
-      }
-
-      return null;
-    } catch (e) {
-      debugPrint("Errore durante il check versione: $e");
-      return null;
-    }
-  }
-
-  // Helper ninja per mappare le piattaforme in base alle stringhe del tuo DB
-  String _getCurrentPlatform() {
-    if (kIsWeb) return 'web';
-    if (Platform.isAndroid) return 'android';
-    if (Platform.isIOS) return 'ios';
-    if (Platform.isWindows) return 'windows';
-    if (Platform.isMacOS) return 'macos';
-    if (Platform.isLinux) return 'linux';
-    return 'unknown';
-  }
-
-  // Il motore matematico (resta invariato)
-  bool _isVersionLower({required String current, required String minimum}) {
-    if (current == minimum) return false;
-
-    List<int> currentParts = current
-        .split('.')
-        .map((e) => int.tryParse(e) ?? 0)
-        .toList();
-    List<int> minParts = minimum
-        .split('.')
-        .map((e) => int.tryParse(e) ?? 0)
-        .toList();
-
-    while (currentParts.length < 3) {
-      currentParts.add(0);
-    }
-    while (minParts.length < 3) {
-      minParts.add(0);
-    }
-
-    if (currentParts[0] != minParts[0]) {
-      return currentParts[0] < minParts[0];
-    }
-    if (currentParts[1] != minParts[1]) {
-      return currentParts[1] < minParts[1];
-    }
-    return currentParts[2] < minParts[2];
-  }
-}

lib/core/widgets/flux_text_field.dart

@@ -21,7 +21,6 @@ class FluxTextField extends StatefulWidget {
   final TextCapitalization? textCapitalization;
   final bool? autocorrect;
   final bool? enabled;
-  final Iterable<String>? autofillHints;
 
   const FluxTextField({
     super.key, // Usiamo super.key per Flutter moderno
@@ -42,7 +41,6 @@ class FluxTextField extends StatefulWidget {
     this.textCapitalization,
     this.autocorrect,
     this.enabled = true,
-    this.autofillHints,
   });
 
   @override
@@ -120,7 +118,6 @@ class _FluxTextFieldState extends State<FluxTextField> {
 
       textCapitalization: widget.textCapitalization ?? TextCapitalization.none,
       enabled: widget.enabled,
-      autofillHints: widget.autofillHints,
     );
   }
 }

lib/core/widgets/image_upload/blocs/image_upload_cubit.dart

@@ -1,60 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:image_picker/image_picker.dart';
-
-part 'image_upload_state.dart';
-
-class ImageUploadCubit extends Cubit<ImageUploadState> {
-  ImageUploadCubit() : super(const ImageUploadState());
-
-  void setStatus(ImageUploadStatus status) {
-    emit(state.copyWith(status: status));
-  }
-
-  void setError(String? message) {
-    emit(
-      state.copyWith(status: ImageUploadStatus.failure, errorMessage: message),
-    );
-  }
-
-  void addFiles(List<PlatformFile> files) {
-    List<PlatformFile> newFiles = List.from(state.stagedFiles);
-    newFiles.addAll(files);
-    emit(
-      state.copyWith(status: ImageUploadStatus.success, stagedFiles: newFiles),
-    );
-  }
-
-  void removeFile(PlatformFile file) {
-    List<PlatformFile> newFiles = List.from(state.stagedFiles);
-    newFiles.remove(file);
-    emit(
-      state.copyWith(status: ImageUploadStatus.success, stagedFiles: newFiles),
-    );
-  }
-
-  Future<void> addPhoto(XFile photo) async {
-    final List<PlatformFile> files = List.from(state.stagedFiles);
-    files.add(PlatformFile(name: photo.name, size: 0));
-    emit(
-      state.copyWith(
-        status: ImageUploadStatus.addingPicture,
-        stagedFiles: files,
-      ),
-    );
-    final List<PlatformFile> newFiles = List.from(files);
-    newFiles.removeLast();
-    final PlatformFile loadedFile = PlatformFile(
-      name: photo.name,
-      size: await photo.length(),
-      bytes: await photo.readAsBytes(),
-      path: photo.path,
-    );
-    newFiles.add(loadedFile);
-
-    emit(
-      state.copyWith(status: ImageUploadStatus.success, stagedFiles: newFiles),
-    );
-  }
-}

lib/core/widgets/image_upload/blocs/image_upload_state.dart

@@ -1,29 +0,0 @@
-part of 'image_upload_cubit.dart';
-
-enum ImageUploadStatus { initial, addingPicture, uploading, success, failure }
-
-class ImageUploadState extends Equatable {
-  final ImageUploadStatus status;
-  final String? errorMessage;
-  final List<PlatformFile> stagedFiles;
-
-  const ImageUploadState({
-    this.status = ImageUploadStatus.initial,
-    this.errorMessage,
-    this.stagedFiles = const [],
-  });
-  ImageUploadState copyWith({
-    ImageUploadStatus? status,
-    String? errorMessage,
-    List<PlatformFile>? stagedFiles,
-  }) {
-    return ImageUploadState(
-      status: status ?? this.status,
-      errorMessage: errorMessage,
-      stagedFiles: stagedFiles ?? this.stagedFiles,
-    );
-  }
-
-  @override
-  List<Object?> get props => [status, errorMessage, stagedFiles];
-}

lib/core/widgets/image_upload/ui/image_upload_screen.dart

@@ -1,306 +0,0 @@
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/core/widgets/image_upload/blocs/image_upload_cubit.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:image_picker/image_picker.dart';
-
-class ImageUploadScreen extends StatelessWidget {
-  final String title;
-  final String companyId;
-
-  const ImageUploadScreen({
-    super.key,
-    required this.title,
-    required this.companyId,
-  });
-
-  bool _isImage(String path) {
-    return ['jpg', 'jpeg', 'png', 'webp'].contains(path.fileExtension());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ImageUploadCubit, ImageUploadState>(
-      builder: (context, state) {
-        return BlocListener<AttachmentsBloc, AttachmentsState>(
-          listener: (context, attachmentState) {
-            if (attachmentState.status == AttachmentsStatus.success &&
-                state.status == ImageUploadStatus.uploading) {
-              if (Navigator.of(context).canPop()) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text("File caricati con successo! ✅"),
-                  ),
-                );
-                Navigator.of(context).pop();
-              } else {
-                context.go('/upload-success');
-              }
-            }
-            if (attachmentState.status == AttachmentsStatus.failure) {
-              context.read<ImageUploadCubit>().setError(attachmentState.error);
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(content: Text("Errore: ${state.errorMessage}")),
-              );
-            }
-          },
-          child: Scaffold(
-            appBar: AppBar(
-              title: Text('Upload: $title'),
-              automaticallyImplyLeading:
-                  state.status != ImageUploadStatus.uploading,
-            ),
-            body: Stack(
-              children: [
-                Column(
-                  children: [
-                    // --- SEZIONE PULSANTI (Fotocamera / Galleria) ---
-                    Padding(
-                      padding: const EdgeInsets.all(16.0),
-                      child: Row(
-                        children: [
-                          Expanded(
-                            child: ElevatedButton.icon(
-                              onPressed:
-                                  state.status == ImageUploadStatus.uploading
-                                  ? null
-                                  : () => _handleCamera(context),
-                              icon: const Icon(Icons.camera_alt),
-                              label: const Text('SCATTA'),
-                              style: ElevatedButton.styleFrom(
-                                padding: const EdgeInsets.symmetric(
-                                  vertical: 16,
-                                ),
-                              ),
-                            ),
-                          ),
-                          Expanded(
-                            child: OutlinedButton.icon(
-                              onPressed:
-                                  state.status == ImageUploadStatus.uploading
-                                  ? null
-                                  : () => _handleFilePicker(context),
-                              icon: const Icon(Icons.folder),
-                              label: const Text("GALLERIA"),
-                              style: OutlinedButton.styleFrom(
-                                padding: const EdgeInsets.symmetric(
-                                  vertical: 16,
-                                ),
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-
-                    const Divider(),
-
-                    // --- SEZIONE ANTEPRIME (La GridView Magica) ---
-                    Expanded(
-                      child: state.stagedFiles.isEmpty
-                          ? const Center(
-                              child: Text(
-                                "Nessun file selezionato.\nScatta una foto o scegli dalla galleria.",
-                                textAlign: TextAlign.center,
-                                style: TextStyle(color: Colors.grey),
-                              ),
-                            )
-                          : GridView.builder(
-                              padding: const EdgeInsets.all(16),
-                              gridDelegate:
-                                  const SliverGridDelegateWithFixedCrossAxisCount(
-                                    crossAxisCount:
-                                        3, // 3 colonne stile galleria
-                                    crossAxisSpacing: 12,
-                                    mainAxisSpacing: 12,
-                                  ),
-                              itemCount: state.stagedFiles.length,
-                              itemBuilder: (context, index) {
-                                final file = state.stagedFiles[index];
-                                final isImg = _isImage(file.name);
-                                if (file.bytes == null) {
-                                  return Container(
-                                    width: double.infinity,
-                                    height: double.infinity,
-                                    decoration: BoxDecoration(
-                                      color: Colors.grey.shade200,
-                                      borderRadius: BorderRadius.circular(12),
-                                      border: Border.all(
-                                        color: Colors.grey.shade300,
-                                      ),
-                                    ),
-                                    child: ClipRRect(
-                                      borderRadius: BorderRadius.circular(12),
-                                      child: const Center(
-                                        child: CircularProgressIndicator(
-                                          color: Colors.blue,
-                                        ),
-                                      ),
-                                    ),
-                                  );
-                                }
-                                return Stack(
-                                  clipBehavior: Clip.none,
-                                  children: [
-                                    // L'ANTEPRIMA
-                                    Container(
-                                      width: double.infinity,
-                                      height: double.infinity,
-                                      decoration: BoxDecoration(
-                                        color: Colors.grey.shade200,
-                                        borderRadius: BorderRadius.circular(12),
-                                        border: Border.all(
-                                          color: Colors.grey.shade300,
-                                        ),
-                                      ),
-                                      child: ClipRRect(
-                                        borderRadius: BorderRadius.circular(12),
-                                        child: isImg
-                                            ? (file.bytes != null
-                                                  // Se abbiamo i bytes (es. scatto da fotocamera) usiamo quelli (a prova di Web!)
-                                                  ? Image.memory(
-                                                      file.bytes!,
-                                                      fit: BoxFit.cover,
-                                                    )
-                                                  // Altrimenti andiamo di file fisico
-                                                  : const Center(
-                                                      child:
-                                                          CircularProgressIndicator(
-                                                            color: Colors.blue,
-                                                          ),
-                                                    ))
-                                            : const Column(
-                                                mainAxisAlignment:
-                                                    MainAxisAlignment.center,
-                                                children: [
-                                                  Icon(
-                                                    Icons.picture_as_pdf,
-                                                    color: Colors.red,
-                                                    size: 36,
-                                                  ),
-                                                  SizedBox(height: 4),
-                                                  Text(
-                                                    "PDF",
-                                                    style: TextStyle(
-                                                      fontSize: 10,
-                                                      fontWeight:
-                                                          FontWeight.bold,
-                                                    ),
-                                                  ),
-                                                ],
-                                              ),
-                                      ),
-                                    ),
-
-                                    // IL PULSANTE CESTINO (In alto a destra)
-                                    Positioned(
-                                      top: -8,
-                                      right: -8,
-                                      child: GestureDetector(
-                                        onTap: () => context
-                                            .read<ImageUploadCubit>()
-                                            .removeFile(file),
-                                        child: Container(
-                                          padding: const EdgeInsets.all(4),
-                                          decoration: const BoxDecoration(
-                                            color: Colors.red,
-                                            shape: BoxShape.circle,
-                                          ),
-                                          child: const Icon(
-                                            Icons.close,
-                                            color: Colors.white,
-                                            size: 16,
-                                          ),
-                                        ),
-                                      ),
-                                    ),
-                                  ],
-                                );
-                              },
-                            ),
-                    ),
-                    // --- SEZIONE INVIA E CHIUDI ---
-                    SafeArea(
-                      child: Padding(
-                        padding: const EdgeInsets.all(16.0),
-                        child: SizedBox(
-                          width: double.infinity,
-                          height: 56,
-                          child: ElevatedButton.icon(
-                            // Il pulsante si accende SOLO se ci sono file nel carrello
-                            onPressed:
-                                state.stagedFiles.isEmpty ||
-                                    state.status == ImageUploadStatus.uploading
-                                ? null
-                                : () => _submitAllFiles(context),
-                            icon: const Icon(Icons.cloud_upload),
-                            label: Text(
-                              "INVIA ${state.stagedFiles.length} FILE E CHIUDI",
-                              style: const TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                            style: ElevatedButton.styleFrom(
-                              backgroundColor: Theme.of(
-                                context,
-                              ).colorScheme.primary,
-                              foregroundColor: Theme.of(
-                                context,
-                              ).colorScheme.onPrimary,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  // --- LOGICA FOTOCAMERA E LIBRERIA ---
-  Future<void> _handleCamera(BuildContext context) async {
-    final ImageUploadCubit imageUploadCubit = context.read<ImageUploadCubit>();
-
-    final picker = ImagePicker();
-    final photo = await picker.pickImage(source: ImageSource.camera);
-
-    if (photo != null) {
-      imageUploadCubit.addPhoto(photo);
-    }
-  }
-
-  Future<void> _handleFilePicker(BuildContext context) async {
-    final ImageUploadCubit imageUploadCubit = context.read<ImageUploadCubit>();
-    final result = await FilePicker.pickFiles(
-      allowMultiple: true,
-      withData: true,
-    );
-    if (result != null) {
-      imageUploadCubit.addFiles(result.files);
-    }
-  }
-
-  // --- LOGICA DI INVIO AL BLoC ---
-  void _submitAllFiles(BuildContext context) {
-    final ImageUploadCubit imageUploadCubit = context.read<ImageUploadCubit>();
-
-    imageUploadCubit.setStatus(ImageUploadStatus.uploading);
-
-    // Lanciamo l'evento del nostro nuovo AttachmentsBloc Agnostico!
-    context.read<AttachmentsBloc>().add(
-      UploadAttachmentsEvent(
-        pickedFiles: imageUploadCubit.state.stagedFiles,
-        companyId: companyId,
-      ),
-    );
-  }
-}

lib/core/widgets/image_upload/ui/upload_success_screen.dart

@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-
-class UploadSuccessScreen extends StatelessWidget {
-  const UploadSuccessScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.green.shade50,
-      body: Center(
-        child: Padding(
-          padding: const EdgeInsets.all(24.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Container(
-                padding: const EdgeInsets.all(24),
-                decoration: BoxDecoration(
-                  color: Colors.green,
-                  shape: BoxShape.circle,
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.green.withValues(alpha: 0.3),
-                      blurRadius: 20,
-                      spreadRadius: 5,
-                    ),
-                  ],
-                ),
-                child: const Icon(Icons.check, size: 80, color: Colors.white),
-              ),
-              const SizedBox(height: 32),
-              const Text(
-                "Upload Completato!",
-                style: TextStyle(
-                  fontSize: 28,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.green,
-                ),
-              ),
-              const SizedBox(height: 16),
-              const Text(
-                "I file sono stati caricati con successo sulla pratica.\nPuoi chiudere questa pagina o finestra del browser.",
-                textAlign: TextAlign.center,
-                style: TextStyle(fontSize: 16, color: Colors.black54),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/core/widgets/qr_upload_dialog.dart

@@ -1,7 +1,5 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
 class QrUploadDialog extends StatelessWidget {
@@ -19,13 +17,7 @@ class QrUploadDialog extends StatelessWidget {
     // Usiamo i colori del tema per renderlo coerente col tuo design
     final theme = Theme.of(context);
 
-    return BlocListener<AttachmentsBloc, AttachmentsState>(
+    return AlertDialog(
-      listener: (context, state) {
-        Navigator.of(context).pop();
-      },
-      listenWhen: (previous, current) =>
-          previous.allFiles.length < current.allFiles.length,
-      child: AlertDialog(
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
       backgroundColor: theme.colorScheme.surface,
       title: Column(
@@ -56,6 +48,7 @@ class QrUploadDialog extends StatelessWidget {
                 style: TextStyle(fontSize: 14, color: Colors.grey),
               ),
               const SizedBox(height: 24),
+              // IL CUORE DELLA MAGIA
               Container(
                 padding: const EdgeInsets.all(16),
                 decoration: BoxDecoration(
@@ -96,7 +89,6 @@ class QrUploadDialog extends StatelessWidget {
         ),
       ],
       actionsAlignment: MainAxisAlignment.center,
-      ),
     );
   }
 }

lib/core/widgets/set_password_screen.dart

@@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:flux/core/utils/extensions.dart';
+import 'package:flux/core/widgets/flux_text_field.dart';
+import 'package:get_it/get_it.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+import 'package:go_router/go_router.dart';
+
+class SetPasswordScreen extends StatefulWidget {
+  const SetPasswordScreen({super.key});
+
+  @override
+  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
+}
+
+class _SetPasswordScreenState extends State<SetPasswordScreen> {
+  final _passwordCtrl = TextEditingController();
+  bool _isLoading = false;
+
+  @override
+  void dispose() {
+    _passwordCtrl.dispose();
+    super.dispose();
+  }
+
+  Future<void> _savePassword() async {
+    final newPassword = _passwordCtrl.text.trim();
+    if (newPassword.length < 6) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(context.l10n.setPasswordScreenAtLeast6Chars)),
+      );
+      return;
+    }
+
+    setState(() => _isLoading = true);
+
+    try {
+      // 1. Aggiorniamo la password dell'utente (che Supabase ha già loggato grazie al link della mail)
+      await GetIt.I.get<SupabaseClient>().auth.updateUser(
+        UserAttributes(password: newPassword),
+      );
+
+      // 2. Finito! Lo mandiamo alla home o facciamo ricaricare la sessione al SessionCubit
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(context.l10n.setPasswordScreenPasswordSetWelcome),
+          ),
+        );
+        context.go('/'); // Rimandiamo al router principale
+      }
+    } on AuthException catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(context.l10n.authError(e.message))),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(context.l10n.commonError(e.toString()))),
+        );
+      }
+    } finally {
+      if (mounted) setState(() => _isLoading = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.l10n.setPasswordScreenWelcomeInFlux),
+        automaticallyImplyLeading:
+            false, // Non può tornare indietro, deve mettere la password!
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const Icon(Icons.lock_reset, size: 80, color: Colors.blueAccent),
+            const SizedBox(height: 24),
+            Text(
+              context.l10n.setPasswordScreenSetPassword,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              context.l10n.setPasswordInviteAcceptedChoosePassword,
+              textAlign: TextAlign.center,
+              style: TextStyle(color: Colors.grey),
+            ),
+            const SizedBox(height: 32),
+            FluxTextField(
+              controller: _passwordCtrl,
+              label: context.l10n.commonNewPassword,
+              icon: Icons.lock,
+              isPassword: true,
+            ),
+            const SizedBox(height: 32),
+            ElevatedButton(
+              onPressed: _isLoading ? null : _savePassword,
+              style: ElevatedButton.styleFrom(
+                padding: const EdgeInsets.symmetric(vertical: 16),
+              ),
+              child: _isLoading
+                  ? const CircularProgressIndicator(color: Colors.white)
+                  : Text(
+                      context.l10n.setPasswordScreenSaveAndStart,
+                      style: TextStyle(fontSize: 16),
+                    ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/core/widgets/shared_forms/customer_section.dart

@@ -1,361 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/routes/routes.dart';
-import 'package:flux/features/customers/blocs/customer_form_cubit.dart';
-import 'package:flux/features/customers/blocs/customers_list_cubit.dart';
-import 'package:flux/features/customers/models/customer_model.dart';
-import 'package:flux/features/customers/ui/quick_customer_dialog.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SharedCustomerSection extends StatelessWidget {
-  final CustomerModel? customer;
-  final ValueChanged<CustomerModel> onCustomerSelected;
-
-  const SharedCustomerSection({
-    super.key,
-    this.customer,
-    required this.onCustomerSelected,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final hasCustomer = customer != null && customer!.id!.isNotEmpty;
-    final theme = Theme.of(context);
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(bottom: 12.0),
-          child: Text(
-            'Cliente',
-            style: theme.textTheme.titleLarge?.copyWith(
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-        ),
-        InkWell(
-          onTap: () => _showCustomerModal(context), // Passiamo il context!
-          child: Container(
-            padding: const EdgeInsets.all(16),
-            decoration: BoxDecoration(
-              border: Border.all(color: theme.colorScheme.primary),
-              borderRadius: BorderRadius.circular(8),
-              color: theme.colorScheme.primaryContainer.withValues(alpha: 0.2),
-            ),
-            child: Row(
-              children: [
-                const Icon(Icons.person),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: Text(
-                    hasCustomer ? customer!.name : 'Seleziona Cliente *',
-                    style: TextStyle(
-                      fontWeight: hasCustomer
-                          ? FontWeight.bold
-                          : FontWeight.normal,
-                      color: hasCustomer ? null : Colors.grey,
-                    ),
-                  ),
-                ),
-                const Icon(Icons.search),
-
-                if (hasCustomer) ...[
-                  const SizedBox(width: 12),
-                  IconButton(
-                    onPressed: () async {
-                      final updatedCustomer = await context.pushNamed(
-                        Routes.customerForm,
-                        pathParameters: {'id': customer!.id!},
-                        extra: customer,
-                      );
-                      if (updatedCustomer != null &&
-                          updatedCustomer is CustomerModel) {
-                        onCustomerSelected(updatedCustomer);
-                      }
-                    },
-                    icon: const Icon(Icons.edit),
-                  ),
-                ],
-              ],
-            ),
-          ),
-        ),
-        if (hasCustomer &&
-            (customer!.phoneNumber.isNotEmpty ||
-                customer!.email.isNotEmpty)) ...[
-          const SizedBox(height: 12), // Un po' più di respiro dal box sopra
-          // Mettiamo i contatti in un Container con un po' di stile per farli sembrare una "Contact Card" integrata
-          Container(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-            decoration: BoxDecoration(
-              color: Colors.grey.withValues(alpha: 0.05), // Sfondo leggerissimo
-              borderRadius: BorderRadius.circular(8),
-              border: Border.all(color: Colors.grey.withValues(alpha: 0.2)),
-            ),
-            child: Column(
-              children: [
-                // --- RIGA TELEFONO ---
-                if (customer!.phoneNumber.isNotEmpty)
-                  Row(
-                    children: [
-                      // Usiamo i pulsanti "Small" per non occupare troppo spazio verticale
-                      IconButton(
-                        visualDensity: VisualDensity.compact,
-                        onPressed: () => launchUrl(
-                          Uri.parse('https://wa.me/39${customer!.phoneNumber}'),
-                        ),
-                        icon: const FaIcon(
-                          FontAwesomeIcons.whatsapp,
-                          color: Colors.green,
-                          size: 20,
-                        ),
-                        tooltip: 'Invia WhatsApp',
-                      ),
-                      const SizedBox(width: 8),
-                      Expanded(
-                        // Expanded evita l'overflow se il numero è assurdamente lungo
-                        child: SelectableText(
-                          customer!.phoneNumber,
-                          style: const TextStyle(
-                            fontSize: 14,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                      ),
-                      IconButton(
-                        visualDensity: VisualDensity.compact,
-                        onPressed: () {
-                          Clipboard.setData(
-                            ClipboardData(text: customer!.phoneNumber),
-                          );
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text('Telefono copiato!'),
-                              duration: Duration(seconds: 2),
-                            ),
-                          );
-                        },
-                        icon: const Icon(
-                          Icons.copy,
-                          size: 18,
-                          color: Colors.grey,
-                        ),
-                        tooltip: 'Copia',
-                      ),
-                    ],
-                  ),
-
-                // Sezione divisoria se ci sono entrambi
-                if (customer!.phoneNumber.isNotEmpty &&
-                    customer!.email.isNotEmpty)
-                  const Divider(height: 8, thickness: 0.5),
-
-                // --- RIGA EMAIL ---
-                if (customer!.email.isNotEmpty)
-                  Row(
-                    children: [
-                      IconButton(
-                        visualDensity: VisualDensity.compact,
-                        onPressed: () => launchUrl(
-                          Uri.parse('mailto:${customer!.email}'),
-                        ), // Rimosso il // dopo mailto:, è più sicuro
-                        icon: const FaIcon(
-                          FontAwesomeIcons.envelope,
-                          color: Colors.blue,
-                          size: 20,
-                        ),
-                        tooltip: 'Invia Email',
-                      ),
-                      const SizedBox(width: 8),
-                      Expanded(
-                        // L'Expanded è vitale per le email che possono essere lunghissime
-                        child: SelectableText(
-                          customer!.email,
-                          style: const TextStyle(
-                            fontSize: 14,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                      ),
-                      IconButton(
-                        visualDensity: VisualDensity.compact,
-                        onPressed: () {
-                          Clipboard.setData(
-                            ClipboardData(text: customer!.email),
-                          );
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text('Email copiata!'),
-                              duration: Duration(seconds: 2),
-                            ),
-                          );
-                        },
-                        icon: const Icon(
-                          Icons.copy,
-                          size: 18,
-                          color: Colors.grey,
-                        ),
-                        tooltip: 'Copia',
-                      ),
-                    ],
-                  ),
-              ],
-            ),
-          ),
-        ],
-      ],
-    );
-  }
-
-  // --- MODALE SELEZIONE CLIENTE ---
-  void _showCustomerModal(BuildContext context) {
-    String currentSearchQuery = '';
-
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      builder: (modalContext) {
-        return DraggableScrollableSheet(
-          initialChildSize: 0.8,
-          minChildSize: 0.5,
-          maxChildSize: 0.95,
-          expand: false,
-          builder: (_, scrollController) {
-            return Column(
-              children: [
-                // Header
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        'Seleziona Cliente',
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Navigator.pop(modalContext),
-                      ),
-                    ],
-                  ),
-                ),
-                // Barra di Ricerca
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: TextField(
-                    autofocus: true,
-                    decoration: InputDecoration(
-                      hintText: 'Cerca per nome, telefono o email...',
-                      prefixIcon: const Icon(Icons.search),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                    ),
-                    onChanged: (query) {
-                      currentSearchQuery = query;
-                      context.read<CustomersListCubit>().searchCustomers(query);
-                    },
-                  ),
-                ),
-                // Pulsante Nuovo Cliente
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: ElevatedButton.icon(
-                    style: ElevatedButton.styleFrom(
-                      minimumSize: const Size.fromHeight(48),
-                    ),
-                    icon: const Icon(Icons.person_add),
-                    label: const Text('Crea Nuovo Cliente'),
-                    onPressed: () async {
-                      // APRIAMO LA DIALOG RAPIDA CON LA MAGIA DEL BLOC PROVIDER
-                      final newCustomer = await showDialog(
-                        context: context,
-                        builder: (dialogContext) {
-                          return BlocProvider.value(
-                            value: context.read<CustomersListCubit>(),
-                            child: BlocProvider<CustomerFormCubit>(
-                              create: (context) => CustomerFormCubit(),
-                              child: QuickCustomerDialog(
-                                initialQuery:
-                                    currentSearchQuery, // <-- Passiamo quello che ha digitato!
-                              ),
-                            ),
-                          );
-                        },
-                      );
-
-                      // Se l'ha creato davvero (e non ha premuto annulla)...
-                      if (newCustomer != null) {
-                        // 1. Aggiorniamo il form delle operazioni
-                        onCustomerSelected(newCustomer);
-
-                        // 2. Chiudiamo la BottomSheet dei clienti per tornare alla form!
-                        if (context.mounted) {
-                          Navigator.pop(modalContext);
-                        }
-                      }
-                    },
-                  ),
-                ),
-                const Divider(),
-                // Lista Clienti dal Bloc
-                Expanded(
-                  child: BlocBuilder<CustomersListCubit, CustomersListState>(
-                    builder: (context, state) {
-                      if (state.status == CustomersListStatus.loading) {
-                        return const Center(child: CircularProgressIndicator());
-                      }
-                      if (state.customers.isEmpty) {
-                        return const Center(
-                          child: Text(
-                            'Nessun cliente trovato.',
-                            style: TextStyle(color: Colors.grey),
-                          ),
-                        );
-                      }
-
-                      return ListView.builder(
-                        controller: scrollController,
-                        itemCount: state.customers.length,
-                        itemBuilder: (context, index) {
-                          final customer = state.customers[index];
-                          return ListTile(
-                            leading: CircleAvatar(
-                              child: Text(
-                                customer.name.substring(0, 1).toUpperCase(),
-                              ),
-                            ),
-                            title: Text(
-                              customer.name,
-                              style: const TextStyle(
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                            subtitle: Text(
-                              '${customer.phoneNumber} • ${customer.email}',
-                            ),
-                            onTap: () {
-                              onCustomerSelected(customer);
-                              Navigator.pop(modalContext);
-                            },
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}

lib/core/widgets/shared_forms/model_section.dart

@@ -1,172 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/master_data/products/blocs/product_cubit.dart';
-import 'package:flux/features/master_data/products/ui/quick_product_dialog.dart';
-
-class SharedModelSection extends StatelessWidget {
-  final String? modelId;
-  final String? modelName;
-  final String label;
-  final Color? backgroundColor;
-  final Color? borderColor;
-
-  // Usiamo una callback che passa direttamente ID e Nome
-  // così non dobbiamo preoccuparci di importare la classe esatta del modello ovunque
-  final void Function(String id, String name) onModelSelected;
-
-  const SharedModelSection({
-    super.key,
-    required this.modelId,
-    required this.modelName,
-    required this.onModelSelected,
-    this.label = 'Seleziona Modello',
-    this.backgroundColor,
-    this.borderColor,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final hasModel = modelId != null && modelId!.isNotEmpty;
-
-    return ListTile(
-      tileColor: backgroundColor,
-      title: Text(label),
-      subtitle: Text(
-        hasModel ? modelName! : 'Nessun modello selezionato',
-        style: TextStyle(
-          color: hasModel ? null : Colors.grey,
-          fontWeight: hasModel ? FontWeight.bold : FontWeight.normal,
-        ),
-      ),
-      trailing: const Icon(Icons.arrow_drop_down),
-      shape: RoundedRectangleBorder(
-        side: BorderSide(color: borderColor ?? theme.dividerColor),
-        borderRadius: BorderRadius.circular(8),
-      ),
-      onTap: () => _showModelModal(context),
-    );
-  }
-
-  void _showModelModal(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      builder: (modalContext) {
-        return DraggableScrollableSheet(
-          initialChildSize: 0.6,
-          minChildSize: 0.4,
-          maxChildSize: 0.9,
-          expand: false,
-          builder: (_, scrollController) {
-            return Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        'Seleziona Modello',
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Navigator.pop(modalContext),
-                      ),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: TextField(
-                    autofocus: true,
-                    textInputAction: TextInputAction.search,
-                    decoration: InputDecoration(
-                      hintText: 'Cerca modello (es. iPhone 15...)',
-                      prefixIcon: const Icon(Icons.search),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                    ),
-                    onChanged: (query) =>
-                        context.read<ProductsCubit>().searchModels(query),
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: ElevatedButton.icon(
-                    style: ElevatedButton.styleFrom(
-                      minimumSize: const Size.fromHeight(48),
-                    ),
-                    icon: const Icon(Icons.add),
-                    label: const Text('Aggiungi Modello al Volo'),
-                    onPressed: () async {
-                      // Leggiamo i brand dal Cubit per passarli alla dialog
-                      final existingBrands = context
-                          .read<ProductsCubit>()
-                          .state
-                          .brands;
-
-                      final newModel = await showDialog(
-                        context: context,
-                        builder: (dialogContext) {
-                          return BlocProvider.value(
-                            value: context.read<ProductsCubit>(),
-                            child: QuickProductDialog(
-                              existingBrands: existingBrands,
-                            ),
-                          );
-                        },
-                      );
-
-                      if (newModel != null) {
-                        // CHIAMIAMO LA CALLBACK!
-                        onModelSelected(newModel.id, newModel.nameWithBrand);
-                        if (context.mounted) Navigator.pop(modalContext);
-                      }
-                    },
-                  ),
-                ),
-                const Divider(),
-                Expanded(
-                  child: BlocBuilder<ProductsCubit, ProductState>(
-                    builder: (context, state) {
-                      return ListView.builder(
-                        controller: scrollController,
-                        itemCount: state.models.length,
-                        itemBuilder: (context, index) {
-                          final deviceModel = state.models[index];
-                          return ListTile(
-                            leading: const Icon(Icons.devices),
-                            title: Text(
-                              deviceModel.nameWithBrand,
-                              style: const TextStyle(
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                            onTap: () {
-                              // CHIAMIAMO LA CALLBACK!
-                              onModelSelected(
-                                deviceModel.id!,
-                                deviceModel.nameWithBrand,
-                              );
-                              Navigator.pop(modalContext);
-                            },
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}

lib/core/widgets/shared_forms/shared_files_section.dart

@@ -1,246 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/widgets/image_upload/blocs/image_upload_cubit.dart';
-import 'package:flux/core/widgets/image_upload/ui/image_upload_screen.dart';
-import 'package:flux/core/widgets/qr_upload_dialog.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:get_it/get_it.dart';
-
-class SharedFilesSection extends StatelessWidget {
-  final String titleNameForUpload;
-  // LA NOSTRA CALLBACK MAGICA
-  final Future<String?> Function()? onGenerateIdForQr;
-
-  const SharedFilesSection({
-    super.key,
-    required this.titleNameForUpload,
-    this.onGenerateIdForQr,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            const Text(
-              'Allegati e Foto',
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-
-            BlocBuilder<AttachmentsBloc, AttachmentsState>(
-              builder: (context, state) {
-                return Row(
-                  children: [
-                    // --- IL TASTO QR CODE (Ora sempre attivo!) ---
-                    Tooltip(
-                      message: 'Carica foto con lo smartphone',
-                      child: IconButton(
-                        icon: const Icon(Icons.qr_code_scanner),
-                        color: theme.colorScheme.primary, // Sempre colorato!
-                        onPressed: () async {
-                          String? targetId = state.parentId;
-
-                          // SE L'ID NON C'È, CHIAMIAMO IL SALVATAGGIO IN BACKGROUND!
-                          if (targetId == null) {
-                            if (onGenerateIdForQr != null) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                const SnackBar(
-                                  content: Text(
-                                    'Salvataggio rapido scheda in corso... ⏳',
-                                  ),
-                                  duration: Duration(seconds: 1),
-                                ),
-                              );
-
-                              // Aspettiamo che il TicketFormCubit faccia il suo lavoro
-                              targetId = await onGenerateIdForQr!();
-                            }
-
-                            // Se fallisce (es. validazione form non passata), ci fermiamo
-                            if (targetId == null) return;
-                          }
-
-                          // GENERAZIONE DEL DEEP LINK AGNOSTICO
-                          final companyId = GetIt.I
-                              .get<SessionCubit>()
-                              .state
-                              .company!
-                              .id!;
-                          final deepLink =
-                              'https://flux.catelli.it/upload/${state.parentType.name}/$targetId?companyId=$companyId';
-
-                          if (context.mounted) {
-                            showDialog(
-                              context: context,
-                              builder: (_) => QrUploadDialog(
-                                deepLinkUrl: deepLink,
-                                title: 'Carica File: $titleNameForUpload',
-                              ),
-                            );
-                          }
-                        },
-                      ),
-                    ),
-                    const SizedBox(width: 8),
-
-                    // --- IL TASTO AGGIUNGI CLASSICO (da PC) ---
-                    TextButton.icon(
-                      icon: const Icon(Icons.add_a_photo),
-                      label: const Text('Aggiungi'),
-                      onPressed: () {
-                        final bloc = context.read<AttachmentsBloc>();
-                        Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (_) => BlocProvider.value(
-                              value: bloc,
-                              child: BlocProvider<ImageUploadCubit>(
-                                create: (context) => ImageUploadCubit(),
-                                child: ImageUploadScreen(
-                                  title: titleNameForUpload,
-                                  companyId: GetIt.I
-                                      .get<SessionCubit>()
-                                      .state
-                                      .company!
-                                      .id!,
-                                ),
-                              ),
-                            ),
-                          ),
-                        );
-                      },
-                    ),
-                  ],
-                );
-              },
-            ),
-          ],
-        ),
-        const SizedBox(height: 8),
-
-        // --- LA VETRINA DEI FILE (Identica a prima) ---
-        BlocBuilder<AttachmentsBloc, AttachmentsState>(
-          builder: (context, state) {
-            final files = state.allFiles;
-
-            if (state.status == AttachmentsStatus.loading) {
-              return const Center(child: CircularProgressIndicator());
-            }
-
-            if (files.isEmpty) {
-              return Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(24),
-                decoration: BoxDecoration(
-                  color: theme.colorScheme.surface,
-                  border: Border.all(
-                    color: theme.dividerColor,
-                    style: BorderStyle.solid,
-                  ),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: const Column(
-                  children: [
-                    Icon(
-                      Icons.image_not_supported_outlined,
-                      color: Colors.grey,
-                      size: 32,
-                    ),
-                    SizedBox(height: 8),
-                    Text(
-                      'Nessun file allegato',
-                      style: TextStyle(color: Colors.grey),
-                    ),
-                  ],
-                ),
-              );
-            }
-
-            return Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: files.map((file) {
-                final isImage = [
-                  'jpg',
-                  'jpeg',
-                  'png',
-                  'webp',
-                ].contains(file.extension.toLowerCase());
-
-                return Container(
-                  width: 100,
-                  height: 100,
-                  decoration: BoxDecoration(
-                    color: theme.colorScheme.surface,
-                    borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: theme.dividerColor),
-                  ),
-                  child: Stack(
-                    children: [
-                      Center(
-                        child: isImage
-                            ? const Icon(
-                                Icons.image,
-                                color: Colors.blue,
-                                size: 40,
-                              )
-                            : const Icon(
-                                Icons.picture_as_pdf,
-                                color: Colors.red,
-                                size: 40,
-                              ),
-                      ),
-                      if (file.id == null)
-                        Positioned(
-                          bottom: 4,
-                          left: 4,
-                          right: 4,
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 2),
-                            decoration: BoxDecoration(
-                              color: Colors.orange,
-                              borderRadius: BorderRadius.circular(4),
-                            ),
-                            child: const Text(
-                              'Da salvare',
-                              textAlign: TextAlign.center,
-                              style: TextStyle(
-                                color: Colors.white,
-                                fontSize: 8,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        ),
-                      Positioned(
-                        top: -8,
-                        right: -8,
-                        child: IconButton(
-                          icon: const Icon(
-                            Icons.cancel,
-                            color: Colors.redAccent,
-                            size: 20,
-                          ),
-                          onPressed: () {
-                            context.read<AttachmentsBloc>().add(
-                              DeleteSpecificAttachmentEvent(file),
-                            );
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                );
-              }).toList(),
-            );
-          },
-        ),
-      ],
-    );
-  }
-}

lib/core/widgets/staff_selector_modal.dart

@@ -1,147 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/master_data/staff/blocs/staff_cubit.dart';
-import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
-// import 'package:flutter_bloc/flutter_bloc.dart';
-// Importa il tuo StaffModel
-
-/// Funzione helper globale per lanciare la modale ovunque ti trovi con 1 riga di codice
-Future<dynamic> showStaffSelectorModal(BuildContext context) async {
-  return showModalBottomSheet(
-    context: context,
-    isScrollControlled:
-        true, // Permette alla modale di essere più alta se serve
-    backgroundColor: Colors.transparent,
-    builder: (context) => const StaffSelectorModal(),
-  );
-}
-
-class StaffSelectorModal extends StatelessWidget {
-  const StaffSelectorModal({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Container(
-      decoration: BoxDecoration(
-        color: theme.colorScheme.surface,
-        borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
-      ),
-      padding: const EdgeInsets.all(24),
-      child: SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min, // Occupa solo lo spazio necessario
-          children: [
-            // --- Maniglietta superiore (UX standard dei BottomSheet) ---
-            Container(
-              width: 40,
-              height: 4,
-              margin: const EdgeInsets.only(bottom: 24),
-              decoration: BoxDecoration(
-                color: theme.dividerColor,
-                borderRadius: BorderRadius.circular(2),
-              ),
-            ),
-
-            // --- Titolo ---
-            const Text(
-              'Chi sei?',
-              style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 8),
-            Text(
-              'Seleziona il tuo profilo per continuare',
-              style: TextStyle(color: Colors.grey.shade600),
-            ),
-            const SizedBox(height: 32),
-            BlocBuilder<StaffCubit, StaffState>(
-              builder: (context, state) {
-                if (state.status == StaffStatus.loading) {
-                  return const CircularProgressIndicator();
-                }
-                final staffList = state.storeStaff;
-                return _buildStaffGrid(context, staffList);
-              },
-            ),
-
-            const SizedBox(height: 16),
-
-            // --- Tasto Annulla ---
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(), // Restituisce null
-              child: const Text('Annulla'),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildStaffGrid(
-    BuildContext context,
-    List<StaffMemberModel> staffList,
-  ) {
-    return Wrap(
-      spacing: 16,
-      runSpacing: 16,
-      alignment: WrapAlignment.center,
-      children: staffList.map((staff) {
-        return InkWell(
-          borderRadius: BorderRadius.circular(16),
-          onTap: () {
-            // Quando l'utente tappa il suo nome, la modale si chiude
-            // e restituisce il modello (o l'ID) alla schermata precedente!
-            Navigator.of(context).pop(staff);
-          },
-          child: Container(
-            width: 100, // Pulsanti larghi e comodi
-            padding: const EdgeInsets.all(16),
-            decoration: BoxDecoration(
-              color: Theme.of(
-                context,
-              ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.3),
-              borderRadius: BorderRadius.circular(16),
-              border: Border.all(color: Theme.of(context).dividerColor),
-            ),
-            child: Column(
-              children: [
-                CircleAvatar(
-                  radius: 30,
-                  backgroundColor: Theme.of(context).colorScheme.primary,
-                  foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                  child: Text(
-                    staff.name.substring(0, 1).toUpperCase(),
-                    style: const TextStyle(
-                      fontSize: 24,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-                const SizedBox(height: 12),
-                Text(
-                  staff.name,
-                  style: const TextStyle(fontWeight: FontWeight.bold),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ],
-            ),
-          ),
-        );
-      }).toList(),
-    );
-  }
-}
-
-Future<StaffMemberModel?> getStaffMember(BuildContext context) async {
-  final sessionState = context.read<SessionCubit>().state;
-
-  if (sessionState.isSingleUserMode) {
-    // Dispositivo personale: non rompiamo le palle. Usiamo l'utente loggato.
-    return sessionState.currentStaffMember;
-  } else {
-    // Dispositivo Condiviso (Kiosk Mode): Chiediamo chi è!
-    return await showStaffSelectorModal(context);
-  }
-}

lib/features/attachments/blocs/attachments_bloc.dart

@@ -1,433 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:typed_data';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/features/attachments/data/attachments_repository.dart';
-import 'package:flux/features/attachments/models/attachment_model.dart';
-import 'package:get_it/get_it.dart';
-import 'package:image_picker/image_picker.dart';
-
-part 'attachments_events.dart';
-part 'attachments_state.dart';
-
-class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
-  final _repository = GetIt.I.get<AttachmentsRepository>();
-
-  AttachmentsBloc({String? parentId, required AttachmentParentType parentType})
-    : super(
-        AttachmentsState(
-          status: AttachmentsStatus.initial,
-          parentId: parentId,
-          parentType: parentType,
-        ),
-      ) {
-    on<ParentEntitySavedEvent>(_onParentEntitySaved);
-    on<LoadAttachmentsEvent>(_onLoadAttachments);
-    on<AddAttachmentsEvent>(_onAddAttachments);
-    on<UploadAttachmentsEvent>(_onUploadAttachments);
-    on<DeleteAttachmentsEvent>(_onDeleteAttachments);
-    on<ToggleAttachmentSelectionEvent>(_onToggleAttachmentSelection);
-    on<LinkAttachmentsToEntityEvent>(_onLinkAttachmentsToEntity);
-    on<RenameAttachmentEvent>(_onRenameAttachment);
-    on<DeleteSpecificAttachmentEvent>(_onDeleteSpecificAttachment);
-    on<SelectAllAttachmentsEvent>(_onSelectAllAttachments);
-    on<ClearAttachmentSelectionEvent>(_onClearAttachmentSelection);
-
-    final currentCompanyId = GetIt.I.get<SessionCubit>().state.company?.id;
-    if (parentId != null && currentCompanyId != null) {
-      add(LoadAttachmentsEvent(parentId: parentId));
-    }
-  }
-
-  FutureOr<void> _onParentEntitySaved(
-    ParentEntitySavedEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    final companyId = GetIt.I.get<SessionCubit>().state.company?.id;
-
-    emit(
-      state.copyWith(
-        parentId: event.newParentId,
-        status: AttachmentsStatus.uploading,
-      ),
-    );
-
-    if (state.localFiles.isNotEmpty) {
-      try {
-        final List<Future<void>> uploadTasks = state.localFiles.map((file) {
-          final fakePlatformFile = PlatformFile(
-            name: '${file.name}.${file.extension}',
-            size: file.fileSize,
-            bytes: file.localBytes,
-          );
-
-          // Chiamiamo il metodo generico passando il parentId e il TYPE
-          return _repository.uploadAndRegisterFile(
-            parentId: event.newParentId,
-            parentType: state.parentType,
-            pickedFile: fakePlatformFile,
-            companyId: companyId!,
-            bucket: _getBucketForParentType,
-          );
-        }).toList();
-
-        await Future.wait(uploadTasks);
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: AttachmentsStatus.failure,
-            error: "Errore upload post-salvataggio: $e",
-          ),
-        );
-        return;
-      }
-    }
-
-    emit(state.copyWith(localFiles: [], status: AttachmentsStatus.ready));
-    add(LoadAttachmentsEvent(parentId: event.newParentId));
-  }
-
-  FutureOr<void> _onLoadAttachments(
-    LoadAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    final currentId = event.parentId ?? state.parentId;
-
-    if (currentId != null) {
-      emit(state.copyWith(status: AttachmentsStatus.loading));
-
-      await emit.forEach(
-        _repository.getFilesStream(
-          currentId,
-          state.parentType,
-        ), // Passiamo il tipo!
-        onData: (List<AttachmentModel> data) =>
-            state.copyWith(status: AttachmentsStatus.ready, remoteFiles: data),
-        onError: (error, stackTrace) => state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: error.toString(),
-        ),
-      );
-    }
-  }
-
-  void _onAddAttachments(
-    AddAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    final currentId = state.parentId;
-    final currentCompanyId = GetIt.I.get<SessionCubit>().state.company?.id;
-
-    if (currentCompanyId == null) {
-      emit(
-        state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: "Company ID non trovato nella sessione",
-        ),
-      );
-      return;
-    }
-
-    // BIVIO 1: PRATICA NUOVA (Salvataggio locale in memoria)
-    if (currentId == null) {
-      final newLocalFiles = event.files.map((file) {
-        // FISCHIO SALVAVITA PER DESKTOP: se i bytes sono nulli, li leggiamo dal path fisico!
-        Uint8List? rawBytes = file.bytes;
-        if (rawBytes == null && file.path != null) {
-          rawBytes = File(file.path!).readAsBytesSync();
-        }
-
-        return AttachmentModel(
-          id: null,
-          companyId: currentCompanyId,
-          operationId: state.parentType == AttachmentParentType.operation
-              ? ''
-              : null,
-          ticketId: state.parentType == AttachmentParentType.ticket ? '' : null,
-          customerId: state.parentType == AttachmentParentType.customer
-              ? ''
-              : null,
-          name: file.name.fileNameWithoutExtension(),
-          extension: file.name.fileExtension(),
-          storagePath: '',
-          fileSize: file.size,
-          localBytes: rawBytes, // Ora i byte ci sono al 100% anche su Mac!
-        );
-      }).toList();
-
-      emit(
-        state.copyWith(
-          localFiles: [...state.localFiles, ...newLocalFiles],
-          status: AttachmentsStatus.ready,
-        ),
-      );
-      return;
-    }
-
-    // BIVIO 2: PRATICA ESISTENTE (Upload immediato)
-    emit(state.copyWith(status: AttachmentsStatus.uploading));
-    try {
-      final List<Future<void>> uploadTasks = event.files.map((file) {
-        return _repository.uploadAndRegisterFile(
-          parentId: currentId,
-          parentType: state.parentType,
-          pickedFile: file,
-          companyId: currentCompanyId,
-          bucket: _getBucketForParentType,
-        );
-      }).toList();
-
-      await Future.wait(uploadTasks);
-      emit(state.copyWith(status: AttachmentsStatus.ready));
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onUploadAttachments(
-    UploadAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    if ((event.pickedFiles == null || event.pickedFiles!.isEmpty) &&
-        (event.photos == null || event.photos!.isEmpty)) {
-      return;
-    }
-
-    if (state.parentId == null) return;
-
-    emit(state.copyWith(status: AttachmentsStatus.uploading));
-    try {
-      final List<Future<void>> uploadTasks = [];
-
-      // 1. Gestione Documenti normali (PlatformFile)
-      if (event.pickedFiles != null) {
-        for (var file in event.pickedFiles!) {
-          uploadTasks.add(
-            _repository.uploadAndRegisterFile(
-              parentId: state.parentId!,
-              parentType: state.parentType,
-              pickedFile: file,
-              companyId: event.companyId,
-              bucket: _getBucketForParentType,
-            ),
-          );
-        }
-      }
-
-      // 2. Gestione Foto Fotocamera (XFile)
-      if (event.photos != null) {
-        for (var photo in event.photos!) {
-          // Leggiamo i byte asincronamente
-          final bytes = await photo.readAsBytes();
-          final fileSize = await photo.length();
-
-          // Lo travestiamo da PlatformFile per passarlo al Repository!
-          final fakePlatformFile = PlatformFile(
-            name: photo.name,
-            size: fileSize,
-            bytes: bytes,
-            path: photo.path,
-          );
-
-          uploadTasks.add(
-            _repository.uploadAndRegisterFile(
-              parentId: state.parentId!,
-              parentType: state.parentType,
-              pickedFile: fakePlatformFile,
-              companyId: event.companyId,
-              bucket: _getBucketForParentType,
-            ),
-          );
-        }
-      }
-
-      // Esecuzione parallela di tutti i documenti e foto
-      await Future.wait(uploadTasks);
-      emit(state.copyWith(status: AttachmentsStatus.success));
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onDeleteAttachments(
-    DeleteAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      await _repository.deleteFiles(
-        files: state.selectedFiles,
-        currentContextType: state.parentType,
-        bucket: _getBucketForParentType,
-      );
-      emit(state.copyWith(status: AttachmentsStatus.ready, selectedFiles: []));
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onToggleAttachmentSelection(
-    ToggleAttachmentSelectionEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    final selectedFiles = List<AttachmentModel>.from(state.selectedFiles);
-    if (selectedFiles.contains(event.file)) {
-      selectedFiles.remove(event.file);
-    } else {
-      selectedFiles.add(event.file);
-    }
-    emit(state.copyWith(selectedFiles: selectedFiles));
-  }
-
-  void _onSelectAllAttachments(
-    SelectAllAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    // Prendiamo TUTTI i file (locali e remoti) e li buttiamo nei selezionati
-    emit(state.copyWith(selectedFiles: state.allFiles));
-  }
-
-  void _onClearAttachmentSelection(
-    ClearAttachmentSelectionEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    // Svuotiamo brutalmente la lista
-    emit(state.copyWith(selectedFiles: []));
-  }
-
-  FutureOr<void> _onLinkAttachmentsToEntity(
-    LinkAttachmentsToEntityEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    if (state.selectedFiles.isEmpty) return;
-
-    // BIVIO 1: PRATICA/TICKET NON ANCORA SALVATA (Modalità Locale)
-    if (state.parentId == null) {
-      final updatedLocalFiles = state.localFiles.map((file) {
-        if (state.selectedFiles.contains(file)) {
-          // Assegniamo dinamicamente l'ID in base all'entità scelta
-          switch (event.targetType) {
-            case AttachmentParentType.customer:
-              return file.copyWith(customerId: event.targetId);
-            case AttachmentParentType.ticket:
-              return file.copyWith(ticketId: event.targetId);
-            case AttachmentParentType.operation:
-              return file.copyWith(operationId: event.targetId);
-            case AttachmentParentType.shippingDocument:
-              return file.copyWith(shippingDocumentId: event.targetId);
-            case AttachmentParentType.note:
-              return file.copyWith(noteId: event.targetId);
-          }
-        }
-        return file;
-      }).toList();
-
-      emit(
-        state.copyWith(
-          localFiles: updatedLocalFiles,
-          selectedFiles: [], // Svuotiamo la selezione
-          status: AttachmentsStatus.ready,
-        ),
-      );
-      return;
-    }
-
-    // BIVIO 2: PRATICA/TICKET ESISTENTE (Modalità Remota su DB)
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      final List<Future<void>> linkTasks = [];
-
-      for (var file in state.selectedFiles) {
-        if (file.id != null) {
-          linkTasks.add(
-            _repository.linkFileToEntity(
-              fileId: file.id!,
-              targetType: event.targetType,
-              targetId: event.targetId,
-            ),
-          );
-        }
-      }
-
-      await Future.wait(linkTasks);
-
-      // Lo stream aggiornerà automaticamente la UI
-      emit(state.copyWith(status: AttachmentsStatus.ready, selectedFiles: []));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: "Errore durante il collegamento: $e",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onRenameAttachment(
-    RenameAttachmentEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    // BIVIO 1: File Locale (Bozza)
-    if (event.file.localBytes != null) {
-      final updatedLocalFiles = state.localFiles.map((f) {
-        if (f == event.file) {
-          return f.copyWith(name: event.newName);
-        }
-        return f;
-      }).toList();
-      emit(state.copyWith(localFiles: updatedLocalFiles));
-      return;
-    }
-
-    // BIVIO 2: File Remoto (Salvato su DB)
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      await _repository.renameAttachment(event.file.id!, event.newName);
-      emit(state.copyWith(status: AttachmentsStatus.ready));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: "Errore rinomina: $e",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onDeleteSpecificAttachment(
-    DeleteSpecificAttachmentEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    if (event.file.localBytes != null) {
-      final updatedLocalFiles = state.localFiles
-          .where((f) => f != event.file)
-          .toList();
-      emit(state.copyWith(localFiles: updatedLocalFiles));
-    }
-  }
-
-  Bucket get _getBucketForParentType {
-    switch (state.parentType) {
-      case AttachmentParentType.customer:
-        return Bucket.documents;
-      case AttachmentParentType.ticket:
-        return Bucket.documents;
-      case AttachmentParentType.operation:
-        return Bucket.documents;
-      case AttachmentParentType.shippingDocument:
-        return Bucket.companyDocuments;
-      case AttachmentParentType.note:
-        return Bucket.documents;
-    }
-  }
-}

lib/features/attachments/blocs/attachments_events.dart

@@ -1,73 +0,0 @@
-part of 'attachments_bloc.dart';
-
-abstract class AttachmentsEvent extends Equatable {
-  const AttachmentsEvent();
-
-  @override
-  List<Object?> get props => [];
-}
-
-/// Chiamato quando l'entità "padre" (es. il Ticket) viene salvata per la prima volta
-class ParentEntitySavedEvent extends AttachmentsEvent {
-  final String newParentId;
-  const ParentEntitySavedEvent(this.newParentId);
-
-  @override
-  List<Object?> get props => [newParentId];
-}
-
-class LoadAttachmentsEvent extends AttachmentsEvent {
-  final String? parentId;
-  const LoadAttachmentsEvent({this.parentId});
-}
-
-class AddAttachmentsEvent extends AttachmentsEvent {
-  final List<PlatformFile> files;
-  const AddAttachmentsEvent(this.files);
-}
-
-class UploadAttachmentsEvent extends AttachmentsEvent {
-  final List<PlatformFile>? pickedFiles;
-  final List<XFile>? photos;
-  final String companyId;
-  const UploadAttachmentsEvent({
-    this.pickedFiles,
-    this.photos,
-    required this.companyId,
-  });
-}
-
-class DeleteAttachmentsEvent extends AttachmentsEvent {}
-
-class ToggleAttachmentSelectionEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  const ToggleAttachmentSelectionEvent(this.file);
-}
-
-class SelectAllAttachmentsEvent extends AttachmentsEvent {}
-
-class ClearAttachmentSelectionEvent extends AttachmentsEvent {}
-
-class LinkAttachmentsToEntityEvent extends AttachmentsEvent {
-  final AttachmentParentType targetType;
-  final String targetId;
-
-  const LinkAttachmentsToEntityEvent({
-    required this.targetType,
-    required this.targetId,
-  });
-
-  @override
-  List<Object?> get props => [targetType, targetId];
-}
-
-class RenameAttachmentEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  final String newName;
-  const RenameAttachmentEvent(this.file, this.newName);
-}
-
-class DeleteSpecificAttachmentEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  const DeleteSpecificAttachmentEvent(this.file);
-}

lib/features/attachments/data/attachments_repository.dart

@@ -1,243 +1,23 @@
 import 'dart:typed_data';
-import 'package:file_picker/file_picker.dart';
+
-import 'package:flux/core/enums_and_consts/consts.dart';
-import 'package:flux/features/attachments/models/attachment_model.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-
-enum Bucket {
-  documents('documents'),
-  companyDocuments('company_documents');
-
-  final String value;
-  const Bucket(this.value);
-}
 
 class AttachmentsRepository {
   final _supabase = Supabase.instance.client;
 
   /// Scarica i byte di un file direttamente da Supabase Storage
-  Future<Uint8List> downloadAttachmentBytes({
+  Future<Uint8List> downloadAttachmentBytes(String storagePath) async {
-    required String storagePath,
-    required Bucket bucket,
-  }) async {
     try {
+      // ATTENZIONE: Sostituisci 'attachments' con il nome VERO del tuo bucket su Supabase!
+      // Se il tuo storagePath contiene già il nome del bucket all'inizio,
+      // assicurati di passargli solo il percorso interno.
       final Uint8List bytes = await _supabase.storage
-          .from(bucket.value)
+          .from('attachments') // <--- NOME DEL TUO BUCKET
           .download(storagePath);
+
       return bytes;
     } catch (e) {
       throw Exception("Impossibile scaricare il documento dal cloud: $e");
     }
   }
-
-  /// RESTITUISCE IL NOME DELLA COLONNA DB IN BASE AL TIPO
-  String _getColumnNameForParent(AttachmentParentType parentType) {
-    switch (parentType) {
-      case AttachmentParentType.operation:
-        return 'operation_id';
-      case AttachmentParentType.ticket:
-        return 'ticket_id';
-      case AttachmentParentType.customer:
-        return 'customer_id';
-      case AttachmentParentType.shippingDocument:
-        return 'shipping_document_id';
-      case AttachmentParentType.note:
-        return 'note_id';
-    }
-  }
-
-  /// RECUPERA I FILE IN TEMPO REALE
-  Stream<List<AttachmentModel>> getFilesStream(
-    String parentId,
-    AttachmentParentType parentType,
-  ) {
-    final columnName = _getColumnNameForParent(parentType);
-
-    return _supabase
-        .from(Tables.attachments)
-        .stream(primaryKey: ['id'])
-        .eq(columnName, parentId)
-        .map(
-          (listOfMaps) =>
-              listOfMaps.map((map) => AttachmentModel.fromMap(map)).toList(),
-        );
-  }
-
-  /// CARICA IL FILE NELLO STORAGE E LO REGISTRA NEL DB
-  Future<void> uploadAndRegisterFile({
-    required String parentId,
-    required AttachmentParentType parentType,
-    required String companyId,
-    required Bucket bucket,
-    PlatformFile? pickedFile, // Ora è opzionale
-    Uint8List? rawBytes, // Alternativa: bytes grezzi
-    String? rawFileName, // Alternativa: nome del file
-  }) async {
-    // 🛡️ L'ASSERT NINJA: O c'è il pickedFile, o ci sono i byte e il nome.
-    // L'assert funziona solo in debug, ma è perfetto per beccare subito errori di chiamata!
-    assert(
-      pickedFile != null || (rawBytes != null && rawFileName != null),
-      'Devi passare o un PlatformFile, oppure rawBytes e rawFileName!',
-    );
-
-    try {
-      // 1. Normalizziamo i dati in base a cosa ci è stato passato
-      final Uint8List finalBytes;
-      final String finalFileName;
-      final int finalFileSize;
-
-      if (pickedFile != null) {
-        if (pickedFile.bytes == null) {
-          throw Exception(
-            "I bytes del file sono vuoti! Ricarica la pagina senza cache.",
-          );
-        }
-        finalBytes = pickedFile.bytes!;
-        finalFileName = pickedFile.name;
-        finalFileSize = pickedFile.size;
-      } else {
-        // Se pickedFile è null, grazie all'assert sappiamo che questi non lo sono
-        finalBytes = rawBytes!;
-        finalFileName = rawFileName!;
-        finalFileSize = finalBytes.length; // Calcoliamo la size dai byte reali
-      }
-
-      // 2. Estraiamo l'estensione e puliamo il nome
-      final extension = finalFileName.contains('.')
-          ? finalFileName.split('.').last
-          : ''; // Fallback se il file non ha estensione
-
-      final cleanName = finalFileName
-          .replaceAll(RegExp(r'[^\w\s\.-]'), '')
-          .replaceAll(' ', '_');
-
-      // 3. Creiamo un path ordinato: idAzienda/tipoEntita/idEntita/timestamp_nomefile
-      final timestamp = DateTime.now().millisecondsSinceEpoch;
-      final storagePath =
-          '$companyId/${parentType.name}/$parentId/${timestamp}_$cleanName';
-
-      // 4. Upload su Supabase Storage
-      await _supabase.storage
-          .from(bucket.value)
-          .uploadBinary(
-            storagePath,
-            finalBytes,
-            fileOptions: FileOptions(contentType: _guessContentType(extension)),
-          );
-
-      // 5. Creiamo la mappa per il DB dinamicamente
-      final Map<String, dynamic> insertData = {
-        'company_id': companyId,
-        'name': finalFileName.replaceAll('.$extension', ''),
-        'extension': extension,
-        'file_size': finalFileSize,
-        'storage_path': storagePath,
-      };
-
-      // Inseriamo l'ID nella colonna giusta!
-      final columnName = _getColumnNameForParent(parentType);
-      insertData[columnName] = parentId;
-
-      // 6. Salviamo su Postgres
-      await _supabase.from(Tables.attachments).insert(insertData);
-    } catch (e) {
-      throw Exception("Errore caricamento: $e");
-    }
-  }
-
-  /// ELIMINA IL FILE (Scollegamento intelligente)
-  Future<void> deleteFiles({
-    required List<AttachmentModel> files,
-    required AttachmentParentType currentContextType,
-    required Bucket bucket,
-  }) async {
-    if (files.isEmpty) return;
-
-    try {
-      for (var file in files) {
-        if (file.id == null) continue;
-
-        // 1. Capiamo quali collegamenti ha questo file attualmente
-        final currentLinks = {
-          AttachmentParentType.operation: file.operationId,
-          AttachmentParentType.ticket: file.ticketId,
-          AttachmentParentType.customer: file.customerId,
-          AttachmentParentType.shippingDocument: file.shippingDocumentId,
-        };
-
-        // 2. Simuliamo la rimozione del collegamento per il contesto attuale
-        currentLinks[currentContextType] = null;
-
-        // 3. Controlliamo se rimangono altri ID valorizzati
-        final hasOtherActiveLinks = currentLinks.values.any(
-          (id) => id != null && id.isNotEmpty,
-        );
-
-        if (hasOtherActiveLinks) {
-          // A. Ci sono ancora altre entità che usano questo file!
-          // Scolleghiamolo SOLO dal contesto attuale mettendo a NULL la sua colonna
-          await _supabase
-              .from(Tables.attachments)
-              .update({currentContextType.dbColumn: null})
-              .eq('id', file.id!);
-        } else {
-          // B. Nessuno usa più questo file! ELIMINAZIONE FISICA TOTALE.
-          await _supabase.from(Tables.attachments).delete().eq('id', file.id!);
-
-          if (file.storagePath != null) {
-            await _supabase.storage.from(bucket.value).remove([
-              file.storagePath!,
-            ]);
-          }
-        }
-      }
-    } catch (e) {
-      throw Exception("Errore nell'eliminazione dei file: $e");
-    }
-  }
-
-  /// RINOMINA UN FILE (Solo nel DB, non cambiamo il file fisico)
-  Future<void> renameAttachment(String fileId, String newName) async {
-    try {
-      await _supabase
-          .from(Tables.attachments)
-          .update({'name': newName})
-          .eq('id', fileId);
-    } catch (e) {
-      throw Exception("Errore nella rinomina del file: $e");
-    }
-  }
-
-  /// ASSOCIA UN FILE A UN'ALTRA ENTITÀ (Modifica il record esistente)
-  Future<void> linkFileToEntity({
-    required String fileId,
-    required AttachmentParentType targetType,
-    required String targetId,
-  }) async {
-    try {
-      // Facciamo un semplice UPDATE aggiungendo l'ID nella colonna giusta
-      await _supabase
-          .from(Tables.attachments)
-          .update({targetType.dbColumn: targetId})
-          .eq('id', fileId);
-    } catch (e) {
-      throw Exception("Errore nel collegamento del file: $e");
-    }
-  }
-
-  // Helper per indovinare il content-type base
-  String _guessContentType(String extension) {
-    switch (extension.toLowerCase()) {
-      case 'pdf':
-        return 'application/pdf';
-      case 'png':
-        return 'image/png';
-      case 'jpg':
-      case 'jpeg':
-        return 'image/jpeg';
-      default:
-        return 'application/octet-stream';
-    }
-  }
 }

lib/features/attachments/models/attachment_model.dart

@@ -7,9 +7,6 @@ class AttachmentModel extends Equatable {
   final DateTime? createdAt;
   final String? customerId;
   final String? operationId;
-  final String? ticketId;
-  final String? shippingDocumentId;
-  final String? noteId;
   final String name;
   final String extension;
   final String? storagePath;
@@ -22,9 +19,6 @@ class AttachmentModel extends Equatable {
     this.createdAt,
     this.customerId,
     this.operationId,
-    this.ticketId,
-    this.shippingDocumentId,
-    this.noteId,
     required this.name,
     required this.extension,
     this.storagePath,
@@ -39,9 +33,6 @@ class AttachmentModel extends Equatable {
     createdAt,
     customerId,
     operationId,
-    ticketId,
-    shippingDocumentId,
-    noteId,
     name,
     extension,
     storagePath,
@@ -68,9 +59,6 @@ class AttachmentModel extends Equatable {
     DateTime? createdAt,
     String? customerId,
     String? operationId,
-    String? ticketId,
-    String? shippingDocumentId,
-    String? noteId,
     String? name,
     String? extension,
     String? storagePath,
@@ -82,9 +70,6 @@ class AttachmentModel extends Equatable {
     createdAt: createdAt ?? this.createdAt,
     customerId: customerId ?? this.customerId,
     operationId: operationId ?? this.operationId,
-    ticketId: ticketId ?? this.ticketId,
-    shippingDocumentId: shippingDocumentId ?? this.shippingDocumentId,
-    noteId: noteId ?? this.noteId,
     name: name ?? this.name,
     extension: extension ?? this.extension,
     storagePath: storagePath ?? this.storagePath,
@@ -101,9 +86,6 @@ class AttachmentModel extends Equatable {
           : null,
       customerId: map['customer_id'] as String?,
       operationId: map['operation_id'] as String?,
-      ticketId: map['ticket_id'] as String?,
-      shippingDocumentId: map['shipping_document_id'] as String?,
-      noteId: map['note_id'] as String?,
       name: map['name'] as String,
       extension: map['extension'] as String,
       storagePath: map['storage_path'] as String?,
@@ -122,9 +104,6 @@ class AttachmentModel extends Equatable {
       'storage_path': storagePath,
       'customer_id': customerId,
       'operation_id': operationId,
-      'ticket_id': ticketId,
-      'shipping_document_id': shippingDocumentId,
-      'note_id': noteId,
       'file_size': fileSize,
       'company_id': companyId,
     };

lib/features/auth/bloc/auth_cubit.dart

@@ -1,15 +1,14 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/data/constants.dart';
 import 'package:flux/core/utils/app_message.dart';
-import 'package:flux/features/master_data/staff/data/staff_repository.dart';
 import 'package:get_it/get_it.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 part 'auth_state.dart';
 
 class AuthCubit extends Cubit<AuthState> {
   final _supabase = GetIt.instance<SupabaseClient>();
-  final _staffRepository = GetIt.instance<StaffRepository>();
 
   AuthCubit() : super(const AuthState());
 
@@ -17,8 +16,7 @@ class AuthCubit extends Cubit<AuthState> {
     emit(state.copyWith(isLoginMode: !state.isLoginMode));
   }
 
-  Future<bool> submitAuth(String email, String password) async {
+  Future<void> submitAuth(String email, String password) async {
-    // <-- Modificato in bool
     // Partiamo puliti: via vecchi messaggi ed errori
     emit(state.copyWith(status: AuthStatus.loading));
 
@@ -29,17 +27,9 @@ class AuthCubit extends Cubit<AuthState> {
           email: email,
           password: password,
         );
-
+        // NESSUN EMIT DI SUCCESS!
-        // Il login è andato a buon fine!
+        // Supabase lancerà l'evento 'signedIn', il SessionCubit lo catturerà
-        emit(
+        // e il GoRouter ci cambierà pagina. Noi stiamo a guardare il caricamento.
-          AuthState(
-            status: AuthStatus.initial,
-            isLoginMode: true,
-            errorMessage: null,
-            infoMessage: null,
-          ),
-        );
-        return true;
       } else {
         // --- LOGICA SIGNUP ---
         final AuthResponse res = await _supabase.auth.signUp(
@@ -48,6 +38,7 @@ class AuthCubit extends Cubit<AuthState> {
         );
 
         if (res.session == null) {
+          // Caso: Conferma Email attivata su Supabase
           emit(
             state.copyWith(
               status: AuthStatus.initial,
@@ -57,24 +48,16 @@ class AuthCubit extends Cubit<AuthState> {
             ),
           );
         } else {
+          // Caso: Autologin post-registrazione (Conferma email disattivata)
+          // 1. Fermiamo il frullino!
           emit(state.copyWith(status: AuthStatus.initial));
+          // 2. Svegliamo il SessionCubit!
           GetIt.I<SessionCubit>().initializeSession();
         }
-
+        // Se non è null, ha fatto il login automatico. Stessa cosa di sopra, ci pensa il SessionCubit.
-        // Anche la registrazione è andata a buon fine!
-        emit(
-          AuthState(
-            status: AuthStatus.initial,
-            isLoginMode: true,
-            errorMessage: null,
-            infoMessage: null,
-          ),
-        );
-        return true;
       }
     } on AuthException catch (e) {
       emit(state.copyWith(status: AuthStatus.failure, errorMessage: e.message));
-      return false; // <-- Il login è fallito
     } catch (e) {
       emit(
         state.copyWith(
@@ -82,7 +65,6 @@ class AuthCubit extends Cubit<AuthState> {
           errorMessage: "Errore imprevisto: $e",
         ),
       );
-      return false; // <-- Il login è fallito
     }
   }
 
@@ -96,7 +78,10 @@ class AuthCubit extends Cubit<AuthState> {
       );
       return;
     }
-    await _staffRepository.resetPassword(email);
+    await _supabase.auth.resetPasswordForEmail(
+      email,
+      redirectTo: resetPasswordUrl,
+    );
     emit(
       state.copyWith(
         status: AuthStatus.pwResetSent,

lib/features/auth/ui/auth_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/core/utils/extensions.dart';
@@ -25,18 +24,14 @@ class _AuthScreenState extends State<AuthScreen> {
     super.dispose();
   }
 
-  void _submit() async {
+  void _submit() {
     // Chiudiamo la tastiera per fare pulizia a schermo
     FocusScope.of(context).unfocus();
 
-    final isSuccess = await context.read<AuthCubit>().submitAuth(
+    context.read<AuthCubit>().submitAuth(
       _emailController.text.trim(),
       _passwordController.text.trim(),
     );
-
-    if (isSuccess) {
-      TextInput.finishAutofillContext();
-    }
   }
 
   @override
@@ -74,7 +69,6 @@ class _AuthScreenState extends State<AuthScreen> {
             child: Center(
               child: SingleChildScrollView(
                 padding: const EdgeInsets.symmetric(horizontal: 32),
-                child: AutofillGroup(
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
@@ -112,10 +106,6 @@ class _AuthScreenState extends State<AuthScreen> {
                       icon: Icons.email_outlined,
                       controller: _emailController,
                       keyboardType: TextInputType.emailAddress,
-                        autofillHints: const [
-                          AutofillHints.email,
-                          AutofillHints.username,
-                        ],
                     ),
                     const SizedBox(height: 20),
                     FluxTextField(
@@ -123,35 +113,10 @@ class _AuthScreenState extends State<AuthScreen> {
                       icon: Icons.lock_outline,
                       isPassword: true, // Magia del FluxTextField!
                       controller: _passwordController,
-                        autofillHints: const [AutofillHints.password],
                       onSubmitted: (_) =>
                           _submit(), // Se lo supporti nel tuo widget custom
                     ),
 
-                      // Link "Dimenticato password?" solo in Login mode
-                      if (state.isLoginMode) ...[
-                        const SizedBox(height: 8),
-                        Align(
-                          alignment: Alignment.centerRight,
-                          child: TextButton(
-                            onPressed: isLoading
-                                ? null
-                                : () => context
-                                      .read<AuthCubit>()
-                                      .requestPasswordReset(
-                                        _emailController.text.trim(),
-                                      ),
-                            child: Text(
-                              context.l10n.authScreenForgotPassword,
-                              style: TextStyle(
-                                color: context.accent,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-
                     const SizedBox(height: 40),
 
                     // --- BOTTONE PRINCIPALE ---
@@ -210,10 +175,9 @@ class _AuthScreenState extends State<AuthScreen> {
                     if (state.isLoginMode) ...[
                       const SizedBox(height: 24),
                       TextButton(
-                          onPressed: () =>
+                        onPressed: () => context
-                              context.read<AuthCubit>().requestPasswordReset(
+                            .read<AuthCubit>()
-                                _emailController.text.trim(),
+                            .requestPasswordReset(_emailController.text.trim()),
-                              ),
                         child: Text(
                           context.l10n.authScreenForgotPassword,
                           style: TextStyle(
@@ -227,7 +191,6 @@ class _AuthScreenState extends State<AuthScreen> {
                 ),
               ),
             ),
-            ),
           );
         },
       ),

lib/features/auth/ui/set_password_screen.dart

@@ -1,255 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flux/main.dart';
-import 'package:go_router/go_router.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
-
-class SetPasswordScreen extends StatefulWidget {
-  const SetPasswordScreen({super.key});
-
-  @override
-  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
-}
-
-class _SetPasswordScreenState extends State<SetPasswordScreen> {
-  final _formKey = GlobalKey<FormState>();
-  final _passwordController = TextEditingController();
-  final _confirmPasswordController = TextEditingController();
-  bool _isLoading = false;
-  bool _obscurePassword = true;
-  String? _errorMessage;
-
-  // Variabile per abilitare l'inserimento
-  bool _isSessionReady = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _forceSessionRecovery();
-  }
-
-  @override
-  void dispose() {
-    _passwordController.dispose();
-    _confirmPasswordController.dispose();
-    super.dispose();
-  }
-
-  // 🎯 LA VERA MAGIA: RICOSTRUIAMO LA SESSIONE A MANO
-  Future<void> _forceSessionRecovery() async {
-    try {
-      // 1. Prendiamo il frammento dalla cassaforte
-      final fragment = initialRecoveryFragment ?? Uri.base.fragment;
-
-      if (fragment.contains('access_token=')) {
-        // 2. Dividiamo la stringa in una mappa chiave:valore
-        final params = Uri.splitQueryString(fragment);
-        final refreshToken = params['refresh_token'];
-
-        if (refreshToken != null) {
-          // 3. Forziamo Supabase a loggare l'utente col refresh token!
-          await Supabase.instance.client.auth.setSession(refreshToken);
-
-          if (mounted) {
-            setState(() {
-              _isSessionReady = true;
-              _errorMessage = null;
-            });
-          }
-          return;
-        }
-      }
-
-      // Fallback: se Supabase ce l'aveva già fatta miracolosamente
-      if (Supabase.instance.client.auth.currentSession != null) {
-        setState(() => _isSessionReady = true);
-      }
-    } catch (e) {
-      debugPrint("Errore ripristino manuale sessione: $e");
-    }
-  }
-
-  Future<void> _submitNewPassword() async {
-    if (!_formKey.currentState!.validate()) return;
-
-    if (!_isSessionReady) {
-      setState(() {
-        _errorMessage =
-            "Sincronizzazione di sicurezza fallita. Il link potrebbe essere scaduto.";
-      });
-      return;
-    }
-
-    setState(() {
-      _isLoading = true;
-      _errorMessage = null;
-    });
-
-    try {
-      // Ora questo updateUser troverà la sessione viva e vegeta!
-      await Supabase.instance.client.auth.updateUser(
-        UserAttributes(password: _passwordController.text.trim()),
-      );
-
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
-            content: Text(
-              'Password impostata con successo! Benvenuto in FLUX.',
-            ),
-            backgroundColor: Colors.green,
-          ),
-        );
-        context.go('/');
-      }
-    } on AuthException catch (e) {
-      setState(() {
-        _errorMessage = e.message;
-      });
-    } catch (e) {
-      setState(() {
-        _errorMessage = "Si è verificato un errore imprevisto. Riprova.";
-      });
-    } finally {
-      if (mounted) {
-        setState(() => _isLoading = false);
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    // Rendiamo la schermata responsive ed elegante per il Web (Cloudflare)
-    final size = MediaQuery.of(context).size;
-    final isWebContainer = size.width > 600;
-
-    return Scaffold(
-      body: Center(
-        child: SingleChildScrollView(
-          child: Container(
-            width: isWebContainer ? 450 : size.width,
-            padding: const EdgeInsets.all(32.0),
-            child: Form(
-              key: _formKey,
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  // Logo o Brand FLUX
-                  Text(
-                    'FLUX',
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      fontSize: 32,
-                      fontWeight: FontWeight.bold,
-                      letterSpacing: -1,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    'Configura la tua chiave di accesso per iniziare a collaborare.',
-                    textAlign: TextAlign.center,
-                    style: TextStyle(color: Colors.grey[600], fontSize: 14),
-                  ),
-                  const SizedBox(height: 32),
-
-                  if (_errorMessage != null) ...[
-                    Container(
-                      padding: const EdgeInsets.all(12),
-                      decoration: BoxDecoration(
-                        color: Colors.red.withValues(alpha: 0.1),
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                      child: Text(
-                        _errorMessage!,
-                        style: const TextStyle(color: Colors.red, fontSize: 13),
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                    const SizedBox(height: 16),
-                  ],
-
-                  // Campo Password
-                  TextFormField(
-                    controller: _passwordController,
-                    obscureText: _obscurePassword,
-                    decoration: InputDecoration(
-                      labelText: 'Nuova Password',
-                      prefixIcon: const Icon(Icons.lock_outline),
-                      suffixIcon: IconButton(
-                        icon: Icon(
-                          _obscurePassword
-                              ? Icons.visibility_off
-                              : Icons.visibility,
-                        ),
-                        onPressed: () => setState(
-                          () => _obscurePassword = !_obscurePassword,
-                        ),
-                      ),
-                      border: const OutlineInputBorder(),
-                    ),
-                    validator: (value) {
-                      if (value == null || value.isEmpty) {
-                        return 'Inserisci una password';
-                      }
-                      if (value.length < 6) {
-                        return 'La password deve avere almeno 6 caratteri';
-                      }
-                      return null;
-                    },
-                  ),
-                  const SizedBox(height: 16),
-
-                  // Campo Conferma Password
-                  TextFormField(
-                    controller: _confirmPasswordController,
-                    obscureText: _obscurePassword,
-                    decoration: const InputDecoration(
-                      labelText: 'Conferma Password',
-                      prefixIcon: Icon(Icons.lock_reset_rounded),
-                      border: OutlineInputBorder(),
-                    ),
-                    validator: (value) {
-                      if (value != _passwordController.text) {
-                        return 'Le password non coincidono';
-                      }
-                      return null;
-                    },
-                  ),
-                  const SizedBox(height: 24),
-
-                  // Bottone di Invio
-                  ElevatedButton(
-                    onPressed: _isLoading ? null : _submitNewPassword,
-                    style: ElevatedButton.styleFrom(
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                      backgroundColor: Colors.black,
-                      foregroundColor: Colors.white,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                    ),
-                    child: _isLoading
-                        ? const SizedBox(
-                            height: 20,
-                            width: 20,
-                            child: CircularProgressIndicator(
-                              strokeWidth: 2,
-                              valueColor: AlwaysStoppedAnimation<Color>(
-                                Colors.white,
-                              ),
-                            ),
-                          )
-                        : const Text(
-                            'Conferma e Accedi',
-                            style: TextStyle(fontWeight: FontWeight.bold),
-                          ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/features/company/bloc/company_bloc.dart

@@ -0,0 +1,33 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/features/company/data/company_repository.dart';
+import 'package:flux/features/company/models/company_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'company_events.dart';
+part 'company_state.dart';
+
+class CompanyBloc extends Bloc<CompanyEvent, CompanyState> {
+  final CompanyRepository _repository = GetIt.I<CompanyRepository>();
+  CompanyBloc() : super(const CompanyState(status: CompanyStatus.initial)) {
+    on<CreateCompanyRequested>((event, emit) async {
+      emit(const CompanyState(status: CompanyStatus.loading));
+      try {
+        final createdCompany = await _repository.createCompany(event.company);
+        emit(
+          state.copyWith(
+            status: CompanyStatus.success,
+            company: createdCompany,
+          ),
+        );
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: CompanyStatus.failure,
+            errorMessage: e.toString(),
+          ),
+        );
+      }
+    });
+  }
+}

lib/features/company/bloc/company_events.dart

@@ -0,0 +1,19 @@
+part of 'company_bloc.dart';
+
+// lib/blocs/company/company_event.dart
+
+abstract class CompanyEvent extends Equatable {
+  const CompanyEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class CreateCompanyRequested extends CompanyEvent {
+  final CompanyModel company;
+
+  const CreateCompanyRequested({required this.company});
+
+  @override
+  List<Object?> get props => [company];
+}

lib/features/company/bloc/company_settings_cubit.dart

@@ -1,131 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/foundation.dart'; // Per kIsWeb
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/company/data/company_repository.dart';
-import 'package:flux/features/company/models/company_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'company_settings_state.dart';
-
-class CompanySettingsCubit extends Cubit<CompanySettingsState> {
-  final CompanyRepository _repository = GetIt.I<CompanyRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-
-  CompanySettingsCubit() : super(const CompanySettingsState());
-
-  void initSettings() {
-    final currentCompany = _sessionCubit.state.company;
-    if (currentCompany != null) {
-      emit(
-        state.copyWith(
-          company: currentCompany,
-          status: CompanySettingsStatus.ready,
-        ),
-      );
-    }
-  }
-
-  void updateFields({
-    String? name,
-    String? vatId, // Modificato da vatNumber a vatId
-    String? fiscalCode, // Aggiunto
-    String? sdi, // Aggiunto
-    String? address,
-    String? city,
-    String? province, // Aggiunto
-    String? zipCode,
-    String? phone,
-    String? email,
-    String? ticketDisclaimer,
-    LabelFormat? labelFormat,
-    double? labelWidth,
-    double? labelHeight,
-    bool? isVertical,
-  }) {
-    if (state.company == null) return;
-
-    final updated = state.company!.copyWith(
-      name: name ?? state.company!.name,
-      vatId: vatId ?? state.company!.vatId,
-      fiscalCode: fiscalCode ?? state.company!.fiscalCode,
-      sdi: sdi ?? state.company!.sdi,
-      address: address ?? state.company!.address,
-      city: city ?? state.company!.city,
-      province: province ?? state.company!.province,
-      zipCode: zipCode ?? state.company!.zipCode,
-      phone: phone ?? state.company!.phone,
-      email: email ?? state.company!.email,
-      ticketDisclaimer: ticketDisclaimer ?? state.company!.ticketDisclaimer,
-      labelFormat: labelFormat ?? state.company!.labelFormat,
-      labelWidth: labelWidth ?? state.company!.labelWidth,
-      labelHeight: labelHeight ?? state.company!.labelHeight,
-      isLabelVertical: isVertical ?? state.company!.isLabelVertical,
-    );
-    emit(state.copyWith(company: updated));
-  }
-
-  Future<void> saveSettings() async {
-    if (state.company == null) return;
-    emit(
-      state.copyWith(status: CompanySettingsStatus.saving, errorMessage: null),
-    );
-
-    try {
-      // 1. Salva i dati su Supabase
-      final updatedCompany = await _repository.updateCompany(state.company!);
-
-      // 2. Aggiorna la sessione globale per riflettere i cambiamenti in tutta l'app
-      _sessionCubit.updateCurrentCompany(updatedCompany);
-
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.success,
-          company: updatedCompany,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  // Metodo per gestire l'upload del logo
-  Future<void> uploadLogo(Uint8List bytes, String fileName) async {
-    if (state.company == null) return;
-    emit(state.copyWith(status: CompanySettingsStatus.uploadingLogo));
-
-    try {
-      // Usa il tuo repository per caricare il file nel bucket 'company_logos'
-      // Il file può essere Uint8List (se sei su Web) o File (se sei su Mobile/Desktop)
-      final publicUrl = await _repository.uploadCompanyLogo(
-        companyId: state.company!.id!,
-        fileBytes: bytes,
-        fileName: fileName,
-      );
-
-      final updatedCompany = state.company!.copyWith(logoUrl: publicUrl);
-
-      emit(
-        state.copyWith(
-          company: updatedCompany,
-          status: CompanySettingsStatus.ready,
-        ),
-      );
-
-      // Chiamiamo il salvataggio per rendere definitivo l'URL nel record della compagnia
-      await saveSettings();
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.failure,
-          errorMessage: "Errore caricamento logo: $e",
-        ),
-      );
-    }
-  }
-}

lib/features/company/bloc/company_settings_state.dart

@@ -1,37 +0,0 @@
-part of 'company_settings_cubit.dart';
-
-class CompanySettingsState extends Equatable {
-  final CompanySettingsStatus status;
-  final CompanyModel? company;
-  final String? errorMessage;
-
-  const CompanySettingsState({
-    this.status = CompanySettingsStatus.initial,
-    this.company,
-    this.errorMessage,
-  });
-
-  CompanySettingsState copyWith({
-    CompanySettingsStatus? status,
-    CompanyModel? company,
-    String? errorMessage,
-  }) {
-    return CompanySettingsState(
-      status: status ?? this.status,
-      company: company ?? this.company,
-      errorMessage: errorMessage,
-    );
-  }
-
-  @override
-  List<Object?> get props => [status, company, errorMessage];
-}
-
-enum CompanySettingsStatus {
-  initial,
-  ready,
-  saving,
-  uploadingLogo,
-  success,
-  failure,
-}

lib/features/company/bloc/company_state.dart

@@ -0,0 +1,26 @@
+part of 'company_bloc.dart';
+
+enum CompanyStatus { initial, loading, success, failure }
+
+class CompanyState extends Equatable {
+  final CompanyStatus status;
+  final String? errorMessage;
+  final CompanyModel? company;
+
+  const CompanyState({required this.status, this.errorMessage, this.company});
+
+  CompanyState copyWith({
+    CompanyStatus? status,
+    String? errorMessage,
+    CompanyModel? company,
+  }) {
+    return CompanyState(
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      company: company ?? this.company,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, errorMessage, company];
+}

lib/features/company/data/company_repository.dart

@@ -1,6 +1,3 @@
-import 'dart:typed_data';
-
-import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import '../models/company_model.dart';
 
@@ -11,7 +8,7 @@ class CompanyRepository {
     try {
       // .select().single() trasforma la risposta nell'oggetto appena inserito
       final response = await _supabase
-          .from(Tables.companies)
+          .from('company')
           .insert(company.toMap())
           .select()
           .single();
@@ -24,67 +21,11 @@ class CompanyRepository {
     }
   }
 
-  Future<CompanyModel> updateCompany(CompanyModel company) async {
-    try {
-      final response = await _supabase
-          .from(Tables.companies)
-          .update(company.toMap())
-          .eq('id', company.id!)
-          .select()
-          .single();
-
-      return CompanyModel.fromMap(response);
-    } on PostgrestException catch (e) {
-      throw e.message;
-    } catch (e) {
-      throw e.toString();
-    }
-  }
-
-  Future<String> uploadCompanyLogo({
-    required String companyId,
-    required Uint8List fileBytes,
-    required String fileName,
-  }) async {
-    try {
-      // 1. Prepariamo il path.
-      // Organizziamo per companyId e aggiungiamo un timestamp per evitare cache del browser
-      // quando l'utente cambia logo più volte.
-      final extension = fileName.split('.').last;
-      final timestamp = DateTime.now().millisecondsSinceEpoch;
-      final filePath = '$companyId/logo_$timestamp.$extension';
-
-      // 2. Caricamento fisico dei bytes
-      // Usiamo uploadBinary che è perfetto per Uint8List
-      await _supabase.storage
-          .from('company_logos')
-          .uploadBinary(
-            filePath,
-            fileBytes,
-            fileOptions: const FileOptions(
-              cacheControl: '3600',
-              upsert:
-                  true, // Se esiste già un file con lo stesso nome, lo sovrascrive
-            ),
-          );
-
-      // 3. Otteniamo l'URL pubblico.
-      // Nota: il bucket 'company_logos' deve essere impostato come PUBLIC su Supabase
-      final String publicUrl = _supabase.storage
-          .from('company_logos')
-          .getPublicUrl(filePath);
-
-      return publicUrl;
-    } catch (e) {
-      throw Exception("Errore durante l'upload del logo: $e");
-    }
-  }
-
   Future<CompanyModel?> getCompany() async {
     try {
       final userId = _supabase.auth.currentUser?.id;
       final response = await _supabase
-          .from(Tables.companies)
+          .from('company')
           .select()
           .eq('user_id', userId as Object)
           .maybeSingle();

lib/features/company/models/company_model.dart

@@ -35,21 +35,6 @@ enum SubscriptionStatus {
   }
 }
 
-enum LabelFormat {
-  none,
-  small_62x29,
-  medium_54x101,
-  large_102x152,
-  custom;
-
-  static LabelFormat fromString(String? value) {
-    return LabelFormat.values.firstWhere(
-      (e) => e.name == value,
-      orElse: () => LabelFormat.none,
-    );
-  }
-}
-
 // ===================================================================
 // IL MODELLO ESATTO
 // ===================================================================
@@ -68,14 +53,8 @@ class CompanyModel extends Equatable {
   final String vatId;
   final String fiscalCode;
   final String sdi;
-  final String? phone;
+  final String companyLogo;
-  final String? email;
+
-  final String? logoUrl;
-  final String? ticketDisclaimer;
-  final LabelFormat labelFormat;
-  final double? labelWidth;
-  final double? labelHeight;
-  final bool isLabelVertical;
   // Stato Pagamenti (Ibride: manuale + Stripe)
   final bool isPaid;
   final DateTime? paymentExpiration;
@@ -99,14 +78,7 @@ class CompanyModel extends Equatable {
     required this.vatId,
     required this.fiscalCode,
     required this.sdi,
-    this.phone,
+    this.companyLogo = '',
-    this.email,
-    this.logoUrl,
-    this.ticketDisclaimer,
-    this.labelFormat = LabelFormat.none,
-    this.labelWidth,
-    this.labelHeight,
-    this.isLabelVertical = false,
     this.isPaid = false,
     this.paymentExpiration,
     this.subscriptionTier = SubscriptionTier.free,
@@ -128,14 +100,7 @@ class CompanyModel extends Equatable {
     String? vatId,
     String? fiscalCode,
     String? sdi,
-    String? logoUrl,
+    String? companyLogo,
-    String? ticketDisclaimer,
-    LabelFormat? labelFormat,
-    double? labelWidth,
-    double? labelHeight,
-    bool? isLabelVertical,
-    String? phone,
-    String? email,
     bool? isPaid,
     DateTime? paymentExpiration,
     SubscriptionTier? subscriptionTier,
@@ -156,14 +121,7 @@ class CompanyModel extends Equatable {
       vatId: vatId ?? this.vatId,
       fiscalCode: fiscalCode ?? this.fiscalCode,
       sdi: sdi ?? this.sdi,
-      logoUrl: logoUrl ?? this.logoUrl,
+      companyLogo: companyLogo ?? this.companyLogo,
-      phone: phone ?? this.phone,
-      email: email ?? this.email,
-      ticketDisclaimer: ticketDisclaimer ?? this.ticketDisclaimer,
-      labelFormat: labelFormat ?? this.labelFormat,
-      labelWidth: labelWidth ?? this.labelWidth,
-      labelHeight: labelHeight ?? this.labelHeight,
-      isLabelVertical: isLabelVertical ?? this.isLabelVertical,
       isPaid: isPaid ?? this.isPaid,
       paymentExpiration: paymentExpiration ?? this.paymentExpiration,
       subscriptionTier: subscriptionTier ?? this.subscriptionTier,
@@ -205,18 +163,7 @@ class CompanyModel extends Equatable {
       vatId: map['vat_id'] ?? '',
       fiscalCode: map['fiscal_code'] ?? '',
       sdi: map['sdi'] ?? '',
-      logoUrl: map['logo_url'],
+      companyLogo: map['company_logo'] ?? '',
-      phone: map['phone'] ?? '',
-      email: map['email'] ?? '',
-      ticketDisclaimer: map['ticket_disclaimer'],
-      labelFormat: LabelFormat.fromString(map['label_format']),
-      labelWidth: map['label_width'] != null
-          ? (map['label_width'] as num).toDouble()
-          : null,
-      labelHeight: map['label_height'] != null
-          ? (map['label_height'] as num).toDouble()
-          : null,
-      isLabelVertical: map['is_label_vertical'] ?? false,
       isPaid: map['is_paid'] ?? false,
       paymentExpiration: map['payment_expiration'] != null
           ? DateTime.tryParse(map['payment_expiration'])
@@ -246,14 +193,7 @@ class CompanyModel extends Equatable {
       'vat_id': vatId,
       'fiscal_code': fiscalCode,
       'sdi': sdi,
-      'logo_url': logoUrl,
+      'company_logo': companyLogo,
-      'phone': phone,
-      'email': email,
-      'ticket_disclaimer': ticketDisclaimer,
-      'label_format': labelFormat.name,
-      'label_width': labelWidth,
-      'label_height': labelHeight,
-      'is_label_vertical': isLabelVertical,
       'is_paid': isPaid,
       if (paymentExpiration != null)
         'payment_expiration': paymentExpiration!.toIso8601String(),
@@ -281,14 +221,7 @@ class CompanyModel extends Equatable {
     vatId,
     fiscalCode,
     sdi,
-    logoUrl,
+    companyLogo,
-    phone,
-    email,
-    ticketDisclaimer,
-    labelFormat,
-    labelWidth,
-    labelHeight,
-    isLabelVertical,
     isPaid,
     paymentExpiration,
     subscriptionTier,

lib/features/company/ui/company_settings_screen.dart

@@ -1,452 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/company/bloc/company_settings_cubit.dart';
-import 'package:flux/features/company/models/company_model.dart';
-import 'package:flux/features/settings/document_sequence/blocs/document_sequence_cubit.dart';
-import 'package:flux/features/settings/document_sequence/ui/document_sequence_section.dart';
-import 'package:image_picker/image_picker.dart';
-
-class CompanySettingsScreen extends StatefulWidget {
-  const CompanySettingsScreen({super.key});
-
-  @override
-  State<CompanySettingsScreen> createState() => _CompanySettingsScreenState();
-}
-
-class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
-  final _formKey = GlobalKey<FormState>();
-
-  final _nameCtrl = TextEditingController();
-  final _vatCtrl = TextEditingController();
-  final _fiscalCodeCtrl = TextEditingController(); // Nuovo
-  final _sdiCtrl = TextEditingController(); // Nuovo
-  final _addressCtrl = TextEditingController();
-  final _cityCtrl = TextEditingController();
-  final _provinceCtrl = TextEditingController(); // Nuovo
-  final _zipCtrl = TextEditingController();
-  final _phoneCtrl = TextEditingController();
-  final _emailCtrl = TextEditingController();
-  final _disclaimerCtrl = TextEditingController();
-
-  bool _isInitialized = false;
-
-  @override
-  void initState() {
-    super.initState();
-    final cubit = context.read<CompanySettingsCubit>();
-    cubit.initSettings();
-    if (cubit.state.status == CompanySettingsStatus.ready &&
-        cubit.state.company != null) {
-      _syncControllers(cubit.state.company!);
-    }
-  }
-
-  @override
-  void dispose() {
-    _nameCtrl.dispose();
-    _vatCtrl.dispose();
-    _fiscalCodeCtrl.dispose(); // Nuovo
-    _sdiCtrl.dispose(); // Nuovo
-    _addressCtrl.dispose();
-    _cityCtrl.dispose();
-    _provinceCtrl.dispose(); // Nuovo
-    _zipCtrl.dispose();
-    _phoneCtrl.dispose();
-    _emailCtrl.dispose();
-    _disclaimerCtrl.dispose();
-
-    super.dispose();
-  }
-
-  void _syncControllers(CompanyModel company) {
-    if (_nameCtrl.text.isEmpty) _nameCtrl.text = company.name;
-    if (_vatCtrl.text.isEmpty) _vatCtrl.text = company.vatId;
-    if (_fiscalCodeCtrl.text.isEmpty) {
-      _fiscalCodeCtrl.text = company.fiscalCode; // Nuovo
-    }
-    if (_sdiCtrl.text.isEmpty) _sdiCtrl.text = company.sdi; // Nuovo
-    if (_provinceCtrl.text.isEmpty) {
-      _provinceCtrl.text = company.province; // Nuovo
-    }
-    if (_addressCtrl.text.isEmpty) _addressCtrl.text = company.address;
-    if (_cityCtrl.text.isEmpty) _cityCtrl.text = company.city;
-    if (_zipCtrl.text.isEmpty) _zipCtrl.text = company.zipCode;
-    if (_phoneCtrl.text.isEmpty) _phoneCtrl.text = company.phone ?? '';
-    if (_emailCtrl.text.isEmpty) _emailCtrl.text = company.email ?? '';
-    _isInitialized = true;
-    if (_disclaimerCtrl.text.isEmpty) {
-      _disclaimerCtrl.text = company.ticketDisclaimer ?? '';
-    }
-  }
-
-  void _flushToCubit() {
-    context.read<CompanySettingsCubit>().updateFields(
-      name: _nameCtrl.text,
-      vatId: _vatCtrl.text,
-      fiscalCode: _fiscalCodeCtrl.text, // Nuovo
-      sdi: _sdiCtrl.text, // Nuovo
-      province: _provinceCtrl.text,
-      address: _addressCtrl.text,
-      city: _cityCtrl.text,
-      zipCode: _zipCtrl.text,
-      phone: _phoneCtrl.text,
-      email: _emailCtrl.text,
-      ticketDisclaimer: _disclaimerCtrl.text,
-    );
-  }
-
-  Future<void> _pickAndUploadLogo() async {
-    final picker = ImagePicker();
-    final companySettingsCubit = context.read<CompanySettingsCubit>();
-
-    final pickedFile = await picker.pickImage(source: ImageSource.gallery);
-
-    if (pickedFile != null && mounted) {
-      // Passiamo i bytes per compatibilità totale con Flutter Web
-      final bytes = await pickedFile.readAsBytes();
-      companySettingsCubit.uploadLogo(bytes, pickedFile.name);
-    }
-  }
-
-  void _onLabelFormatChanged(LabelFormat selectedFormat) {
-    double? w;
-    double? h;
-
-    switch (selectedFormat) {
-      case LabelFormat.small_62x29:
-        w = 62.0;
-        h = 29.0;
-        break;
-      case LabelFormat.medium_54x101:
-        w = 54.0;
-        h = 101.0;
-        break;
-      case LabelFormat.large_102x152:
-        w = 102.0;
-        h = 152.0;
-        break;
-      case LabelFormat.custom:
-      case LabelFormat.none:
-        // Lasciamo i valori null o quelli vecchi
-        break;
-    }
-
-    context.read<CompanySettingsCubit>().updateFields(
-      labelFormat: selectedFormat,
-      labelWidth: w,
-      labelHeight: h,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Impostazioni Azienda')),
-      body: BlocConsumer<CompanySettingsCubit, CompanySettingsState>(
-        listener: (context, state) {
-          if (state.status == CompanySettingsStatus.ready && !_isInitialized) {
-            _syncControllers(state.company!);
-          }
-          if (state.status == CompanySettingsStatus.success) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(
-                content: Text('Impostazioni salvate con successo!'),
-                backgroundColor: Colors.green,
-              ),
-            );
-          }
-          if (state.status == CompanySettingsStatus.failure) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(state.errorMessage ?? 'Errore'),
-                backgroundColor: Colors.red,
-              ),
-            );
-          }
-        },
-        builder: (context, state) {
-          if (state.company == null) {
-            return const Center(child: CircularProgressIndicator());
-          }
-
-          final company = state.company!;
-
-          return Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 800),
-              child: Form(
-                key: _formKey,
-                child: ListView(
-                  padding: const EdgeInsets.all(24.0),
-                  children: [
-                    // --- SEZIONE LOGO ---
-                    Center(
-                      child: Stack(
-                        alignment: Alignment.bottomRight,
-                        children: [
-                          Container(
-                            height: 120,
-                            width: 120,
-                            decoration: BoxDecoration(
-                              color: theme.colorScheme.surfaceContainerHighest,
-                              shape: BoxShape.circle,
-                              border: Border.all(color: theme.dividerColor),
-                              image: company.logoUrl != null
-                                  ? DecorationImage(
-                                      image: NetworkImage(company.logoUrl!),
-                                      fit: BoxFit.contain,
-                                    )
-                                  : null,
-                            ),
-                            child: company.logoUrl == null
-                                ? const Icon(
-                                    Icons.business,
-                                    size: 50,
-                                    color: Colors.grey,
-                                  )
-                                : null,
-                          ),
-                          if (state.status ==
-                              CompanySettingsStatus.uploadingLogo)
-                            const Positioned.fill(
-                              child: Center(child: CircularProgressIndicator()),
-                            ),
-                          FloatingActionButton.small(
-                            onPressed:
-                                state.status ==
-                                    CompanySettingsStatus.uploadingLogo
-                                ? null
-                                : _pickAndUploadLogo,
-                            child: const Icon(Icons.camera_alt),
-                          ),
-                        ],
-                      ),
-                    ),
-                    const SizedBox(height: 32),
-
-                    // --- SEZIONE DATI PRINCIPALI ---
-                    Text(
-                      'Dati Legali',
-                      style: theme.textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const Divider(),
-                    const SizedBox(height: 16),
-                    TextFormField(
-                      controller: _nameCtrl,
-                      decoration: const InputDecoration(
-                        labelText: 'Ragione Sociale',
-                        prefixIcon: Icon(Icons.badge),
-                      ),
-                      validator: (val) => val == null || val.isEmpty
-                          ? 'Campo obbligatorio'
-                          : null,
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: TextFormField(
-                            controller: _vatCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Partita IVA',
-                              prefixIcon: Icon(Icons.receipt_long),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _fiscalCodeCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Codice Fiscale',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _sdiCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Codice SDI',
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-
-                    // --- SEZIONE INDIRIZZO E CONTATTI ---
-                    Text(
-                      'Sede e Contatti',
-                      style: theme.textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const Divider(),
-                    const SizedBox(height: 16),
-                    TextFormField(
-                      controller: _addressCtrl,
-                      decoration: const InputDecoration(
-                        labelText: 'Indirizzo (Via e numero civico)',
-                        prefixIcon: Icon(Icons.location_on),
-                      ),
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          flex: 2,
-                          child: TextFormField(
-                            controller: _cityCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Città',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          flex: 1,
-                          child: TextFormField(
-                            controller: _provinceCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Provincia (es. MI)',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          flex: 1,
-                          child: TextFormField(
-                            controller: _zipCtrl,
-                            decoration: const InputDecoration(labelText: 'CAP'),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: TextFormField(
-                            controller: _phoneCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Telefono',
-                              prefixIcon: Icon(Icons.phone),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _emailCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Email',
-                              prefixIcon: Icon(Icons.email),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    BlocProvider(
-                      create: (context) =>
-                          DocumentSequenceCubit(state.company!.id!)
-                            ..loadSequences(),
-                      child: const DocumentSequenceSection(),
-                    ),
-                    const SizedBox(height: 16),
-                    // Sezione Disclaimer
-                    Text(
-                      "Note Legali Ricevuta",
-                      style: theme.textTheme.titleMedium,
-                    ),
-                    const SizedBox(height: 8),
-                    TextFormField(
-                      controller: _disclaimerCtrl,
-                      maxLines: 5,
-                      decoration: const InputDecoration(
-                        hintText:
-                            "Inserisci qui la liberatoria legale che apparirà sulla ricevuta dei ticket...",
-                        border: OutlineInputBorder(),
-                      ),
-                      onChanged: (val) => context
-                          .read<CompanySettingsCubit>()
-                          .updateFields(ticketDisclaimer: val),
-                    ),
-
-                    const SizedBox(height: 24),
-
-                    // Sezione Etichette
-                    Text(
-                      "Configurazione Etichette",
-                      style: theme.textTheme.titleMedium,
-                    ),
-                    const SizedBox(height: 8),
-                    DropdownButtonFormField<LabelFormat>(
-                      initialValue: company.labelFormat,
-                      decoration: const InputDecoration(
-                        prefixIcon: Icon(Icons.label_outline),
-                        labelText: "Formato Stampa Etichetta",
-                      ),
-                      items: LabelFormat.values
-                          .map(
-                            (f) => DropdownMenuItem(
-                              value: f,
-                              child: Text(
-                                f.name.replaceAll('_', ' ').toUpperCase(),
-                              ),
-                            ),
-                          )
-                          .toList(),
-                      onChanged: (val) {
-                        if (val != null) {
-                          _onLabelFormatChanged(val);
-                        }
-                      },
-                    ),
-                    const SizedBox(height: 48),
-
-                    // --- PULSANTE SALVATAGGIO ---
-                    SizedBox(
-                      height: 50,
-                      child: ElevatedButton.icon(
-                        onPressed: state.status == CompanySettingsStatus.saving
-                            ? null
-                            : () {
-                                if (_formKey.currentState!.validate()) {
-                                  _flushToCubit();
-                                  context
-                                      .read<CompanySettingsCubit>()
-                                      .saveSettings();
-                                }
-                              },
-                        icon: state.status == CompanySettingsStatus.saving
-                            ? const SizedBox(
-                                width: 20,
-                                height: 20,
-                                child: CircularProgressIndicator(
-                                  color: Colors.white,
-                                  strokeWidth: 2,
-                                ),
-                              )
-                            : const Icon(Icons.save),
-                        label: const Text(
-                          'Salva Impostazioni',
-                          style: TextStyle(fontSize: 16),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

lib/features/company/ui/create_company_screen.dart

@@ -0,0 +1,328 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/utils/extensions.dart';
+import 'package:flux/features/company/bloc/company_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/theme/theme.dart';
+import 'package:flux/core/widgets/flux_text_field.dart';
+import 'package:flux/features/company/models/company_model.dart';
+
+class CreateCompanyScreen extends StatefulWidget {
+  const CreateCompanyScreen({super.key});
+
+  @override
+  State<CreateCompanyScreen> createState() => _CreateCompanyScreenState();
+}
+
+// lib/ui/setup/create_company_screen.dart
+
+class _CreateCompanyScreenState extends State<CreateCompanyScreen> {
+  final _formKey = GlobalKey<FormState>();
+
+  // Controller per i campi obbligatori
+  final _ragioneSocialeController = TextEditingController();
+  final _indirizzoController = TextEditingController();
+  final _capController = TextEditingController();
+  final _cittaController = TextEditingController();
+  final _provinciaController = TextEditingController();
+  final _pIvaController = TextEditingController();
+  final _cfController = TextEditingController();
+  final _univocoController = TextEditingController();
+
+  @override
+  void dispose() {
+    // Ricordati sempre di chiuderli!
+    _ragioneSocialeController.dispose();
+    _indirizzoController.dispose();
+    _capController.dispose();
+    _cittaController.dispose();
+    _provinciaController.dispose();
+    _pIvaController.dispose();
+    _cfController.dispose();
+    _univocoController.dispose();
+    super.dispose();
+  }
+
+  void _onSave() {
+    if (_formKey.currentState!.validate()) {
+      // Recuperiamo l'ID utente attuale da Supabase o dal SessionBloc
+      final userId = context.read<SessionCubit>().state.user!.id;
+
+      final company = CompanyModel(
+        userId: userId,
+        name: _ragioneSocialeController.text.trim(),
+        address: _indirizzoController.text.trim(),
+        zipCode: _capController.text.trim(),
+        city: _cittaController.text.trim(),
+        province: _provinciaController.text.trim(),
+        vatId: _pIvaController.text.trim(),
+        fiscalCode: _cfController.text.trim(),
+        sdi: _univocoController.text.trim().toUpperCase(),
+        // Gli altri campi hanno i default nel modello
+      );
+
+      // Spariamo l'evento al Bloc
+      context.read<CompanyBloc>().add(CreateCompanyRequested(company: company));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.l10n.createCompanyScreenCompanyConfiguration),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.logout_rounded),
+            onPressed: () {
+              // Qui chiami il tuo Bloc dell'autenticazione per fare logout
+              // Esempio se hai un AuthBloc o SessionBloc:
+              //context.read<AuthBloc>().add(LogoutRequested());
+
+              // Se vuoi solo tornare brutalmente alla login per testare il logo:
+              // Navigator.of(context).pushReplacementNamed('/login');
+            },
+          ),
+        ],
+      ),
+      body: BlocConsumer<CompanyBloc, CompanyState>(
+        listener: (context, state) {
+          if (state.status == CompanyStatus.success && state.company != null) {
+            // 1. Aggiorniamo la singleton con i dati reali (ID incluso)
+            //GetIt.I.get<AppSettings>().setCurrentCompany(state.company);
+
+            // 2. Notifichiamo il SessionBloc per cambiare pagina
+            //context.read<SessionCubit>().add(AppStarted());
+          }
+
+          if (state.status == CompanyStatus.failure) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  state.errorMessage ?? context.l10n.commonSavingError,
+                ),
+                backgroundColor: Colors.redAccent,
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          return SafeArea(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.all(24.0),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    _buildHeader(context),
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 1: IDENTITÀ FISCALE ---
+                    _SectionTitle(
+                      title: context.l10n.createCompanyScreenFiscalData,
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.createCompanyScreenCompanyName,
+                      icon: Icons.business,
+                      controller: _ragioneSocialeController,
+                    ),
+                    const SizedBox(height: 16),
+                    Row(
+                      children: [
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.createCompanyScreenVatId,
+                            icon: Icons.numbers,
+                            controller: _pIvaController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.createCompanyScreenFiscalCode,
+                            icon: Icons.badge_outlined,
+                            controller: _cfController,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.createCompanyScreenSdiPec,
+                      icon: Icons.send_and_archive_outlined,
+                      controller: _univocoController,
+                    ),
+
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 2: SEDE LEGALE ---
+                    _SectionTitle(
+                      title:
+                          context.l10n.createCompanyScreenCompanyLegalAddress,
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.commonAddress,
+                      icon: Icons.home_work_outlined,
+                      controller: _indirizzoController,
+                    ),
+                    const SizedBox(height: 16),
+                    Row(
+                      children: [
+                        Expanded(
+                          flex: 2,
+                          child: FluxTextField(
+                            label: context.l10n.commonCity,
+                            icon: Icons.location_city,
+                            controller: _cittaController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.commonZipCode,
+                            icon: Icons.map_outlined,
+                            controller: _capController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.commonProvince,
+                            icon: Icons.explore_outlined,
+                            controller: _provinciaController,
+                          ),
+                        ),
+                      ],
+                    ),
+
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 3: LOGO AZIENDALE ---
+                    _SectionTitle(title: 'BRANDING'),
+                    const SizedBox(height: 16),
+                    _buildLogoPicker(context),
+
+                    const SizedBox(height: 48),
+
+                    // --- BOTTONE INVIO ---
+                    _buildSubmitButton(context, state),
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // Placeholder per il futuro caricamento logo
+  Widget _buildLogoPicker(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(24),
+      decoration: BoxDecoration(
+        color: context.accent.withValues(alpha: 0.05),
+        borderRadius: BorderRadius.circular(16),
+        // Bordo continuo ma sottile e semitrasparente per un look pulito
+        border: Border.all(
+          color: context.accent.withValues(alpha: 0.3),
+          width: 1,
+        ),
+      ),
+      child: Column(
+        children: [
+          Icon(Icons.cloud_upload_outlined, color: context.accent, size: 32),
+          const SizedBox(height: 12),
+          Text(
+            context.l10n.createCompanyScreenUploadLogo,
+            style: TextStyle(
+              color: context.primaryText,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            context.l10n.createCompanyScreenWillBeUsedForReceipts,
+            textAlign: TextAlign.center,
+            style: TextStyle(color: context.secondaryText, fontSize: 12),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSubmitButton(BuildContext context, CompanyState state) {
+    return SizedBox(
+      width: double.infinity,
+      height: 56,
+      child: ElevatedButton(
+        onPressed: state.status == CompanyStatus.loading
+            ? null
+            : () => _onSave(),
+        child: state.status == CompanyStatus.loading
+            ? const CircularProgressIndicator()
+            : Text(context.l10n.createCompanyScreenSaveCompany),
+      ),
+    );
+  }
+
+  Widget _buildHeader(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          padding: const EdgeInsets.all(12),
+          decoration: BoxDecoration(
+            color: context.accent.withValues(alpha: 0.1),
+            borderRadius: BorderRadius.circular(16),
+          ),
+          child: Icon(
+            Icons.domain_add_rounded,
+            color: context.accent,
+            size: 32,
+          ),
+        ),
+        const SizedBox(height: 24),
+        Text(
+          context.l10n.createCompanyScreenSetupYourCompany,
+          style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+            fontWeight: FontWeight.bold,
+            color: context.primaryText,
+          ),
+        ),
+        const SizedBox(height: 12),
+        Text(
+          context.l10n.createCompanyScreenFluxNeedsYourFiscalData,
+          style: TextStyle(
+            color: context.secondaryText,
+            fontSize: 15,
+            height: 1.5,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+// Widget di supporto per i titoli delle sezioni
+class _SectionTitle extends StatelessWidget {
+  final String title;
+  const _SectionTitle({required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      title,
+      style: TextStyle(
+        color: context.accent,
+        fontWeight: FontWeight.w800,
+        letterSpacing: 1.2,
+        fontSize: 13,
+      ),
+    );
+  }
+}

lib/features/customers/blocs/customer_files_bloc.dart

@@ -0,0 +1,139 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/features/attachments/models/attachment_model.dart';
+import 'package:flux/features/customers/data/customer_repository.dart';
+import 'package:get_it/get_it.dart';
+
+part 'customer_files_events.dart';
+part 'customer_files_state.dart';
+
+class CustomerFilesBloc extends Bloc<CustomerFilesEvent, CustomerFilesState> {
+  final CustomerRepository _repository = GetIt.I<CustomerRepository>();
+  final String customerId;
+  CustomerFilesBloc(this.customerId)
+    : super(const CustomerFilesState(status: CustomerFilesStatus.initial)) {
+    on<LoadCustomerFilesEvent>(_loadCustomerFiles);
+    on<UploadCustomerFileEvent>(_uploadCustomerFile);
+    on<UploadMultipleCustomerFilesEvent>(_uploadMultipleCustomerFiles);
+    on<DeleteCustomerFilesEvent>(_deleteCustomerFiles);
+    on<ToggleCustomerFileSelectionEvent>(_toggleCustomerFileSelection);
+  }
+  void _loadCustomerFiles(
+    LoadCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    await emit.forEach<List<AttachmentModel>>(
+      _repository.getCustomerFilesStream(customerId),
+      onData: (customerFiles) => CustomerFilesState(
+        status: CustomerFilesStatus.success,
+        customerFiles: customerFiles,
+      ),
+      onError: (error, stackTrace) => CustomerFilesState(
+        status: CustomerFilesStatus.failure,
+        error: error.toString(),
+      ),
+    );
+  }
+
+  Future<void> _uploadCustomerFile(
+    UploadCustomerFileEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    emit(state.copyWith(status: CustomerFilesStatus.uploading));
+    if (event.pickedFile != null) {
+      try {
+        await _repository.uploadAndRegisterFile(
+          customerId: customerId,
+          pickedFile: event.pickedFile!,
+        );
+        emit(state.copyWith(status: CustomerFilesStatus.success));
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: CustomerFilesStatus.failure,
+            error: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  FutureOr<void> _uploadMultipleCustomerFiles(
+    UploadMultipleCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    if (event.files.isEmpty) {
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: "Nessun file selezionato",
+        ),
+      );
+      return;
+    }
+    emit(state.copyWith(status: CustomerFilesStatus.uploading, error: null));
+    try {
+      // 2. Creiamo una lista di "Promesse" (Futures) per il repository
+      final List<Future<void>> uploadTasks = [];
+      for (var file in event.files) {
+        // Aggiungiamo il task alla lista, ma NON usiamo await qui dentro!
+        uploadTasks.add(
+          _repository.uploadAndRegisterFile(
+            customerId: customerId,
+            pickedFile: file,
+          ),
+        );
+      }
+      // 3. ESECUZIONE PARALLELA!
+      // Aspettiamo che tutti i file siano caricati contemporaneamente.
+      await Future.wait(uploadTasks);
+      // 4. GRAN FINALE: Tutto caricato, emettiamo il success!
+      emit(state.copyWith(status: CustomerFilesStatus.success));
+    } catch (e) {
+      // Se anche un solo file fallisce, catturiamo l'errore
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: "Errore durante l'upload multiplo: $e",
+        ),
+      );
+    }
+  }
+
+  Future<void> _deleteCustomerFiles(
+    DeleteCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    emit(state.copyWith(status: CustomerFilesStatus.loading));
+    try {
+      await _repository.deleteDocuments(state.selectedFiles);
+      emit(
+        state.copyWith(status: CustomerFilesStatus.success, selectedFiles: []),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  void _toggleCustomerFileSelection(
+    ToggleCustomerFileSelectionEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) {
+    List<AttachmentModel> selectedFiles = List.from(state.selectedFiles);
+    if (selectedFiles.contains(event.file)) {
+      selectedFiles.remove(event.file);
+    } else {
+      selectedFiles.add(event.file);
+    }
+    emit(state.copyWith(selectedFiles: selectedFiles));
+  }
+}

lib/features/customers/blocs/customer_files_events.dart

@@ -0,0 +1,30 @@
+part of 'customer_files_bloc.dart';
+
+abstract class CustomerFilesEvent extends Equatable {
+  const CustomerFilesEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LoadCustomerFilesEvent extends CustomerFilesEvent {}
+
+class UploadCustomerFileEvent extends CustomerFilesEvent {
+  final PlatformFile? pickedFile;
+  final File? photo;
+  const UploadCustomerFileEvent({this.pickedFile, this.photo});
+}
+
+class UploadMultipleCustomerFilesEvent extends CustomerFilesEvent {
+  final List<PlatformFile> files;
+  const UploadMultipleCustomerFilesEvent(this.files);
+  @override
+  List<Object> get props => [files];
+}
+
+class DeleteCustomerFilesEvent extends CustomerFilesEvent {}
+
+class ToggleCustomerFileSelectionEvent extends CustomerFilesEvent {
+  final AttachmentModel file;
+  const ToggleCustomerFileSelectionEvent(this.file);
+}

lib/features/customers/blocs/customer_files_state.dart

@@ -0,0 +1,34 @@
+part of 'customer_files_bloc.dart';
+
+enum CustomerFilesStatus { initial, loading, uploading, success, failure }
+
+class CustomerFilesState extends Equatable {
+  const CustomerFilesState({
+    required this.status,
+    this.error,
+    this.customerFiles = const [],
+    this.selectedFiles = const [],
+  });
+
+  final CustomerFilesStatus status;
+  final String? error;
+  final List<AttachmentModel> customerFiles;
+  final List<AttachmentModel> selectedFiles;
+
+  @override
+  List<Object?> get props => [status, error, customerFiles, selectedFiles];
+
+  CustomerFilesState copyWith({
+    CustomerFilesStatus? status,
+    String? error,
+    List<AttachmentModel>? customerFiles,
+    List<AttachmentModel>? selectedFiles,
+  }) {
+    return CustomerFilesState(
+      status: status ?? this.status,
+      error: error,
+      customerFiles: customerFiles ?? this.customerFiles,
+      selectedFiles: selectedFiles ?? this.selectedFiles,
+    );
+  }
+}

lib/features/customers/blocs/customer_form_cubit.dart

@@ -1,132 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/customers/data/customer_repository.dart';
-import 'package:flux/features/customers/models/customer_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'customer_form_state.dart';
-
-class CustomerFormCubit extends Cubit<CustomerFormState> {
-  final CustomerRepository _repository = GetIt.I<CustomerRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-
-  CustomerFormCubit({CustomerModel? existingCustomer, String? customerId})
-    : super(
-        CustomerFormState(customer: existingCustomer ?? CustomerModel.empty()),
-      );
-
-  Future<void> initForm({
-    CustomerModel? existingCustomer,
-    String? customerId,
-  }) async {
-    emit(state.copyWith(status: CustomerFormStatus.loading));
-
-    try {
-      if (existingCustomer != null) {
-        emit(
-          state.copyWith(
-            customer: existingCustomer,
-            status: CustomerFormStatus.ready,
-          ),
-        );
-      } else if (customerId != null) {
-        final customer = await _repository.getCustomerById(customerId);
-        emit(
-          state.copyWith(customer: customer, status: CustomerFormStatus.ready),
-        );
-      } else {
-        // Nuovo cliente, inizializziamo con valori vuoti
-        emit(
-          state.copyWith(
-            customer: CustomerModel.empty().copyWith(
-              companyId: _sessionCubit.state.company!.id!,
-            ),
-            status: CustomerFormStatus.ready,
-          ),
-        );
-      }
-    } on Exception catch (e) {
-      emit(
-        state.copyWith(
-          status: CustomerFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  void updateDoNotDisturb(bool value) {
-    emit(
-      state.copyWith(customer: state.customer.copyWith(doNotDisturb: value)),
-    );
-  }
-
-  void updateFields({
-    String? name,
-    String? phoneNumber,
-    String? email,
-    String? note,
-    bool? doNotDisturb,
-    bool? isBusiness,
-  }) {
-    emit(
-      state.copyWith(
-        customer: state.customer.copyWith(
-          name: name ?? state.customer.name,
-          phoneNumber: phoneNumber ?? state.customer.phoneNumber,
-          email: email ?? state.customer.email,
-          note: note ?? state.customer.note,
-          doNotDisturb: doNotDisturb ?? state.customer.doNotDisturb,
-          isBusiness: isBusiness ?? state.customer.isBusiness,
-        ),
-      ),
-    );
-  }
-
-  Future<void> saveCustomer() async {
-    emit(state.copyWith(status: CustomerFormStatus.saving));
-
-    try {
-      if (state.customer.id != null) {
-        // Aggiorna cliente esistente
-        await _repository.updateCustomer(state.customer);
-      } else {
-        // Crea nuovo cliente
-        await _repository.insertCustomer(state.customer);
-      }
-      emit(state.copyWith(status: CustomerFormStatus.success));
-    } on Exception catch (e) {
-      emit(
-        state.copyWith(
-          status: CustomerFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  Future<CustomerModel?> quickCreateCustomer({
-    required String name,
-    String? phone,
-    String? email,
-    required bool isBusiness,
-  }) async {
-    final newCustomer = CustomerModel(
-      name: name,
-      phoneNumber: phone ?? '',
-      email: email ?? '',
-      companyId: _sessionCubit.state.company!.id!,
-      note: '',
-      isBusiness: isBusiness,
-    );
-
-    try {
-      final saved = await _repository.insertCustomer(newCustomer);
-      // Lo aggiungeremo in cima ai suggerimenti
-      return saved;
-    } catch (e) {
-      return null;
-    }
-  }
-}

lib/features/customers/blocs/customer_form_state.dart

@@ -1,30 +0,0 @@
-part of 'customer_form_cubit.dart';
-
-enum CustomerFormStatus { initial, loading, ready, saving, success, failure }
-
-class CustomerFormState extends Equatable {
-  final CustomerFormStatus status;
-  final CustomerModel customer;
-  final String? errorMessage;
-
-  const CustomerFormState({
-    this.status = CustomerFormStatus.initial,
-    required this.customer,
-    this.errorMessage,
-  });
-
-  CustomerFormState copyWith({
-    CustomerFormStatus? status,
-    CustomerModel? customer,
-    String? errorMessage,
-  }) {
-    return CustomerFormState(
-      status: status ?? this.status,
-      customer: customer ?? this.customer,
-      errorMessage: errorMessage,
-    );
-  }
-
-  @override
-  List<Object?> get props => [status, customer, errorMessage];
-}

lib/features/customers/blocs/customers_cubit.dart

@@ -0,0 +1,160 @@
+import 'dart:async'; // Serve per il Timer del debounce
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/features/customers/data/customer_repository.dart';
+import 'package:flux/features/customers/models/customer_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'customers_state.dart';
+
+class CustomersCubit extends Cubit<CustomersState> {
+  final CustomerRepository _repository = GetIt.I<CustomerRepository>();
+  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
+
+  // Variabile per gestire il debounce della ricerca
+  Timer? _searchDebounce;
+
+  CustomersCubit() : super(const CustomersState());
+
+  // --- LETTURA ---
+  Future<void> loadCustomers() async {
+    emit(state.copyWith(status: CustomersStatus.loading));
+    try {
+      final customers = await _repository.getCustomers(
+        _sessionCubit.state.company!.id!,
+      );
+      emit(
+        state.copyWith(status: CustomersStatus.success, customers: customers),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: CustomersStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  // --- CREAZIONE ---
+  Future<void> createCustomer(CustomerModel customer) async {
+    emit(state.copyWith(status: CustomersStatus.loading));
+    try {
+      final newCustomer = await _repository.saveCustomer(customer);
+
+      // Aggiorniamo la lista locale aggiungendo il nuovo cliente in cima
+      final updatedList = List<CustomerModel>.from(state.customers)
+        ..insert(0, newCustomer);
+
+      emit(
+        state.copyWith(
+          status: CustomersStatus.success,
+          customers: updatedList,
+          lastCreatedCustomer: newCustomer,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: CustomersStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  // --- AGGIORNAMENTO ---
+  Future<void> updateCustomer(CustomerModel customer) async {
+    emit(state.copyWith(status: CustomersStatus.loading));
+    try {
+      final updatedCustomer = await _repository.updateCustomer(customer);
+
+      final updatedList = List<CustomerModel>.from(state.customers);
+      final index = updatedList.indexWhere((c) => c.id == updatedCustomer.id);
+
+      if (index != -1) {
+        updatedList[index] = updatedCustomer;
+      }
+
+      emit(
+        state.copyWith(
+          status: CustomersStatus.success,
+          customers: updatedList,
+          lastCreatedCustomer:
+              updatedCustomer, // Utile se modifichi un cliente appena creato
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: CustomersStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  // --- RICERCA CON DEBOUNCE ---
+  void searchCustomers(String query) {
+    // 1. Se c'è già una ricerca in attesa (l'utente sta digitando veloce), la annulliamo
+    if (_searchDebounce?.isActive ?? false) _searchDebounce!.cancel();
+
+    // 2. Facciamo partire un timer di 400 millisecondi
+    _searchDebounce = Timer(const Duration(milliseconds: 300), () async {
+      // Se cancella tutto e la query è vuota, ricarichiamo la lista base
+      if (query.trim().isEmpty) {
+        await loadCustomers();
+        return;
+      }
+
+      // Nessun "loading" state qui, per evitare sfarfallii visivi mentre si scrive
+      try {
+        final results = await _repository.searchCustomers(
+          _sessionCubit.state.company!.id!,
+          query,
+        );
+        emit(
+          state.copyWith(status: CustomersStatus.success, customers: results),
+        );
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: CustomersStatus.failure,
+            errorMessage: e.toString(),
+          ),
+        );
+      }
+    });
+  }
+
+  Future<CustomerModel?> quickCreateCustomer({
+    required String name,
+    String? phone,
+    String? email,
+  }) async {
+    final newCustomer = CustomerModel(
+      name: name,
+      phoneNumber: phone ?? '',
+      email: email ?? '',
+      companyId: _sessionCubit.state.company!.id!,
+      note: '',
+    );
+
+    try {
+      final saved = await _repository.saveCustomer(newCustomer);
+      // Lo aggiungiamo in cima ai suggerimenti
+      emit(state.copyWith(customers: [saved, ...state.customers]));
+      return saved;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  // Pulizia della memoria quando il Cubit viene distrutto
+  @override
+  Future<void> close() {
+    _searchDebounce?.cancel();
+    return super.close();
+  }
+}

lib/features/customers/blocs/customers_list_cubit.dart

@@ -1,85 +0,0 @@
-import 'dart:async'; // Serve per il Timer del debounce
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/customers/data/customer_repository.dart';
-import 'package:flux/features/customers/models/customer_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'customers_list_state.dart';
-
-class CustomersListCubit extends Cubit<CustomersListState> {
-  final CustomerRepository _repository = GetIt.I<CustomerRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-
-  // Variabile per gestire il debounce della ricerca
-  Timer? _searchDebounce;
-
-  CustomersListCubit() : super(const CustomersListState());
-
-  // --- LETTURA ---
-  Future<void> loadCustomers() async {
-    emit(state.copyWith(status: CustomersListStatus.loading));
-    try {
-      final customers = await _repository.getCustomers(
-        _sessionCubit.state.company!.id!,
-      );
-      emit(
-        state.copyWith(
-          status: CustomersListStatus.success,
-          customers: customers,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CustomersListStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  // --- RICERCA CON DEBOUNCE ---
-  void searchCustomers(String query) {
-    // 1. Se c'è già una ricerca in attesa (l'utente sta digitando veloce), la annulliamo
-    if (_searchDebounce?.isActive ?? false) _searchDebounce!.cancel();
-
-    // 2. Facciamo partire un timer di 400 millisecondi
-    _searchDebounce = Timer(const Duration(milliseconds: 300), () async {
-      // Se cancella tutto e la query è vuota, ricarichiamo la lista base
-      if (query.trim().isEmpty) {
-        await loadCustomers();
-        return;
-      }
-
-      // Nessun "loading" state qui, per evitare sfarfallii visivi mentre si scrive
-      try {
-        final results = await _repository.searchCustomers(
-          _sessionCubit.state.company!.id!,
-          query,
-        );
-        emit(
-          state.copyWith(
-            status: CustomersListStatus.success,
-            customers: results,
-          ),
-        );
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: CustomersListStatus.failure,
-            errorMessage: e.toString(),
-          ),
-        );
-      }
-    });
-  }
-
-  // Pulizia della memoria quando il Cubit viene distrutto
-  @override
-  Future<void> close() {
-    _searchDebounce?.cancel();
-    return super.close();
-  }
-}

lib/features/customers/blocs/customers_state.dart

@@ -1,6 +1,6 @@
-part of 'customers_list_cubit.dart';
+part of 'customers_cubit.dart';
 
-enum CustomersListStatus {
+enum CustomersStatus {
   initial,
   loading,
   filesLoading,
@@ -9,26 +9,26 @@ enum CustomersListStatus {
   failure,
 }
 
-class CustomersListState extends Equatable {
+class CustomersState extends Equatable {
-  final CustomersListStatus status;
+  final CustomersStatus status;
   final List<CustomerModel> customers;
   final CustomerModel? lastCreatedCustomer;
   final String? errorMessage;
 
-  const CustomersListState({
+  const CustomersState({
-    this.status = CustomersListStatus.initial,
+    this.status = CustomersStatus.initial,
     this.customers = const [],
     this.lastCreatedCustomer,
     this.errorMessage,
   });
 
-  CustomersListState copyWith({
+  CustomersState copyWith({
-    CustomersListStatus? status,
+    CustomersStatus? status,
     List<CustomerModel>? customers,
     CustomerModel? lastCreatedCustomer,
     String? errorMessage,
   }) {
-    return CustomersListState(
+    return CustomersState(
       status: status ?? this.status,
       customers: customers ?? this.customers,
       lastCreatedCustomer: lastCreatedCustomer ?? this.lastCreatedCustomer,

lib/features/customers/data/customer_repository.dart

@@ -1,6 +1,5 @@
 import 'package:file_picker/file_picker.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/core/utils/extensions.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
 import 'package:get_it/get_it.dart';
@@ -12,10 +11,10 @@ class CustomerRepository {
   final String companyId = GetIt.I.get<SessionCubit>().state.company!.id!;
 
   // Crea un nuovo cliente
-  Future<CustomerModel> insertCustomer(CustomerModel customer) async {
+  Future<CustomerModel> saveCustomer(CustomerModel customer) async {
     try {
       final response = await _supabase
-          .from(Tables.customers)
+          .from('customer')
           .upsert(customer.toJson())
           .select()
           .single();
@@ -28,7 +27,7 @@ class CustomerRepository {
   Future<CustomerModel> updateCustomer(CustomerModel customer) async {
     try {
       final response = await _supabase
-          .from(Tables.customers)
+          .from('customer')
           .update(customer.toJson())
           .eq('id', customer.id!)
           .select()
@@ -43,14 +42,14 @@ class CustomerRepository {
   Future<List<CustomerModel>> getCustomers(String companyId) async {
     try {
       final response = await _supabase
-          .from(Tables.customers)
+          .from('customer')
           .select('''
             *,
-            ${Tables.attachments}(*)
+            attachment(*)
             ''')
           .eq('company_id', companyId)
           .eq('is_active', true)
-          .order('name', ascending: true);
+          .order('name');
 
       return (response as List).map((c) => CustomerModel.fromMap(c)).toList();
     } catch (e) {
@@ -58,23 +57,6 @@ class CustomerRepository {
     }
   }
 
-  Future<CustomerModel> getCustomerById(String customerId) async {
-    try {
-      final response = await _supabase
-          .from(Tables.customers)
-          .select('''
-            *,
-            ${Tables.attachments}(*)
-            ''')
-          .eq('id', customerId)
-          .single();
-
-      return CustomerModel.fromMap(response);
-    } catch (e) {
-      throw '$e';
-    }
-  }
-
   // Ricerca clienti per nome o telefono (fondamentale per la UX)
   Future<List<CustomerModel>> searchCustomers(
     String companyId,
@@ -82,7 +64,7 @@ class CustomerRepository {
   ) async {
     try {
       final response = await _supabase
-          .from(Tables.customers)
+          .from('customer')
           .select()
           .eq('company_id', companyId)
           .or('name.ilike.%$query%,phone_number.ilike.%$query%')
@@ -97,7 +79,7 @@ class CustomerRepository {
   /// Ascolta in tempo reale i file caricati per un cliente
   Stream<List<AttachmentModel>> getCustomerFilesStream(String customerId) {
     return _supabase
-        .from(Tables.attachments)
+        .from('attachment')
         .stream(primaryKey: ['id'])
         .eq('customer_id', customerId)
         .order('created_at', ascending: false)
@@ -111,7 +93,7 @@ class CustomerRepository {
   Future<List<AttachmentModel>> getCustomerFiles(String customerId) async {
     try {
       final response = await _supabase
-          .from(Tables.attachments)
+          .from('attachment')
           .select()
           .eq('customer_id', customerId);
 
@@ -162,7 +144,7 @@ class CustomerRepository {
       }
 
       final response = await _supabase
-          .from(Tables.attachments)
+          .from('attachment')
           .insert(fileToSave.toMap())
           .select()
           .single();
@@ -174,7 +156,7 @@ class CustomerRepository {
   }
 
   Future<void> saveFileReference(AttachmentModel file) async {
-    await _supabase.from(Tables.attachments).upsert(file.toMap());
+    await _supabase.from('attachment').upsert(file.toMap());
   }
 
   Future<void> deleteDocuments(List<AttachmentModel> files) async {
@@ -193,16 +175,13 @@ class CustomerRepository {
     }
     try {
       if (idsToDelete.isNotEmpty) {
-        await _supabase
+        await _supabase.from('attachment').delete().inFilter('id', idsToDelete);
-            .from(Tables.attachments)
-            .delete()
-            .inFilter('id', idsToDelete);
         // 3. Cancellazione MASSIVA dallo Storage
         await _supabase.storage.from('documents').remove(storagePathsToDelete);
       }
       if (idsToEdit.isNotEmpty) {
         await _supabase
-            .from(Tables.attachments)
+            .from('attachment')
             .update({'customer_id': null})
             .inFilter('id', idsToEdit);
       }

lib/features/customers/models/customer_model.dart

@@ -14,7 +14,6 @@ class CustomerModel extends Equatable {
   final String companyId; // UUID
   final bool isActive;
   final List<AttachmentModel> attachments;
-  final bool isBusiness;
 
   const CustomerModel({
     this.id,
@@ -28,7 +27,6 @@ class CustomerModel extends Equatable {
     required this.companyId,
     this.isActive = true,
     this.attachments = const [],
-    this.isBusiness = false,
   });
 
   @override
@@ -44,18 +42,8 @@ class CustomerModel extends Equatable {
     companyId,
     isActive,
     attachments,
-    isBusiness,
   ];
 
-  factory CustomerModel.empty() => CustomerModel(
-    name: '',
-    phoneNumber: '',
-    email: '',
-    note: '',
-    companyId:
-        '', // Dovrebbe essere sempre fornito, ma lasciamo vuoto per sicurezza
-  );
-
   CustomerModel copyWith({
     String? id,
     DateTime? createdAt,
@@ -68,7 +56,6 @@ class CustomerModel extends Equatable {
     String? companyId,
     bool? isActive,
     List<AttachmentModel>? attachments,
-    bool? isBusiness,
   }) {
     return CustomerModel(
       id: id ?? this.id,
@@ -82,7 +69,6 @@ class CustomerModel extends Equatable {
       companyId: companyId ?? this.companyId,
       isActive: isActive ?? this.isActive,
       attachments: attachments ?? this.attachments,
-      isBusiness: isBusiness ?? this.isBusiness,
     );
   }
 
@@ -107,7 +93,6 @@ class CustomerModel extends Equatable {
               ?.map((x) => AttachmentModel.fromMap(x))
               .toList() ??
           const [],
-      isBusiness: map['is_business'] as bool? ?? false,
     );
   }
 
@@ -123,7 +108,6 @@ class CustomerModel extends Equatable {
       'do_not_disturb': doNotDisturb,
       'company_id': companyId,
       'is_active': isActive,
-      'is_business': isBusiness,
     };
   }
 }

lib/features/customers/ui/customer_detail_screen.dart

@@ -6,10 +6,9 @@ import 'package:flux/core/theme/theme.dart';
 import 'package:flux/core/widgets/image_viewer_widget.dart';
 import 'package:flux/core/widgets/pdf_viewer_widget.dart';
 import 'package:flux/core/widgets/qr_upload_dialog.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
+import 'package:flux/features/customers/blocs/customer_files_bloc.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
-import 'package:get_it/get_it.dart';
 
 class CustomerDetailScreen extends StatefulWidget {
   final CustomerModel customer;
@@ -27,13 +26,11 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
   }
 
   void _loadFiles() {
-    context.read<AttachmentsBloc>().add(
+    context.read<CustomerFilesBloc>().add(LoadCustomerFilesEvent());
-      LoadAttachmentsEvent(parentId: widget.customer.id),
-    );
   }
 
   Future<void> _pickAndUpload() async {
-    AttachmentsBloc attachmentsBloc = context.read<AttachmentsBloc>();
+    CustomerFilesBloc customerFilesBloc = context.read<CustomerFilesBloc>();
 
     // Chiamata statica pulita
     FilePickerResult? result = await FilePicker.pickFiles(
@@ -43,18 +40,17 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
     );
 
     if (result != null) {
+      for (var pickedFile in result.files) {
         try {
-        attachmentsBloc.add(
+          customerFilesBloc.add(
-          UploadAttachmentsEvent(
+            UploadCustomerFileEvent(pickedFile: pickedFile),
-            pickedFiles: result.files,
-            companyId: GetIt.I.get<SessionCubit>().state.company!.id!,
-          ),
           );
         } catch (e) {
           if (mounted) {
-          ScaffoldMessenger.of(
+            ScaffoldMessenger.of(context).showSnackBar(
-            context,
+              SnackBar(content: Text("Errore upload ${pickedFile.name}: $e")),
-          ).showSnackBar(SnackBar(content: Text("$e")));
+            );
+          }
         }
       }
     }
@@ -147,7 +143,7 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
   }
 
   Widget _buildDocumentSection() {
-    return BlocBuilder<AttachmentsBloc, AttachmentsState>(
+    return BlocBuilder<CustomerFilesBloc, CustomerFilesState>(
       builder: (context, state) {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -217,9 +213,9 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
               ],
             ),
             const SizedBox(height: 20),
-            if (state.status == AttachmentsStatus.loading)
+            if (state.status == CustomerFilesStatus.loading)
               const Center(child: CircularProgressIndicator())
-            else if (state.allFiles.isEmpty)
+            else if (state.customerFiles.isEmpty)
               const Center(child: Text("Nessun documento presente"))
             else
               Expanded(
@@ -230,9 +226,9 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
                     crossAxisSpacing: 16,
                     childAspectRatio: 1.2,
                   ),
-                  itemCount: state.allFiles.length,
+                  itemCount: state.customerFiles.length,
                   itemBuilder: (context, index) =>
-                      _FileCard(file: state.allFiles[index], state: state),
+                      _FileCard(file: state.customerFiles[index], state: state),
                 ),
               ),
           ],
@@ -272,14 +268,14 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
 
 class _FileCard extends StatelessWidget {
   final AttachmentModel file;
-  final AttachmentsState state;
+  final CustomerFilesState state;
   const _FileCard({required this.file, required this.state});
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () => context.read<AttachmentsBloc>().add(
+      onTap: () => context.read<CustomerFilesBloc>().add(
-        ToggleAttachmentSelectionEvent(file),
+        ToggleCustomerFileSelectionEvent(file),
       ),
       onDoubleTap: () => _handleDoubleClickOnFile(context, file),
       child: Stack(

lib/features/customers/ui/customer_form.dart

@@ -0,0 +1,138 @@
+import 'package:flutter/material.dart';
+import 'package:flux/core/widgets/flux_text_field.dart';
+import 'package:flux/features/customers/models/customer_model.dart'; // Uso il tuo widget!
+
+class CustomerForm extends StatefulWidget {
+  final CustomerModel? customer; // Se presente, siamo in modalità "Modifica"
+  final Function(CustomerModel customer) onSave;
+
+  const CustomerForm({
+    super.key,
+    this.customer, // Opzionale
+    required this.onSave,
+  });
+
+  @override
+  State<CustomerForm> createState() => _CustomerFormState();
+}
+
+class _CustomerFormState extends State<CustomerForm> {
+  final _formKey = GlobalKey<FormState>();
+
+  // Controller inizializzati con i dati del cliente (se presenti)
+  late final TextEditingController _nomeController;
+  late final TextEditingController _telefonoController;
+  late final TextEditingController _emailController;
+  late final TextEditingController _noteController;
+  late bool _nonDisturbare;
+
+  @override
+  void initState() {
+    super.initState();
+    // Se widget.customer è null, i campi saranno vuoti
+    _nomeController = TextEditingController(text: widget.customer?.name ?? '');
+    _telefonoController = TextEditingController(
+      text: widget.customer?.phoneNumber ?? '',
+    );
+    _emailController = TextEditingController(
+      text: widget.customer?.email ?? '',
+    );
+    _noteController = TextEditingController(text: widget.customer?.note ?? '');
+    _nonDisturbare = widget.customer?.doNotDisturb ?? false;
+  }
+
+  @override
+  void dispose() {
+    _nomeController.dispose();
+    _telefonoController.dispose();
+    _emailController.dispose();
+    _noteController.dispose();
+    super.dispose();
+  }
+
+  void _submit() {
+    if (_formKey.currentState!.validate()) {
+      // Creiamo un nuovo modello partendo da quello esistente (se c'è)
+      // o creandone uno da zero, preservando l'ID in caso di modifica.
+      final updatedCustomer =
+          widget.customer?.copyWith(
+            name: _nomeController.text.trim(),
+            phoneNumber: _telefonoController.text.trim(),
+            email: _emailController.text.trim(),
+            note: _noteController.text.trim(),
+            doNotDisturb: _nonDisturbare,
+          ) ??
+          CustomerModel(
+            // Caso nuovo cliente
+            name: _nomeController.text.trim(),
+            phoneNumber: _telefonoController.text.trim(),
+            email: _emailController.text.trim(),
+            note: _noteController.text.trim(),
+            doNotDisturb: _nonDisturbare,
+            companyId: '', // Verrà iniettato dal Bloc o dal chiamante
+          );
+
+      widget.onSave(updatedCustomer);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: _formKey,
+      child: SingleChildScrollView(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              widget.customer == null ? 'Nuovo Cliente' : 'Modifica Cliente',
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            const SizedBox(height: 20),
+            FluxTextField(
+              label: 'Nome Completo',
+              autoFocus: true,
+              icon: Icons.person_outline,
+              controller: _nomeController,
+            ),
+            const SizedBox(height: 16),
+            FluxTextField(
+              label: 'Telefono',
+              icon: Icons.phone_android_outlined,
+              controller: _telefonoController,
+              keyboardType: TextInputType.phone,
+            ),
+            const SizedBox(height: 16),
+            FluxTextField(
+              label: 'Email',
+              icon: Icons.alternate_email_outlined,
+              controller: _emailController,
+            ),
+            const SizedBox(height: 16),
+            FluxTextField(
+              label: 'Note',
+              icon: Icons.notes_outlined,
+              controller: _noteController,
+              minLines: 3,
+            ),
+            const SizedBox(height: 8),
+            SwitchListTile(
+              title: const Text('Non disturbare'),
+              value: _nonDisturbare,
+              onChanged: (v) => setState(() => _nonDisturbare = v),
+            ),
+            const SizedBox(height: 24),
+            SizedBox(
+              width: double.infinity,
+              height: 50,
+              child: ElevatedButton(
+                onPressed: _submit,
+                child: Text(widget.customer == null ? 'SALVA' : 'AGGIORNA'),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/customers/ui/customer_form_screen.dart

@@ -1,225 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/widgets/flux_text_field.dart';
-import 'package:flux/core/widgets/shared_forms/attachments_section.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:flux/features/customers/blocs/customer_form_cubit.dart';
-import 'package:flux/features/customers/models/customer_model.dart'; // Uso il tuo widget!
-
-class CustomerFormScreen extends StatefulWidget {
-  final CustomerModel? customer;
-  final String? customerId;
-
-  const CustomerFormScreen({super.key, this.customer, this.customerId});
-
-  @override
-  State<CustomerFormScreen> createState() => _CustomerFormScreenState();
-}
-
-class _CustomerFormScreenState extends State<CustomerFormScreen> {
-  final _formKey = GlobalKey<FormState>();
-
-  // Controller inizializzati con i dati del cliente (se presenti)
-  final TextEditingController _nomeController = TextEditingController();
-  final TextEditingController _telefonoController = TextEditingController();
-  final TextEditingController _emailController = TextEditingController();
-  final TextEditingController _noteController = TextEditingController();
-  bool _isInitialized = false;
-
-  @override
-  void initState() {
-    super.initState();
-
-    // 1. Lanciamo l'inizializzazione (che se è sincrona, finirà istantaneamente)
-    context.read<CustomerFormCubit>().initForm(
-      customerId: widget.customerId,
-      existingCustomer: widget.customer,
-    );
-
-    // 2. Leggiamo lo stato SUBITO DOPO. Se è già ready, non aspettiamo il listener!
-    final currentState = context.read<CustomerFormCubit>().state;
-    if (currentState.status == CustomerFormStatus.ready && !_isInitialized) {
-      _syncTextControllers(currentState.customer);
-    }
-  }
-
-  @override
-  void dispose() {
-    _nomeController.dispose();
-    _telefonoController.dispose();
-    _emailController.dispose();
-    _noteController.dispose();
-    super.dispose();
-  }
-
-  void _syncTextControllers(CustomerModel customer) {
-    if (_nomeController.text.isEmpty) {
-      _nomeController.text = customer.name;
-    }
-    if (_telefonoController.text.isEmpty) {
-      _telefonoController.text = customer.phoneNumber;
-    }
-    if (_emailController.text.isEmpty) {
-      _emailController.text = customer.email;
-    }
-    if (_noteController.text.isEmpty) {
-      _noteController.text = customer.note;
-    }
-    _isInitialized = true;
-  }
-
-  void _flushControllersToCubit() {
-    context.read<CustomerFormCubit>().updateFields(
-      name: _nomeController.text.trim(),
-      phoneNumber: _telefonoController.text.trim(),
-      email: _emailController.text.trim(),
-      note: _noteController.text.trim(),
-    );
-  }
-
-  void _saveCustomer() {
-    if (_formKey.currentState!.validate()) {
-      _flushControllersToCubit();
-      context.read<CustomerFormCubit>().saveCustomer();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<CustomerFormCubit, CustomerFormState>(
-      listenWhen: (previous, current) => previous.status != current.status,
-      listener: (context, state) {
-        if (state.status == CustomerFormStatus.ready && !_isInitialized) {
-          _syncTextControllers(state.customer);
-        }
-        if (state.status == CustomerFormStatus.success) {
-          Navigator.of(context).pop(state.customer);
-        } else if (state.status == CustomerFormStatus.failure) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(state.errorMessage ?? 'Errore sconosciuto')),
-          );
-        }
-      },
-      builder: (context, state) {
-        return Scaffold(
-          appBar: AppBar(
-            title: Text(
-              state.customer.id == null
-                  ? 'Nuovo Cliente'
-                  : 'Modifica ${state.customer.name}',
-            ),
-            actions: [],
-          ),
-          body: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Form(
-              key: _formKey,
-              child: SingleChildScrollView(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Row(
-                      children: [
-                        ChoiceChip(
-                          label: const Text('Privato (Domestico)'),
-                          selected: !state.customer.isBusiness,
-                          selectedColor: Colors.blue.withValues(alpha: 0.2),
-                          checkmarkColor: Colors.blue.shade700,
-                          onSelected: (selected) {
-                            if (selected) {
-                              context.read<CustomerFormCubit>().updateFields(
-                                isBusiness: false,
-                              );
-                            }
-                          },
-                        ),
-                        const SizedBox(width: 12),
-                        ChoiceChip(
-                          label: const Text('Business (P.IVA)'),
-                          selected: state.customer.isBusiness,
-                          selectedColor: Colors.orange.withValues(alpha: 0.2),
-                          checkmarkColor: Colors.orange.shade700,
-                          onSelected: (selected) {
-                            if (selected) {
-                              context.read<CustomerFormCubit>().updateFields(
-                                isBusiness: true,
-                              );
-                            }
-                          },
-                        ),
-                      ],
-                    ),
-                    const Divider(height: 32),
-                    FluxTextField(
-                      label: 'Nome Completo',
-                      autoFocus: true,
-                      icon: Icons.person_outline,
-                      controller: _nomeController,
-                      keyboardType: TextInputType.name,
-                    ),
-                    const SizedBox(height: 16),
-                    FluxTextField(
-                      label: 'Telefono',
-                      icon: Icons.phone_android_outlined,
-                      controller: _telefonoController,
-                      keyboardType: TextInputType.phone,
-                    ),
-                    const SizedBox(height: 16),
-                    FluxTextField(
-                      label: 'Email',
-                      icon: Icons.alternate_email_outlined,
-                      controller: _emailController,
-                      keyboardType: TextInputType.emailAddress,
-                    ),
-                    const SizedBox(height: 16),
-                    FluxTextField(
-                      label: 'Note',
-                      icon: Icons.notes_outlined,
-                      controller: _noteController,
-                      minLines: 3,
-                    ),
-                    const SizedBox(height: 8),
-                    SwitchListTile(
-                      title: const Text('Non disturbare'),
-                      value: state.customer.doNotDisturb,
-                      onChanged: (v) => context
-                          .read<CustomerFormCubit>()
-                          .updateDoNotDisturb(v),
-                    ),
-                    const Divider(height: 32),
-                    BlocProvider<AttachmentsBloc>(
-                      create: (context) => AttachmentsBloc(
-                        parentType: AttachmentParentType.customer,
-                        parentId: state.customer.id,
-                      ),
-                      child: SharedAttachmentsSection(
-                        parentType: AttachmentParentType.customer,
-                        parentId: state.customer.id,
-                      ),
-                    ),
-                    const SizedBox(height: 24),
-                    SizedBox(
-                      width: double.infinity,
-                      height: 50,
-                      child: ElevatedButton(
-                        onPressed: _saveCustomer,
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Theme.of(context).primaryColor,
-                          foregroundColor: Colors.white,
-                        ),
-
-                        child: Text(
-                          widget.customer == null ? 'SALVA' : 'AGGIORNA',
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

lib/features/customers/ui/customer_mobile_upload_screen.dart

@@ -1,32 +1,32 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
+import 'package:flux/features/customers/blocs/customer_files_bloc.dart';
 
-class OldSharedUploadScreen extends StatefulWidget {
+class CustomerMobileUploadScreen extends StatefulWidget {
-  final String title;
+  final String customerId;
-  final String companyId;
+  final String customerName;
 
-  const OldSharedUploadScreen({
+  const CustomerMobileUploadScreen({
     super.key,
-    required this.title,
+    required this.customerId,
-    required this.companyId,
+    required this.customerName,
   });
 
   @override
-  State<OldSharedUploadScreen> createState() => _OldSharedUploadScreenState();
+  State<CustomerMobileUploadScreen> createState() =>
+      _CustomerMobileUploadScreenState();
 }
 
-class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
+class _CustomerMobileUploadScreenState
+    extends State<CustomerMobileUploadScreen> {
   // 1. LA NOSTRA STAGING AREA (Il "Carrello")
   final List<PlatformFile> _stagedFiles = [];
 
   // 2. STATO DI CARICAMENTO GLOBALE
   bool _isUploading = false;
-  bool _isProcessingLocal = false;
 
   // Funzione magica per capire se è un'immagine o un PDF dall'estensione
   bool _isImage(String path) {
@@ -36,25 +36,18 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocListener<AttachmentsBloc, AttachmentsState>(
+    return BlocListener<CustomerFilesBloc, CustomerFilesState>(
       listener: (context, state) {
         // Quando il BLoC ci dice che ha finito l'upload (Success), chiudiamo la pagina!
-        if (state.status == AttachmentsStatus.success && _isUploading) {
+        if (state.status == CustomerFilesStatus.success && _isUploading) {
-          // CONTROLLO MAGICO: C'è una pagina dietro di noi?
-          if (Navigator.of(context).canPop()) {
-            // Modalità "App Nativa": siamo entrati dal tasto "Aggiungi"
           ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(content: Text("File caricati con successo! ✅")),
+            const SnackBar(
+              content: Text("Tutti i file caricati con successo! ✅"),
+            ),
           );
           Navigator.of(context).pop();
-          } else {
-            // Modalità "Web/QR Code": Navighiamo alla pagina di successo!
-            // Assicurati di aver importato go_router in questo file
-
-            context.go('/upload-success');
         }
-        }
+        if (state.status == CustomerFilesStatus.failure) {
-        if (state.status == AttachmentsStatus.failure) {
           setState(() => _isUploading = false);
           ScaffoldMessenger.of(
             context,
@@ -63,8 +56,8 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
       },
       child: Scaffold(
         appBar: AppBar(
-          title: Text("Upload: ${widget.title}"),
+          title: Text("Upload: ${widget.customerName}"),
-          // Togliamo la freccia indietro se stiamo caricando per evitare macelli
+          // Togliamo la freccia indietro se stiamo caricando per evitare disastri
           automaticallyImplyLeading: !_isUploading,
         ),
         body: Stack(
@@ -117,7 +110,8 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
                           padding: const EdgeInsets.all(16),
                           gridDelegate:
                               const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3, // 3 colonne stile galleria
+                                crossAxisCount:
+                                    3, // 3 colonne come la galleria dell'iPhone
                                 crossAxisSpacing: 12,
                                 mainAxisSpacing: 12,
                               ),
@@ -143,17 +137,10 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
                                   child: ClipRRect(
                                     borderRadius: BorderRadius.circular(12),
                                     child: isImg
-                                        ? (file.bytes != null
+                                        ? Image.file(
-                                              // Se abbiamo i bytes (es. scatto da fotocamera) usiamo quelli (a prova di Web!)
-                                              ? Image.memory(
-                                                  file.bytes!,
-                                                  fit: BoxFit.cover,
-                                                )
-                                              // Altrimenti andiamo di file fisico
-                                              : Image.file(
                                             File(file.path!),
                                             fit: BoxFit.cover,
-                                                ))
+                                          )
                                         : const Column(
                                             mainAxisAlignment:
                                                 MainAxisAlignment.center,
@@ -241,11 +228,11 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
               ],
             ),
 
-            // --- OVERLAY DI CARICAMENTO ---
+            // --- OVERLAY DI CARICAMENTO (Impedisce tap multipli) ---
-            if (_isUploading || _isProcessingLocal)
+            if (_isUploading)
               Container(
                 color: Colors.black.withValues(alpha: 0.5),
-                child: Center(
+                child: const Center(
                   child: Card(
                     child: Padding(
                       padding: EdgeInsets.all(24.0),
@@ -255,9 +242,7 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
                           CircularProgressIndicator(),
                           SizedBox(height: 16),
                           Text(
-                            _isUploading
+                            "Caricamento in corso...",
-                                ? "Invio in corso..."
-                                : "Elaborazione foto...",
                             style: TextStyle(fontWeight: FontWeight.bold),
                           ),
                         ],
@@ -274,38 +259,30 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
 
   // --- LOGICA FOTOCAMERA E LIBRERIA ---
   Future<void> _handleCamera() async {
-    setState(() => _isProcessingLocal = true);
-    await Future.delayed(const Duration(milliseconds: 100));
-
-    try {
     final picker = ImagePicker();
-      final photo = await picker.pickImage(source: ImageSource.camera);
+    final photo = await picker.pickImage(
-
+      source: ImageSource.camera,
+      imageQuality: 80,
+    );
     if (photo != null) {
-        final photoBytes = await photo.readAsBytes();
+      final photoBytes = await photo.readAsBytes(); // Sicuro anche per Web!
       final photoSize = await photo.length();
 
       final platformFile = PlatformFile(
         name: photo.name,
         size: photoSize,
         path: photo.path,
-          bytes: photoBytes,
+        bytes: photoBytes, // I bytes ci salvano la vita su Supabase!
       );
-
       setState(() {
-          _stagedFiles.add(platformFile);
+        _stagedFiles.add(platformFile); // Unifichiamo tutto in un dart:io File
       });
     }
-    } finally {
-      setState(() => _isProcessingLocal = false);
-    }
   }
 
   Future<void> _handleFilePicker() async {
-    final result = await FilePicker.pickFiles(
+    // allowMultiple: true permette di pescare 5 foto dalla galleria in un colpo solo!
-      allowMultiple: true,
+    final result = await FilePicker.pickFiles(allowMultiple: true);
-      withData: true,
-    );
     if (result != null) {
       setState(() {
         _stagedFiles.addAll(result.files);
@@ -317,12 +294,11 @@ class _OldSharedUploadScreenState extends State<OldSharedUploadScreen> {
   void _submitAllFiles() {
     setState(() => _isUploading = true);
 
-    // Lanciamo l'evento del nostro nuovo AttachmentsBloc Agnostico!
+    // Diciamo al BLoC di caricare tutti i file.
-    context.read<AttachmentsBloc>().add(
+    // Usiamo il tuo evento esistente per ogni file (il BLoC li metterà in coda)
-      UploadAttachmentsEvent(
+    final bloc = context.read<CustomerFilesBloc>();
-        pickedFiles: _stagedFiles,
+    bloc.add(UploadMultipleCustomerFilesEvent(_stagedFiles));
-        companyId: widget.companyId,
+
-      ),
+    // N.B: Il Navigator.pop() viene chiamato dal BlocListener in alto quando lo stato diventa "success"!
-    );
   }
 }

lib/features/customers/ui/customers_content.dart

@@ -1,20 +1,22 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
-import 'package:flux/features/customers/blocs/customers_list_cubit.dart';
+import 'package:flux/features/customers/blocs/customers_cubit.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
+import 'package:flux/features/customers/ui/customer_form.dart';
+import 'package:flux/temp/migration_tools.dart';
 import 'package:go_router/go_router.dart';
 
-class CustomersListScreen extends StatefulWidget {
+class CustomersContent extends StatefulWidget {
-  const CustomersListScreen({super.key});
+  const CustomersContent({super.key});
 
   @override
-  State<CustomersListScreen> createState() => _CustomersListScreenState();
+  State<CustomersContent> createState() => _CustomersContentState();
 }
 
-class _CustomersListScreenState extends State<CustomersListScreen> {
+class _CustomersContentState extends State<CustomersContent> {
   final TextEditingController _searchController = TextEditingController();
 
   @override
@@ -26,14 +28,14 @@ class _CustomersListScreenState extends State<CustomersListScreen> {
   void _loadInitialCustomers() {
     final companyId = context.read<SessionCubit>().state.company?.id;
     if (companyId != null) {
-      context.read<CustomersListCubit>().loadCustomers();
+      context.read<CustomersCubit>().loadCustomers();
     }
   }
 
   void _onSearch(String query) {
     final companyId = context.read<SessionCubit>().state.company?.id;
     if (companyId != null) {
-      context.read<CustomersListCubit>().searchCustomers(query);
+      context.read<CustomersCubit>().searchCustomers(query);
     }
   }
 
@@ -52,12 +54,7 @@ class _CustomersListScreenState extends State<CustomersListScreen> {
           Padding(
             padding: const EdgeInsets.only(right: 16),
             child: ElevatedButton.icon(
-              onPressed: () {
+              onPressed: () => openCustomerForm(context: context),
-                context.pushNamed(
-                  Routes.customerForm,
-                  pathParameters: {'id': 'new'},
-                );
-              },
               icon: const Icon(Icons.person_add_alt_1_rounded, size: 20),
               label: const Text('NUOVO'),
               style: ElevatedButton.styleFrom(
@@ -89,11 +86,47 @@ class _CustomersListScreenState extends State<CustomersListScreen> {
             ),
           ),
 
+          //TODO cancella quando import finito
+          ElevatedButton(
+            onPressed: () async {
+              try {
+                // 1. Mostra un loading (opzionale ma utile)
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(content: Text('Caricamento JSON in corso...')),
+                );
+
+                // 2. Legge tutto il file come stringa
+                final String jsonString = await rootBundle.loadString(
+                  'assets/schedeRiparazione-1778021345.json',
+                );
+
+                // 3. Lancia lo script (sostituisci l'UUID con l'ID della tua azienda su Supabase)
+                await TicketMigrationScript().runMigration(jsonString);
+
+                // 4. Successo!
+                if (context.mounted) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('Migrazione Completata! Guarda i log.'),
+                    ),
+                  );
+                }
+              } catch (e) {
+                if (context.mounted) {
+                  ScaffoldMessenger.of(
+                    context,
+                  ).showSnackBar(SnackBar(content: Text('Errore: $e')));
+                }
+              }
+            },
+            child: const Text('migra clienti'),
+          ),
+
           // LISTA CLIENTI
           Expanded(
-            child: BlocBuilder<CustomersListCubit, CustomersListState>(
+            child: BlocBuilder<CustomersCubit, CustomersState>(
               builder: (context, state) {
-                if (state.status == CustomersListStatus.loading &&
+                if (state.status == CustomersStatus.loading &&
                     state.customers.isEmpty) {
                   return const Center(child: CircularProgressIndicator());
                 }
@@ -114,9 +147,8 @@ class _CustomersListScreenState extends State<CustomersListScreen> {
                     final customer = state.customers[index];
                     return _CustomerTile(
                       customer: customer,
-                      onTap: () => context.pushNamed(
+                      onTap: () => context.push(
-                        Routes.customerDetails,
+                        '/customer/${customer.id}',
-                        pathParameters: {'id': customer.id!},
                         extra: customer,
                       ),
                     );
@@ -218,16 +250,8 @@ class _CustomerTile extends StatelessWidget {
           ),
         ),
         trailing: IconButton(
-          onPressed: () async {
+          onPressed: () =>
-            final CustomersListCubit customersCubit = context
+              openCustomerForm(context: context, customer: customer),
-                .read<CustomersListCubit>();
-            await context.pushNamed(
-              Routes.customerForm,
-              pathParameters: {'id': customer.id!},
-              extra: customer,
-            );
-            customersCubit.loadCustomers();
-          },
           icon: Icon(Icons.edit_note_rounded, color: context.accent),
         ),
       ),
@@ -236,7 +260,7 @@ class _CustomerTile extends StatelessWidget {
 }
 
 /// Funzione unica per gestire Creazione e Modifica
-/* void openCustomerForm({
+void openCustomerForm({
   CustomerModel? customer,
   required BuildContext context,
 }) {
@@ -269,4 +293,4 @@ class _CustomerTile extends StatelessWidget {
       ),
     ),
   );
-} */
+}

lib/features/customers/ui/quick_customer_dialog.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/customers/blocs/customer_form_cubit.dart';
+import 'package:flux/features/customers/blocs/customers_cubit.dart';
 
 class QuickCustomerDialog extends StatefulWidget {
   final String initialQuery;
@@ -16,7 +16,6 @@ class _QuickCustomerDialogState extends State<QuickCustomerDialog> {
   final _phoneCtrl = TextEditingController();
   final _emailCtrl = TextEditingController();
   final _noteCtrl = TextEditingController();
-  bool _isBusiness = false; // Aggiungiamo un campo per il tipo di cliente
 
   bool _isLoading = false;
 
@@ -44,12 +43,13 @@ class _QuickCustomerDialogState extends State<QuickCustomerDialog> {
 
     // Chiamata al Cubit (aggiorna i parametri in base a come li hai definiti)
     final newCustomer = await context
-        .read<CustomerFormCubit>()
+        .read<CustomersCubit>()
         .quickCreateCustomer(
-          isBusiness: _isBusiness,
           name: _nameCtrl.text.trim(),
           phone: _phoneCtrl.text.trim(),
-          email: _emailCtrl.text.trim(),
+          // Aggiungi questi se li hai inseriti nel tuo CustomerCubit:
+          // email: _emailCtrl.text.trim(),
+          // note: _noteCtrl.text.trim(),
         );
 
     setState(() => _isLoading = false);
@@ -67,41 +67,6 @@ class _QuickCustomerDialogState extends State<QuickCustomerDialog> {
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Row(
-                children: [
-                  ChoiceChip(
-                    label: const Text('Privato (Domestico)'),
-                    selected: _isBusiness == false,
-                    selectedColor: Colors.blue.withValues(alpha: 0.2),
-                    checkmarkColor: Colors.blue.shade700,
-                    onSelected: (selected) {
-                      if (selected) {
-                        setState(() {
-                          _isBusiness = false;
-                        });
-                      }
-                    },
-                  ),
-                  const SizedBox(width: 12),
-                  ChoiceChip(
-                    label: const Text('Business (P.IVA)'),
-                    selected: _isBusiness == true,
-                    selectedColor: Colors.orange.withValues(alpha: 0.2),
-                    checkmarkColor: Colors.orange.shade700,
-                    onSelected: (selected) {
-                      if (selected) {
-                        setState(() {
-                          _isBusiness = true;
-                        });
-                      }
-                    },
-                  ),
-                ],
-              ),
-            ),
-            const Divider(height: 32),
             TextField(
               controller: _nameCtrl,
               autofocus: true, // Focus immediato!

lib/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart

@@ -1,74 +0,0 @@
-import 'dart:async';
-
-import 'package:equatable/equatable.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/notes/data/notes_repository.dart';
-import 'package:flux/features/notes/models/note_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'dashboard_note_list_state.dart';
-
-class DashboardNoteListCubit extends Cubit<DashboardNoteListState> {
-  final NotesRepository _repository = GetIt.I.get<NotesRepository>();
-  final String? companyId;
-  final String? staffId;
-  StreamSubscription<void>? _subscription;
-
-  DashboardNoteListCubit({required this.companyId, required this.staffId})
-    : super(DashboardNoteListState(status: DashboardNoteListStatus.initial));
-
-  void stopListening() {
-    _subscription?.cancel();
-    _subscription = null;
-  }
-
-  void startListening() {
-    stopListening();
-
-    emit(state.copyWith(status: DashboardNoteListStatus.loading));
-
-    // Primo caricamento
-    _loadNotesSilently();
-
-    // Inizio ascolto campanello
-    try {
-      _subscription = _repository
-          .notesStream(companyId: companyId!, currentStaffId: staffId!)
-          .listen((_) {
-            // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
-            _loadNotesSilently();
-          });
-    } on Exception catch (e) {
-      debugPrint(e.toString());
-    }
-  }
-
-  Future<void> _loadNotesSilently() async {
-    try {
-      final notes = await _repository.getNotes();
-      if (isClosed) return;
-      emit(
-        state.copyWith(
-          status: DashboardNoteListStatus.success,
-          notes: notes,
-          errorMessage: null,
-        ),
-      );
-    } catch (e) {
-      if (isClosed) return;
-      emit(
-        state.copyWith(
-          status: DashboardNoteListStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  @override
-  Future<void> close() {
-    stopListening();
-    return super.close();
-  }
-}