C4M
/
CARING_RESTORANT
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

commit

master
andrymodeste 4 months ago
parent
a4274b9425 21c8d2d924
commit
84675fb1a0
5 changed files with 103 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      lib/pages/cart_page.dart
  2. 8
      lib/pages/commandes_screen.dart
  3. 96
      lib/pages/menu.dart
  4. 6
      lib/pages/menus_screen.dart
  5. 2
      macos/Runner/DebugProfile.entitlements

8
lib/pages/cart_page.dart
View File

@ -110,7 +110,7 @@ class _CartPageState extends State<CartPage> {
Text('• Table: ${widget.tableId}'), Text('• Table: ${widget.tableId}'),
Text('• Personnes: ${widget.personne}'), Text('• Personnes: ${widget.personne}'),
Text('• Articles: ${_getTotalArticles()}'), Text('• Articles: ${_getTotalArticles()}'),
Text('• Total: ${_calculateTotal().toStringAsFixed(2)} €'), Text('• Total: ${_calculateTotal().toStringAsFixed(2)} MGA'),
], ],
), ),
actions: [ actions: [
@ -385,7 +385,7 @@ class _CartPageState extends State<CartPage> {
], ],
), ),
Text( Text(
'${item.prix.toStringAsFixed(2)} € l\'unité', '${item.prix.toStringAsFixed(2)} MGA l\'unité',
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Colors.grey[600], color: Colors.grey[600],
@ -447,7 +447,7 @@ class _CartPageState extends State<CartPage> {
), ),
// Prix total de l'article // Prix total de l'article
Text( Text(
'${(item.prix * item.quantity).toStringAsFixed(2)} €', '${(item.prix * item.quantity).toStringAsFixed(2)} MGA',
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -527,7 +527,7 @@ class _CartPageState extends State<CartPage> {
), ),
), ),
Text( Text(
'${_calculateTotal().toStringAsFixed(2)} €', '${_calculateTotal().toStringAsFixed(2)} MGA',
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

8
lib/pages/commandes_screen.dart
View File

@ -32,7 +32,7 @@ class _OrdersManagementScreenState extends State<OrdersManagementScreen> {
// Get all orders with filtering for active ones only // Get all orders with filtering for active ones only
final response = await http.get( final response = await http.get(
Uri.parse('$baseUrl/commandes?statut=en_attente,en_preparation'), Uri.parse('$baseUrl/commandes'),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json', 'Accept': 'application/json',
@ -309,7 +309,7 @@ class _OrdersManagementScreenState extends State<OrdersManagementScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'Table ${order.tableId} - ${order.totalTtc.toStringAsFixed(2)} €', 'Table ${order.tableId} - ${order.totalTtc.toStringAsFixed(2)} MGA',
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
const Text('Mode de paiement:'), const Text('Mode de paiement:'),
@ -668,7 +668,7 @@ class OrderCard extends StatelessWidget {
), ),
), ),
Text( Text(
'${(item.quantite * 8.00).toStringAsFixed(2)} €', // Placeholder price '${(item.quantite * 8.00).toStringAsFixed(2)} MGA', // Placeholder price
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
color: Colors.black87, color: Colors.black87,
@ -701,7 +701,7 @@ class OrderCard extends StatelessWidget {
), ),
), ),
Text( Text(
'${order.totalTtc.toStringAsFixed(2)} €', '${order.totalTtc.toStringAsFixed(2)} MGA',
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

96
lib/pages/menu.dart
View File

@ -9,7 +9,8 @@ class MenuPage extends StatefulWidget {
final int tableId; final int tableId;
final int personne; final int personne;
const MenuPage({Key? key, required this.tableId, required this.personne}) : super(key: key); const MenuPage({Key? key, required this.tableId, required this.personne})
: super(key: key);
@override @override
State<MenuPage> createState() => _MenuPageState(); State<MenuPage> createState() => _MenuPageState();
@ -29,13 +30,16 @@ class _MenuPageState extends State<MenuPage> {
Future<void> fetchCategories() async { Future<void> fetchCategories() async {
try { try {
final url = Uri.parse("https://restaurant.careeracademy.mg/api/menu-categories"); final url = Uri.parse(
"https://restaurant.careeracademy.mg/api/menu-categories",
);
final response = await http.get(url); final response = await http.get(url);
if (response.statusCode == 200) { if (response.statusCode == 200) {
final jsonResponse = json.decode(response.body); final jsonResponse = json.decode(response.body);
final categoriesList = (jsonResponse['data']?['categories'] ?? []) as List<dynamic>; final categoriesList =
(jsonResponse['data']?['categories'] ?? []) as List<dynamic>;
setState(() { setState(() {
_categories = categoriesList; _categories = categoriesList;
@ -54,15 +58,16 @@ class _MenuPageState extends State<MenuPage> {
Future<void> fetchMenus(int categoryId) async { Future<void> fetchMenus(int categoryId) async {
try { try {
final url = Uri.parse("https://restaurant.careeracademy.mg/api/menus/category/$categoryId?disponible=true"); final url = Uri.parse(
"https://restaurant.careeracademy.mg/api/menus/category/$categoryId?disponible=true",
);
final response = await http.get(url); final response = await http.get(url);
if (response.statusCode == 200) { if (response.statusCode == 200) {
final jsonResponse = json.decode(response.body); final jsonResponse = json.decode(response.body);
final List<dynamic> menusList = jsonResponse is List final List<dynamic> menusList =
? jsonResponse jsonResponse is List ? jsonResponse : (jsonResponse['data'] ?? []);
: (jsonResponse['data'] ?? []);
setState(() { setState(() {
_menus = menusList; _menus = menusList;
@ -99,10 +104,7 @@ class _MenuPageState extends State<MenuPage> {
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return AddToCartModal( return AddToCartModal(item: item, onAddToCart: addToCart);
item: item,
onAddToCart: addToCart,
);
}, },
); );
} }
@ -112,10 +114,13 @@ class _MenuPageState extends State<MenuPage> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => CartPage( builder:
(context) => CartPage(
tableId: widget.tableId, tableId: widget.tableId,
personne: widget.personne, personne: widget.personne,
cartItems: List.from(_cart), // Copie de la liste pour éviter les modifications cartItems: List.from(
_cart,
), // Copie de la liste pour éviter les modifications
), ),
), ),
).then((_) { ).then((_) {
@ -163,14 +168,16 @@ class _MenuPageState extends State<MenuPage> {
if (_categories.isNotEmpty) if (_categories.isNotEmpty)
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: _categories.map<Widget>((cat) { children:
_categories.map<Widget>((cat) {
return buildCategoryButton(cat['nom'], cat['id']); return buildCategoryButton(cat['nom'], cat['id']);
}).toList(), }).toList(),
) )
else else
Center(child: CircularProgressIndicator()), Center(child: CircularProgressIndicator()),
Expanded( Expanded(
child: _menus.isNotEmpty child:
_menus.isNotEmpty
? ListView.builder( ? ListView.builder(
itemCount: _menus.length, itemCount: _menus.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
@ -178,7 +185,10 @@ class _MenuPageState extends State<MenuPage> {
return Card( return Card(
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
child: ListTile( child: ListTile(
onTap: () => showAddToCartModal(item), // Clic sur tout l'item onTap:
() => showAddToCartModal(
item,
), // Clic sur tout l'item
leading: Container( leading: Container(
width: 60, width: 60,
height: 60, height: 60,
@ -198,7 +208,7 @@ class _MenuPageState extends State<MenuPage> {
), ),
subtitle: Text(item['commentaire'] ?? ''), subtitle: Text(item['commentaire'] ?? ''),
trailing: Text( trailing: Text(
"${formatPrix(item['prix'])} €", "${formatPrix(item['prix'])} MGA",
style: TextStyle( style: TextStyle(
color: Colors.green[700], color: Colors.green[700],
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -295,9 +305,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Dialog( return Dialog(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16),
),
child: Container( child: Container(
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
constraints: BoxConstraints(maxWidth: 400), constraints: BoxConstraints(maxWidth: 400),
@ -311,10 +319,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
children: [ children: [
Text( Text(
widget.item['nom'] ?? 'Menu', widget.item['nom'] ?? 'Menu',
style: TextStyle( style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
fontSize: 20,
fontWeight: FontWeight.bold,
),
), ),
IconButton( IconButton(
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
@ -343,13 +348,11 @@ class _AddToCartModalState extends State<AddToCartModal> {
SizedBox(height: 16), SizedBox(height: 16),
// Description // Description
if (widget.item['commentaire'] != null && widget.item['commentaire'].toString().isNotEmpty) if (widget.item['commentaire'] != null &&
widget.item['commentaire'].toString().isNotEmpty)
Text( Text(
widget.item['commentaire'], widget.item['commentaire'],
style: TextStyle( style: TextStyle(fontSize: 14, color: Colors.grey[600]),
fontSize: 14,
color: Colors.grey[600],
),
), ),
SizedBox(height: 16), SizedBox(height: 16),
@ -359,13 +362,10 @@ class _AddToCartModalState extends State<AddToCartModal> {
children: [ children: [
Text( Text(
"Prix unitaire", "Prix unitaire",
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
fontSize: 16,
fontWeight: FontWeight.w500,
),
), ),
Text( Text(
"${formatPrix(widget.item['prix'])} €", "${formatPrix(widget.item['prix'])} MGA",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -379,21 +379,21 @@ class _AddToCartModalState extends State<AddToCartModal> {
// Quantité // Quantité
Text( Text(
"Quantité", "Quantité",
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
fontSize: 16,
fontWeight: FontWeight.w500,
),
), ),
SizedBox(height: 8), SizedBox(height: 8),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
IconButton( IconButton(
onPressed: _quantity > 1 ? () { onPressed:
_quantity > 1
? () {
setState(() { setState(() {
_quantity--; _quantity--;
}); });
} : null, }
: null,
icon: Icon(Icons.remove), icon: Icon(Icons.remove),
style: IconButton.styleFrom( style: IconButton.styleFrom(
backgroundColor: Colors.grey[200], backgroundColor: Colors.grey[200],
@ -402,10 +402,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
SizedBox(width: 20), SizedBox(width: 20),
Text( Text(
_quantity.toString(), _quantity.toString(),
style: TextStyle( style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
fontSize: 18,
fontWeight: FontWeight.bold,
),
), ),
SizedBox(width: 20), SizedBox(width: 20),
IconButton( IconButton(
@ -426,10 +423,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
// Notes // Notes
Text( Text(
"Notes (optionnel)", "Notes (optionnel)",
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
fontSize: 16,
fontWeight: FontWeight.w500,
),
), ),
SizedBox(height: 8), SizedBox(height: 8),
TextField( TextField(
@ -466,7 +460,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
), ),
), ),
Text( Text(
"${calculateTotal().toStringAsFixed(2)} €", "${calculateTotal().toStringAsFixed(2)} MGA",
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -490,7 +484,9 @@ class _AddToCartModalState extends State<AddToCartModal> {
// Afficher un snackbar de confirmation // Afficher un snackbar de confirmation
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text("${widget.item['nom']} ajouté au panier"), content: Text(
"${widget.item['nom']} ajouté au panier",
),
backgroundColor: Colors.green, backgroundColor: Colors.green,
duration: Duration(seconds: 2), duration: Duration(seconds: 2),
), ),

6
lib/pages/menus_screen.dart
View File

@ -186,7 +186,7 @@ class _MenuPageState extends State<MenuPage> {
), ),
subtitle: Text(item['commentaire'] ?? ''), subtitle: Text(item['commentaire'] ?? ''),
trailing: Text( trailing: Text(
"${formatPrix(item['prix'])} €", "${formatPrix(item['prix'])} MGA",
style: TextStyle( style: TextStyle(
color: Colors.green[700], color: Colors.green[700],
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -345,7 +345,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
), ),
Text( Text(
"${formatPrix(widget.item['prix'])} €", "${formatPrix(widget.item['prix'])} MGA",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -440,7 +440,7 @@ class _AddToCartModalState extends State<AddToCartModal> {
), ),
), ),
Text( Text(
"${calculateTotal().toStringAsFixed(2)} €", "${calculateTotal().toStringAsFixed(2)} MGA",
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

2
macos/Runner/DebugProfile.entitlements
View File

@ -8,5 +8,7 @@
<true/> <true/>
<key>com.apple.security.network.server</key> <key>com.apple.security.network.server</key>
<true/> <true/>
<key>com.apple.security.network.client</key>
<true/>
</dict> </dict>
</plist> </plist>

Write Preview
Loading…
Cancel
Save