dfa

2026-05-08 18:51:28 +02:00
parent 42a9506f02
commit c6ef798b22
7 changed files with 120 additions and 75 deletions
--- a/lib/features/company/bloc/company_settings_cubit.dart
+++ b/lib/features/company/bloc/company_settings_cubit.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart'; // Per kIsWeb
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -6,7 +5,6 @@ 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';
-import 'package:image_picker/image_picker.dart';

 part 'company_settings_state.dart';

@@ -30,9 +28,12 @@ class CompanySettingsCubit extends Cubit<CompanySettingsState> {

  void updateFields({
    String? name,
-    String? vatId,
+    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,
@@ -42,8 +43,11 @@ class CompanySettingsCubit extends Cubit<CompanySettingsState> {
    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,
--- a/lib/features/company/bloc/company_settings_state.dart
+++ b/lib/features/company/bloc/company_settings_state.dart
@@ -1,6 +1,6 @@
 part of 'company_settings_cubit.dart';

-class CompanySettingsState {
+class CompanySettingsState extends Equatable {
  final CompanySettingsStatus status;
  final CompanyModel? company;
  final String? errorMessage;
@@ -22,6 +22,9 @@ class CompanySettingsState {
      errorMessage: errorMessage,
    );
  }
+
+  @override
+  List<Object?> get props => [status, company, errorMessage];
 }

 enum CompanySettingsStatus {
--- a/lib/features/company/models/company_model.dart
+++ b/lib/features/company/models/company_model.dart
@@ -205,7 +205,7 @@ class CompanyModel extends Equatable {
      'sdi': sdi,
      'company_logo': logoUrl,
      'phone': phone,
-      'email': 'email',
+      'email': email,
      'is_paid': isPaid,
      if (paymentExpiration != null)
        'payment_expiration': paymentExpiration!.toIso8601String(),
--- a/lib/features/company/ui/company_settings_screen.dart
+++ b/lib/features/company/ui/company_settings_screen.dart
@@ -1,6 +1,7 @@
 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:image_picker/image_picker.dart';

 class CompanySettingsScreen extends StatefulWidget {
@@ -15,8 +16,11 @@ class _CompanySettingsScreenState extends State<CompanySettingsScreen> {

  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();
@@ -26,27 +30,42 @@ class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
  @override
  void initState() {
    super.initState();
-    context.read<CompanySettingsCubit>().initSettings();
+    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();
    super.dispose();
  }

-  void _syncControllers(company) {
-    if (_nameCtrl.text.isEmpty) _nameCtrl.text = company.name ?? '';
-    if (_vatCtrl.text.isEmpty) _vatCtrl.text = company.vatNumber ?? '';
-    if (_addressCtrl.text.isEmpty) _addressCtrl.text = company.address ?? '';
-    if (_cityCtrl.text.isEmpty) _cityCtrl.text = company.city ?? '';
-    if (_zipCtrl.text.isEmpty) _zipCtrl.text = company.zipCode ?? '';
+  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;
@@ -56,6 +75,9 @@ class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
    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,
@@ -174,29 +196,43 @@ class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
                    ),
                    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(
-                          flex: 2,
                          child: TextFormField(
-                            controller: _nameCtrl,
+                            controller: _vatCtrl,
                            decoration: const InputDecoration(
-                              labelText: 'Ragione Sociale',
-                              prefixIcon: Icon(Icons.badge),
+                              labelText: 'Partita IVA',
+                              prefixIcon: Icon(Icons.receipt_long),
                            ),
-                            validator: (val) => val == null || val.isEmpty
-                                ? 'Campo obbligatorio'
-                                : null,
                          ),
                        ),
                        const SizedBox(width: 16),
                        Expanded(
-                          flex: 1,
                          child: TextFormField(
-                            controller: _vatCtrl,
+                            controller: _fiscalCodeCtrl,
                            decoration: const InputDecoration(
-                              labelText: 'Partita IVA / C.F.',
-                              prefixIcon: Icon(Icons.receipt_long),
+                              labelText: 'Codice Fiscale',
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 16),
+                        Expanded(
+                          child: TextFormField(
+                            controller: _sdiCtrl,
+                            decoration: const InputDecoration(
+                              labelText: 'Codice SDI',
                            ),
                          ),
                        ),
@@ -233,6 +269,16 @@ class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
                          ),
                        ),
                        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(