diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6d2f83f..497d14a 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
+
diff --git a/assets/icons/ic_add_dependents.png b/assets/icons/ic_add_dependents.png
new file mode 100644
index 0000000..5202f1f
Binary files /dev/null and b/assets/icons/ic_add_dependents.png differ
diff --git a/assets/icons/ic_category_check.png b/assets/icons/ic_category_check.png
new file mode 100644
index 0000000..94de67b
Binary files /dev/null and b/assets/icons/ic_category_check.png differ
diff --git a/assets/images/all_categories.png b/assets/images/all_categories.png
new file mode 100644
index 0000000..aa6f895
Binary files /dev/null and b/assets/images/all_categories.png differ
diff --git a/assets/images/cat_all.png b/assets/images/cat_all.png
new file mode 100644
index 0000000..aa6f895
Binary files /dev/null and b/assets/images/cat_all.png differ
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 89a6568..7878074 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -381,7 +381,7 @@
"browseCategories": "تصفح الفئات",
"searchItems": "عناصر البحث",
"offerAndDiscounts": "العروض والخصومات",
- "offerValid": "العرض صالح",
+ "offerValid": "العرض ساري",
"offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
@@ -552,9 +552,6 @@
"pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
"youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
"open": "يفتح",
- "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
- "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
- "generate": "يولد",
"paymentRequest": "طلب الدفع",
"paymentDetails": "تفاصيل الدفع",
"requestNo": "رقم الطلب",
@@ -669,16 +666,117 @@
"incidentDetails": "تفاصيل الحادث",
"ticketNumber": "رقم التذكرة",
"ticketId": "معرف التذكرة",
- "pleaseSelectProject": "الرجاء اختيار مشروع",
- "viewAttachment" : "عرض المرفق",
- "parkingQr": "وقوف السيارات QR",
- "startNow": "ابدأ الآن",
- "destination_type": "نوع الوجهة",
- "source_organization_name": "اسم منظمة المصدر",
- "destination_organization_name": "اسم منظمة الوجهة",
+ "pleaseSelectProject": "الرجاء اختيار مشروع",
+ "viewAttachment": "عرض المرفق",
+ "parkingQr": "وقوف السيارات QR",
+ "startNow": "ابدأ الآن",
+ "destination_type": "نوع الوجهة",
+ "source_organization_name": "اسم منظمة المصدر",
+ "destination_organization_name": "اسم منظمة الوجهة",
"costCenter": "مركز التكلفة",
"priceSAR": "السعر (ريال سعودي)",
"amountSAR": "المبلغ (ريال سعودي)",
- "amuLastThreeMonths": "AMU (آخر 3 أشهر)"
+ "amuLastThreeMonths": "AMU (آخر 3 أشهر)",
+ "mazayaTitle": "مزايا",
+ "mazayaAccessGranted": "تم منح حق الوصول لمزايا",
+ "mazayaAccessGrantedDesc": "أصبح لدى {} حق وصول نشط الآن. شارك رابط التنزيل أدناه ليتمكن من تثبيت تطبيق مهم وإكمال الإعداد.",
+ "accessIsNowActive": "الوصول نشط الآن",
+ "accessIsNowActiveDesc": "يمكن لـ {} استخدام الرابط المرفق لتنزيل تطبيق مزايا ومتابعة الإعداد على جهازه.",
+ "dependentAccessActive": "وصول التابع نشط",
+ "shareableAppDownloadLink": "رابط تنزيل التطبيق للمشاركة",
+ "shareableAppDownloadLinkDesc": "أرسل هذا الرابط إلى {} ليتمكن من تنزيل تطبيق مزايا ومتابعة الإعداد.",
+ "downloadLink": "رابط التنزيل",
+ "shareDownloadLink": "مشاركة رابط التنزيل",
+ "copyLink": "نسخ الرابط",
+ "done": "تم",
+ "linkCopied": "تم نسخ الرابط بنجاح",
+ "mazayaAccessRevoked": "تم إلغاء الوصول لمزايا",
+ "mazayaAccessRevokedDesc": "قام الكفيل بإلغاء وصول التابع. لم يعد بالإمكان فتح العروض أو تسجيل الدخول بالبصمة.",
+ "contactYourSponsor": "تواصل مع الكفيل",
+ "contactYourSponsorDesc": "اطلب من كفيلك السماح بالوصول لمزايا مرة أخرى من تفاصيل التابعين. يمكن للكفيل فقط استعادة الوصول.",
+ "dependentAccessBlocked": "تم حظر وصول التابع",
+ "returnToSignIn": "العودة إلى تسجيل الدخول",
+ "allowMazayaAccess": "السماح بالوصول لمزايا",
+ "revokeMazayaAccess": "إلغاء الوصول لمزايا",
+ "active": "نشط",
+ "noAccess": "غير متاح",
+ "offerDetails": "تفاصيل العرض",
+ "offerIdNotAvailable": "معرف العرض غير متوفر",
+ "unableToRedeemOffer": "تعذر الحصول على رابط العرض، يرجى المحاولة لاحقاً",
+ "errorRedeemingOffer": "حدث خطأ أثناء استخدام العرض",
+ "useOffer": "استخدام العرض",
+ "online": "عبر الإنترنت",
+ "inStore": "في المتجر",
+ "ksa": "المملكة",
+ "riyadh": "الرياض",
+ "noInstructionsAvailable": "لا توجد طريقة استخدام محددة.",
+ "contactInformation": "معلومات التواصل:",
+ "humanResources": "الموارد البشرية",
+ "drSulaimanAlHabib": "سليمان الحبيب",
+ "allCategories": "الكل",
+ "noOffersAvailable": "لا توجد عروض متاحة",
+ "addDependents": "إضافة تابعين",
+ "myDependents": "التابعون",
+ "offDiscount": "خصم {}",
+ "usageLabel": "الاستخدام: ",
+ "areYouSureWantToLogOut": "هل أنت متأكد من تسجيل الخروج؟",
+ "searchDependents": "البحث في التابعين",
+ "searchFamilyMembers": "البحث في أفراد العائلة",
+ "addAnotherUser": "إضافة مستخدم آخر",
+ "joinMazaya": "انضم إلى مزايا",
+ "joinMazayaSubtitle": "احصل على أفضل العروض والصفقات الحصرية في المطاعم والتسوق ومكافآت نمط الحياة.",
+ "continueAsEmployee": "المتابعة كموظف",
+ "continueAsEmployeeSubtitle": "سجل الدخول باستخدام اسم المستخدم وكلمة المرور الخاصة بالموظف.",
+ "pleaseEnterNationalId": "الرجاء إدخال رقم الهوية الوطنية",
+ "pleaseSelectDob": "الرجاء تحديد تاريخ الميلاد",
+ "unableToRetrieveDependentInfo": "تعذر الحصول على معلومات التابع",
+ "failedToSendOtp": "فشل إرسال رمز التحقق",
+ "verificationCodeResent": "تم إعادة إرسال رمز التحقق",
+ "nationalId": "الهوية الوطنية",
+ "addDependent": "إضافة تابع",
+ "stepVerify": "التحقق",
+ "stepBasic": "الأساسية",
+ "stepAdditional": "إضافية",
+ "findYourDependent": "البحث عن تابعك",
+ "findYourDependentDesc": "أدخل التفاصيل تماماً كما تظهر في الهوية الوطنية. سنقوم باسترداد السجل بأمان من مركز المعلومات الوطني (NHIC).",
+ "enter10DigitNationalId": "أدخل رقم الهوية المكون من 10 أرقام",
+ "nationalIdMustBe10Digits": "يجب أن يتكون رقم الهوية من 10 أرقام",
+ "dateFormatPlaceholder": "يوم / شهر / سنة",
+ "searchUser": "بحث عن المستخدم",
+ "dependentNotFoundNhic": "لم يتم العثور على سجل لهذا التابع في مركز المعلومات الوطني",
+ "basicInfo": "المعلومات الأساسية",
+ "basicInfoDesc": "بيانات الهوية المطلوبة المستردة من مركز المعلومات الوطني.",
+ "additionalInfo": "معلومات إضافية",
+ "additionalInfoDesc": "إضافة أو مراجعة بيانات الكفالة والأهلية.",
+ "select": "اختر",
+ "enterFieldPlaceholder": "أدخل {}",
+ "requiredField": "الحقل المطلوب",
+ "pleaseFillField": "الرجاء إدخال {}",
+ "reviewAndSubmit": "المراجعة والإرسال",
+ "reviewAndSubmitDesc": "يرجى مراجعة تفاصيل التابع بعناية قبل تأكيد الإرسال.",
+ "arabicName": "الاسم بالعربية",
+ "relationship": "صلة القرابة",
+ "sponsor": "الكفيل",
+ "dependentSponsorDetail": "تفاصيل كفيل التابع",
+ "insuranceEligibility": "أهلية التأمين",
+ "relationshipStartDate": "تاريخ بدء العلاقة",
+ "dependentAddedSuccessfully": "تم إرسال الطلب بنجاح",
+ "genderMale": "ذكر",
+ "genderFemale": "أنثى",
+ "religionIslam": "الإسلام",
+ "back": "السابق",
+ "submitRequest": "إرسال الطلب",
+ "enterDependentDetailsToContinue": "أدخل تفاصيل التابع للمتابعة.",
+ "enterBasicDetailsDesc": "يرجى إدخال البيانات الأساسية للتابع.",
+ "locations": "الفروع والمواقع",
+ "availableOffers": "العروض المتاحة",
+ "selectOfferToRedeem": "اختر العرض الذي ترغب في استخدامه",
+ "viewOnMap": "عرض على الخريطة",
+ "showAllLocations": "عرض جميع الفروع ({})",
+ "showLess": "عرض أقل",
+ "searchBranches": "البحث عن الفروع أو المدن...",
+ "allCities": "الكل",
+ "noBranchesFound": "لم يتم العثور على فروع مطابقة",
+ "browseAllBranches": "تصفح جميع الفروع ({}) في مختلف المدن",
+ "branchesCount": "{} فرع"
}
-
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index 306620b..6e194e9 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -570,7 +570,6 @@
"pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.",
"youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit.",
"requesterOperatingUnit": "Requester Operating Unit",
- "generate": "Generate",
"paymentRequest": "Pay Request",
"paymentDetails": "Payment Details",
"requestNo": "Request No",
@@ -667,15 +666,117 @@
"incidentDetails": "Incident Details",
"ticketNumber": "Ticket Number",
"ticketId": "Ticket ID",
- "pleaseSelectProject": "Please select a project",
- "viewAttachment" : "View Attachment",
- "parkingQr": "Parking QR",
- "startNow": "Start Now",
- "destination_type": "Destination Type",
- "source_organization_name": "Source Organization Name",
+ "pleaseSelectProject": "Please select a project",
+ "viewAttachment": "View Attachment",
+ "parkingQr": "Parking QR",
+ "startNow": "Start Now",
+ "destination_type": "Destination Type",
+ "source_organization_name": "Source Organization Name",
"destination_organization_name": "Destination Organization Name",
"costCenter": "Cost Center",
"priceSAR": "Price (SAR)",
"amountSAR": "Amount (SAR)",
- "amuLastThreeMonths": "AMU (Last 3 months)"
-}
\ No newline at end of file
+ "amuLastThreeMonths": "AMU (Last 3 months)",
+ "mazayaTitle": "Mazaya",
+ "mazayaAccessGranted": "Mazaya access granted",
+ "mazayaAccessGrantedDesc": "{} now has active access. Share the download link below so they can install the Mohem app and complete setup.",
+ "accessIsNowActive": "Access is now active",
+ "accessIsNowActiveDesc": "{} can use the provided link to download the Mazaya app and continue setup on their device.",
+ "dependentAccessActive": "Dependent access active",
+ "shareableAppDownloadLink": "Shareable app-download link",
+ "shareableAppDownloadLinkDesc": "Send this link to {} so they can download the Mazaya app and continue setup.",
+ "downloadLink": "Download link",
+ "shareDownloadLink": "Share Download Link",
+ "copyLink": "Copy Link",
+ "done": "Done",
+ "linkCopied": "Link copied to clipboard",
+ "mazayaAccessRevoked": "Mazaya access revoked",
+ "mazayaAccessRevokedDesc": "Your sponsor has revoked your dependent access. You can no longer open offers or sign in with biometrics.",
+ "contactYourSponsor": "Contact your sponsor",
+ "contactYourSponsorDesc": "Ask your sponsor to allow Mazaya access again from Dependent Details. Only the sponsor can restore access.",
+ "dependentAccessBlocked": "Dependent access blocked",
+ "returnToSignIn": "Return to Sign In",
+ "allowMazayaAccess": "Allow Mazaya Access",
+ "revokeMazayaAccess": "Revoke Mazaya Access",
+ "active": "Active",
+ "noAccess": "No access",
+ "offerDetails": "Offer Details",
+ "offerIdNotAvailable": "Offer ID not available",
+ "unableToRedeemOffer": "Unable to redeem offer, please try again later",
+ "errorRedeemingOffer": "An error occurred while redeeming offer",
+ "useOffer": "Use Offer",
+ "online": "Online",
+ "inStore": "In Store",
+ "ksa": "KSA",
+ "riyadh": "Riyadh",
+ "noInstructionsAvailable": "No instructions available.",
+ "contactInformation": "Contact Information:",
+ "humanResources": "Human Resources",
+ "drSulaimanAlHabib": "DR SULAIMAN AL HABIB",
+ "allCategories": "All",
+ "noOffersAvailable": "No offers available",
+ "addDependents": "Add Dependents",
+ "myDependents": "My Dependents",
+ "offDiscount": "{} Off",
+ "usageLabel": "Usage: ",
+ "areYouSureWantToLogOut": "Are you sure you want to log out?",
+ "searchDependents": "Search dependents",
+ "searchFamilyMembers": "Search family members",
+ "addAnotherUser": "Add another user",
+ "joinMazaya": "Join Mazaya",
+ "joinMazayaSubtitle": "Get the best offers and exclusive deals across dining, shopping, and lifestyle rewards.",
+ "continueAsEmployee": "Continue as an employee",
+ "continueAsEmployeeSubtitle": "Sign in with your employee username and password.",
+ "pleaseEnterNationalId": "Please enter National ID",
+ "pleaseSelectDob": "Please select Date of Birth",
+ "unableToRetrieveDependentInfo": "Unable to retrieve dependent information",
+ "failedToSendOtp": "Failed to send verification code",
+ "verificationCodeResent": "Verification code resent",
+ "nationalId": "National ID",
+ "addDependent": "Add Dependent",
+ "stepVerify": "Verify",
+ "stepBasic": "Basic",
+ "stepAdditional": "Additional",
+ "findYourDependent": "Find your dependent",
+ "findYourDependentDesc": "Enter the details exactly as they appear on the National ID. We'll securely retrieve the record from NHIC.",
+ "enter10DigitNationalId": "Enter 10-digit National ID",
+ "nationalIdMustBe10Digits": "National ID must be 10 digits",
+ "dateFormatPlaceholder": "DD / MM / YYYY",
+ "searchUser": "Search User",
+ "dependentNotFoundNhic": "Sorry, error while getting dependent info from NHIC",
+ "basicInfo": "Basic Info",
+ "basicInfoDesc": "Required identity details fetched from NHIC.",
+ "additionalInfo": "Additional Info",
+ "additionalInfoDesc": "Add or review sponsorship and eligibility details.",
+ "select": "Select",
+ "enterFieldPlaceholder": "Enter {}",
+ "requiredField": "Required field",
+ "pleaseFillField": "Please fill {}",
+ "reviewAndSubmit": "Review & Submit",
+ "reviewAndSubmitDesc": "Please review the dependent details carefully before submitting.",
+ "arabicName": "Arabic Name",
+ "relationship": "Relationship",
+ "sponsor": "Sponsor",
+ "dependentSponsorDetail": "Dependent Sponsor Detail",
+ "insuranceEligibility": "Insurance Eligibility",
+ "relationshipStartDate": "Start Date",
+ "dependentAddedSuccessfully": "Dependent added successfully",
+ "genderMale": "Male",
+ "genderFemale": "Female",
+ "religionIslam": "Islam",
+ "back": "Back",
+ "submitRequest": "Submit",
+ "enterDependentDetailsToContinue": "Enter the dependent details to continue.",
+ "enterBasicDetailsDesc": "Please enter the dependent's basic identity details.",
+ "locations": "Locations",
+ "availableOffers": "Available Offers",
+ "selectOfferToRedeem": "Select an offer to use",
+ "viewOnMap": "View on map",
+ "showAllLocations": "Show all {} locations",
+ "showLess": "Show less",
+ "searchBranches": "Search branches or cities...",
+ "allCities": "All",
+ "noBranchesFound": "No branches found",
+ "browseAllBranches": "Browse all {} branches across cities",
+ "branchesCount": "{} Branches"
+}
diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart
index 7e346c8..edce588 100644
--- a/lib/api/api_client.dart
+++ b/lib/api/api_client.dart
@@ -88,7 +88,7 @@ class ApiClient {
if (!kReleaseMode) {
print("Url:$url");
var bodyJson = json.encode(jsonObject);
- print("body:$bodyJson");
+ print("body:$bodyJson" );
}
var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
try {
diff --git a/lib/api/login_api_client.dart b/lib/api/login_api_client.dart
index f487b80..22ecc7f 100644
--- a/lib/api/login_api_client.dart
+++ b/lib/api/login_api_client.dart
@@ -1,13 +1,16 @@
import 'dart:async';
import 'dart:io';
+import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/models/basic_member_information_model.dart';
import 'package:mohem_flutter_app/models/check_mobile_app_version_model.dart';
import 'package:mohem_flutter_app/models/generic_response_model.dart';
+import 'package:mohem_flutter_app/models/dependent/get_mobile_login_info_dependent_model.dart';
import 'package:mohem_flutter_app/models/get_mobile_login_info_list_model.dart';
import 'package:mohem_flutter_app/models/member_login_list_model.dart';
@@ -30,6 +33,50 @@ class LoginApiClient {
}, url, postParams);
}
+ Future getMobileLoginInfoNEWDependent(String deviceToken, String deviceType, {int? memberType}) async {
+ String url = "${ApiConsts.erpRest}Mohemm_GetMobileLoginInfo_NEW_Dependent";
+ String effectiveDeviceToken = deviceToken;
+ if (effectiveDeviceToken.isEmpty) {
+ effectiveDeviceToken = AppState().getDeviceToken ?? "";
+ }
+ // if (effectiveDeviceToken.isEmpty && !AppState().getIsHuawei) {
+ // try {
+ // await Firebase.initializeApp();
+ // String? tok = await FirebaseMessaging.instance.getToken();
+ // if (tok != null && tok.isNotEmpty) {
+ // effectiveDeviceToken = tok;
+ // AppState().setDeviceToken = tok;
+ // }
+ // } catch (_) {}
+ // }
+
+ Map postParams = {};
+ postParams["DeviceToken"] = effectiveDeviceToken;
+ postParams["DeviceType"] = deviceType;
+ postParams["MemberType"] = memberType ?? MemberType.dependent.value;
+ return await ApiClient().postJsonForObject((json) {
+ if (kDebugMode) {
+ print("Mohemm_GetMobileLoginInfo_NEW_Dependent Response: $json");
+ }
+ List? list = json['Mohemm_GetMobileLoginInfo_NEW_DependentList'] ??
+ json['Mohemm_GetMobileLoginInfo_NEW_Dependent'] ??
+ json['Mohemm_GetMobileLoginInfo_DependentList'] ??
+ json['Mohemm_GetMobileLoginInfoDependentList'] ??
+ json['Mohemm_GetMobileLoginInfoList'] ??
+ json['GetMobileLoginInfoList'] ??
+ json['Response'] ??
+ json['Data'];
+ if (list != null && list.isNotEmpty && list.first is Map) {
+ return GetMobileLoginInfoDependentModel.fromJson(list.first as Map);
+ }
+ if (json is Map &&
+ (json['DependentID'] != null || json['DepedentName'] != null || json['DOB'] != null || json['NationalID'] != null || json['LoginType'] != null)) {
+ return GetMobileLoginInfoDependentModel.fromJson(json);
+ }
+ return null;
+ }, url, postParams);
+ }
+
Future insertMobileLoginInfoNEW(
String email, int sessionId, String employeeName, int loginType, String mobileNumber, String userName, String deviceToken, String deviceType,
{int? memberType}) async {
@@ -56,6 +103,71 @@ class LoginApiClient {
}, url, postParams);
}
+ Future insertMobileLoginInfoDependent({
+ required int loginType,
+ String? nationalId,
+ String? dob,
+ String? dependentName,
+ String? mobileNumber,
+ String? logInTokenID,
+ String? tokenID,
+ int? sessionId,
+ String? email,
+ String? deviceToken,
+ String? deviceType,
+ int? companyId,
+ int? versionId,
+ int? channel,
+ int? memberType,
+ BuildContext? context,
+ }) async {
+ String url = "${ApiConsts.erpRest}Mohemm_InsertMobileLoginInfo_Dependent";
+ String devType = deviceType ?? (Platform.isAndroid ? "android" : "ios");
+ String devToken = (deviceToken != null && deviceToken.isNotEmpty)
+ ? deviceToken
+ : (AppState().getIsHuawei ? AppState().getHuaweiPushToken : (AppState().getDeviceToken ?? ""));
+
+ String effectiveToken = (tokenID != null && tokenID.isNotEmpty)
+ ? tokenID
+ : (AppState().postParamsObject?.tokenID ?? AppState().authenticationTokenID ?? "");
+
+ Map postParams = {
+ "VersionID": versionId ?? 5,
+ "Channel": channel ?? 31,
+ "LanguageID": context != null ? AppState().getLanguageID(context) : 2,
+ "MemberType": memberType ?? 1,
+ "MobileType": devType,
+ "MobileNumber": mobileNumber ?? "",
+ "UserName": nationalId ?? "",
+ "P_USER_NAME": nationalId ?? "",
+ "P_DEP_NATIONAL_ID": nationalId ?? "",
+ "P_DEP_BIRTH_DATE": dob ?? "",
+ "P_DEPENDENT_NAME": dependentName ?? "",
+ "EmployeeName": dependentName ?? "",
+ "LogInTokenID": logInTokenID ?? (AppState().postParamsObject?.logInTokenID ?? ""),
+ "CompanyID": companyId ?? 1,
+ "DeviceType": devType,
+ "DeviceToken": devToken,
+ "LoginType": loginType,
+ "P_SESSION_ID": sessionId ?? (AppState().postParamsObject?.pSessionId ?? 0),
+ "TokenID": effectiveToken,
+ "P_EMAIL_ADDRESS": email ?? "",
+ };
+
+ if (kDebugMode) {
+ print("Mohemm_InsertMobileLoginInfo (Dependent) Request: $postParams");
+ }
+
+ return await ApiClient().postJsonForObject((json) {
+ if (kDebugMode) {
+ print("Mohemm_InsertMobileLoginInfo (Dependent) Response: $json");
+ }
+ GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+ AppState().setLogged = true;
+ return responseData;
+ }, url, postParams);
+ }
+
Future checkMobileAppVersion() async {
String url = "${ApiConsts.utilitiesRest}CheckMobileAppVersion";
Map postParams = {};
@@ -102,6 +214,7 @@ class LoginApiClient {
AppState().postParamsObject?.pUserName = AppState().getUserName;
AppState().postParamsObject?.pSelectedEmployeeNumber = AppState().getUserName;
AppState().postParamsObject?.setPLegislationCode = responseData.basicMemberInformation!.pLEGISLATIONCODE;
+ AppState().postParamsInitConfig.setPLegislationCode = responseData.basicMemberInformation!.pLEGISLATIONCODE;
AppState().postParamsObject?.setPayrollCodeStr = responseData.memberInformationList!.first.pAYROLLCODE;
AppState().setBusinessCardPrivilege = responseData.businessCardPrivilege ?? false;
return responseData;
@@ -178,22 +291,62 @@ class LoginApiClient {
Future memberLoginDependent({
required String nationalId,
required String birthDate,
+ String? deviceToken,
+ String? deviceType,
BuildContext? context,
}) async {
String url = "${ApiConsts.erpRest}MemberLogin_Dependent";
+ String devType = deviceType ?? (Platform.isAndroid ? "android" : "ios");
+ String devToken = deviceToken ?? "";
+ if (devToken.isEmpty) {
+ devToken = AppState().getIsHuawei
+ ? AppState().getHuaweiPushToken
+ : (AppState().getDeviceToken ?? "");
+ }
+ if (devToken.isEmpty && !AppState().getIsHuawei) {
+ try {
+ String savedToken = await Utils.getStringFromPrefs("P_DEP_DEVICE_TOKEN");
+ if (savedToken.isNotEmpty) {
+ devToken = savedToken;
+ }
+ } catch (_) {}
+ }
+
Map postParams = {
"VersionID": 20,
"Channel": 31,
"LanguageID": context != null ? AppState().getLanguageID(context) : 2,
- "MobileType": Platform.isAndroid ? "android" : "ios",
+ "DeviceToken": devToken,
+ "DeviceType": devType,
+ "MobileType": devType,
"P_DEP_NATIONAL_ID": nationalId,
"P_DEP_BIRTH_DATE": birthDate,
};
+ if (kDebugMode) {
+ print("MemberLogin_Dependent Request: $postParams");
+ }
return await ApiClient().postJsonForObject((json) {
+ if (kDebugMode) {
+ print("MemberLogin_Dependent Response: $json");
+ }
GenericResponseModel responseData = GenericResponseModel.fromJson(json);
if (responseData.logInTokenID != null && responseData.logInTokenID!.isNotEmpty) {
AppState().postParamsObject?.setLogInTokenID = responseData.logInTokenID;
}
+ String? authToken = (responseData.authenticationTokenID != null && responseData.authenticationTokenID!.trim().isNotEmpty)
+ ? responseData.authenticationTokenID!.trim()
+ : null;
+ if (authToken != null && authToken.isNotEmpty) {
+ AppState().postParamsObject?.setTokenID = authToken;
+ AppState().setAuthenticationTokenID = authToken;
+ }
+ if (responseData.getWalaplusDepInfoModel != null) {
+ AppState().setWalaplusDepInfoModel = responseData.getWalaplusDepInfoModel;
+ if (responseData.getWalaplusDepInfoModel?.pDependentName != null &&
+ responseData.getWalaplusDepInfoModel!.pDependentName!.trim().isNotEmpty) {
+ AppState().setDependentName = responseData.getWalaplusDepInfoModel!.pDependentName!.trim();
+ }
+ }
AppState().setUserName = nationalId;
AppState().postParamsObject?.setUserName = nationalId;
AppState().postParamsObject?.setPUserName = nationalId;
@@ -249,13 +402,12 @@ class LoginApiClient {
};
return await ApiClient().postJsonForObject((json) {
GenericResponseModel responseData = GenericResponseModel.fromJson(json);
- String effectiveToken = (responseData.tokenID != null && responseData.tokenID!.isNotEmpty)
- ? responseData.tokenID!
- : ((responseData.logInTokenID != null && responseData.logInTokenID!.isNotEmpty)
- ? responseData.logInTokenID!
- : logInTokenID);
+ String effectiveToken = (responseData.authenticationTokenID != null && responseData.authenticationTokenID!.trim().isNotEmpty)
+ ? responseData.authenticationTokenID!.trim()
+ : (AppState().postParamsObject?.tokenID ?? AppState().authenticationTokenID ?? "");
AppState().postParamsObject?.setTokenID = effectiveToken;
+ AppState().setAuthenticationTokenID = effectiveToken;
AppState().postParamsObject?.setLogInTokenID = (responseData.logInTokenID != null && responseData.logInTokenID!.isNotEmpty)
? responseData.logInTokenID!
: logInTokenID;
@@ -268,6 +420,14 @@ class LoginApiClient {
AppState().isAuthenticated = true;
AppState().setLogged = true;
+ if (responseData.getWalaplusDepInfoModel != null) {
+ AppState().setWalaplusDepInfoModel = responseData.getWalaplusDepInfoModel;
+ if (responseData.getWalaplusDepInfoModel?.pDependentName != null &&
+ responseData.getWalaplusDepInfoModel!.pDependentName!.trim().isNotEmpty) {
+ AppState().setDependentName = responseData.getWalaplusDepInfoModel!.pDependentName!.trim();
+ }
+ }
+
return responseData;
}, url, postParams);
}
diff --git a/lib/api/my_attendance_api_client.dart b/lib/api/my_attendance_api_client.dart
index 3978c2d..cd564f8 100644
--- a/lib/api/my_attendance_api_client.dart
+++ b/lib/api/my_attendance_api_client.dart
@@ -55,9 +55,9 @@ class MyAttendanceApiClient {
}, url, postParams);
}
- Future getCEIDffStructure(String pFunctionName, String? empID) async {
+ Future getCEIDffStructure(String pFunctionName, String? empID, int? relationID) async {
String url = "${ApiConsts.erpRest}GET_CEI_DFF_STRUCTURE";
- Map postParams = {"P_FUNCTION_NAME": pFunctionName};
+ Map postParams = {"P_FUNCTION_NAME": pFunctionName,"P_CONTACT_RELATIONSHIP_ID": relationID};
postParams.addAll(AppState().postParamsJson);
if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
return await ApiClient().postJsonForObject((json) {
diff --git a/lib/api/offers_and_discounts_api_client.dart b/lib/api/offers_and_discounts_api_client.dart
index 7fb07ac..bd4723d 100644
--- a/lib/api/offers_and_discounts_api_client.dart
+++ b/lib/api/offers_and_discounts_api_client.dart
@@ -72,44 +72,116 @@ class OffersAndDiscountsApiClient {
);
}
- Future> getWalaPlusCategories({BuildContext? context}) async {
- String url = ApiConsts.walaPlusCategories;
-
+ String _resolveUserName() {
String? pUserName = AppState().getUserName;
if (pUserName == null || pUserName.isEmpty) {
- pUserName = "2537367522";
+ pUserName = AppState().postParamsObject?.userName ??
+ AppState().postParamsObject?.pUserName ??
+ AppState().memberInformationList?.eMPLOYEENUMBER;
}
+ return pUserName ?? "";
+ }
- String? tokenID = AppState().postParamsObject?.tokenID;
- if (tokenID == null || tokenID.isEmpty || tokenID == "adm!n") {
- tokenID = "@dm!n";
+ String _resolveDepNationalId() {
+ if (!ApiConsts.isDependetLogin) {
+ return "";
+ }
+ return AppState().getUserName ?? "";
+ }
+
+ String _resolveMobileNumber({String? overrideMobile}) {
+ if (overrideMobile != null && overrideMobile.trim().isNotEmpty) {
+ return overrideMobile.trim();
+ }
+ String? mobile = AppState().postParamsObject?.mobileNumber;
+ if (mobile != null && mobile.trim().isNotEmpty) {
+ return mobile.trim();
+ }
+ mobile = AppState().memberInformationList?.eMPLOYEEMOBILENUMBER;
+ if (mobile != null && mobile.trim().isNotEmpty) {
+ return mobile.trim();
+ }
+ mobile = AppState().walaplusDepInfoModel?.pEmpMobileNumber;
+ if (mobile != null && mobile.trim().isNotEmpty) {
+ return mobile.trim();
}
+ mobile = AppState().memberLoginList?.pMOBILENUMBER;
+ if (mobile != null && mobile.trim().isNotEmpty) {
+ return mobile.trim();
+ }
+ mobile = AppState().memberInformationList?.mobileNumberWithZipCode;
+ if (mobile != null && mobile.trim().isNotEmpty) {
+ return mobile.trim();
+ }
+ return "";
+ }
- String? logInTokenID = AppState().postParamsObject?.logInTokenID;
- if (logInTokenID == null || logInTokenID.isEmpty) {
- logInTokenID = "@dm!n";
+
+ Map _getBaseWalaPlusParams() {
+ Map base = {};
+ base.addAll(AppState().postParamsJson);
+ if (ApiConsts.isDependetLogin) {
+ String? token = AppState().postParamsObject?.tokenID ?? AppState().authenticationTokenID;
+ if (token != null && token.isNotEmpty) {
+ base["TokenID"] = token;
+ }
+ String? logInToken = AppState().postParamsObject?.logInTokenID;
+ if (logInToken != null && logInToken.isNotEmpty) {
+ base["LogInTokenID"] = logInToken;
+ }
}
+ _cleanWalaPlusParams(base);
+ return base;
+ }
- Map postParams = {
- "VersionID": 20,
- "Channel": 31,
- "LanguageID": context != null ? AppState().getLanguageID(context) : 2,
- "LogInTokenID": logInTokenID,
- "TokenID": tokenID,
- "P_USER_NAME": pUserName,
- };
+ void _cleanWalaPlusParams(Map map) {
+ map.remove("P_EMAIL_ADDRESS");
+ map.remove("P_SESSION_ID");
+ map.remove("PayrollCodeStr");
+ map.remove("LegislationCodeStr");
+ map.remove("P_SELECTED_EMPLOYEE_NUMBER");
+ map.removeWhere((key, value) => value == null);
+ }
+
+ Future> getWalaPlusCategories({BuildContext? context, String? mobileNumber}) async {
+ String url = ApiConsts.walaPlusCategories;
+ String pUserName = _resolveUserName();
+ String pMobileNumber = _resolveMobileNumber(overrideMobile: mobileNumber);
+ String pDepNationalId = _resolveDepNationalId();
+
+ Map postParams = _getBaseWalaPlusParams();
+ postParams["UserName"] = pUserName;
+ postParams["P_USER_NAME"] = pUserName;
+ postParams["P_DEP_NATIONAL_ID"] = pDepNationalId;
+ if (pMobileNumber.isNotEmpty) {
+ postParams["MobileNumber"] = pMobileNumber;
+ }
+ postParams["MemberType"] = ApiConsts.isDependetLogin ? 2 : 1;
+ postParams["CompanyID"] = 1;
+ _cleanWalaPlusParams(postParams);
return await ApiClient().postJsonForObject(
(response) {
List categories = [];
- if (response != null && response['WalaPlus_Categories'] != null) {
- var cats = response['WalaPlus_Categories'];
+ if (response != null) {
+ dynamic cats = response['WalaPlus_Categories'] ??
+ response['walaPlus_Categories'] ??
+ response['WalaPlusCategories'] ??
+ response['result'];
if (cats is String) {
- cats = json.decode(cats);
+ try {
+ cats = json.decode(cats);
+ } catch (e) {
+ debugPrint("Error decoding WalaPlus_Categories: $e");
+ }
}
if (cats is List) {
cats.forEach((v) {
- categories.add(WalaPlusCategoryModel.fromJson(v));
+ if (v is Map) {
+ categories.add(WalaPlusCategoryModel.fromJson(v));
+ } else if (v is Map) {
+ categories.add(WalaPlusCategoryModel.fromJson(Map.from(v)));
+ }
});
}
}
@@ -126,51 +198,61 @@ class OffersAndDiscountsApiClient {
int perPage = 10,
String? geoLocation,
BuildContext? context,
+ String? mobileNumber,
}) async {
String url = ApiConsts.walaPlusRetailers;
-
- String? pUserName = AppState().getUserName;
- if (pUserName == null || pUserName.isEmpty) {
- pUserName = "2537367522";
+ String pUserName = _resolveUserName();
+ String pMobileNumber = _resolveMobileNumber(overrideMobile: mobileNumber);
+ String pDepNationalId = _resolveDepNationalId();
+ String effectiveCatId = (categoryId == "all" || categoryId == "0" || categoryId == null) ? "" : categoryId;
+
+ Map postParams = _getBaseWalaPlusParams();
+ postParams["UserName"] = pUserName;
+ postParams["P_USER_NAME"] = pUserName;
+ postParams["P_DEP_NATIONAL_ID"] = pDepNationalId;
+ if (pMobileNumber.isNotEmpty) {
+ postParams["MobileNumber"] = pMobileNumber;
}
-
- String? tokenID = AppState().postParamsObject?.tokenID;
- if (tokenID == null || tokenID.isEmpty) {
- tokenID = "adm!n";
- }
-
- String? logInTokenID = AppState().postParamsObject?.logInTokenID;
- if (logInTokenID == null || logInTokenID.isEmpty) {
- logInTokenID = "@dm!n";
- }
-
- Map postParams = {
- "VersionID": 20,
- "Channel": 31,
- "LanguageID": context != null ? AppState().getLanguageID(context) : 2,
- "LogInTokenID": logInTokenID,
- "TokenID": tokenID,
- "P_USER_NAME": pUserName,
- "WP_CategoryID": (categoryId == "all" || categoryId == null) ? "" : categoryId,
- "WP_Page": page,
- "WP_Per_page": perPage,
- };
+ postParams["MemberType"] = ApiConsts.isDependetLogin ? 2 : 1;
+ postParams["CompanyID"] = 1;
+ postParams["WP_CategoryID"] = effectiveCatId;
+ postParams["WP_Page"] = page;
+ postParams["WP_Per_page"] = perPage;
if (geoLocation != null && geoLocation.isNotEmpty) {
postParams["WP_Geo_Location"] = geoLocation;
}
+ _cleanWalaPlusParams(postParams);
return await ApiClient().postJsonForObject(
(response) {
- if (response != null && response['WalaPlus_Retailers'] != null) {
- var val = response['WalaPlus_Retailers'];
+ if (response != null) {
+ dynamic val = response['WalaPlus_Retailers'] ??
+ response['walaPlus_Retailers'] ??
+ response['WalaPlusRetailers'] ??
+ response['WP_Retailers'] ??
+ response['result'];
if (val is String) {
- val = json.decode(val);
+ try {
+ val = json.decode(val);
+ } catch (e) {
+ debugPrint("Error decoding WalaPlus_Retailers: $e");
+ }
}
if (val is Map) {
return WalaPlusRetailersResponse.fromJson(val);
} else if (val is Map) {
return WalaPlusRetailersResponse.fromJson(Map.from(val));
+ } else if (val is List) {
+ List retailers = [];
+ for (var v in val) {
+ if (v is Map) {
+ retailers.add(WalaPlusRetailerModel.fromJson(v));
+ } else if (v is Map) {
+ retailers.add(WalaPlusRetailerModel.fromJson(Map.from(v)));
+ }
+ }
+ return WalaPlusRetailersResponse(retailers: retailers, page: 1, pagesCount: 1, perPage: retailers.length);
}
}
return null;
@@ -183,48 +265,161 @@ class OffersAndDiscountsApiClient {
Future getWalaPlusRetailerById({
required String retailerId,
BuildContext? context,
+ String? mobileNumber,
}) async {
String url = ApiConsts.walaPlusRetailersByID;
-
- String? pUserName = AppState().getUserName;
- if (pUserName == null || pUserName.isEmpty) {
- pUserName = "2537367522";
- }
-
- String? tokenID = AppState().postParamsObject?.tokenID;
- if (tokenID == null || tokenID.isEmpty) {
- tokenID = "adm!n";
- }
-
- String? logInTokenID = AppState().postParamsObject?.logInTokenID;
- if (logInTokenID == null || logInTokenID.isEmpty) {
- logInTokenID = "@dm!n";
+ String pUserName = _resolveUserName();
+ String pMobileNumber = _resolveMobileNumber(overrideMobile: mobileNumber);
+ String pDepNationalId = _resolveDepNationalId();
+
+ Map postParams = _getBaseWalaPlusParams();
+ postParams["WP_RetailerID"] = retailerId;
+ postParams["RetailerID"] = retailerId;
+ postParams["UserName"] = pUserName;
+ postParams["P_USER_NAME"] = pUserName;
+ postParams["P_DEP_NATIONAL_ID"] = pDepNationalId;
+ if (pMobileNumber.isNotEmpty) {
+ postParams["MobileNumber"] = pMobileNumber;
}
+ postParams["MemberType"] = ApiConsts.isDependetLogin ? 2 : 1;
+ postParams["CompanyID"] = 1;
+ _cleanWalaPlusParams(postParams);
- Map postParams = {
- "VersionID": 20,
- "Channel": 31,
- "LanguageID": context != null ? AppState().getLanguageID(context) : 2,
- "LogInTokenID": logInTokenID,
- "TokenID": tokenID,
- "RetailerID": retailerId,
- "P_USER_NAME": pUserName,
- };
+ debugPrint("getWalaPlusRetailerById: calling $url with WP_RetailerID: $retailerId");
return await ApiClient().postJsonForObject(
(response) {
- if (response != null && response['WalaPlus_RetailersByID'] != null) {
- var val = response['WalaPlus_RetailersByID'];
+ if (response != null) {
+ debugPrint("getWalaPlusRetailerById response keys: ${response is Map ? response.keys.toList() : 'non-map'}");
+ dynamic val = response['WalaPlus_RetailersByID'] ??
+ response['walaPlus_RetailersByID'] ??
+ response['WalaPlusRetailersByID'] ??
+ response['WP_RetailersByID'] ??
+ response['result'];
if (val is String) {
- val = json.decode(val);
+ try {
+ val = json.decode(val);
+ } catch (e) {
+ debugPrint("Error decoding WalaPlus_RetailersByID JSON string: $e");
+ }
}
+ WalaPlusRetailerModel? model;
if (val is List && val.isNotEmpty) {
var item = val.first;
if (item is Map) {
- return WalaPlusRetailerModel.fromJson(item);
+ model = WalaPlusRetailerModel.fromJson(item);
} else if (item is Map) {
- return WalaPlusRetailerModel.fromJson(Map.from(item));
+ model = WalaPlusRetailerModel.fromJson(Map.from(item));
+ }
+ } else if (val is Map) {
+ Map map = (val is Map) ? val : Map.from(val);
+ if (map.containsKey('retailer')) {
+ var byIdResponse = WalaPlusRetailersByIDResponse.fromJson(map);
+ model = byIdResponse.primaryRetailer ?? WalaPlusRetailerModel.fromJson(map);
+ } else {
+ model = WalaPlusRetailerModel.fromJson(map);
+ }
+ if ((model?.offers == null || model!.offers!.isEmpty) && (map.containsKey('offers') || map.containsKey('Offers'))) {
+ model?.offers = WalaPlusRetailerModel.parseOffersList(map['offers'] ?? map['Offers']);
+ }
+ if ((model?.locations == null || model!.locations!.isEmpty) &&
+ (map.containsKey('locations') || map.containsKey('Locations') || map.containsKey('location') || map.containsKey('Location'))) {
+ model?.locations = WalaPlusRetailerModel.parseLocationsList(
+ map['locations'] ?? map['Locations'] ?? map['location'] ?? map['Location'],
+ );
}
+ } else if (response is Map && response.containsKey('name')) {
+ model = WalaPlusRetailerModel.fromJson(response);
+ }
+
+ if (model != null) {
+ if (response is Map) {
+ if ((model.offers == null || model.offers!.isEmpty) && (response.containsKey('offers') || response.containsKey('Offers'))) {
+ model.offers = WalaPlusRetailerModel.parseOffersList(response['offers'] ?? response['Offers']);
+ }
+ if ((model.locations == null || model.locations!.isEmpty) &&
+ (response.containsKey('locations') || response.containsKey('Locations') || response.containsKey('location') || response.containsKey('Location'))) {
+ model.locations = WalaPlusRetailerModel.parseLocationsList(
+ response['locations'] ?? response['Locations'] ?? response['location'] ?? response['Location'],
+ );
+ }
+ }
+ debugPrint("getWalaPlusRetailerById: parsed retailer '${model.name}', offers: ${model.offers?.length ?? 0}, locations: ${model.locations?.length ?? 0}");
+ return model;
+ }
+ }
+ return null;
+ },
+ url,
+ postParams,
+ );
+ }
+
+ String _resolveUserReference({String? overrideUserReference}) {
+ if (overrideUserReference != null && overrideUserReference.trim().isNotEmpty) {
+ return overrideUserReference.trim();
+ }
+ String? ref = AppState().memberInformationList?.eMPLOYEENUMBER?.toString();
+ if (ref != null && ref.trim().isNotEmpty) {
+ return ref.trim();
+ }
+ String? pUserName = AppState().getUserName;
+ if (pUserName != null && pUserName.trim().isNotEmpty) {
+ return pUserName.trim();
+ }
+ return "";
+ }
+
+ Future?> redeemWalaPlusOffer({
+ required String offerId,
+ String? offerType,
+ String? userReference,
+ BuildContext? context,
+ }) async {
+ String url = ApiConsts.walaPlusOfferRedeem;
+ String pUserName = _resolveUserName();
+ String pUserReference = _resolveUserReference(overrideUserReference: userReference);
+
+ Map postParams = _getBaseWalaPlusParams();
+ postParams["WP_User_Reference"] = pUserReference;
+ postParams["WP_Offer_Id"] = offerId;
+ postParams["WP_Offer_Type"] = (offerType != null && offerType.trim().isNotEmpty) ? offerType.trim() : "promo";
+ postParams["UserName"] = pUserName;
+ postParams["P_USER_NAME"] = pUserName;
+
+ if (ApiConsts.isDependetLogin) {
+ String pDepNationalId = _resolveDepNationalId();
+ if (pDepNationalId.isNotEmpty) {
+ postParams["P_DEP_NATIONAL_ID"] = pDepNationalId;
+ }
+ postParams["MemberType"] = 2;
+ } else {
+ postParams["P_DEP_NATIONAL_ID"] = "";
+ postParams["MemberType"] = 1;
+ }
+ _cleanWalaPlusParams(postParams);
+
+ debugPrint("redeemWalaPlusOffer calling $url with params: $postParams");
+
+ return await ApiClient().postJsonForObject(
+ (response) {
+ if (response != null) {
+ debugPrint("redeemWalaPlusOffer response: $response");
+ dynamic val = response['WalaPlus_OfferRedeem'] ??
+ response['walaPlus_OfferRedeem'] ??
+ response['WalaPlusOfferRedeem'] ??
+ response['result'];
+ if (val is String) {
+ try {
+ val = json.decode(val);
+ } catch (e) {
+ debugPrint("Error decoding WalaPlus_OfferRedeem: $e");
+ }
+ }
+ if (val is Map) {
+ return val;
+ } else if (val is Map) {
+ return Map.from(val);
}
}
return null;
diff --git a/lib/api/profile_api_client.dart b/lib/api/profile_api_client.dart
index 342ac31..c9d5794 100644
--- a/lib/api/profile_api_client.dart
+++ b/lib/api/profile_api_client.dart
@@ -24,6 +24,8 @@ import 'package:mohem_flutter_app/models/profile/submit_address_transaction.dart
import 'package:mohem_flutter_app/models/profile/submit_basic_details_transaction_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_contact_transaction_list_model.dart';
import 'package:mohem_flutter_app/models/profile/submit_phone_transactions.dart';
+import 'package:mohem_flutter_app/models/profile/patient_info_model.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/models/start_phone_approval_process_model.dart';
class ProfileApiClient {
@@ -417,4 +419,62 @@ class ProfileApiClient {
return responseData.getPerformanceAppraisalList ?? [];
}, url, postParams);
}
+
+ Future getPatientInfo({
+ required String nationalId,
+ required String dob,
+ String? logInTokenID,
+ }) async {
+ // NHIC Service GetPatientInfo only works on Production (hmgwebservices.com)
+ // String url = "https://hmgwebservices.com/Services/NHIC.svc/REST/GetPatientInfo";
+ String url = "${ApiConsts.erpRest}GetMemberInfo";
+ String token = logInTokenID ??
+ AppState().postParamsObject?.logInTokenID ??
+ "";
+
+ Map postParams = {
+ "PatientIdentificationID": int.tryParse(nationalId.trim()) ?? nationalId.trim(),
+ "PatientOutSA": 0,
+ "DOB": dob.trim(),
+ "LogInTokenID": token,
+ "PatientMobileNumber":AppState().postParamsObject?.mobileNumber, // added this as per e-services changed
+ "TokenID":AppState().postParamsObject?.tokenID,// added this as per e-services changed
+ "LanguageID":AppState().postParamsObject?.languageID,// added this as per e-services changed
+ "Channel":AppState().postParamsObject?.channel,
+ "VersionID": AppState().postParamsObject?.versionID,
+ "UserName":AppState().postParamsObject?.userName
+ };
+ print(jsonEncode(postParams));
+ return await ApiClient().postJsonForObject((json) {
+ return PatientInfoModel.fromJson(json);
+ }, url, postParams);
+ }
+
+ Future processContactMazayaAccess({
+ required String accessAction,
+ int? contactRelationshipId,
+ int? contactPersonId,
+ int? personId,
+ }) async {
+ String url = "${ApiConsts.erpRest}PROCESS_CONTACT_MAZAYA_ACCESS";
+ String action = accessAction.trim().toLowerCase() == "revoke" ? "Revoke" : "Grant";
+ Map postParams = {
+ "P_MENU_TYPE": "E",
+ "P_SELECTED_RESP_ID": -999,
+ "P_ACCESS_ACTION": action,
+ };
+ if (contactRelationshipId != null) {
+ postParams["P_CONTACT_RELATIONSHIP_ID"] = contactRelationshipId;
+ }
+ if (contactPersonId != null) {
+ postParams["P_CONTACT_PERSON_ID"] = contactPersonId;
+ }
+ if (personId != null) {
+ postParams["P_PERSON_ID"] = personId;
+ }
+ postParams.addAll(AppState().postParamsJson);
+ return await ApiClient().postJsonForObject((json) {
+ return GenericResponseModel.fromJson(json);
+ }, url, postParams);
+ }
}
diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart
index e518ea5..91f8be6 100644
--- a/lib/app_state/app_state.dart
+++ b/lib/app_state/app_state.dart
@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart';
import 'package:mohem_flutter_app/models/itg_forms_models/request_detail_model.dart';
+import 'package:mohem_flutter_app/models/generic_response_model.dart';
import 'package:mohem_flutter_app/models/member_information_list_model.dart';
import 'package:mohem_flutter_app/models/member_login_list_model.dart';
import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
@@ -92,11 +93,58 @@ class AppState {
final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.1, mobileType: Platform.isAndroid ? "android" : "ios");
+ PostParamsModel get postParamsInitConfig {
+ if (_postParamsInitConfig.pLegislationCode == null) {
+ if (_postParams?.pLegislationCode != null) {
+ _postParamsInitConfig.pLegislationCode = _postParams?.pLegislationCode;
+ } else if (_memberLoginList?.pLEGISLATIONCODE != null) {
+ _postParamsInitConfig.pLegislationCode = _memberLoginList?.pLEGISLATIONCODE;
+ }
+ }
+ return _postParamsInitConfig;
+ }
+
+ GetWalaplusDepInfoModel? _walaplusDepInfoModel;
+
+ GetWalaplusDepInfoModel? get walaplusDepInfoModel => _walaplusDepInfoModel;
+
+ set setWalaplusDepInfoModel(GetWalaplusDepInfoModel? model) => _walaplusDepInfoModel = model;
+
+ String? _dependentName;
+
+ String? get dependentName => _dependentName ?? _walaplusDepInfoModel?.pDependentName;
+
+ set setDependentName(String? name) => _dependentName = name;
+
+ int? _dependentLoginType;
+
+ int? get dependentLoginType => _dependentLoginType;
+
+ set setDependentLoginType(int? type) => _dependentLoginType = type;
+
+ String? _dependentDob;
+
+ String? get dependentDob => _dependentDob;
+
+ set setDependentDob(String? dob) => _dependentDob = dob;
+
+ String? _authenticationTokenID;
+
+ String? get authenticationTokenID => _authenticationTokenID;
+
+ set setAuthenticationTokenID(String? token) => _authenticationTokenID = token;
+
void setPostParamsInitConfig() {
isAuthenticated = false;
isLogged = false;
_memberLoginList = null;
_memberInformationList = null;
+ _walaplusDepInfoModel = null;
+ _dependentName = null;
+ _dependentLoginType = null;
+ _dependentDob = null;
+ _authenticationTokenID = null;
+ _postParamsInitConfig.pLegislationCode = null;
_postParams = _postParamsInitConfig;
}
@@ -143,7 +191,13 @@ class AppState {
MemberLoginListModel? get memberLoginList => _memberLoginList;
- set setMemberLoginListModel(MemberLoginListModel? _memberLoginList) => this._memberLoginList = _memberLoginList;
+ set setMemberLoginListModel(MemberLoginListModel? _memberLoginList) {
+ this._memberLoginList = _memberLoginList;
+ if (_memberLoginList?.pLEGISLATIONCODE != null) {
+ _postParamsInitConfig.pLegislationCode = _memberLoginList?.pLEGISLATIONCODE?.trim().toUpperCase();
+ _postParams?.pLegislationCode = _memberLoginList?.pLEGISLATIONCODE?.trim().toUpperCase();
+ }
+ }
MemberInformationListModel? _memberInformationList;
diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index 74d1572..dfe42c4 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -1,7 +1,7 @@
import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
class ApiConsts {
- // static String baseUrl = "http://10.200.204.11"; // Local server
+ // static String baseUrl = "http://10.201.214.101:2027"; // Local server
// static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
// static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
@@ -9,10 +9,10 @@ class ApiConsts {
// static String baseUrl = "https://webservices.hmg.com"; // PreProd
// static String baseUrl = "https://hmgwebservices.com"; // Live server
- // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+ static String baseUrl = "https://mohemm.hmg.com"; // New Live server
static String ssoBaseUrl = "https://sso.hmg.com"; // New Live server
//
- static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+ // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
// static String baseUrl = "http://10.20.200.111:1010/";
// static String baseUrl = "https://mohemm.hmg.com"; // New Live server
//static String eLearningBaseUrl = "https://elearning.hmg.com/moodle_dev/api/"; // Elearning server UAT
@@ -43,6 +43,8 @@ class ApiConsts {
static String walaPlusCategories = erpRest + "WalaPlus_Categories";
static String walaPlusRetailers = erpRest + "WalaPlus_Retailers";
static String walaPlusRetailersByID = erpRest + "WalaPlus_RetailersByID";
+ static String walaPlusOfferRedeem = erpRest + "WalaPlus_OfferRedeem";
+ static String processContactMazayaAccess = erpRest + "PROCESS_CONTACT_MAZAYA_ACCESS";
static String ssoAuthRedirection = ssoBaseUrl + "/api/auth/connect";
diff --git a/lib/classes/inAppWebView.dart b/lib/classes/inAppWebView.dart
index ccb24fd..d19f951 100644
--- a/lib/classes/inAppWebView.dart
+++ b/lib/classes/inAppWebView.dart
@@ -1,6 +1,7 @@
import 'dart:developer';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:permission_handler/permission_handler.dart';
class MyInAppBrowser extends InAppBrowser {
final Function onExitCallback;
@@ -30,4 +31,21 @@ class MyInAppBrowser extends InAppBrowser {
void onLoadError(Uri? url, int code, String message) {
log("Can't load $url.. Error: $message");
}
+
+ @override
+ Future onPermissionRequest(PermissionRequest permissionRequest) async {
+ log("onPermissionRequest: ${permissionRequest.resources}");
+ try {
+ var status = await Permission.camera.status;
+ if (!status.isGranted) {
+ await Permission.camera.request();
+ }
+ } catch (e) {
+ log("Error checking/requesting camera permission: $e");
+ }
+ return PermissionResponse(
+ resources: permissionRequest.resources,
+ action: PermissionResponseAction.GRANT,
+ );
+ }
}
diff --git a/lib/classes/utils.dart b/lib/classes/utils.dart
index 2ae4fe3..9971317 100644
--- a/lib/classes/utils.dart
+++ b/lib/classes/utils.dart
@@ -393,7 +393,11 @@ class Utils {
AppState().isLogged = false;
AppState().setPostParamsInitConfig();
if (chatData != null) {
- chatData.disposeData();
+ try {
+ chatData.disposeData();
+ } catch (e) {
+
+ }
}
// SharedPreferences prefs = await SharedPreferences.getInstance();
// await prefs.clear();
diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index a9d868f..e555d02 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -48,6 +48,8 @@ import 'package:mohem_flutter_app/ui/my_team/view_attendance.dart';
import 'package:mohem_flutter_app/ui/parking_qr/parking_qr.dart';
import 'package:mohem_flutter_app/ui/payslip/monthly_pay_slip_screen.dart';
import 'package:mohem_flutter_app/ui/performance/performance_appraisal_screen.dart';
+import 'package:mohem_flutter_app/ui/profile/add_dependent_verify_screen.dart';
+import 'package:mohem_flutter_app/ui/profile/mazaya_access_result_screen.dart';
import 'package:mohem_flutter_app/ui/profile/add_update_family_member.dart';
import 'package:mohem_flutter_app/ui/profile/basic_details.dart';
import 'package:mohem_flutter_app/ui/profile/contact_details.dart';
@@ -85,6 +87,7 @@ import 'package:mohem_flutter_app/ui/work_list/itg_detail_screen.dart';
import 'package:mohem_flutter_app/ui/work_list/work_list_screen.dart';
import 'package:mohem_flutter_app/ui/work_list/worklist_detail_screen.dart';
import 'package:mohem_flutter_app/ui/work_list/worklist_settings.dart';
+import 'package:mohem_flutter_app/widgets/app_in_app_webview_screen.dart';
class AppRoutes {
static GlobalKey navigatorKey = GlobalKey();
@@ -146,6 +149,8 @@ class AppRoutes {
static const String familyMembers = "/familyMembers";
static const String deleteFamilyMember = "/deleteFamilyMember";
static const String addUpdateFamilyMember = "/addUpdateFamilyMember";
+ static const String addDependentVerify = "/addDependentVerify";
+ static const String mazayaAccessResult = "/mazayaAccessResult";
// Mowadhafhi
static const String mowadhafhi = "/mowadhafhi";
@@ -229,6 +234,7 @@ class AppRoutes {
//Parking QR
static const String parkingQr = "/parkingQrScreen";
+ static const String appInAppWebView = "/appInAppWebView";
static final Map routes = {
login: (BuildContext context) => LoginScreen(),
@@ -237,6 +243,16 @@ class AppRoutes {
dashboard: (BuildContext context) => DashboardScreen(),
dashboardScreenForDependet: (BuildContext context) => const DashboardScreenForDependet(),
walaPlusRetailerDetails: (BuildContext context) => const WalaPlusRetailerDetailsScreen(),
+ appInAppWebView: (BuildContext context) {
+ Object? args = ModalRoute.of(context)?.settings.arguments;
+ if (args is Map) {
+ return AppInAppWebViewScreen(
+ url: args['url'] ?? "",
+ title: args['title'],
+ );
+ }
+ return const Scaffold();
+ },
survey: (BuildContext context) => SurveyScreen(),
advertisement: (BuildContext context) => ITGAdsScreen(),
@@ -287,6 +303,8 @@ class AppRoutes {
deleteFamilyMember: (BuildContext context) => DeleteFamilyMember(ModalRoute.of(context)!.settings.arguments as int),
requestSubmitScreen: (BuildContext context) => RequestSubmitScreen(),
addUpdateFamilyMember: (BuildContext context) => AddUpdateFamilyMember(),
+ addDependentVerify: (BuildContext context) => const AddDependentVerifyScreen(),
+ mazayaAccessResult: (BuildContext context) => const MazayaAccessResultScreen(),
//mowadhafhi
mowadhafhi: (BuildContext context) => MowadhafhiHome(),
@@ -358,7 +376,6 @@ class AppRoutes {
etqanOvr: (BuildContext context) => EtqanOvrHome(),
etqanCreateRequest: (BuildContext context) => EtqanOvrCreateRequest(),
etqanGetIncidientRequest: (BuildContext context) => EtqanOvrRequestDetailed(),
- activityScreen:(BuildContext context) => const EventActivityScreen(),
//Parking QR
parkingQr: (BuildContext context) => const ParkingQrScreen(),
diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart
index 93a6cf8..a3dddff 100644
--- a/lib/extensions/string_extensions.dart
+++ b/lib/extensions/string_extensions.dart
@@ -134,14 +134,16 @@ extension EmailValidator on String {
),
);
- Widget toText13({Color? color, bool isUnderLine = false}) => Text(
+ Widget toText13({Color? color, bool isUnderLine = false, bool isBold = false, int? maxlines, TextOverflow? overflow}) => Text(
this,
- style: TextStyle(fontSize: 13, fontWeight: FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.52, decoration: isUnderLine ? TextDecoration.underline : null),
+ maxLines: maxlines,
+ overflow: overflow,
+ style: TextStyle(fontSize: 13, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.52, decoration: isUnderLine ? TextDecoration.underline : null),
);
Widget toText14({Color? color, bool isUnderLine = false, bool isBold = false, FontWeight? weight, int? maxlines, TextAlign? textAlign, bool isCenter = false}) => Text(
this,
- textAlign: isCenter ? TextAlign.center : (textAlign ?? TextAlign.left),
+ textAlign: isCenter ? TextAlign.center : textAlign,
maxLines: maxlines,
style: TextStyle(
color: color ?? MyColors.darkTextColor,
diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
index 516fe03..242fde5 100644
--- a/lib/generated/codegen_loader.g.dart
+++ b/lib/generated/codegen_loader.g.dart
@@ -336,6 +336,8 @@ class CodegenLoader extends AssetLoader{
"createdFor": "انشاء لأجل",
"requestCreatedSuccessfully": "تم انشاء الطلب بنجاح",
"search": "بحث",
+ "filterEnterPrDetailsHere": "ادخل تفاصيل طلب الشراء هنا",
+ "filterEnterPoDetailsHere": "ادخل تفاصيل أمر الشراء هنا",
"wantToReject": "هل انت متأكد تريد الرفض",
"requestType": "نوع الطلب",
"employeeDigitalID": "هويةالموظف الرقمية",
@@ -395,7 +397,7 @@ class CodegenLoader extends AssetLoader{
"browseCategories": "تصفح الفئات",
"searchItems": "عناصر البحث",
"offerAndDiscounts": "العروض والخصومات",
- "offerValid": "العرض صالح",
+ "offerValid": "العرض ساري",
"offerExpired": "انتهى العرض",
"whatAreYouOffering": "ما الذي تعرضه؟",
"selectCategory": "اختر الفئة",
@@ -690,7 +692,109 @@ class CodegenLoader extends AssetLoader{
"costCenter": "مركز التكلفة",
"priceSAR": "السعر (ريال سعودي)",
"amountSAR": "المبلغ (ريال سعودي)",
- "amuLastThreeMonths": "AMU (آخر 3 أشهر)"
+ "amuLastThreeMonths": "AMU (آخر 3 أشهر)",
+ "mazayaTitle": "مزايا",
+ "mazayaAccessGranted": "تم منح حق الوصول لمزايا",
+ "mazayaAccessGrantedDesc": "أصبح لدى {} حق وصول نشط الآن. شارك رابط التنزيل أدناه ليتمكن من تثبيت تطبيق مهم وإكمال الإعداد.",
+ "accessIsNowActive": "الوصول نشط الآن",
+ "accessIsNowActiveDesc": "يمكن لـ {} استخدام الرابط المرفق لتنزيل تطبيق مزايا ومتابعة الإعداد على جهازه.",
+ "dependentAccessActive": "وصول التابع نشط",
+ "shareableAppDownloadLink": "رابط تنزيل التطبيق للمشاركة",
+ "shareableAppDownloadLinkDesc": "أرسل هذا الرابط إلى {} ليتمكن من تنزيل تطبيق مزايا ومتابعة الإعداد.",
+ "downloadLink": "رابط التنزيل",
+ "shareDownloadLink": "مشاركة رابط التنزيل",
+ "copyLink": "نسخ الرابط",
+ "done": "تم",
+ "linkCopied": "تم نسخ الرابط بنجاح",
+ "mazayaAccessRevoked": "تم إلغاء الوصول لمزايا",
+ "mazayaAccessRevokedDesc": "قام الكفيل بإلغاء وصول التابع. لم يعد بالإمكان فتح العروض أو تسجيل الدخول بالبصمة.",
+ "contactYourSponsor": "تواصل مع الكفيل",
+ "contactYourSponsorDesc": "اطلب من كفيلك السماح بالوصول لمزايا مرة أخرى من تفاصيل التابعين. يمكن للكفيل فقط استعادة الوصول.",
+ "dependentAccessBlocked": "تم حظر وصول التابع",
+ "returnToSignIn": "العودة إلى تسجيل الدخول",
+ "allowMazayaAccess": "السماح بالوصول لمزايا",
+ "revokeMazayaAccess": "إلغاء الوصول لمزايا",
+ "active": "نشط",
+ "noAccess": "غير متاح",
+ "offerDetails": "تفاصيل العرض",
+ "offerIdNotAvailable": "معرف العرض غير متوفر",
+ "unableToRedeemOffer": "تعذر الحصول على رابط العرض، يرجى المحاولة لاحقاً",
+ "errorRedeemingOffer": "حدث خطأ أثناء استخدام العرض",
+ "useOffer": "استخدام العرض",
+ "online": "عبر الإنترنت",
+ "inStore": "في المتجر",
+ "ksa": "المملكة",
+ "riyadh": "الرياض",
+ "noInstructionsAvailable": "لا توجد طريقة استخدام محددة.",
+ "contactInformation": "معلومات التواصل:",
+ "humanResources": "الموارد البشرية",
+ "drSulaimanAlHabib": "سليمان الحبيب",
+ "allCategories": "الكل",
+ "noOffersAvailable": "لا توجد عروض متاحة",
+ "addDependents": "إضافة تابعين",
+ "myDependents": "التابعون",
+ "offDiscount": "خصم {}",
+ "usageLabel": "الاستخدام: ",
+ "areYouSureWantToLogOut": "هل أنت متأكد من تسجيل الخروج؟",
+ "searchDependents": "البحث في التابعين",
+ "searchFamilyMembers": "البحث في أفراد العائلة",
+ "addAnotherUser": "إضافة مستخدم آخر",
+ "joinMazaya": "انضم إلى مزايا",
+ "joinMazayaSubtitle": "احصل على أفضل العروض والصفقات الحصرية في المطاعم والتسوق ومكافآت نمط الحياة.",
+ "continueAsEmployee": "المتابعة كموظف",
+ "continueAsEmployeeSubtitle": "سجل الدخول باستخدام اسم المستخدم وكلمة المرور الخاصة بالموظف.",
+ "pleaseEnterNationalId": "الرجاء إدخال رقم الهوية الوطنية",
+ "pleaseSelectDob": "الرجاء تحديد تاريخ الميلاد",
+ "unableToRetrieveDependentInfo": "تعذر الحصول على معلومات التابع",
+ "failedToSendOtp": "فشل إرسال رمز التحقق",
+ "verificationCodeResent": "تم إعادة إرسال رمز التحقق",
+ "nationalId": "الهوية الوطنية",
+ "addDependent": "إضافة تابع",
+ "stepVerify": "التحقق",
+ "stepBasic": "الأساسية",
+ "stepAdditional": "إضافية",
+ "findYourDependent": "البحث عن تابعك",
+ "findYourDependentDesc": "أدخل التفاصيل تماماً كما تظهر في الهوية الوطنية. سنقوم باسترداد السجل بأمان من مركز المعلومات الوطني (NHIC).",
+ "enter10DigitNationalId": "أدخل رقم الهوية المكون من 10 أرقام",
+ "nationalIdMustBe10Digits": "يجب أن يتكون رقم الهوية من 10 أرقام",
+ "dateFormatPlaceholder": "يوم / شهر / سنة",
+ "searchUser": "بحث عن المستخدم",
+ "dependentNotFoundNhic": "لم يتم العثور على سجل لهذا التابع في مركز المعلومات الوطني",
+ "basicInfo": "المعلومات الأساسية",
+ "basicInfoDesc": "بيانات الهوية المطلوبة المستردة من مركز المعلومات الوطني.",
+ "additionalInfo": "معلومات إضافية",
+ "additionalInfoDesc": "إضافة أو مراجعة بيانات الكفالة والأهلية.",
+ "select": "اختر",
+ "enterFieldPlaceholder": "أدخل {}",
+ "requiredField": "الحقل المطلوب",
+ "pleaseFillField": "الرجاء إدخال {}",
+ "reviewAndSubmit": "المراجعة والإرسال",
+ "reviewAndSubmitDesc": "يرجى مراجعة تفاصيل التابع بعناية قبل تأكيد الإرسال.",
+ "arabicName": "الاسم بالعربية",
+ "relationship": "صلة القرابة",
+ "sponsor": "الكفيل",
+ "dependentSponsorDetail": "تفاصيل كفيل التابع",
+ "insuranceEligibility": "أهلية التأمين",
+ "relationshipStartDate": "تاريخ بدء العلاقة",
+ "dependentAddedSuccessfully": "تم إرسال الطلب بنجاح",
+ "genderMale": "ذكر",
+ "genderFemale": "أنثى",
+ "religionIslam": "الإسلام",
+ "back": "السابق",
+ "submitRequest": "إرسال الطلب",
+ "enterDependentDetailsToContinue": "أدخل تفاصيل التابع للمتابعة.",
+ "enterBasicDetailsDesc": "يرجى إدخال البيانات الأساسية للتابع.",
+ "locations": "الفروع والمواقع",
+ "availableOffers": "العروض المتاحة",
+ "selectOfferToRedeem": "اختر العرض الذي ترغب في استخدامه",
+ "viewOnMap": "عرض على الخريطة",
+ "showAllLocations": "عرض جميع الفروع ({})",
+ "showLess": "عرض أقل",
+ "searchBranches": "البحث عن الفروع أو المدن...",
+ "allCities": "الكل",
+ "noBranchesFound": "لم يتم العثور على فروع مطابقة",
+ "browseAllBranches": "تصفح جميع الفروع ({}) في مختلف المدن",
+ "branchesCount": "{} فرع"
};
static const Map _en_US = {
"mohemm": "Mohemm",
@@ -1009,6 +1113,8 @@ static const Map _en_US = {
"requestType": "Request Type",
"requestCreatedSuccessfully": "Request created successfully",
"search": "Search",
+ "filterEnterPrDetailsHere": "Enter PR Details here",
+ "filterEnterPoDetailsHere": "Enter PO Details here",
"wantToReject": "Are you sure want to reject?",
"employeeDigitalID": "Employee Digital ID",
"businessCard": "Business Card",
@@ -1368,7 +1474,109 @@ static const Map _en_US = {
"costCenter": "Cost Center",
"priceSAR": "Price (SAR)",
"amountSAR": "Amount (SAR)",
- "amuLastThreeMonths": "AMU (Last 3 months)"
+ "amuLastThreeMonths": "AMU (Last 3 months)",
+ "mazayaTitle": "Mazaya",
+ "mazayaAccessGranted": "Mazaya access granted",
+ "mazayaAccessGrantedDesc": "{} now has active access. Share the download link below so they can install the Mohem app and complete setup.",
+ "accessIsNowActive": "Access is now active",
+ "accessIsNowActiveDesc": "{} can use the provided link to download the Mazaya app and continue setup on their device.",
+ "dependentAccessActive": "Dependent access active",
+ "shareableAppDownloadLink": "Shareable app-download link",
+ "shareableAppDownloadLinkDesc": "Send this link to {} so they can download the Mazaya app and continue setup.",
+ "downloadLink": "Download link",
+ "shareDownloadLink": "Share Download Link",
+ "copyLink": "Copy Link",
+ "done": "Done",
+ "linkCopied": "Link copied to clipboard",
+ "mazayaAccessRevoked": "Mazaya access revoked",
+ "mazayaAccessRevokedDesc": "Your sponsor has revoked your dependent access. You can no longer open offers or sign in with biometrics.",
+ "contactYourSponsor": "Contact your sponsor",
+ "contactYourSponsorDesc": "Ask your sponsor to allow Mazaya access again from Dependent Details. Only the sponsor can restore access.",
+ "dependentAccessBlocked": "Dependent access blocked",
+ "returnToSignIn": "Return to Sign In",
+ "allowMazayaAccess": "Allow Mazaya Access",
+ "revokeMazayaAccess": "Revoke Mazaya Access",
+ "active": "Active",
+ "noAccess": "No access",
+ "offerDetails": "Offer Details",
+ "offerIdNotAvailable": "Offer ID not available",
+ "unableToRedeemOffer": "Unable to redeem offer, please try again later",
+ "errorRedeemingOffer": "An error occurred while redeeming offer",
+ "useOffer": "Use Offer",
+ "online": "Online",
+ "inStore": "In Store",
+ "ksa": "KSA",
+ "riyadh": "Riyadh",
+ "noInstructionsAvailable": "No instructions available.",
+ "contactInformation": "Contact Information:",
+ "humanResources": "Human Resources",
+ "drSulaimanAlHabib": "DR SULAIMAN AL HABIB",
+ "allCategories": "All",
+ "noOffersAvailable": "No offers available",
+ "addDependents": "Add Dependents",
+ "myDependents": "My Dependents",
+ "offDiscount": "{} Off",
+ "usageLabel": "Usage: ",
+ "areYouSureWantToLogOut": "Are you sure you want to log out?",
+ "searchDependents": "Search dependents",
+ "searchFamilyMembers": "Search family members",
+ "addAnotherUser": "Add another user",
+ "joinMazaya": "Join Mazaya",
+ "joinMazayaSubtitle": "Get the best offers and exclusive deals across dining, shopping, and lifestyle rewards.",
+ "continueAsEmployee": "Continue as an employee",
+ "continueAsEmployeeSubtitle": "Sign in with your employee username and password.",
+ "pleaseEnterNationalId": "Please enter National ID",
+ "pleaseSelectDob": "Please select Date of Birth",
+ "unableToRetrieveDependentInfo": "Unable to retrieve dependent information",
+ "failedToSendOtp": "Failed to send verification code",
+ "verificationCodeResent": "Verification code resent",
+ "nationalId": "National ID",
+ "addDependent": "Add Dependent",
+ "stepVerify": "Verify",
+ "stepBasic": "Basic",
+ "stepAdditional": "Additional",
+ "findYourDependent": "Find your dependent",
+ "findYourDependentDesc": "Enter the details exactly as they appear on the National ID. We'll securely retrieve the record from NHIC.",
+ "enter10DigitNationalId": "Enter 10-digit National ID",
+ "nationalIdMustBe10Digits": "National ID must be 10 digits",
+ "dateFormatPlaceholder": "DD / MM / YYYY",
+ "searchUser": "Search User",
+ "dependentNotFoundNhic": "Sorry, error while getting dependent info from NHIC",
+ "basicInfo": "Basic Info",
+ "basicInfoDesc": "Required identity details fetched from NHIC.",
+ "additionalInfo": "Additional Info",
+ "additionalInfoDesc": "Add or review sponsorship and eligibility details.",
+ "select": "Select",
+ "enterFieldPlaceholder": "Enter {}",
+ "requiredField": "Required field",
+ "pleaseFillField": "Please fill {}",
+ "reviewAndSubmit": "Review & Submit",
+ "reviewAndSubmitDesc": "Please review the dependent details carefully before submitting.",
+ "arabicName": "Arabic Name",
+ "relationship": "Relationship",
+ "sponsor": "Sponsor",
+ "dependentSponsorDetail": "Dependent Sponsor Detail",
+ "insuranceEligibility": "Insurance Eligibility",
+ "relationshipStartDate": "Start Date",
+ "dependentAddedSuccessfully": "Dependent added successfully",
+ "genderMale": "Male",
+ "genderFemale": "Female",
+ "religionIslam": "Islam",
+ "back": "Back",
+ "submitRequest": "Submit",
+ "enterDependentDetailsToContinue": "Enter the dependent details to continue.",
+ "enterBasicDetailsDesc": "Please enter the dependent's basic identity details.",
+ "locations": "Locations",
+ "availableOffers": "Available Offers",
+ "selectOfferToRedeem": "Select an offer to use",
+ "viewOnMap": "View on map",
+ "showAllLocations": "Show all {} locations",
+ "showLess": "Show less",
+ "searchBranches": "Search branches or cities...",
+ "allCities": "All",
+ "noBranchesFound": "No branches found",
+ "browseAllBranches": "Browse all {} branches across cities",
+ "branchesCount": "{} Branches"
};
static const Map> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US};
}
diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
index 9abe224..73e9b86 100644
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@@ -665,5 +665,108 @@ abstract class LocaleKeys {
static const priceSAR = 'priceSAR';
static const amountSAR = 'amountSAR';
static const amuLastThreeMonths = 'amuLastThreeMonths';
+ static const mazayaTitle = 'mazayaTitle';
+ static const mazayaAccessGranted = 'mazayaAccessGranted';
+ static const mazayaAccessGrantedDesc = 'mazayaAccessGrantedDesc';
+ static const accessIsNowActive = 'accessIsNowActive';
+ static const accessIsNowActiveDesc = 'accessIsNowActiveDesc';
+ static const dependentAccessActive = 'dependentAccessActive';
+ static const shareableAppDownloadLink = 'shareableAppDownloadLink';
+ static const shareableAppDownloadLinkDesc = 'shareableAppDownloadLinkDesc';
+ static const downloadLink = 'downloadLink';
+ static const shareDownloadLink = 'shareDownloadLink';
+ static const copyLink = 'copyLink';
+ static const done = 'done';
+ static const linkCopied = 'linkCopied';
+ static const mazayaAccessRevoked = 'mazayaAccessRevoked';
+ static const mazayaAccessRevokedDesc = 'mazayaAccessRevokedDesc';
+ static const contactYourSponsor = 'contactYourSponsor';
+ static const contactYourSponsorDesc = 'contactYourSponsorDesc';
+ static const dependentAccessBlocked = 'dependentAccessBlocked';
+ static const returnToSignIn = 'returnToSignIn';
+ static const allowMazayaAccess = 'allowMazayaAccess';
+ static const revokeMazayaAccess = 'revokeMazayaAccess';
+ static const active = 'active';
+ static const noAccess = 'noAccess';
+ static const offerDetails = 'offerDetails';
+ static const offerIdNotAvailable = 'offerIdNotAvailable';
+ static const unableToRedeemOffer = 'unableToRedeemOffer';
+ static const errorRedeemingOffer = 'errorRedeemingOffer';
+ static const useOffer = 'useOffer';
+ static const online = 'online';
+ static const inStore = 'inStore';
+ static const ksa = 'ksa';
+ static const riyadh = 'riyadh';
+ static const noInstructionsAvailable = 'noInstructionsAvailable';
+ static const contactInformation = 'contactInformation';
+ static const humanResources = 'humanResources';
+ static const drSulaimanAlHabib = 'drSulaimanAlHabib';
+ static const allCategories = 'allCategories';
+ static const noOffersAvailable = 'noOffersAvailable';
+ static const addDependents = 'addDependents';
+ static const myDependents = 'myDependents';
+ static const offDiscount = 'offDiscount';
+ static const usageLabel = 'usageLabel';
+ static const areYouSureWantToLogOut = 'areYouSureWantToLogOut';
+ static const searchDependents = 'searchDependents';
+ static const searchFamilyMembers = 'searchFamilyMembers';
+ static const addAnotherUser = 'addAnotherUser';
+ static const joinMazaya = 'joinMazaya';
+ static const joinMazayaSubtitle = 'joinMazayaSubtitle';
+ static const continueAsEmployee = 'continueAsEmployee';
+ static const continueAsEmployeeSubtitle = 'continueAsEmployeeSubtitle';
+ static const pleaseEnterNationalId = 'pleaseEnterNationalId';
+ static const pleaseSelectDob = 'pleaseSelectDob';
+ static const unableToRetrieveDependentInfo = 'unableToRetrieveDependentInfo';
+ static const failedToSendOtp = 'failedToSendOtp';
+ static const verificationCodeResent = 'verificationCodeResent';
+ static const nationalId = 'nationalId';
+ static const addDependent = 'addDependent';
+ static const stepVerify = 'stepVerify';
+ static const stepBasic = 'stepBasic';
+ static const stepAdditional = 'stepAdditional';
+ static const findYourDependent = 'findYourDependent';
+ static const findYourDependentDesc = 'findYourDependentDesc';
+ static const enter10DigitNationalId = 'enter10DigitNationalId';
+ static const nationalIdMustBe10Digits = 'nationalIdMustBe10Digits';
+ static const dateFormatPlaceholder = 'dateFormatPlaceholder';
+ static const searchUser = 'searchUser';
+ static const dependentNotFoundNhic = 'dependentNotFoundNhic';
+ static const basicInfo = 'basicInfo';
+ static const basicInfoDesc = 'basicInfoDesc';
+ static const additionalInfo = 'additionalInfo';
+ static const additionalInfoDesc = 'additionalInfoDesc';
+ static const select = 'select';
+ static const enterFieldPlaceholder = 'enterFieldPlaceholder';
+ static const requiredField = 'requiredField';
+ static const pleaseFillField = 'pleaseFillField';
+ static const reviewAndSubmit = 'reviewAndSubmit';
+ static const reviewAndSubmitDesc = 'reviewAndSubmitDesc';
+ static const arabicName = 'arabicName';
+ static const relationship = 'relationship';
+ static const sponsor = 'sponsor';
+ static const dependentSponsorDetail = 'dependentSponsorDetail';
+ static const insuranceEligibility = 'insuranceEligibility';
+ static const relationshipStartDate = 'relationshipStartDate';
+ static const dependentAddedSuccessfully = 'dependentAddedSuccessfully';
+ static const genderMale = 'genderMale';
+ static const genderFemale = 'genderFemale';
+ static const religionIslam = 'religionIslam';
+ static const back = 'back';
+ static const submitRequest = 'submitRequest';
+ static const enterDependentDetailsToContinue = 'enterDependentDetailsToContinue';
+ static const enterBasicDetailsDesc = 'enterBasicDetailsDesc';
+ static const locations = 'locations';
+ static const availableOffers = 'availableOffers';
+ static const selectOfferToRedeem = 'selectOfferToRedeem';
+ static const viewOnMap = 'viewOnMap';
+ static const showAllLocations = 'showAllLocations';
+ static const showLess = 'showLess';
+ static const searchBranches = 'searchBranches';
+ static const allCities = 'allCities';
+ static const noBranchesFound = 'noBranchesFound';
+ static const browseAllBranches = 'browseAllBranches';
+ static const branchesCount = 'branchesCount';
}
+
diff --git a/lib/models/dependent/get_mobile_login_info_dependent_model.dart b/lib/models/dependent/get_mobile_login_info_dependent_model.dart
new file mode 100644
index 0000000..6ab4114
--- /dev/null
+++ b/lib/models/dependent/get_mobile_login_info_dependent_model.dart
@@ -0,0 +1,92 @@
+class GetMobileLoginInfoDependentModel {
+ int? iD;
+ String? dependentID;
+ String? depedentName;
+ String? dob;
+ int? channelID;
+ int? companyID;
+ String? deviceType;
+ String? deviceToken;
+ int? language;
+ int? gender;
+ int? loginType;
+ String? createdOn;
+ String? editedOn;
+ bool? businessCardPrivilege;
+
+ GetMobileLoginInfoDependentModel({
+ this.iD,
+ this.dependentID,
+ this.depedentName,
+ this.dob,
+ this.channelID,
+ this.companyID,
+ this.deviceType,
+ this.deviceToken,
+ this.language,
+ this.gender,
+ this.loginType,
+ this.createdOn,
+ this.editedOn,
+ this.businessCardPrivilege,
+ });
+
+ // Convenience aliases for existing logic
+ String? get nationalId => dependentID;
+ String? get birthDate => dob;
+ String? get employeeName => depedentName;
+ String? get dependentName => depedentName;
+
+ GetMobileLoginInfoDependentModel.fromJson(Map json) {
+ iD = json['ID'];
+ dependentID = (json['DependentID'] ??
+ json['DEPENDENT_ID'] ??
+ json['P_DEP_NATIONAL_ID'] ??
+ json['NationalID'] ??
+ json['NationalId'] ??
+ json['EmployeeID'] ??
+ json['UserName'])
+ ?.toString();
+ depedentName = (json['DepedentName'] ??
+ json['DependentName'] ??
+ json['P_DEPENDENT_NAME'] ??
+ json['EmployeeName'])
+ ?.toString();
+ dob = (json['DOB'] ??
+ json['BirthDate'] ??
+ json['DateOfBirth'] ??
+ json['P_DEP_BIRTH_DATE'] ??
+ json['P_BIRTH_DATE'] ??
+ json['Birth_Date'])
+ ?.toString();
+ channelID = json['ChannelID'] != null ? int.tryParse(json['ChannelID'].toString()) : null;
+ companyID = json['CompanyID'] != null ? int.tryParse(json['CompanyID'].toString()) : null;
+ deviceType = json['DeviceType']?.toString();
+ deviceToken = json['DeviceToken']?.toString();
+ language = json['Language'] != null ? int.tryParse(json['Language'].toString()) : null;
+ gender = json['Gender'] != null ? int.tryParse(json['Gender'].toString()) : null;
+ loginType = json['LoginType'] != null ? int.tryParse(json['LoginType'].toString()) : null;
+ createdOn = json['CreatedOn']?.toString();
+ editedOn = json['EditedOn']?.toString();
+ businessCardPrivilege = json['BusinessCardPrivilege'];
+ }
+
+ Map toJson() {
+ Map data = {};
+ data['ID'] = iD;
+ data['DependentID'] = dependentID;
+ data['DepedentName'] = depedentName;
+ data['DOB'] = dob;
+ data['ChannelID'] = channelID;
+ data['CompanyID'] = companyID;
+ data['DeviceType'] = deviceType;
+ data['DeviceToken'] = deviceToken;
+ data['Language'] = language;
+ data['Gender'] = gender;
+ data['LoginType'] = loginType;
+ data['CreatedOn'] = createdOn;
+ data['EditedOn'] = editedOn;
+ data['BusinessCardPrivilege'] = businessCardPrivilege;
+ return data;
+ }
+}
diff --git a/lib/models/generic_response_model.dart b/lib/models/generic_response_model.dart
index b6f4ef8..9e2d838 100644
--- a/lib/models/generic_response_model.dart
+++ b/lib/models/generic_response_model.dart
@@ -688,7 +688,7 @@ class GenericResponseModel {
serviceName = json['ServiceName'];
time = json['Time'];
androidLink = json['AndroidLink'];
- authenticationTokenID = json['AuthenticationTokenID'];
+ authenticationTokenID = json['AuthenticationTokenID']?.toString();
data = json['Data'];
dataw = json['Dataw'];
dietType = json['DietType'];
@@ -2009,10 +2009,23 @@ class TicketBookingResult {
class GetWalaplusDepInfoModel {
String? pEmpEmailAddress;
String? pEmpMobileNumber;
+ String? pDependentName;
- GetWalaplusDepInfoModel({this.pEmpEmailAddress, this.pEmpMobileNumber});
-
- factory GetWalaplusDepInfoModel.fromJson(Map json) => GetWalaplusDepInfoModel(pEmpEmailAddress: json["P_EMP_EMAIL_ADDRESS"], pEmpMobileNumber: json["P_EMP_MOBILE_NUMBER"]);
+ GetWalaplusDepInfoModel({
+ this.pEmpEmailAddress,
+ this.pEmpMobileNumber,
+ this.pDependentName,
+ });
- Map toJson() => {"P_EMP_EMAIL_ADDRESS": pEmpEmailAddress, "P_EMP_MOBILE_NUMBER": pEmpMobileNumber};
+ factory GetWalaplusDepInfoModel.fromJson(Map json) => GetWalaplusDepInfoModel(
+ pEmpEmailAddress: json["P_EMP_EMAIL_ADDRESS"],
+ pEmpMobileNumber: json["P_EMP_MOBILE_NUMBER"],
+ pDependentName: json["P_DEPENDENT_NAME"],
+ );
+
+ Map toJson() => {
+ "P_EMP_EMAIL_ADDRESS": pEmpEmailAddress,
+ "P_EMP_MOBILE_NUMBER": pEmpMobileNumber,
+ "P_DEPENDENT_NAME": pDependentName,
+ };
}
diff --git a/lib/models/get_employee_contacts.model.dart b/lib/models/get_employee_contacts.model.dart
index df0a41f..be139fa 100644
--- a/lib/models/get_employee_contacts.model.dart
+++ b/lib/models/get_employee_contacts.model.dart
@@ -8,6 +8,8 @@ class GetEmployeeContactsList {
int? pERSONID;
String? pRIMARYCONTACTFLAG;
String? rELATIONSHIP;
+ String? mAZAYAACCESSFLG;
+ dynamic mazayaAccess;
GetEmployeeContactsList(
{this.cONTACTNAME,
@@ -17,7 +19,9 @@ class GetEmployeeContactsList {
this.dATEOFBIRTH,
this.pERSONID,
this.pRIMARYCONTACTFLAG,
- this.rELATIONSHIP});
+ this.rELATIONSHIP,
+ this.mAZAYAACCESSFLG,
+ this.mazayaAccess});
GetEmployeeContactsList.fromJson(Map json) {
cONTACTNAME = json['CONTACT_NAME'];
@@ -28,18 +32,22 @@ class GetEmployeeContactsList {
pERSONID = json['PERSON_ID'];
pRIMARYCONTACTFLAG = json['PRIMARY_CONTACT_FLAG'];
rELATIONSHIP = json['RELATIONSHIP'];
+ mAZAYAACCESSFLG = json['MAZAYA_ACCESS_FLG']?.toString() ?? json['MAZAYA_ACCESS']?.toString();
+ mazayaAccess = mAZAYAACCESSFLG;
}
Map toJson() {
- Map data = new Map();
- data['CONTACT_NAME'] = this.cONTACTNAME;
- data['CONTACT_PERSON_ID'] = this.cONTACTPERSONID;
- data['CONTACT_RELATIONSHIP_ID'] = this.cONTACTRELATIONSHIPID;
- data['CONTACT_TYPE'] = this.cONTACTTYPE;
- data['DATE_OF_BIRTH'] = this.dATEOFBIRTH;
- data['PERSON_ID'] = this.pERSONID;
- data['PRIMARY_CONTACT_FLAG'] = this.pRIMARYCONTACTFLAG;
- data['RELATIONSHIP'] = this.rELATIONSHIP;
+ Map data = {};
+ data['CONTACT_NAME'] = cONTACTNAME;
+ data['CONTACT_PERSON_ID'] = cONTACTPERSONID;
+ data['CONTACT_RELATIONSHIP_ID'] = cONTACTRELATIONSHIPID;
+ data['CONTACT_TYPE'] = cONTACTTYPE;
+ data['DATE_OF_BIRTH'] = dATEOFBIRTH;
+ data['PERSON_ID'] = pERSONID;
+ data['PRIMARY_CONTACT_FLAG'] = pRIMARYCONTACTFLAG;
+ data['RELATIONSHIP'] = rELATIONSHIP;
+ data['MAZAYA_ACCESS_FLG'] = mAZAYAACCESSFLG;
+ data['MAZAYA_ACCESS'] = mazayaAccess;
return data;
}
}
\ No newline at end of file
diff --git a/lib/models/get_mobile_login_info_list_model.dart b/lib/models/get_mobile_login_info_list_model.dart
index d544ef5..00267a2 100644
--- a/lib/models/get_mobile_login_info_list_model.dart
+++ b/lib/models/get_mobile_login_info_list_model.dart
@@ -1,6 +1,6 @@
class GetMobileLoginInfoListModel {
int? iD;
- String? employeeID;
+ dynamic? employeeID; //do not change this
int? channelID;
int? companyID;
String? deviceType;
diff --git a/lib/models/offers_and_discounts/wala_plus_category_model.dart b/lib/models/offers_and_discounts/wala_plus_category_model.dart
index 51e835f..aac2752 100644
--- a/lib/models/offers_and_discounts/wala_plus_category_model.dart
+++ b/lib/models/offers_and_discounts/wala_plus_category_model.dart
@@ -11,14 +11,33 @@ class WalaPlusCategoryModel {
this.imageThumb,
this.name,
this.parentId,
- });
+ }) {
+ if ((image == null || image!.isEmpty) && id != null && id!.trim().isNotEmpty && id != "all" && id != "0") {
+ String cleanId = id!.trim();
+ if (cleanId.toLowerCase().endsWith('.png')) {
+ cleanId = cleanId.substring(0, cleanId.length - 4);
+ }
+ image = Uri.encodeFull("https://epharmacy.hmg.com/middleware/images/category/$cleanId.png");
+ }
+ }
WalaPlusCategoryModel.fromJson(Map json) {
- id = json['id']?.toString();
- image = json['image']?.toString();
- imageThumb = json['image_thumb']?.toString();
- name = json['name']?.toString();
- parentId = json['parent_id']?.toString();
+ id = (json['id'] ?? json['Id'] ?? json['ID'])?.toString();
+ name = (json['name'] ?? json['Name'])?.toString();
+ parentId = (json['parent_id'] ?? json['Parent_Id'] ?? json['parentId'])?.toString();
+ imageThumb = (json['image_thumb'] ?? json['Image_Thumb'] ?? json['imageThumb'])?.toString();
+
+ // Use category image URL from HMG middleware using ID from WalaPlus_Categories API:
+ // https://epharmacy.hmg.com/middleware/images/category/{id}.png
+ if (id != null && id!.trim().isNotEmpty && id != "all" && id != "0") {
+ String cleanId = id!.trim();
+ if (cleanId.toLowerCase().endsWith('.png')) {
+ cleanId = cleanId.substring(0, cleanId.length - 4);
+ }
+ image = Uri.encodeFull("https://epharmacy.hmg.com/middleware/images/category/$cleanId.png");
+ } else {
+ image = (json['image'] ?? json['Image'])?.toString();
+ }
}
Map toJson() {
@@ -33,4 +52,15 @@ class WalaPlusCategoryModel {
bool get isMainCategory => parentId == null || parentId!.isEmpty;
bool get isSvg => (image ?? '').toLowerCase().contains('.svg');
+
+ String get categoryImageUrl {
+ if (id != null && id!.trim().isNotEmpty && id != "all" && id != "0") {
+ String cleanId = id!.trim();
+ if (cleanId.toLowerCase().endsWith('.png')) {
+ cleanId = cleanId.substring(0, cleanId.length - 4);
+ }
+ return Uri.encodeFull("https://epharmacy.hmg.com/middleware/images/category/$cleanId.png");
+ }
+ return image ?? '';
+ }
}
diff --git a/lib/models/offers_and_discounts/wala_plus_retailer_model.dart b/lib/models/offers_and_discounts/wala_plus_retailer_model.dart
index 39137fc..e7f7a9c 100644
--- a/lib/models/offers_and_discounts/wala_plus_retailer_model.dart
+++ b/lib/models/offers_and_discounts/wala_plus_retailer_model.dart
@@ -1,3 +1,6 @@
+import 'dart:convert';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/offers_and_discounts/wala_plus_category_model.dart';
class WalaPlusRetailersResponse {
@@ -15,16 +18,32 @@ class WalaPlusRetailersResponse {
factory WalaPlusRetailersResponse.fromJson(Map json) {
List retailersList = [];
- if (json['retailers'] != null && json['retailers'] is List) {
- json['retailers'].forEach((v) {
- retailersList.add(WalaPlusRetailerModel.fromJson(v));
+ dynamic retailersData = json['retailers'] ?? json['Retailers'] ?? json['data'] ?? json['items'];
+ if (retailersData is String) {
+ try {
+ retailersData = jsonDecode(retailersData);
+ } catch (_) {}
+ }
+ if (retailersData is List) {
+ retailersData.forEach((v) {
+ if (v is Map) {
+ retailersList.add(WalaPlusRetailerModel.fromJson(v));
+ } else if (v is Map) {
+ retailersList.add(WalaPlusRetailerModel.fromJson(Map.from(v)));
+ }
});
}
return WalaPlusRetailersResponse(
- page: json['page'] is int ? json['page'] : int.tryParse(json['page']?.toString() ?? ''),
- pagesCount: json['pages_count'] is int ? json['pages_count'] : int.tryParse(json['pages_count']?.toString() ?? ''),
- perPage: json['per_page'] is int ? json['per_page'] : int.tryParse(json['per_page']?.toString() ?? ''),
+ page: json['page'] is int
+ ? json['page']
+ : int.tryParse(json['page']?.toString() ?? json['WP_Page']?.toString() ?? '1'),
+ pagesCount: json['pages_count'] is int
+ ? json['pages_count']
+ : int.tryParse(json['pages_count']?.toString() ?? json['pagesCount']?.toString() ?? json['totalPages']?.toString() ?? '1'),
+ perPage: json['per_page'] is int
+ ? json['per_page']
+ : int.tryParse(json['per_page']?.toString() ?? json['perPage']?.toString() ?? json['WP_Per_page']?.toString() ?? '10'),
retailers: retailersList,
);
}
@@ -41,6 +60,95 @@ class WalaPlusRetailersResponse {
}
}
+class WalaPlusRetailersByIDResponse {
+ int? page;
+ int? pagesCount;
+ int? perPage;
+ List? locations;
+ List? offers;
+ List? retailer;
+
+ WalaPlusRetailersByIDResponse({
+ this.page,
+ this.pagesCount,
+ this.perPage,
+ this.locations,
+ this.offers,
+ this.retailer,
+ });
+
+ factory WalaPlusRetailersByIDResponse.fromJson(Map json) {
+ List locList = WalaPlusRetailerModel.parseLocationsList(
+ json['locations'] ?? json['Locations'] ?? json['location'] ?? json['Location'],
+ );
+ List offList = WalaPlusRetailerModel.parseOffersList(
+ json['offers'] ?? json['Offers'],
+ );
+
+ List retList = [];
+ dynamic retData = json['retailer'] ?? json['Retailer'];
+ if (retData is List) {
+ for (var r in retData) {
+ if (r is Map) {
+ var model = WalaPlusRetailerModel.fromJson(r);
+ if (model.locations == null || model.locations!.isEmpty) model.locations = locList;
+ if (model.offers == null || model.offers!.isEmpty) model.offers = offList;
+ retList.add(model);
+ } else if (r is Map) {
+ var model = WalaPlusRetailerModel.fromJson(Map.from(r));
+ if (model.locations == null || model.locations!.isEmpty) model.locations = locList;
+ if (model.offers == null || model.offers!.isEmpty) model.offers = offList;
+ retList.add(model);
+ }
+ }
+ } else if (retData is Map) {
+ var model = WalaPlusRetailerModel.fromJson(Map.from(retData));
+ if (model.locations == null || model.locations!.isEmpty) model.locations = locList;
+ if (model.offers == null || model.offers!.isEmpty) model.offers = offList;
+ retList.add(model);
+ }
+
+ return WalaPlusRetailersByIDResponse(
+ page: json['page'] is int
+ ? json['page']
+ : int.tryParse(json['page']?.toString() ?? json['WP_Page']?.toString() ?? ''),
+ pagesCount: json['pages_count'] is int
+ ? json['pages_count']
+ : int.tryParse(json['pages_count']?.toString() ?? json['pagesCount']?.toString() ?? ''),
+ perPage: json['per_page'] is int
+ ? json['per_page']
+ : int.tryParse(json['per_page']?.toString() ?? json['perPage']?.toString() ?? ''),
+ locations: locList,
+ offers: offList,
+ retailer: retList,
+ );
+ }
+
+ WalaPlusRetailerModel? get primaryRetailer {
+ if (retailer != null && retailer!.isNotEmpty) {
+ return retailer!.first;
+ }
+ return null;
+ }
+
+ Map toJson() {
+ Map data = {};
+ data['page'] = page;
+ data['pages_count'] = pagesCount;
+ data['per_page'] = perPage;
+ if (locations != null) {
+ data['locations'] = locations!.map((v) => v.toJson()).toList();
+ }
+ if (offers != null) {
+ data['offers'] = offers!.map((v) => v.toJson()).toList();
+ }
+ if (retailer != null) {
+ data['retailer'] = retailer!.map((v) => v.toJson()).toList();
+ }
+ return data;
+ }
+}
+
class WalaPlusRetailerModel {
String? id;
String? name;
@@ -64,8 +172,17 @@ class WalaPlusRetailerModel {
String? howToUse;
WalaPlusRetailerContact? contact;
dynamic offerWeight;
+ List? offers;
List? locations;
List? categories;
+ String? validity;
+ String? validTo;
+ String? validUntil;
+ String? endDate;
+ String? expiryDate;
+ String? duration;
+ String? email;
+ String? phone;
WalaPlusRetailerModel({
this.id,
@@ -90,62 +207,223 @@ class WalaPlusRetailerModel {
this.howToUse,
this.contact,
this.offerWeight,
+ this.offers,
this.locations,
this.categories,
+ this.validity,
+ this.validTo,
+ this.validUntil,
+ this.endDate,
+ this.expiryDate,
+ this.duration,
+ this.email,
+ this.phone,
});
+ static List parseOffersList(data) {
+ List list = [];
+ if (data == null) return list;
+ if (data is String) {
+ try {
+ data = jsonDecode(data);
+ } catch (_) {}
+ }
+ if (data is List) {
+ for (var v in data) {
+ if (v is Map) {
+ list.add(WalaPlusOfferModel.fromJson(v));
+ } else if (v is Map) {
+ list.add(WalaPlusOfferModel.fromJson(Map.from(v)));
+ }
+ }
+ }
+ return list;
+ }
+
+ static List parseLocationsList(data) {
+ List list = [];
+ if (data == null) return list;
+ if (data is String) {
+ try {
+ data = jsonDecode(data);
+ } catch (_) {}
+ }
+ if (data is List) {
+ for (var v in data) {
+ if (v is Map) {
+ list.add(WalaPlusRetailerLocation.fromJson(v));
+ } else if (v is Map) {
+ list.add(WalaPlusRetailerLocation.fromJson(Map.from(v)));
+ }
+ }
+ }
+ return list;
+ }
+
factory WalaPlusRetailerModel.fromJson(Map json) {
- List locationsList = [];
- if (json['locations'] != null && json['locations'] is List) {
- json['locations'].forEach((v) {
- locationsList.add(WalaPlusRetailerLocation.fromJson(v));
- });
+ Map targetJson = json;
+ dynamic offersSource = json['offers'] ?? json['Offers'];
+ dynamic locationsSource = json['locations'] ?? json['Locations'] ?? json['location'] ?? json['Location'];
+
+ // If json is the wrapper object from WalaPlus_RetailersByID containing 'retailer' key
+ if (json['retailer'] != null || json['Retailer'] != null) {
+ dynamic retailerData = json['retailer'] ?? json['Retailer'];
+ if (retailerData is List && retailerData.isNotEmpty) {
+ var first = retailerData.first;
+ if (first is Map) {
+ targetJson = first;
+ } else if (first is Map) {
+ targetJson = Map.from(first);
+ }
+ } else if (retailerData is Map) {
+ targetJson = retailerData;
+ } else if (retailerData is Map) {
+ targetJson = Map.from(retailerData);
+ }
+ if (locationsSource == null || (locationsSource is List && locationsSource.isEmpty)) {
+ locationsSource = targetJson['locations'] ?? targetJson['Locations'] ?? targetJson['location'] ?? targetJson['Location'];
+ }
+ if (offersSource == null || (offersSource is List && offersSource.isEmpty)) {
+ offersSource = targetJson['offers'] ?? targetJson['Offers'];
+ }
}
+ List offersList = parseOffersList(offersSource ?? targetJson['offers'] ?? targetJson['Offers']);
+ List locationsList = parseLocationsList(
+ locationsSource ?? targetJson['locations'] ?? targetJson['Locations'] ?? targetJson['location'] ?? targetJson['Location'],
+ );
+
List categoriesList = [];
- if (json['categories'] != null && json['categories'] is List) {
- json['categories'].forEach((v) {
+ if (targetJson['categories'] != null && targetJson['categories'] is List) {
+ targetJson['categories'].forEach((v) {
categoriesList.add(WalaPlusCategoryModel.fromJson(v));
});
}
WalaPlusRetailerContact? contactObj;
- if (json['contact'] != null) {
- if (json['contact'] is Map) {
- contactObj = WalaPlusRetailerContact.fromJson(Map.from(json['contact']));
- } else if (json['contact'] is String && json['contact'].toString().trim().isNotEmpty) {
- contactObj = WalaPlusRetailerContact(website: json['contact'].toString());
+ if (targetJson['contact'] != null) {
+ if (targetJson['contact'] is Map) {
+ contactObj = WalaPlusRetailerContact.fromJson(Map.from(targetJson['contact']));
+ } else if (targetJson['contact'] is String && targetJson['contact'].toString().trim().isNotEmpty) {
+ contactObj = WalaPlusRetailerContact(website: targetJson['contact'].toString());
+ }
+ }
+
+ String? foundValidity = targetJson['validity']?.toString() ??
+ targetJson['valid_to']?.toString() ??
+ targetJson['valid_until']?.toString() ??
+ targetJson['end_date']?.toString() ??
+ targetJson['expiry_date']?.toString() ??
+ targetJson['expire_date']?.toString() ??
+ targetJson['duration']?.toString() ??
+ targetJson['validity_period']?.toString() ??
+ targetJson['valid_duration']?.toString() ??
+ targetJson['offer_validity']?.toString();
+
+ if (foundValidity == null || foundValidity == "null" || foundValidity.trim().isEmpty) {
+ for (var entry in targetJson.entries) {
+ String k = entry.key.toLowerCase();
+ if ((k.contains('valid') || k.contains('expir') || k.contains('duration')) &&
+ !k.contains('isverificationcodevalid') &&
+ !k.contains('barcode')) {
+ if (entry.value != null && entry.value.toString().trim().isNotEmpty && entry.value.toString() != "null") {
+ foundValidity = entry.value.toString().trim();
+ break;
+ }
+ }
}
}
return WalaPlusRetailerModel(
- id: json['id']?.toString(),
- name: json['name']?.toString(),
- offerTitle: json['offer_title']?.toString(),
- offerType: json['offer_type']?.toString(),
- description: json['description']?.toString(),
- info: json['info']?.toString(),
- image: json['image']?.toString(),
- imageThumb: json['image_thumb']?.toString(),
- logo: json['logo']?.toString(),
- logoThumb: json['logo_thumb']?.toString(),
- website: json['website']?.toString(),
- type: json['type']?.toString(),
- usage: json['usage'],
- weight: json['weight'],
- geoId: json['geo_id'],
- pin: json['pin']?.toString(),
- barcodeStandard: json['barcode_standard']?.toString(),
- arHowToUse: json['ar_how_to_use']?.toString(),
- enHowToUse: json['en_how_to_use']?.toString(),
- howToUse: json['how_to_use']?.toString(),
+ id: targetJson['id']?.toString() ??
+ targetJson['WP_RetailerID']?.toString() ??
+ targetJson['retailer_id']?.toString() ??
+ targetJson['RetailerID']?.toString() ??
+ targetJson['retailerId']?.toString(),
+ name: decodeUnicodeString(targetJson['name']),
+ offerTitle: decodeUnicodeString(targetJson['offer_title']),
+ offerType: targetJson['offer_type']?.toString(),
+ description: decodeUnicodeString(targetJson['description']),
+ info: decodeUnicodeString(targetJson['info']),
+ image: targetJson['image']?.toString(),
+ imageThumb: targetJson['image_thumb']?.toString(),
+ logo: targetJson['logo']?.toString(),
+ logoThumb: targetJson['logo_thumb']?.toString(),
+ website: targetJson['website']?.toString(),
+ type: targetJson['type']?.toString(),
+ usage: targetJson['usage'] is String ? decodeUnicodeString(targetJson['usage']) : targetJson['usage'],
+ weight: targetJson['weight'],
+ geoId: targetJson['geo_id'],
+ pin: targetJson['pin']?.toString(),
+ barcodeStandard: targetJson['barcode_standard']?.toString(),
+ arHowToUse: decodeUnicodeString(targetJson['ar_how_to_use']),
+ enHowToUse: decodeUnicodeString(targetJson['en_how_to_use']),
+ howToUse: decodeUnicodeString(targetJson['how_to_use']),
contact: contactObj,
- offerWeight: json['offer_weight'],
+ offerWeight: targetJson['offer_weight'],
+ offers: offersList,
locations: locationsList,
categories: categoriesList,
+ validity: foundValidity,
+ validTo: targetJson['valid_to']?.toString() ?? targetJson['validTo']?.toString(),
+ validUntil: targetJson['valid_until']?.toString() ?? targetJson['validUntil']?.toString(),
+ endDate: targetJson['end_date']?.toString() ?? targetJson['endDate']?.toString(),
+ expiryDate: targetJson['expiry_date']?.toString() ?? targetJson['expiryDate']?.toString(),
+ duration: targetJson['duration']?.toString(),
+ email: targetJson['email']?.toString() ?? targetJson['contact_email']?.toString() ?? contactObj?.primaryEmail,
+ phone: targetJson['phone']?.toString() ?? targetJson['contact_phone']?.toString() ?? targetJson['mobile']?.toString() ?? contactObj?.primaryPhone,
);
}
+ static String? decodeUnicodeString(Object? val) {
+ if (val == null) return null;
+ String s = val.toString().trim();
+ if (s.isEmpty || s == "null") return null;
+
+ while ((s.startsWith('"') && s.endsWith('"')) || (s.startsWith("'") && s.endsWith("'"))) {
+ if (s.length >= 2) {
+ s = s.substring(1, s.length - 1).trim();
+ } else {
+ break;
+ }
+ }
+
+ s = s
+ .replaceAll(r'\/', '/')
+ .replaceAll(r'\"', '"')
+ .replaceAll(r"\'", "'");
+
+ s = s.replaceAllMapped(RegExp(r'\\u([0-9a-fA-F]{4})'), (match) {
+ try {
+ var codeUnit = int.parse(match.group(1)!, radix: 16);
+ return String.fromCharCode(codeUnit);
+ } catch (_) {
+ return match.group(0)!;
+ }
+ });
+
+ s = s
+ .replaceAll(r'\u201c', '“')
+ .replaceAll(r'\u201d', '”')
+ .replaceAll(r'\u2019', '’')
+ .replaceAll(r'\u2018', '‘')
+ .replaceAll(r'\u00a0', ' ')
+ .replaceAll(r'\u2022', '•')
+ .replaceAll(r'\u2013', '–')
+ .replaceAll(r'\u2014', '—')
+ .replaceAll(r'\u200f', '')
+ .replaceAll(r'\u200e', '')
+ .replaceAll(r'\u061f', '؟')
+ .replaceAll(r'\u201', '“')
+ .replaceAll('"', '"')
+ .replaceAll(''', "'")
+ .replaceAll(''', "'")
+ .replaceAll(' ', ' ')
+ .replaceAll('&', '&');
+
+ return s;
+ }
+
Map toJson() {
Map data = {};
data['id'] = id;
@@ -170,6 +448,17 @@ class WalaPlusRetailerModel {
data['how_to_use'] = howToUse;
data['contact'] = contact?.toJson();
data['offer_weight'] = offerWeight;
+ data['validity'] = validity;
+ data['valid_to'] = validTo;
+ data['valid_until'] = validUntil;
+ data['end_date'] = endDate;
+ data['expiry_date'] = expiryDate;
+ data['duration'] = duration;
+ data['email'] = email;
+ data['phone'] = phone;
+ if (offers != null) {
+ data['offers'] = offers!.map((v) => v.toJson()).toList();
+ }
if (locations != null) {
data['locations'] = locations!.map((v) => v.toJson()).toList();
}
@@ -179,76 +468,279 @@ class WalaPlusRetailerModel {
return data;
}
+ String? get displayImage {
+ if (image != null && image!.trim().isNotEmpty && image != "null") return image!.trim();
+ if (imageThumb != null && imageThumb!.trim().isNotEmpty && imageThumb != "null") return imageThumb!.trim();
+ return null;
+ }
+
+ String? get displayLogo {
+ if (logo != null && logo!.trim().isNotEmpty && logo != "null") return logo!.trim();
+ if (logoThumb != null && logoThumb!.trim().isNotEmpty && logoThumb != "null") return logoThumb!.trim();
+ return null;
+ }
+
String? get resolvedWebsite {
- if (contact?.website != null && contact!.website!.trim().isNotEmpty) {
+ if (contact?.website != null && contact!.website!.trim().isNotEmpty && contact!.website != "null") {
return contact!.website!.trim();
}
- if (website != null && website!.trim().isNotEmpty) {
+ if (website != null && website!.trim().isNotEmpty && website != "null") {
return website!.trim();
}
return null;
}
- String get displayCity {
+ bool get hasPhysicalLocation {
if (locations != null && locations!.isNotEmpty) {
for (var loc in locations!) {
- if (loc.city != null && loc.city!.trim().isNotEmpty) {
- return loc.city!.trim();
+ if ((loc.cityNameEn != null && loc.cityNameEn!.trim().isNotEmpty && loc.cityNameEn != "null") ||
+ (loc.cityNameAr != null && loc.cityNameAr!.trim().isNotEmpty && loc.cityNameAr != "null") ||
+ (loc.city != null && loc.city!.trim().isNotEmpty && loc.city != "null")) {
+ return true;
}
}
}
- if (type?.toLowerCase() == 'online') {
- return 'Online';
+ return false;
+ }
+
+ String getDisplayCity({bool isAr = false}) {
+ if (locations != null && locations!.isNotEmpty) {
+ // 1. First pass: look for specific city name
+ for (var loc in locations!) {
+ String? cName = isAr ? loc.cityNameAr : loc.cityNameEn;
+ if (cName != null && cName.trim().isNotEmpty && cName != "null") {
+ return cName.trim();
+ }
+ }
+ // 2. Second pass: fallback to city if not generic country
+ for (var loc in locations!) {
+ if (loc.city != null && loc.city!.trim().isNotEmpty && loc.city != "null") {
+ String c = loc.city!.trim();
+ if (c.toLowerCase() != 'saudi arabia' && c != 'المملكة العربية السعودية') {
+ return c;
+ }
+ }
+ }
+ // 3. Third pass: any non-empty city
+ for (var loc in locations!) {
+ if (loc.city != null && loc.city!.trim().isNotEmpty && loc.city != "null") {
+ return loc.city!.trim();
+ }
+ }
}
return '';
}
+ String get displayCity => getDisplayCity(isAr: false);
+
String get displayUsage {
- if (usage != null && usage.toString().isNotEmpty) {
- return 'Usage : $usage';
- }
- if (type != null && type!.isNotEmpty) {
- if (type!.toLowerCase() == 'online') return 'Online';
- if (type!.toLowerCase() == 'store') return 'In Store';
- return type!;
+ if (usage != null) {
+ String u = usage.toString().trim();
+ if (int.tryParse(u) != null) {
+ return 'usage:$u';
+ }
+ if (!u.contains('<') && !u.contains('{') && u.isNotEmpty && u.length <= 12 && u.toLowerCase() != 'online' && u.toLowerCase() != 'store') {
+ return 'usage:$u';
+ }
}
return '';
}
+
+ String getDisplayValidity({bool isAr = false}) {
+ if (validity != null && validity!.trim().isNotEmpty && validity != "null") {
+ return validity!.trim();
+ }
+ if (validTo != null && validTo!.trim().isNotEmpty && validTo != "null") {
+ return validTo!.trim();
+ }
+ if (validUntil != null && validUntil!.trim().isNotEmpty && validUntil != "null") {
+ return validUntil!.trim();
+ }
+ if (endDate != null && endDate!.trim().isNotEmpty && endDate != "null") {
+ return endDate!.trim();
+ }
+ if (expiryDate != null && expiryDate!.trim().isNotEmpty && expiryDate != "null") {
+ return expiryDate!.trim();
+ }
+ if (duration != null && duration!.trim().isNotEmpty && duration != "null") {
+ return duration!.trim();
+ }
+ return LocaleKeys.offerValid.tr();
+ }
+
+ String? get resolvedEmail {
+ if (email != null && email!.trim().isNotEmpty && email != "null") {
+ return email!.trim();
+ }
+ if (contact?.primaryEmail != null && contact!.primaryEmail!.trim().isNotEmpty && contact!.primaryEmail != "null") {
+ return contact!.primaryEmail!.trim();
+ }
+ if (locations != null && locations!.isNotEmpty) {
+ for (var loc in locations!) {
+ if (loc.contact != null && loc.contact!.contains('@')) {
+ return loc.contact!.trim();
+ }
+ }
+ }
+ String combined = "${description ?? ''} ${info ?? ''} ${howToUse ?? ''} ${arHowToUse ?? ''} ${enHowToUse ?? ''}";
+ RegExp emailRegex = RegExp(r'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}');
+ Match? match = emailRegex.firstMatch(combined);
+ if (match != null) {
+ return match.group(0);
+ }
+ return null;
+ }
+
+ String? get resolvedPhone {
+ if (phone != null && phone!.trim().isNotEmpty && phone != "null") {
+ return phone!.trim();
+ }
+ if (contact?.primaryPhone != null && contact!.primaryPhone!.trim().isNotEmpty && contact!.primaryPhone != "null") {
+ return contact!.primaryPhone!.trim();
+ }
+ if (locations != null && locations!.isNotEmpty) {
+ for (var loc in locations!) {
+ if (loc.contact != null &&
+ loc.contact!.trim().isNotEmpty &&
+ loc.contact != "null" &&
+ !loc.contact!.contains('@')) {
+ return loc.contact!.trim();
+ }
+ }
+ }
+ String combined = "${description ?? ''} ${info ?? ''} ${howToUse ?? ''} ${arHowToUse ?? ''} ${enHowToUse ?? ''}";
+ RegExp phoneRegex = RegExp(r'(?:\+?966|0)?(?:5\d{8}|1\d{7}|9200\d{5}|800\d{6,7})');
+ Match? match = phoneRegex.firstMatch(combined);
+ if (match != null) {
+ return match.group(0);
+ }
+ return null;
+ }
+
+ bool get isOnlineStore => (type?.trim().toLowerCase() == 'online');
+
+ bool get isInstore => (type?.trim().toLowerCase() == 'instore' ||
+ type?.trim().toLowerCase() == 'in_store' ||
+ type?.trim().toLowerCase() == 'in store' ||
+ type?.trim().toLowerCase() == 'store' ||
+ (type == null && locations != null && locations!.isNotEmpty));
+
+ String? get normalizedType {
+ if (type != null && type!.trim().isNotEmpty) {
+ String t = type!.trim().toLowerCase();
+ if (t == 'online') return 'online';
+ if (t == 'instore' || t == 'in_store' || t == 'in store' || t == 'store') return 'instore';
+ return t;
+ }
+ if (locations != null && locations!.isNotEmpty) {
+ return 'instore';
+ }
+ return null;
+ }
+
+ String? getDisplayType() {
+ String? norm = normalizedType;
+ if (norm == 'online') return LocaleKeys.online.tr();
+ if (norm == 'instore') return LocaleKeys.inStore.tr();
+ if (type != null && type!.trim().isNotEmpty) {
+ return type!.trim();
+ }
+ return null;
+ }
}
class WalaPlusRetailerContact {
+ String? email;
List? emails;
+ String? phone;
List? phones;
String? website;
+ String? address;
+ String? instagram;
+ String? twitter;
- WalaPlusRetailerContact({this.emails, this.phones, this.website});
+ WalaPlusRetailerContact({
+ this.email,
+ this.emails,
+ this.phone,
+ this.phones,
+ this.website,
+ this.address,
+ this.instagram,
+ this.twitter,
+ });
factory WalaPlusRetailerContact.fromJson(Map json) {
List emailsList = [];
if (json['emails'] != null && json['emails'] is List) {
json['emails'].forEach((v) => emailsList.add(v.toString()));
}
+ String? singleEmail = json['email']?.toString() ?? json['email_address']?.toString();
+ if (singleEmail != null && singleEmail.trim().isNotEmpty && singleEmail != "null") {
+ if (!emailsList.contains(singleEmail.trim())) {
+ emailsList.add(singleEmail.trim());
+ }
+ }
+
List phonesList = [];
if (json['phones'] != null && json['phones'] is List) {
json['phones'].forEach((v) => phonesList.add(v.toString()));
}
+ String? singlePhone = json['phone']?.toString() ?? json['mobile']?.toString() ?? json['phone_number']?.toString();
+ if (singlePhone != null && singlePhone.trim().isNotEmpty && singlePhone != "null") {
+ if (!phonesList.contains(singlePhone.trim())) {
+ phonesList.add(singlePhone.trim());
+ }
+ }
+
return WalaPlusRetailerContact(
+ email: singleEmail,
emails: emailsList,
+ phone: singlePhone,
phones: phonesList,
- website: json['website']?.toString(),
+ website: WalaPlusRetailerModel.decodeUnicodeString(json['website']),
+ address: WalaPlusRetailerModel.decodeUnicodeString(json['address']),
+ instagram: json['instagram']?.toString(),
+ twitter: json['twitter']?.toString(),
);
}
Map toJson() {
return {
+ 'email': email,
'emails': emails,
+ 'phone': phone,
'phones': phones,
'website': website,
+ 'address': address,
+ 'instagram': instagram,
+ 'twitter': twitter,
};
}
+
+ String? get primaryEmail {
+ if (email != null && email!.trim().isNotEmpty && email != "null") return email!.trim();
+ if (emails != null && emails!.isNotEmpty) {
+ for (var e in emails!) {
+ if (e.trim().isNotEmpty && e != "null") return e.trim();
+ }
+ }
+ return null;
+ }
+
+ String? get primaryPhone {
+ if (phone != null && phone!.trim().isNotEmpty && phone != "null") return phone!.trim();
+ if (phones != null && phones!.isNotEmpty) {
+ for (var p in phones!) {
+ if (p.trim().isNotEmpty && p != "null") return p.trim();
+ }
+ }
+ return null;
+ }
}
class WalaPlusRetailerLocation {
+ dynamic id;
String? address;
String? city;
String? cityNameAr;
@@ -261,6 +753,7 @@ class WalaPlusRetailerLocation {
dynamic placeId;
WalaPlusRetailerLocation({
+ this.id,
this.address,
this.city,
this.cityNameAr,
@@ -275,13 +768,14 @@ class WalaPlusRetailerLocation {
factory WalaPlusRetailerLocation.fromJson(Map json) {
return WalaPlusRetailerLocation(
- address: json['address']?.toString(),
- city: json['city']?.toString(),
- cityNameAr: json['city_name_ar']?.toString(),
- cityNameEn: json['city_name_en']?.toString(),
+ id: json['id'],
+ address: WalaPlusRetailerModel.decodeUnicodeString(json['address']),
+ city: WalaPlusRetailerModel.decodeUnicodeString(json['city']),
+ cityNameAr: WalaPlusRetailerModel.decodeUnicodeString(json['city_name_ar']),
+ cityNameEn: WalaPlusRetailerModel.decodeUnicodeString(json['city_name_en']),
contact: json['contact']?.toString(),
- countryNameAr: json['country_name_ar']?.toString(),
- countryNameEn: json['country_name_en']?.toString(),
+ countryNameAr: WalaPlusRetailerModel.decodeUnicodeString(json['country_name_ar']),
+ countryNameEn: WalaPlusRetailerModel.decodeUnicodeString(json['country_name_en']),
latitude: json['latitude'] is num ? (json['latitude'] as num).toDouble() : double.tryParse(json['latitude']?.toString() ?? ''),
longitude: json['longitude'] is num ? (json['longitude'] as num).toDouble() : double.tryParse(json['longitude']?.toString() ?? ''),
placeId: json['place_id'],
@@ -289,7 +783,8 @@ class WalaPlusRetailerLocation {
}
Map toJson() {
- Map data = {};
+ Map data = {};
+ data['id'] = id;
data['address'] = address;
data['city'] = city;
data['city_name_ar'] = cityNameAr;
@@ -302,4 +797,95 @@ class WalaPlusRetailerLocation {
data['place_id'] = placeId;
return data;
}
+
+ String getLocalizedCity(bool isAr) {
+ if (isAr) {
+ if (cityNameAr != null && cityNameAr!.trim().isNotEmpty && cityNameAr != "null") {
+ return cityNameAr!.trim();
+ }
+ } else {
+ if (cityNameEn != null && cityNameEn!.trim().isNotEmpty && cityNameEn != "null") {
+ return cityNameEn!.trim();
+ }
+ }
+ if (city != null && city!.trim().isNotEmpty && city != "null") {
+ return city!.trim();
+ }
+ return isAr ? (cityNameAr ?? "") : (cityNameEn ?? "");
+ }
+
+ String getLocalizedCountry(bool isAr) {
+ if (isAr) {
+ if (countryNameAr != null && countryNameAr!.trim().isNotEmpty && countryNameAr != "null") {
+ return countryNameAr!.trim();
+ }
+ } else {
+ if (countryNameEn != null && countryNameEn!.trim().isNotEmpty && countryNameEn != "null") {
+ return countryNameEn!.trim();
+ }
+ }
+ return "";
+ }
+}
+
+class WalaPlusOfferModel {
+ String? id;
+ String? retailerId;
+ String? title;
+ String? image;
+ String? imageThumb;
+ String? type;
+ String? description;
+ dynamic price;
+ dynamic usage;
+ String? expiredAt;
+
+ WalaPlusOfferModel({
+ this.id,
+ this.retailerId,
+ this.title,
+ this.image,
+ this.imageThumb,
+ this.type,
+ this.description,
+ this.price,
+ this.usage,
+ this.expiredAt,
+ });
+
+ factory WalaPlusOfferModel.fromJson(Map json) {
+ return WalaPlusOfferModel(
+ id: json['id']?.toString(),
+ retailerId: (json['retailer_id'] ?? json['retailerId'] ?? json['retailerID'])?.toString(),
+ title: WalaPlusRetailerModel.decodeUnicodeString(json['title']),
+ image: json['image']?.toString(),
+ imageThumb: (json['image_thumb'] ?? json['imageThumb'])?.toString(),
+ type: json['type']?.toString(),
+ description: WalaPlusRetailerModel.decodeUnicodeString(json['description']),
+ price: json['price'],
+ usage: json['usage'],
+ expiredAt: (json['expired_at'] ?? json['expiredAt'] ?? json['expiry_date'])?.toString(),
+ );
+ }
+
+ Map toJson() {
+ return {
+ 'id': id,
+ 'retailer_id': retailerId,
+ 'title': title,
+ 'image': image,
+ 'image_thumb': imageThumb,
+ 'type': type,
+ 'description': description,
+ 'price': price,
+ 'usage': usage,
+ 'expired_at': expiredAt,
+ };
+ }
+
+ String? get displayImage {
+ if (image != null && image!.trim().isNotEmpty && image != "null") return image!.trim();
+ if (imageThumb != null && imageThumb!.trim().isNotEmpty && imageThumb != "null") return imageThumb!.trim();
+ return null;
+ }
}
diff --git a/lib/models/post_params_model.dart b/lib/models/post_params_model.dart
index 05356c2..ac2a690 100644
--- a/lib/models/post_params_model.dart
+++ b/lib/models/post_params_model.dart
@@ -40,7 +40,7 @@ class PostParamsModel {
mobileType = json['MobileType'];
logInTokenID = json['LogInTokenID'];
payrollCodeStr = json['PayrollCodeStr'];
- pLegislationCode = json['LegislationCodeStr'];
+ pLegislationCode = json['LegislationCodeStr']?.toString().trim().toUpperCase();
tokenID = json['TokenID'];
}
@@ -92,7 +92,7 @@ class PostParamsModel {
set setPSelectedEmployeeNumber(String? v) => pSelectedEmployeeNumber = v;
- set setPLegislationCode(String? v) => pLegislationCode = v;
+ set setPLegislationCode(String? v) => pLegislationCode = v?.trim().toUpperCase();
set setPayrollCodeStr(String? v) => payrollCodeStr = v;
}
diff --git a/lib/models/profile/patient_info_model.dart b/lib/models/profile/patient_info_model.dart
new file mode 100644
index 0000000..1940f08
--- /dev/null
+++ b/lib/models/profile/patient_info_model.dart
@@ -0,0 +1,139 @@
+class PatientInfoModel {
+ int? age;
+ String? dateOfBirth;
+ String? firstNameAr;
+ String? firstNameEn;
+ String? secondNameAr;
+ String? secondNameEn;
+ String? thirdNameAr;
+ String? thirdNameEn;
+ String? lastNameAr;
+ String? lastNameEn;
+ String? gender;
+ String? healthId;
+ String? idNumber;
+ String? idType;
+ bool? isHijri;
+ String? maritalStatus;
+ String? maritalStatusCode;
+ String? nationalDateOfBirth;
+ String? nationality;
+ String? nationalityCode;
+ String? occupation;
+ String? patientStatus;
+ String? placeOfBirth;
+ int? messageStatus;
+ String? errorEndUserMessage;
+ String? errorMessage;
+
+ PatientInfoModel({
+ this.age,
+ this.dateOfBirth,
+ this.firstNameAr,
+ this.firstNameEn,
+ this.secondNameAr,
+ this.secondNameEn,
+ this.thirdNameAr,
+ this.thirdNameEn,
+ this.lastNameAr,
+ this.lastNameEn,
+ this.gender,
+ this.healthId,
+ this.idNumber,
+ this.idType,
+ this.isHijri,
+ this.maritalStatus,
+ this.maritalStatusCode,
+ this.nationalDateOfBirth,
+ this.nationality,
+ this.nationalityCode,
+ this.occupation,
+ this.patientStatus,
+ this.placeOfBirth,
+ this.messageStatus,
+ this.errorEndUserMessage,
+ this.errorMessage,
+ });
+
+ factory PatientInfoModel.fromJson(Map json) {
+ return PatientInfoModel(
+ age: json['Age'],
+ dateOfBirth: json['DateOfBirth'],
+ firstNameAr: json['FirstNameAr'],
+ firstNameEn: json['FirstNameEn'],
+ secondNameAr: json['SecondNameAr'],
+ secondNameEn: json['SecondNameEn'],
+ thirdNameAr: json['ThirdNameAr'],
+ thirdNameEn: json['ThirdNameEn'],
+ lastNameAr: json['LastNameAr'],
+ lastNameEn: json['LastNameEn'],
+ gender: json['Gender'],
+ healthId: json['HealthId'],
+ idNumber: json['IdNumber'],
+ idType: json['IdType'],
+ isHijri: json['IsHijri'],
+ maritalStatus: json['MaritalStatus'],
+ maritalStatusCode: json['MaritalStatusCode'],
+ nationalDateOfBirth: json['NationalDateOfBirth'],
+ nationality: json['Nationality'],
+ nationalityCode: json['NationalityCode'],
+ occupation: json['Occupation'],
+ patientStatus: json['PatientStatus']?.toString(),
+ placeOfBirth: json['PlaceofBirth'],
+ messageStatus: json['MessageStatus'],
+ errorEndUserMessage: json['ErrorEndUserMessage'],
+ errorMessage: json['ErrorMessage'],
+ );
+ }
+
+ Map toJson() {
+ return {
+ 'Age': age,
+ 'DateOfBirth': dateOfBirth,
+ 'FirstNameAr': firstNameAr,
+ 'FirstNameEn': firstNameEn,
+ 'SecondNameAr': secondNameAr,
+ 'SecondNameEn': secondNameEn,
+ 'ThirdNameAr': thirdNameAr,
+ 'ThirdNameEn': thirdNameEn,
+ 'LastNameAr': lastNameAr,
+ 'LastNameEn': lastNameEn,
+ 'Gender': gender,
+ 'HealthId': healthId,
+ 'IdNumber': idNumber,
+ 'IdType': idType,
+ 'IsHijri': isHijri,
+ 'MaritalStatus': maritalStatus,
+ 'MaritalStatusCode': maritalStatusCode,
+ 'NationalDateOfBirth': nationalDateOfBirth,
+ 'Nationality': nationality,
+ 'NationalityCode': nationalityCode,
+ 'Occupation': occupation,
+ 'PatientStatus': patientStatus,
+ 'PlaceofBirth': placeOfBirth,
+ 'MessageStatus': messageStatus,
+ 'ErrorEndUserMessage': errorEndUserMessage,
+ 'ErrorMessage': errorMessage,
+ };
+ }
+
+ String get fullNameAr {
+ List parts = [
+ firstNameAr ?? '',
+ secondNameAr ?? '',
+ (thirdNameAr != null && thirdNameAr != '-') ? thirdNameAr! : '',
+ lastNameAr ?? '',
+ ].where((s) => s.trim().isNotEmpty && s != '-').toList();
+ return parts.join(' ').trim();
+ }
+
+ String get fullNameEn {
+ List parts = [
+ firstNameEn ?? '',
+ secondNameEn ?? '',
+ (thirdNameEn != null && thirdNameEn != '-') ? thirdNameEn! : '',
+ lastNameEn ?? '',
+ ].where((s) => s.trim().isNotEmpty && s != '-').toList();
+ return parts.join(' ').trim();
+ }
+}
diff --git a/lib/provider/chat_call_provider.dart b/lib/provider/chat_call_provider.dart
index 45205df..5eb3964 100644
--- a/lib/provider/chat_call_provider.dart
+++ b/lib/provider/chat_call_provider.dart
@@ -17,12 +17,12 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin {
MediaStream? _remoteStream;
void initCallListeners() {
- chatHubConnection.on("OnCallAcceptedAsync", onCallAcceptedAsync);
- chatHubConnection.on("OnIceCandidateAsync", onIceCandidateAsync);
- chatHubConnection.on("OnOfferAsync", onOfferAsync);
- chatHubConnection.on("OnAnswerOffer", onAnswerOffer);
- chatHubConnection.on("OnHangUpAsync", onHangUpAsync);
- chatHubConnection.on("OnCallDeclinedAsync", onCallDeclinedAsync);
+ chatHubConnection?.on("OnCallAcceptedAsync", onCallAcceptedAsync);
+ chatHubConnection?.on("OnIceCandidateAsync", onIceCandidateAsync);
+ chatHubConnection?.on("OnOfferAsync", onOfferAsync);
+ chatHubConnection?.on("OnAnswerOffer", onAnswerOffer);
+ chatHubConnection?.on("OnHangUpAsync", onHangUpAsync);
+ chatHubConnection?.on("OnCallDeclinedAsync", onCallDeclinedAsync);
}
//Video Constraints
@@ -175,13 +175,13 @@ class ChatCallProvider with ChangeNotifier, DiagnosticableTreeMixin {
args = [targetUserID, data];
//json In Data
}
- await chatHubConnection.invoke(invokeMethod, args: args);
+ await chatHubConnection?.invoke(invokeMethod, args: args);
}
void stopListeners() async {
- chatHubConnection.off('OnCallDeclinedAsync');
- chatHubConnection.off('OnCallAcceptedAsync');
- chatHubConnection.off('OnIceCandidateAsync');
- chatHubConnection.off('OnAnswerOffer');
+ chatHubConnection?.off('OnCallDeclinedAsync');
+ chatHubConnection?.off('OnCallAcceptedAsync');
+ chatHubConnection?.off('OnIceCandidateAsync');
+ chatHubConnection?.off('OnAnswerOffer');
}
}
diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart
index 4c19817..e0f5900 100644
--- a/lib/provider/chat_provider_model.dart
+++ b/lib/provider/chat_provider_model.dart
@@ -113,16 +113,16 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
Future buildHubConnection() async {
chatHubConnection = await getHubConnection();
- await chatHubConnection.start();
+ await chatHubConnection?.start();
if (kDebugMode) {
logger.i("Hub Conn: Startedddddddd");
}
- chatHubConnection.on("OnDeliveredChatUserAsync", onMsgReceived);
- chatHubConnection.on("OnGetChatConversationCount", onNewChatConversion);
+ chatHubConnection?.on("OnDeliveredChatUserAsync", onMsgReceived);
+ chatHubConnection?.on("OnGetChatConversationCount", onNewChatConversion);
//group On message
- chatHubConnection.on("OnDeliveredGroupChatHistoryAsync", onGroupMsgReceived);
+ chatHubConnection?.on("OnDeliveredGroupChatHistoryAsync", onGroupMsgReceived);
}
Future getHubConnection() async {
@@ -135,16 +135,16 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
}
void registerEvents() {
- chatHubConnection.on("OnUpdateUserStatusAsync", changeStatus);
- // chatHubConnection.on("OnDeliveredChatUserAsync", onMsgReceived);
+ chatHubConnection?.on("OnUpdateUserStatusAsync", changeStatus);
+ // chatHubConnection?.on("OnDeliveredChatUserAsync", onMsgReceived);
- chatHubConnection.on("OnSubmitChatAsync", OnSubmitChatAsync);
- chatHubConnection.on("OnUserTypingAsync", onUserTyping);
- chatHubConnection.on("OnUserCountAsync", userCountAsync);
- // chatHubConnection.on("OnUpdateUserChatHistoryWindowsAsync", updateChatHistoryWindow);
- chatHubConnection.on("OnGetUserChatHistoryNotDeliveredAsync", chatNotDelivered);
- chatHubConnection.on("OnUpdateUserChatHistoryStatusAsync", updateUserChatStatus);
- chatHubConnection.on("OnGetGroupUserStatusAsync", getGroupUserStatus);
+ chatHubConnection?.on("OnSubmitChatAsync", OnSubmitChatAsync);
+ chatHubConnection?.on("OnUserTypingAsync", onUserTyping);
+ chatHubConnection?.on("OnUserCountAsync", userCountAsync);
+ // chatHubConnection?.on("OnUpdateUserChatHistoryWindowsAsync", updateChatHistoryWindow);
+ chatHubConnection?.on("OnGetUserChatHistoryNotDeliveredAsync", chatNotDelivered);
+ chatHubConnection?.on("OnUpdateUserChatHistoryStatusAsync", updateUserChatStatus);
+ chatHubConnection?.on("OnGetGroupUserStatusAsync", getGroupUserStatus);
//
// {"type":1,"target":"","arguments":[[{"id":217869,"userName":"Sultan.Khan","email":"Sultan.Khan@cloudsolutions.com.sa","phone":null,"title":"Sultan.Khan","userStatus":1,"image":null,"unreadMessageCount":0,"userAction":3,"isPin":false,"isFav":false,"isAdmin":false,"rKey":null,"totalCount":0,"isHuaweiDevice":false,"deviceToken":null},{"id":15153,"userName":"Tamer.Fanasheh","email":"Tamer.F@cloudsolutions.com.sa","phone":null,"title":"Tamer Fanasheh","userStatus":2,"image":null,"unreadMessageCount":0,"userAction":3,"isPin":false,"isFav":false,"isAdmin":true,"rKey":null,"totalCount":0,"isHuaweiDevice":false,"deviceToken":null}]]}
@@ -183,7 +183,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
}
Future invokeUserChatHistoryNotDeliveredAsync({required int userId}) async {
- await chatHubConnection.invoke("GetUserChatHistoryNotDeliveredAsync", args: [userId]);
+ await chatHubConnection?.invoke("GetUserChatHistoryNotDeliveredAsync", args: [userId]);
return "";
}
@@ -252,7 +252,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
void updateUserChatHistoryStatusAsync(List data) {
try {
- chatHubConnection.invoke("UpdateUserChatHistoryStatusAsync", args: [data]);
+ chatHubConnection?.invoke("UpdateUserChatHistoryStatusAsync", args: [data]);
} catch (e) {
throw e;
}
@@ -260,7 +260,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
void updateUserChatHistoryOnMsg(List data) {
try {
- chatHubConnection.invoke("UpdateUserChatHistoryStatusAsync", args: [data]);
+ chatHubConnection?.invoke("UpdateUserChatHistoryStatusAsync", args: [data]);
} catch (e) {
throw e;
}
@@ -753,7 +753,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
String chatData =
'{"contant":"$msg","contantNo":"$contentNo","chatEventId":$chatEventId,"fileTypeId": $fileTypeId,"currentUserId":${AppState().chatDetails!.response!.id},"chatSource":1,"userChatHistoryLineRequestList":[{"isSeen":false,"isDelivered":false,"targetUserId":$targetUserId,"targetUserStatus":1}],"chatReplyId":$chatReplyId,"conversationId":"$chatCID"}';
- await chatHubConnection.invoke("AddChatUserAsync", args: