|
|
@ -14,6 +14,8 @@ class _OrderHistoryPageState extends State<OrderHistoryPage> |
|
|
List<CommandeData> commandes = []; |
|
|
List<CommandeData> commandes = []; |
|
|
bool isLoading = true; |
|
|
bool isLoading = true; |
|
|
String? error; |
|
|
String? error; |
|
|
|
|
|
DateTime? _startDate; |
|
|
|
|
|
DateTime? _endDate; |
|
|
|
|
|
|
|
|
// Informations d'affichage et pagination |
|
|
// Informations d'affichage et pagination |
|
|
int totalItems = 0; |
|
|
int totalItems = 0; |
|
|
@ -37,144 +39,146 @@ class _OrderHistoryPageState extends State<OrderHistoryPage> |
|
|
|
|
|
|
|
|
_loadCommandes(); |
|
|
_loadCommandes(); |
|
|
} |
|
|
} |
|
|
|
|
|
Future<void> _loadCommandes({int page = 1}) async { |
|
|
|
|
|
try { |
|
|
|
|
|
setState(() { |
|
|
|
|
|
isLoading = true; |
|
|
|
|
|
error = null; |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
Future<void> _loadCommandes({int page = 1}) async { |
|
|
// Construction des paramètres de requête |
|
|
try { |
|
|
Map<String, String> queryParams = { |
|
|
setState(() { |
|
|
'statut': 'payee', |
|
|
isLoading = true; |
|
|
'page': page.toString(), |
|
|
error = null; |
|
|
'limit': itemsPerPage.toString(), |
|
|
}); |
|
|
}; |
|
|
|
|
|
|
|
|
// Ajouter les paramètres de pagination à l'URL |
|
|
// ✅ CORRECTION : Envoyer la date en format ISO avec fuseau horaire UTC |
|
|
final uri = Uri.parse('$baseUrl/api/commandes').replace(queryParameters: { |
|
|
if (_startDate != null) { |
|
|
'statut': 'payee', |
|
|
// Début de journée en UTC (00:00:00) |
|
|
'page': page.toString(), |
|
|
final startUtc = DateTime.utc( |
|
|
'limit': itemsPerPage.toString(), |
|
|
_startDate!.year, |
|
|
}); |
|
|
_startDate!.month, |
|
|
|
|
|
_startDate!.day, |
|
|
|
|
|
0, 0, 0, |
|
|
|
|
|
); |
|
|
|
|
|
queryParams['date_start'] = startUtc.toIso8601String(); |
|
|
|
|
|
print('📅 Date début (UTC): ${startUtc.toIso8601String()}'); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (_endDate != null) { |
|
|
|
|
|
// Fin de journée en UTC (23:59:59) |
|
|
|
|
|
final endUtc = DateTime.utc( |
|
|
|
|
|
_endDate!.year, |
|
|
|
|
|
_endDate!.month, |
|
|
|
|
|
_endDate!.day, |
|
|
|
|
|
23, 59, 59, 999, |
|
|
|
|
|
); |
|
|
|
|
|
queryParams['date_end'] = endUtc.toIso8601String(); |
|
|
|
|
|
print('📅 Date fin (UTC): ${endUtc.toIso8601String()}'); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
final response = await http.get(uri, headers: _headers); |
|
|
// Debug: Afficher l'URL complète |
|
|
|
|
|
final uri = Uri.parse('$baseUrl/api/commandes').replace(queryParameters: queryParams); |
|
|
if (response.statusCode == 200) { |
|
|
print('🌐 URL appelée: $uri'); |
|
|
final dynamic responseBody = json.decode(response.body); |
|
|
|
|
|
|
|
|
final response = await http.get(uri, headers: _headers); |
|
|
List<dynamic> data = []; |
|
|
|
|
|
|
|
|
print('📡 Status code: ${response.statusCode}'); |
|
|
// Gestion améliorée de la réponse |
|
|
|
|
|
if (responseBody is Map<String, dynamic>) { |
|
|
if (response.statusCode == 200) { |
|
|
|
|
|
final dynamic responseBody = json.decode(response.body); |
|
|
// Structure: {"success": true, "data": {"commandes": [...], "pagination": {...}}} |
|
|
List<dynamic> data = []; |
|
|
if (responseBody.containsKey('data') && responseBody['data'] is Map<String, dynamic>) { |
|
|
|
|
|
final dataMap = responseBody['data'] as Map<String, dynamic>; |
|
|
// Gestion selon le format de réponse |
|
|
if (dataMap.containsKey('commandes')) { |
|
|
if (responseBody is Map<String, dynamic>) { |
|
|
final commandesValue = dataMap['commandes']; |
|
|
final dataMap = responseBody['data'] as Map<String, dynamic>?; |
|
|
|
|
|
|
|
|
if (commandesValue is List<dynamic>) { |
|
|
if (dataMap != null) { |
|
|
data = commandesValue; |
|
|
final commandesValue = dataMap['commandes']; |
|
|
} else if (commandesValue != null) { |
|
|
if (commandesValue is List) { |
|
|
data = [commandesValue]; |
|
|
data = commandesValue; |
|
|
} |
|
|
} else if (commandesValue != null) { |
|
|
|
|
|
data = [commandesValue]; |
|
|
// Pagination |
|
|
|
|
|
if (dataMap.containsKey('pagination')) { |
|
|
|
|
|
final pagination = dataMap['pagination'] as Map<String, dynamic>?; |
|
|
|
|
|
if (pagination != null) { |
|
|
|
|
|
currentPage = pagination['currentPage'] ?? page; |
|
|
|
|
|
totalPages = pagination['totalPages'] ?? 1; |
|
|
|
|
|
totalItems = pagination['totalItems'] ?? data.length; |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
// Si pas de pagination dans la réponse, calculer approximativement |
|
|
|
|
|
totalItems = data.length; |
|
|
|
|
|
currentPage = page; |
|
|
|
|
|
totalPages = (totalItems / itemsPerPage).ceil(); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
totalItems = 0; |
|
|
|
|
|
currentPage = 1; |
|
|
|
|
|
totalPages = 1; |
|
|
|
|
|
} |
|
|
|
|
|
} else if (responseBody.containsKey('commandes')) { |
|
|
|
|
|
// Fallback: commandes directement dans responseBody |
|
|
|
|
|
final commandesValue = responseBody['commandes']; |
|
|
|
|
|
|
|
|
|
|
|
if (commandesValue is List<dynamic>) { |
|
|
|
|
|
data = commandesValue; |
|
|
|
|
|
} else if (commandesValue != null) { |
|
|
|
|
|
data = [commandesValue]; |
|
|
|
|
|
} |
|
|
|
|
|
totalItems = data.length; |
|
|
|
|
|
currentPage = page; |
|
|
|
|
|
totalPages = (totalItems / itemsPerPage).ceil(); |
|
|
|
|
|
} else { |
|
|
|
|
|
totalItems = 0; |
|
|
|
|
|
currentPage = 1; |
|
|
|
|
|
totalPages = 1; |
|
|
|
|
|
} |
|
|
} |
|
|
} else if (responseBody is List<dynamic>) { |
|
|
|
|
|
data = responseBody; |
|
|
// Pagination |
|
|
totalItems = data.length; |
|
|
final pagination = dataMap['pagination'] as Map<String, dynamic>?; |
|
|
currentPage = page; |
|
|
currentPage = pagination?['currentPage'] ?? page; |
|
|
totalPages = (totalItems / itemsPerPage).ceil(); |
|
|
totalPages = pagination?['totalPages'] ?? (data.length / itemsPerPage).ceil(); |
|
|
} else { |
|
|
totalItems = pagination?['totalItems'] ?? data.length; |
|
|
throw Exception('Format de réponse inattendu: ${responseBody.runtimeType}'); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
} else if (responseBody is List) { |
|
|
|
|
|
data = responseBody; |
|
|
// Conversion sécurisée avec prints détaillés |
|
|
totalItems = data.length; |
|
|
List<CommandeData> parsedCommandes = []; |
|
|
currentPage = page; |
|
|
for (int i = 0; i < data.length; i++) { |
|
|
totalPages = (totalItems / itemsPerPage).ceil(); |
|
|
try { |
|
|
} else { |
|
|
final item = data[i]; |
|
|
throw Exception('Format de réponse inattendu: ${responseBody.runtimeType}'); |
|
|
|
|
|
} |
|
|
if (item is Map<String, dynamic>) { |
|
|
|
|
|
item.forEach((key, value) { |
|
|
// Parsing sécurisé des commandes |
|
|
}); |
|
|
List<CommandeData> parsedCommandes = []; |
|
|
|
|
|
for (int i = 0; i < data.length; i++) { |
|
|
final commandeData = CommandeData.fromJson(item); |
|
|
try { |
|
|
|
|
|
final item = data[i]; |
|
|
if (commandeData.items != null) { |
|
|
if (item is Map<String, dynamic>) { |
|
|
for (int j = 0; j < commandeData.items!.length; j++) { |
|
|
final commandeData = CommandeData.fromJson(item); |
|
|
final commandeItem = commandeData.items![j]; |
|
|
parsedCommandes.add(commandeData); |
|
|
} |
|
|
} else { |
|
|
} |
|
|
print('Item $i invalide: ${item.runtimeType}'); |
|
|
|
|
|
|
|
|
parsedCommandes.add(commandeData); |
|
|
|
|
|
} else { |
|
|
|
|
|
print('ERROR: Item $i n\'est pas un Map: ${item.runtimeType}'); |
|
|
|
|
|
} |
|
|
|
|
|
} catch (e, stackTrace) { |
|
|
|
|
|
print('ERROR: Erreur lors du parsing de l\'item $i: $e'); |
|
|
|
|
|
print('Stack trace: $stackTrace'); |
|
|
|
|
|
// Continue avec les autres items |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
} catch (e, stackTrace) { |
|
|
|
|
|
print('Erreur parsing item $i: $e'); |
|
|
|
|
|
print(stackTrace); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
setState(() { |
|
|
|
|
|
commandes = parsedCommandes; |
|
|
|
|
|
isLoading = false; |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// Initialiser les animations après avoir mis à jour l'état |
|
|
|
|
|
_initializeAnimations(); |
|
|
|
|
|
_startAnimations(); |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
print('ERROR: HTTP ${response.statusCode}: ${response.reasonPhrase}'); |
|
|
|
|
|
setState(() { |
|
|
|
|
|
error = 'Erreur HTTP ${response.statusCode}: ${response.reasonPhrase}'; |
|
|
|
|
|
isLoading = false; |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
} |
|
|
} catch (e, stackTrace) { |
|
|
|
|
|
print('=== ERREUR GÉNÉRALE ==='); |
|
|
print('✅ ${parsedCommandes.length} commandes chargées'); |
|
|
print('Erreur: $e'); |
|
|
|
|
|
print('Stack trace: $stackTrace'); |
|
|
setState(() { |
|
|
|
|
|
commandes = parsedCommandes; |
|
|
|
|
|
isLoading = false; |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
_initializeAnimations(); |
|
|
|
|
|
_startAnimations(); |
|
|
|
|
|
} else { |
|
|
setState(() { |
|
|
setState(() { |
|
|
error = 'Erreur de connexion: $e'; |
|
|
error = 'Erreur HTTP ${response.statusCode}: ${response.reasonPhrase}'; |
|
|
isLoading = false; |
|
|
isLoading = false; |
|
|
}); |
|
|
}); |
|
|
|
|
|
print('Erreur HTTP ${response.statusCode}: ${response.reasonPhrase}'); |
|
|
} |
|
|
} |
|
|
|
|
|
} catch (e, stackTrace) { |
|
|
|
|
|
print('=== ERREUR GÉNÉRALE ==='); |
|
|
|
|
|
print('Erreur: $e'); |
|
|
|
|
|
print('Stack trace: $stackTrace'); |
|
|
|
|
|
setState(() { |
|
|
|
|
|
error = 'Erreur de connexion: $e'; |
|
|
|
|
|
isLoading = false; |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Future<void> _selectDate(BuildContext context, bool isStart) async { |
|
|
|
|
|
final DateTime? picked = await showDatePicker( |
|
|
|
|
|
context: context, |
|
|
|
|
|
initialDate: isStart ? (_startDate ?? DateTime.now()) : (_endDate ?? DateTime.now()), |
|
|
|
|
|
firstDate: DateTime(2020), |
|
|
|
|
|
lastDate: DateTime(2100), |
|
|
|
|
|
); |
|
|
|
|
|
if (picked != null) { |
|
|
|
|
|
setState(() { |
|
|
|
|
|
if (isStart) { |
|
|
|
|
|
_startDate = picked; |
|
|
|
|
|
} else { |
|
|
|
|
|
_endDate = picked; |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// Fonction pour aller à la page suivante |
|
|
// Fonction pour aller à la page suivante |
|
|
void _goToNextPage() { |
|
|
void _goToNextPage() { |
|
|
@ -258,73 +262,151 @@ class _OrderHistoryPageState extends State<OrderHistoryPage> |
|
|
), |
|
|
), |
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
|
|
|
Widget _buildHeader() { |
|
|
Widget _buildHeader() { |
|
|
return AnimatedBuilder( |
|
|
return AnimatedBuilder( |
|
|
animation: _animationController, |
|
|
animation: _animationController, |
|
|
builder: (context, child) { |
|
|
builder: (context, child) { |
|
|
return Transform.translate( |
|
|
return Transform.translate( |
|
|
offset: Offset(0, -50 * (1 - _animationController.value)), |
|
|
offset: Offset(0, -50 * (1 - _animationController.value)), |
|
|
child: Opacity( |
|
|
child: Opacity( |
|
|
opacity: _animationController.value, |
|
|
opacity: _animationController.value, |
|
|
child: Container( |
|
|
child: Container( |
|
|
width: double.infinity, |
|
|
width: double.infinity, |
|
|
margin: EdgeInsets.symmetric(horizontal: 20, vertical: 5), |
|
|
margin: EdgeInsets.symmetric(horizontal: 20, vertical: 5), |
|
|
padding: EdgeInsets.all(10), |
|
|
padding: EdgeInsets.all(10), |
|
|
decoration: BoxDecoration( |
|
|
decoration: BoxDecoration( |
|
|
color: Colors.white, |
|
|
color: Colors.white, |
|
|
borderRadius: BorderRadius.circular(12), |
|
|
borderRadius: BorderRadius.circular(12), |
|
|
boxShadow: [ |
|
|
boxShadow: [ |
|
|
BoxShadow( |
|
|
BoxShadow( |
|
|
color: Colors.grey.withOpacity(0.08), |
|
|
color: Colors.grey.withOpacity(0.08), |
|
|
blurRadius: 6, |
|
|
blurRadius: 6, |
|
|
offset: Offset(0, 2), |
|
|
offset: Offset(0, 2), |
|
|
), |
|
|
|
|
|
], |
|
|
|
|
|
), |
|
|
|
|
|
child: Column( |
|
|
|
|
|
children: [ |
|
|
|
|
|
Text( |
|
|
|
|
|
'Historique des commandes payées', |
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
fontSize: 18, |
|
|
|
|
|
fontWeight: FontWeight.bold, |
|
|
|
|
|
color: Color(0xFF2c3e50), |
|
|
), |
|
|
), |
|
|
], |
|
|
textAlign: TextAlign.center, |
|
|
), |
|
|
), |
|
|
child: Column( |
|
|
SizedBox(height: 2), |
|
|
children: [ |
|
|
Text( |
|
|
Text( |
|
|
'Consultez toutes les commandes qui ont été payées', |
|
|
'Historique des commandes payées', |
|
|
style: TextStyle( |
|
|
style: TextStyle( |
|
|
fontSize: 12, |
|
|
fontSize: 18, |
|
|
color: Colors.grey.shade600, |
|
|
fontWeight: FontWeight.bold, |
|
|
|
|
|
color: Color(0xFF2c3e50), |
|
|
|
|
|
), |
|
|
|
|
|
textAlign: TextAlign.center, |
|
|
|
|
|
), |
|
|
), |
|
|
SizedBox(height: 2), |
|
|
textAlign: TextAlign.center, |
|
|
Text( |
|
|
), |
|
|
'Consultez toutes les commandes qui ont été payées', |
|
|
SizedBox(height: 6), |
|
|
style: TextStyle( |
|
|
// Barre des filtres |
|
|
fontSize: 12, |
|
|
Row( |
|
|
color: Colors.grey.shade600, |
|
|
mainAxisAlignment: MainAxisAlignment.center, |
|
|
|
|
|
children: [ |
|
|
|
|
|
ElevatedButton( |
|
|
|
|
|
onPressed: () => _selectDate(context, true), |
|
|
|
|
|
child: Text(_startDate == null |
|
|
|
|
|
? 'Date début' |
|
|
|
|
|
: 'Début: ${_startDate!.day}/${_startDate!.month}/${_startDate!.year}'), |
|
|
|
|
|
style: ElevatedButton.styleFrom( |
|
|
|
|
|
backgroundColor: Color(0xFF4CAF50), |
|
|
|
|
|
foregroundColor: Colors.white, |
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), |
|
|
|
|
|
textStyle: TextStyle(fontSize: 10), |
|
|
|
|
|
), |
|
|
), |
|
|
), |
|
|
textAlign: TextAlign.center, |
|
|
SizedBox(width: 5), |
|
|
), |
|
|
ElevatedButton( |
|
|
if (totalItems > 0) |
|
|
onPressed: () => _selectDate(context, false), |
|
|
Padding( |
|
|
child: Text(_endDate == null |
|
|
padding: EdgeInsets.only(top: 4), |
|
|
? 'Date fin' |
|
|
child: Text( |
|
|
: 'Fin: ${_endDate!.day}/${_endDate!.month}/${_endDate!.year}'), |
|
|
totalPages > 1 |
|
|
style: ElevatedButton.styleFrom( |
|
|
? '$totalItems commande${totalItems > 1 ? 's' : ''} • Page $currentPage/$totalPages' |
|
|
backgroundColor: Color(0xFF4CAF50), |
|
|
: '$totalItems commande${totalItems > 1 ? 's' : ''} trouvée${totalItems > 1 ? 's' : ''}', |
|
|
foregroundColor: Colors.white, |
|
|
style: TextStyle( |
|
|
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), |
|
|
fontSize: 10, |
|
|
textStyle: TextStyle(fontSize: 10), |
|
|
color: Colors.grey.shade500, |
|
|
|
|
|
fontWeight: FontWeight.w500, |
|
|
|
|
|
), |
|
|
|
|
|
textAlign: TextAlign.center, |
|
|
|
|
|
), |
|
|
), |
|
|
), |
|
|
), |
|
|
], |
|
|
SizedBox(width: 5), |
|
|
), |
|
|
ElevatedButton( |
|
|
|
|
|
onPressed: () => _loadCommandes(page: 1), |
|
|
|
|
|
child: Text('Filtrer'), |
|
|
|
|
|
style: ElevatedButton.styleFrom( |
|
|
|
|
|
backgroundColor: Colors.orange, |
|
|
|
|
|
foregroundColor: Colors.white, |
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), |
|
|
|
|
|
textStyle: TextStyle(fontSize: 10), |
|
|
|
|
|
), |
|
|
|
|
|
), |
|
|
|
|
|
SizedBox(width: 5), |
|
|
|
|
|
ElevatedButton( |
|
|
|
|
|
onPressed: () { |
|
|
|
|
|
setState(() { |
|
|
|
|
|
_startDate = null; |
|
|
|
|
|
_endDate = null; |
|
|
|
|
|
}); |
|
|
|
|
|
_loadCommandes(page: 1); |
|
|
|
|
|
}, |
|
|
|
|
|
child: Text('Réinitialiser'), |
|
|
|
|
|
style: ElevatedButton.styleFrom( |
|
|
|
|
|
backgroundColor: Colors.grey, |
|
|
|
|
|
foregroundColor: Colors.white, |
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), |
|
|
|
|
|
textStyle: TextStyle(fontSize: 10), |
|
|
|
|
|
), |
|
|
|
|
|
), |
|
|
|
|
|
SizedBox(width: 5), |
|
|
|
|
|
ElevatedButton( |
|
|
|
|
|
onPressed: () { |
|
|
|
|
|
final today = DateTime.now(); |
|
|
|
|
|
setState(() { |
|
|
|
|
|
_startDate = DateTime(today.year, today.month, today.day); |
|
|
|
|
|
_endDate = DateTime(today.year, today.month, today.day, 23, 59, 59); |
|
|
|
|
|
}); |
|
|
|
|
|
_loadCommandes(page: 1); |
|
|
|
|
|
}, |
|
|
|
|
|
child: Text('Aujourd’hui'), |
|
|
|
|
|
style: ElevatedButton.styleFrom( |
|
|
|
|
|
backgroundColor: Colors.blue, |
|
|
|
|
|
foregroundColor: Colors.white, |
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), |
|
|
|
|
|
textStyle: TextStyle(fontSize: 10), |
|
|
|
|
|
), |
|
|
|
|
|
), |
|
|
|
|
|
], |
|
|
|
|
|
), |
|
|
|
|
|
SizedBox(height: 4), |
|
|
|
|
|
if (totalItems > 0) |
|
|
|
|
|
Padding( |
|
|
|
|
|
padding: EdgeInsets.only(top: 4), |
|
|
|
|
|
child: Text( |
|
|
|
|
|
totalPages > 1 |
|
|
|
|
|
? '$totalItems commande${totalItems > 1 ? 's' : ''} • Page $currentPage/$totalPages' |
|
|
|
|
|
: '$totalItems commande${totalItems > 1 ? 's' : ''} trouvée${totalItems > 1 ? 's' : ''}', |
|
|
|
|
|
style: TextStyle( |
|
|
|
|
|
fontSize: 10, |
|
|
|
|
|
color: Colors.grey.shade500, |
|
|
|
|
|
fontWeight: FontWeight.w500, |
|
|
|
|
|
), |
|
|
|
|
|
textAlign: TextAlign.center, |
|
|
|
|
|
), |
|
|
|
|
|
), |
|
|
|
|
|
], |
|
|
), |
|
|
), |
|
|
), |
|
|
), |
|
|
); |
|
|
), |
|
|
}, |
|
|
); |
|
|
); |
|
|
}, |
|
|
} |
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
Widget _buildPagination() { |
|
|
Widget _buildPagination() { |
|
|
return Container( |
|
|
return Container( |
|
|
@ -462,91 +544,106 @@ class _OrderHistoryPageState extends State<OrderHistoryPage> |
|
|
return pages; |
|
|
return pages; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Widget _buildContent() { |
|
|
Widget _buildContent() { |
|
|
if (isLoading) { |
|
|
if (isLoading) { |
|
|
return Center( |
|
|
return const Center( |
|
|
child: Column( |
|
|
child: CircularProgressIndicator(color: Color(0xFF4CAF50)), |
|
|
mainAxisAlignment: MainAxisAlignment.center, |
|
|
); |
|
|
children: [ |
|
|
} |
|
|
CircularProgressIndicator( |
|
|
|
|
|
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFF4CAF50)), |
|
|
|
|
|
), |
|
|
|
|
|
SizedBox(height: 16), |
|
|
|
|
|
Text( |
|
|
|
|
|
'Chargement des commandes...', |
|
|
|
|
|
style: TextStyle(color: Colors.grey.shade600), |
|
|
|
|
|
), |
|
|
|
|
|
], |
|
|
|
|
|
), |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (error != null) { |
|
|
if (error != null) { |
|
|
return Center( |
|
|
return Center( |
|
|
child: Column( |
|
|
child: Text(error!, style: TextStyle(color: Colors.red)), |
|
|
mainAxisAlignment: MainAxisAlignment.center, |
|
|
); |
|
|
children: [ |
|
|
} |
|
|
Icon(Icons.error_outline, size: 64, color: Colors.grey), |
|
|
|
|
|
SizedBox(height: 16), |
|
|
if (commandes.isEmpty) { |
|
|
Padding( |
|
|
return const Center( |
|
|
padding: EdgeInsets.symmetric(horizontal: 20), |
|
|
child: Text("Aucune commande trouvée"), |
|
|
child: Text( |
|
|
); |
|
|
error!, |
|
|
} |
|
|
style: TextStyle(color: Colors.grey), |
|
|
|
|
|
textAlign: TextAlign.center, |
|
|
// ✅ Afficher les données sous forme de tableau |
|
|
), |
|
|
return SingleChildScrollView( |
|
|
), |
|
|
scrollDirection: Axis.horizontal, |
|
|
SizedBox(height: 16), |
|
|
child: ConstrainedBox( |
|
|
ElevatedButton( |
|
|
constraints: BoxConstraints(minWidth: MediaQuery.of(context).size.width * 0.9), // 1.5x la largeur écran |
|
|
onPressed: () => _loadCommandes(page: currentPage), |
|
|
child: SingleChildScrollView( |
|
|
child: Text('Réessayer'), |
|
|
child: _buildTableView(), |
|
|
style: ElevatedButton.styleFrom( |
|
|
), |
|
|
backgroundColor: Color(0xFF4CAF50), |
|
|
), |
|
|
foregroundColor: Colors.white, |
|
|
); |
|
|
), |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Widget _buildTableView() { |
|
|
|
|
|
return DataTable( |
|
|
|
|
|
columnSpacing: 20, |
|
|
|
|
|
headingRowColor: MaterialStateProperty.all(const Color(0xFF4CAF50)), |
|
|
|
|
|
headingTextStyle: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold), |
|
|
|
|
|
dataRowHeight: 48, |
|
|
|
|
|
columns: const [ |
|
|
|
|
|
DataColumn(label: Text("N°")), |
|
|
|
|
|
DataColumn(label: Text("Table")), |
|
|
|
|
|
DataColumn(label: Text("Total")), |
|
|
|
|
|
DataColumn(label: Text("Détails")), // Nouvelle colonne pour le bouton |
|
|
|
|
|
], |
|
|
|
|
|
rows: commandes.map((commande) { |
|
|
|
|
|
return DataRow( |
|
|
|
|
|
cells: [ |
|
|
|
|
|
DataCell(Text(commande.numeroCommande ?? '-')), |
|
|
|
|
|
DataCell(Text(commande.tablename ?? '-')), |
|
|
|
|
|
DataCell(Text(_formatPrice(commande.totalTtc ?? 0))), |
|
|
|
|
|
DataCell( |
|
|
|
|
|
IconButton( |
|
|
|
|
|
icon: Icon(Icons.info, color: Color(0xFF4CAF50)), |
|
|
|
|
|
tooltip: 'Voir les détails', |
|
|
|
|
|
onPressed: () { |
|
|
|
|
|
_showCommandeDetails(commande); |
|
|
|
|
|
}, |
|
|
), |
|
|
), |
|
|
], |
|
|
), |
|
|
), |
|
|
], |
|
|
); |
|
|
); |
|
|
} |
|
|
}).toList(), |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (commandes.isEmpty) { |
|
|
// Exemple de fonction pour afficher les détails dans un dialog |
|
|
return Center( |
|
|
void _showCommandeDetails(CommandeData commande) { |
|
|
child: Column( |
|
|
showDialog( |
|
|
mainAxisAlignment: MainAxisAlignment.center, |
|
|
context: context, |
|
|
children: [ |
|
|
builder: (context) { |
|
|
Icon(Icons.restaurant_menu, size: 64, color: Colors.grey), |
|
|
return AlertDialog( |
|
|
SizedBox(height: 16), |
|
|
title: Text('Détails commande ${commande.numeroCommande ?? ""}'), |
|
|
Text( |
|
|
content: SingleChildScrollView( |
|
|
currentPage > 1 |
|
|
child: Column( |
|
|
? 'Aucune commande sur cette page' |
|
|
crossAxisAlignment: CrossAxisAlignment.start, |
|
|
: 'Aucune commande payée', |
|
|
children: [ |
|
|
style: TextStyle(color: Colors.grey, fontSize: 16), |
|
|
Text('Table: ${commande.tablename ?? "-"}'), |
|
|
), |
|
|
Text( |
|
|
if (currentPage > 1) ...[ |
|
|
'Date de paiement: ${commande.datePaiement != null ? _formatDateTime(commande.datePaiement!) : "-"}', |
|
|
SizedBox(height: 16), |
|
|
|
|
|
ElevatedButton( |
|
|
|
|
|
onPressed: () => _goToPage(1), |
|
|
|
|
|
child: Text('Retour à la première page'), |
|
|
|
|
|
style: ElevatedButton.styleFrom( |
|
|
|
|
|
backgroundColor: Color(0xFF4CAF50), |
|
|
|
|
|
foregroundColor: Colors.white, |
|
|
|
|
|
), |
|
|
|
|
|
), |
|
|
), |
|
|
|
|
|
Text('Total TTC: ${_formatPrice(commande.totalTtc ?? 0)}'), |
|
|
|
|
|
SizedBox(height: 10), |
|
|
|
|
|
const Text('Articles:', style: TextStyle(fontWeight: FontWeight.bold)), |
|
|
|
|
|
...?commande.items?.map((item) => Text( |
|
|
|
|
|
'${item.quantite} × ${item.menuNom} - ${_formatPrice(item.totalItem)}')), |
|
|
], |
|
|
], |
|
|
], |
|
|
), |
|
|
), |
|
|
), |
|
|
|
|
|
actions: [ |
|
|
|
|
|
TextButton( |
|
|
|
|
|
onPressed: () => Navigator.pop(context), |
|
|
|
|
|
child: const Text('Fermer'), |
|
|
|
|
|
), |
|
|
|
|
|
], |
|
|
); |
|
|
); |
|
|
} |
|
|
}, |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ListView.builder( |
|
|
|
|
|
padding: EdgeInsets.symmetric(horizontal: 20), |
|
|
|
|
|
itemCount: commandes.length, |
|
|
|
|
|
itemBuilder: (context, index) { |
|
|
|
|
|
return _buildOrderCard(commandes[index], index); |
|
|
|
|
|
}, |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Widget _buildOrderCard(CommandeData commande, int index) { |
|
|
Widget _buildOrderCard(CommandeData commande, int index) { |
|
|
if (index >= _cardAnimationControllers.length) { |
|
|
if (index >= _cardAnimationControllers.length) { |
|
|
@ -1052,20 +1149,19 @@ class CommandeData { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static DateTime? _parseDateTime(dynamic value) { |
|
|
static DateTime? _parseDateTime(dynamic value) { |
|
|
if (value == null) return null; |
|
|
if (value == null) return null; |
|
|
if (value is String) { |
|
|
if (value is String) { |
|
|
try { |
|
|
try { |
|
|
final result = DateTime.parse(value); |
|
|
return DateTime.parse(value).toLocal(); // converti en heure locale |
|
|
return result; |
|
|
} catch (e) { |
|
|
} catch (e) { |
|
|
print('Erreur parsing date: $value - $e'); |
|
|
print('Erreur parsing date: $value - $e'); |
|
|
return null; |
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
print('Impossible de parser en datetime: $value'); |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static List<CommandeItem>? _parseItems(dynamic value) { |
|
|
static List<CommandeItem>? _parseItems(dynamic value) { |
|
|
|
|
|
|
|
|
|
