update Mzansi Wallet nav

This commit is contained in:
2025-08-18 15:02:52 +02:00
parent af54224484
commit e58eeab4ea
6 changed files with 225 additions and 101 deletions

View File

@@ -1,7 +1,10 @@
import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart';
import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart';
@@ -49,9 +52,9 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
void openscanner() async { void openscanner() async {
Navigator.of(context).pushNamed( context.pushNamed(
'/scanner', "barcodeScanner",
arguments: _cardNumberController, extra: _cardNumberController,
); );
} }
@@ -136,18 +139,31 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
const SizedBox(height: 15), const SizedBox(height: 15),
Center( Center(
child: MihButton( child: MihButton(
onPressed: () { onPressed: () async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
MIHMzansiWalletApis.updateLoyaltyCardAPICall( int statusCode = await MIHMzansiWalletApis
.updateLoyaltyCardAPICall(
widget.signedInUser, widget.signedInUser,
widget.cardList[index].idloyalty_cards, widget.cardList[index].idloyalty_cards,
widget.cardList[index].favourite, widget.cardList[index].favourite,
widget.cardList[index].priority_index, widget.cardList[index].priority_index,
_nicknameController.text, _nicknameController.text,
_cardNumberController.text, _cardNumberController.text,
0,
ctxt, ctxt,
); );
if (statusCode == 200) {
context.pop();
context.pop();
context.goNamed(
"mzansiWallet",
extra: WalletArguments(
widget.signedInUser,
0,
),
);
} else {
internetConnectionPopUp();
}
} else { } else {
MihAlertServices().formNotFilledCompletely(context); MihAlertServices().formNotFilledCompletely(context);
} }
@@ -184,13 +200,23 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
builder: (context) { builder: (context) {
return MIHDeleteMessage( return MIHDeleteMessage(
deleteType: "Loyalty Card", deleteType: "Loyalty Card",
onTap: () { onTap: () async {
MIHMzansiWalletApis.deleteLoyaltyCardAPICall( int statusCode =
await MIHMzansiWalletApis.deleteLoyaltyCardAPICall(
widget.signedInUser, widget.signedInUser,
widget.cardList[index].idloyalty_cards, widget.cardList[index].idloyalty_cards,
widget.navIndex,
context, context,
); );
if (statusCode == 200) {
setState(() {
widget.cardList.removeAt(index);
});
context.pop();
context.pop();
} else {
context.pop();
internetConnectionPopUp();
}
}); });
}, },
); );
@@ -225,17 +251,30 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
height: 15, height: 15,
), ),
MihButton( MihButton(
onPressed: () { onPressed: () async {
MIHMzansiWalletApis.updateLoyaltyCardAPICall( int statusCode =
await MIHMzansiWalletApis.updateLoyaltyCardAPICall(
widget.signedInUser, widget.signedInUser,
widget.cardList[index].idloyalty_cards, widget.cardList[index].idloyalty_cards,
"Yes", "Yes",
_noFavourites, _noFavourites,
widget.cardList[index].nickname, widget.cardList[index].nickname,
widget.cardList[index].card_number, widget.cardList[index].card_number,
1,
ctxt, ctxt,
); );
if (statusCode == 200) {
context.pop();
context.pop();
context.goNamed(
"mzansiWallet",
extra: WalletArguments(
widget.signedInUser,
1,
),
);
} else {
internetConnectionPopUp();
}
}, },
buttonColor: MihColors.getGreenColor( buttonColor: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"), MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
@@ -257,6 +296,17 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
); );
} }
void internetConnectionPopUp() {
showDialog(
context: context,
builder: (context) {
return const MIHErrorMessage(
errorType: "Internet Connection",
);
},
);
}
void removeFromFavCardWindow(BuildContext ctxt, int index) { void removeFromFavCardWindow(BuildContext ctxt, int index) {
showDialog( showDialog(
context: context, context: context,
@@ -286,17 +336,30 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
height: 15, height: 15,
), ),
MihButton( MihButton(
onPressed: () { onPressed: () async {
MIHMzansiWalletApis.updateLoyaltyCardAPICall( int statusCode =
await MIHMzansiWalletApis.updateLoyaltyCardAPICall(
widget.signedInUser, widget.signedInUser,
widget.cardList[index].idloyalty_cards, widget.cardList[index].idloyalty_cards,
"", "",
0, 0,
widget.cardList[index].nickname, widget.cardList[index].nickname,
widget.cardList[index].card_number, widget.cardList[index].card_number,
0,
ctxt, ctxt,
); );
if (statusCode == 200) {
context.pop();
context.pop();
context.goNamed(
"mzansiWallet",
extra: WalletArguments(
widget.signedInUser,
0,
),
);
} else {
internetConnectionPopUp();
}
}, },
buttonColor: MihColors.getRedColor( buttonColor: MihColors.getRedColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"), MzansiInnovationHub.of(context)!.theme.mode == "Dark"),

View File

@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mobile_scanner/mobile_scanner.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -36,7 +37,7 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
}); });
print(bcode.barcodes.first.rawValue); print(bcode.barcodes.first.rawValue);
_scannerController.stop(); _scannerController.stop();
Navigator.of(context).pop(); context.pop();
} }
} }
@@ -123,7 +124,7 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
child: MihButton( child: MihButton(
onPressed: () { onPressed: () {
_scannerController.stop(); _scannerController.stop();
Navigator.of(context).pop(); context.pop();
}, },
buttonColor: MihColors.getRedColor( buttonColor: MihColors.getRedColor(
MzansiInnovationHub.of(context)!.theme.mode == MzansiInnovationHub.of(context)!.theme.mode ==

View File

@@ -1,3 +1,4 @@
import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
@@ -52,7 +53,13 @@ class _MihWalletState extends State<MihWallet> {
icon: const Icon(Icons.arrow_back), icon: const Icon(Icons.arrow_back),
iconSize: 35, iconSize: 35,
onTap: () { onTap: () {
Navigator.of(context).pop(); context.goNamed(
'home',
extra: AuthArguments(
true,
false,
),
);
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();
}, },
); );

View File

@@ -1,3 +1,4 @@
import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
@@ -25,10 +26,14 @@ class _MihWalletTileState extends State<MihWalletTile> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MihPackageTile( return MihPackageTile(
onTap: () { onTap: () {
Navigator.of(context).pushNamed( context.goNamed(
'/mzansi-wallet', 'mzansiWallet',
arguments: WalletArguments(widget.signedInUser, 0), extra: WalletArguments(widget.signedInUser, 0),
); );
// Navigator.of(context).pushNamed(
// '/mzansi-wallet',
// arguments: WalletArguments(widget.signedInUser, 0),
// );
}, },
appName: "Mzansi Wallet", appName: "Mzansi Wallet",
appIcon: Icon( appIcon: Icon(

View File

@@ -1,6 +1,8 @@
import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart';
import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/main.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart';
@@ -73,9 +75,9 @@ class _MihCardsState extends State<MihCards> {
} }
void openscanner() async { void openscanner() async {
Navigator.of(context).pushNamed( context.pushNamed(
'/scanner', "barcodeScanner",
arguments: cardNumberController, extra: cardNumberController,
); );
} }
@@ -87,6 +89,71 @@ class _MihCardsState extends State<MihCards> {
} }
} }
void successPopUp(String title, String message, int packageIndex) {
showDialog(
context: context,
builder: (context) {
return MihPackageAlert(
alertIcon: Icon(
Icons.check_circle_outline_rounded,
size: 150,
color: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
),
alertTitle: title,
alertBody: Column(
children: [
Text(
message,
style: TextStyle(
color: MihColors.getSecondaryColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
fontSize: 15,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 25),
Center(
child: MihButton(
onPressed: () {
context.pop();
},
buttonColor: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
elevation: 10,
width: 300,
child: Text(
"Dismiss",
style: TextStyle(
color: MihColors.getPrimaryColor(
MzansiInnovationHub.of(context)!.theme.mode ==
"Dark"),
fontSize: 20,
fontWeight: FontWeight.bold,
),
),
),
)
],
),
alertColour: MihColors.getGreenColor(
MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
);
},
);
}
void internetConnectionPopUp() {
showDialog(
context: context,
builder: (context) {
return const MIHErrorMessage(
errorType: "Internet Connection",
);
},
);
}
void addCardWindow(BuildContext ctxt, double width) { void addCardWindow(BuildContext ctxt, double width) {
showDialog( showDialog(
context: context, context: context,
@@ -246,7 +313,7 @@ class _MihCardsState extends State<MihCards> {
const SizedBox(height: 15), const SizedBox(height: 15),
Center( Center(
child: MihButton( child: MihButton(
onPressed: () { onPressed: () async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
if (shopController.text == "") { if (shopController.text == "") {
showDialog( showDialog(
@@ -257,7 +324,8 @@ class _MihCardsState extends State<MihCards> {
}, },
); );
} else { } else {
MIHMzansiWalletApis.addLoyaltyCardAPICall( int statusCode =
await MIHMzansiWalletApis.addLoyaltyCardAPICall(
widget.signedInUser, widget.signedInUser,
widget.signedInUser.app_id, widget.signedInUser.app_id,
shopController.text, shopController.text,
@@ -265,9 +333,22 @@ class _MihCardsState extends State<MihCards> {
"", "",
0, 0,
_nicknameController.text, _nicknameController.text,
0,
context, context,
); );
if (statusCode == 201) {
setState(() {
cardList = MIHMzansiWalletApis.getLoyaltyCards(
widget.signedInUser.app_id);
});
context.pop();
successPopUp(
"Successfully Added Card",
"The loyalty card has been added to your favourites.",
0,
);
} else {
internetConnectionPopUp();
}
} }
} else { } else {
MihAlertServices().formNotFilledCompletely(context); MihAlertServices().formNotFilledCompletely(context);

View File

@@ -1,7 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:go_router/go_router.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/loyalty_card.dart';
import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -22,22 +22,12 @@ class MIHMzansiWalletApis {
static Future<List<MIHLoyaltyCard>> getLoyaltyCards( static Future<List<MIHLoyaltyCard>> getLoyaltyCards(
String app_id, String app_id,
) async { ) async {
//print("Patien manager page: $endpoint");
final response = await http.get(Uri.parse( final response = await http.get(Uri.parse(
"${AppEnviroment.baseApiUrl}/mzasni-wallet/loyalty-cards/$app_id")); "${AppEnviroment.baseApiUrl}/mzasni-wallet/loyalty-cards/$app_id"));
// print("Here");
// print("Body: ${response.body}");
// print("Code: ${response.statusCode}");
// errorCode = response.statusCode.toString();
// errorBody = response.body;
if (response.statusCode == 200) { if (response.statusCode == 200) {
//print("Here1");
Iterable l = jsonDecode(response.body); Iterable l = jsonDecode(response.body);
//print("Here2");
List<MIHLoyaltyCard> patientQueue = List<MIHLoyaltyCard>.from( List<MIHLoyaltyCard> patientQueue = List<MIHLoyaltyCard>.from(
l.map((model) => MIHLoyaltyCard.fromJson(model))); l.map((model) => MIHLoyaltyCard.fromJson(model)));
//print("Here3");
//print(patientQueue);
return patientQueue; return patientQueue;
} else { } else {
throw Exception('failed to fatch loyalty cards'); throw Exception('failed to fatch loyalty cards');
@@ -55,19 +45,10 @@ class MIHMzansiWalletApis {
//print("Patien manager page: $endpoint"); //print("Patien manager page: $endpoint");
final response = await http.get(Uri.parse( final response = await http.get(Uri.parse(
"${AppEnviroment.baseApiUrl}/mzasni-wallet/loyalty-cards/favourites/$app_id")); "${AppEnviroment.baseApiUrl}/mzasni-wallet/loyalty-cards/favourites/$app_id"));
// print("Here");
// print("Body: ${response.body}");
// print("Code: ${response.statusCode}");
// errorCode = response.statusCode.toString();
// errorBody = response.body;
if (response.statusCode == 200) { if (response.statusCode == 200) {
// print("Here1");
Iterable l = jsonDecode(response.body); Iterable l = jsonDecode(response.body);
//print("Here2");
List<MIHLoyaltyCard> patientQueue = List<MIHLoyaltyCard>.from( List<MIHLoyaltyCard> patientQueue = List<MIHLoyaltyCard>.from(
l.map((model) => MIHLoyaltyCard.fromJson(model))); l.map((model) => MIHLoyaltyCard.fromJson(model)));
//print("Here3");
//print(patientQueue);
return patientQueue; return patientQueue;
} else { } else {
throw Exception('failed to fatch loyalty cards'); throw Exception('failed to fatch loyalty cards');
@@ -82,10 +63,9 @@ class MIHMzansiWalletApis {
/// BuildContext context, /// BuildContext context,
/// ///
/// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS) /// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS)
static Future<void> deleteLoyaltyCardAPICall( static Future<int> deleteLoyaltyCardAPICall(
AppUser signedInUser, AppUser signedInUser,
int idloyalty_cards, int idloyalty_cards,
int navIndex,
BuildContext context, BuildContext context,
) async { ) async {
loadingPopUp(context); loadingPopUp(context);
@@ -99,22 +79,24 @@ class MIHMzansiWalletApis {
); );
//print("Here4"); //print("Here4");
//print(response.statusCode); //print(response.statusCode);
if (response.statusCode == 200) { context.pop();
Navigator.of(context).pop(); return response.statusCode;
Navigator.of(context).pop(); // if (response.statusCode == 200) {
Navigator.of(context).pop(); // Navigator.of(context).pop();
Navigator.of(context).pop(); // Navigator.of(context).pop();
Navigator.of(context).pushNamed( // Navigator.of(context).pop();
'/mzansi-wallet', // Navigator.of(context).pop();
arguments: WalletArguments(signedInUser, navIndex), // Navigator.of(context).pushNamed(
); // '/mzansi-wallet',
String message = // arguments: WalletArguments(signedInUser, navIndex),
"The loyalty card has been deleted successfully. This means it will no longer be visible in your Mzansi Wallet."; // );
successPopUp(message, context); // String message =
} else { // "The loyalty card has been deleted successfully. This means it will no longer be visible in your Mzansi Wallet.";
Navigator.pop(context); // successPopUp(message, context);
internetConnectionPopUp(context); // } else {
} // Navigator.pop(context);
// internetConnectionPopUp(context);
// }
} }
/// This function is used to add a lopyalty card to users mzansi wallet. /// This function is used to add a lopyalty card to users mzansi wallet.
@@ -127,7 +109,7 @@ class MIHMzansiWalletApis {
/// BuildContext context, /// BuildContext context,
/// ///
/// Returns VOID (TRIGGERS SUCCESS pop up) /// Returns VOID (TRIGGERS SUCCESS pop up)
static Future<void> addLoyaltyCardAPICall( static Future<int> addLoyaltyCardAPICall(
AppUser signedInUser, AppUser signedInUser,
String app_id, String app_id,
String shop_name, String shop_name,
@@ -135,7 +117,6 @@ class MIHMzansiWalletApis {
String favourite, String favourite,
int priority_index, int priority_index,
String nickname, String nickname,
int navIndex,
BuildContext context, BuildContext context,
) async { ) async {
loadingPopUp(context); loadingPopUp(context);
@@ -154,21 +135,23 @@ class MIHMzansiWalletApis {
"nickname": nickname, "nickname": nickname,
}), }),
); );
if (response.statusCode == 201) { context.pop();
Navigator.pop(context); return response.statusCode;
String message = // if (response.statusCode == 201) {
"Your $shop_name Loyalty Card was successfully added to your Mzansi Wallet."; // // Navigator.pop(context);
Navigator.pop(context); // // String message =
Navigator.pop(context); // // "Your $shop_name Loyalty Card was successfully added to your Mzansi Wallet.";
Navigator.of(context).pushNamed( // // Navigator.pop(context);
'/mzansi-wallet', // // Navigator.pop(context);
arguments: WalletArguments(signedInUser, navIndex), // // Navigator.of(context).pushNamed(
); // // '/mzansi-wallet',
successPopUp(message, context); // // arguments: WalletArguments(signedInUser, navIndex),
} else { // // );
Navigator.pop(context); // // successPopUp(message, context);
internetConnectionPopUp(context); // } else {
} // // Navigator.pop(context);
// // internetConnectionPopUp(context);
// }
} }
/// This function is used to Update loyalty card from users mzansi wallet. /// This function is used to Update loyalty card from users mzansi wallet.
@@ -179,14 +162,13 @@ class MIHMzansiWalletApis {
/// BuildContext context, /// BuildContext context,
/// ///
/// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS) /// Returns VOID (TRIGGERS NOTIGICATIOPN ON SUCCESS)
static Future<void> updateLoyaltyCardAPICall( static Future<int> updateLoyaltyCardAPICall(
AppUser signedInUser, AppUser signedInUser,
int idloyalty_cards, int idloyalty_cards,
String favourite, String favourite,
int priority_index, int priority_index,
String nickname, String nickname,
String card_number, String card_number,
int navIndex,
BuildContext context, BuildContext context,
) async { ) async {
loadingPopUp(context); loadingPopUp(context);
@@ -204,23 +186,8 @@ class MIHMzansiWalletApis {
"card_number": card_number, "card_number": card_number,
}), }),
); );
//print("Here4"); context.pop();
//print(response.statusCode); return response.statusCode;
if (response.statusCode == 200) {
Navigator.of(context).pop();
Navigator.of(context).pop();
Navigator.of(context).pop();
Navigator.of(context).pop();
Navigator.of(context).pushNamed(
'/mzansi-wallet',
arguments: WalletArguments(signedInUser, navIndex),
);
String message = "The loyalty card has been added to your favourites.";
successPopUp(message, context);
} else {
Navigator.pop(context);
internetConnectionPopUp(context);
}
} }
//================== POP UPS ========================================================================== //================== POP UPS ==========================================================================