Compare commits
10 Commits
e602782edd
...
766e8ffefb
| Author | SHA1 | Date | |
|---|---|---|---|
|
766e8ffefb | ||
|
|
fd8a4cb469 | ||
|
|
81895849df | ||
|
|
653f1f93bf | ||
|
|
3874ef062b | ||
|
|
079fb01608 | ||
|
|
50270ed2da | ||
|
|
bf1d07a048 | ||
|
|
157545f1c0 | ||
|
|
841cdf8c21 |
@@ -8,7 +8,43 @@
|
||||
"client": [
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:893074789710:android:05002c15a64cf1e0c4ba1f",
|
||||
"mobilesdk_app_id": "1:893074789710:android:70c2e98114a8ef1ac4ba1f",
|
||||
"android_client_info": {
|
||||
"package_name": "felix.fondex.driver"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
},
|
||||
{
|
||||
"client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
|
||||
"client_type": 2,
|
||||
"ios_info": {
|
||||
"bundle_id": "com.emart.driver"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:893074789710:android:e932bc88da6665b3c4ba1f",
|
||||
"android_client_info": {
|
||||
"package_name": "felix.fondex.uz"
|
||||
}
|
||||
@@ -32,10 +68,10 @@
|
||||
"client_type": 3
|
||||
},
|
||||
{
|
||||
"client_id": "893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com",
|
||||
"client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
|
||||
"client_type": 2,
|
||||
"ios_info": {
|
||||
"bundle_id": "felix.fondex.uz"
|
||||
"bundle_id": "com.emart.driver"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
|
||||
|
||||
@@ -18,7 +18,7 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
|
||||
id("com.android.application") version "8.7.0" apply false
|
||||
id("com.android.application") version "8.9.1" apply false
|
||||
// START: FlutterFire Configuration
|
||||
id("com.google.gms.google-services") version("4.3.15") apply false
|
||||
// END: FlutterFire Configuration
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
"forgotPassword": "Forgot Password",
|
||||
"login": "Log in",
|
||||
"orContinueWith": "or continue with",
|
||||
|
||||
|
||||
"withGoogle": "with Google",
|
||||
"withApple": "with Apple",
|
||||
"dontHaveAccount": "Didn't have an account?",
|
||||
@@ -104,5 +102,56 @@
|
||||
"youAreNotLoggedIn": "You’re not logged in. Please sign in to access your account and explore all features.",
|
||||
"noOrderfound": "No order found",
|
||||
"reset_password_link_sent": "A reset link has been sent to {email}",
|
||||
"pay_amount": "Pay Amount: {amount}"
|
||||
"pay_amount": "Pay Amount: {amount}",
|
||||
"otherServices": "Other Services",
|
||||
"foodDelivery": "Food Delivery",
|
||||
"delivery": "Delivery",
|
||||
"bookingTaxi": "Booking \nTaxi",
|
||||
"updateYourWardrobe": "Update your wardrobe",
|
||||
"weDeliverSafely": "We deliver safely",
|
||||
"rent": "Rent",
|
||||
"hugeSelectionOfAds": "Huge selection of ads!",
|
||||
"cosmetics": "Cosmetics",
|
||||
"moreThan1000Products": "More than 1000 products",
|
||||
"foodProducts": "Food products",
|
||||
"enableLocation": "Enable Location for a Personalized Experience",
|
||||
"allowLocation": "Allow location access to discover beauty stores and services near you.",
|
||||
"useCurrentLocation": "Use current location",
|
||||
"setFromMap": "Set from map",
|
||||
"enterManuallyLocation": "Enter Manually location",
|
||||
|
||||
|
||||
"changeLanguage": "Change Language",
|
||||
"selectPrefferedLanguage": "Select your preferred language for a personalized app experience.",
|
||||
"searchStoreItem": "Search the store, item and more...",
|
||||
"category": "Category",
|
||||
"highlightsForU": "Highlights for you",
|
||||
"newArrival": "New Arrivals",
|
||||
"topBrands": "Top Brands",
|
||||
"styleUp": "Style up with the latest fits, now at unbeatable prices.",
|
||||
"additionlOffers": "Additional Offers",
|
||||
"largestDiscounts": "Largest Discounts",
|
||||
"newArrivals": "New Arrivals",
|
||||
"popularStores": "Popular Stores",
|
||||
"allStores": "All Stores",
|
||||
"alert": "Alert",
|
||||
"cancel": "Cancel",
|
||||
"ok": "Ok",
|
||||
"doYouWantChangeTheDeliverOption": "Do you really want to change the delivery option? Your cart will be empty.",
|
||||
"freeDelivery": "Free Delivery",
|
||||
"upto": "Upto",
|
||||
"viewCart": "View Cart",
|
||||
"viewTimings": "View Timings",
|
||||
"timingIsNotAdded": "Timing is not added by store",
|
||||
"alsoApplicableOnTable": "Also applicable on table booking",
|
||||
"tableBooking": "Table Booking",
|
||||
"quickConformations": "Quick Conformations",
|
||||
"menu": "Menu",
|
||||
"searchAndMore": "Search the item and more...",
|
||||
"veg": "Veg",
|
||||
"nonVeg": "Non Veg",
|
||||
"favourites": "Favourites",
|
||||
"orders": "Orders",
|
||||
"takeAway": "TakeAway"
|
||||
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
{
|
||||
"loginToExplore" : "Log in to explore your all in one vendor app favourites and shop effortlessly.",
|
||||
"emailAddress": "Email Address*",
|
||||
"password": "Password*",
|
||||
"enterPassword": "Enter password",
|
||||
"forgotPassword": "Forgot Password",
|
||||
"login": "Log in",
|
||||
"orContinueWith": "or continue with",
|
||||
|
||||
|
||||
"withGoogle": "with Google",
|
||||
"withApple": "with Apple",
|
||||
"dontHaveAccount": "Didn't have an account?",
|
||||
"signUp": "Sign up",
|
||||
"skip": "Skip",
|
||||
"signUpToExplore": "Sign up to explore all our services and start shopping, riding, and more.",
|
||||
"firstName": "First Name*",
|
||||
"lastName": "Last Name*",
|
||||
"enterMobileNumber": "Enter Mobile number",
|
||||
"confirmPassword": "Confirm Password*",
|
||||
"enterConfirmPassword": "Enter confirm password",
|
||||
"referralCode": "Referral Code",
|
||||
"enterReferralCode": "Enter referral code",
|
||||
"alreadyHaveAccount":"Already have an account?",
|
||||
"enterYourregisteredEmail": "Enter your registered email to receive a reset link.",
|
||||
"sendLink": "Send Link",
|
||||
"rememberPassword": "Remember Password?",
|
||||
"enterOtpSent": "Enter the OTP sent to your mobile",
|
||||
"resendOTP": "Resend OTP",
|
||||
"verify": "Verify",
|
||||
"useYourMobileNumber": "Use your mobile number to Log in easily and securely.",
|
||||
"sendCode":"Send Code",
|
||||
"serviceIsUnavailable": "Service is unavailable at the selected address.",
|
||||
"pickUpLocation": "Pickup Location",
|
||||
"destinationLocation": "Destination Location",
|
||||
"continueT":"Continue",
|
||||
"plsSelectSourceLocation": "Please select source location",
|
||||
"plsSelectDestinationLocations": "Please select destination location",
|
||||
"selectVehicleType": "Select Your Vehicle Type",
|
||||
"plsSelectVehicleTypeFirst": "Please select a vehicle type first.",
|
||||
"plsSelectPaymentMethod": "Please select a payment method",
|
||||
"insufficientWallet": "Insufficient wallet balance. Please select another payment method.",
|
||||
"promoCode": "Promo code",
|
||||
"thisOfferNotEligible": "This offer not eligible for this booking",
|
||||
"viewAll": "View All",
|
||||
"writeCoupon": "Write coupon Code",
|
||||
"redeemNow": "Redeem now",
|
||||
"plsEnterCouponCode":"Please enter a coupon code",
|
||||
"couponApplied": "Coupon applied successfully",
|
||||
"couponExpired": "This coupon code has been expired",
|
||||
"invalidCouponCode": "Invalid coupon code",
|
||||
"orderSummary": "Order Summary",
|
||||
"subtotal": "Subtotal",
|
||||
"discount": "Discount",
|
||||
"orderTotal": "Order Total",
|
||||
"confirmBooking": "Confirm Booking",
|
||||
"waitingForDriver": "Waiting for driver....",
|
||||
"cancelRide": "Cancel Ride",
|
||||
"riderCancelledSucces": "Ride cancelled successfully",
|
||||
"failedToCancel": "Failed to cancel ride",
|
||||
"pleaseWait": "Please wait...",
|
||||
"change": "Change",
|
||||
"yourSosRequest": "Your SOS request has been submitted to admin",
|
||||
"yourSosrequestAlreadySubmitted": "Your SOS request is already submitted",
|
||||
"payNow": "Pay Now",
|
||||
"youDoNothaveSufficientwalletBalance": "You do not have sufficient wallet balance",
|
||||
"somethingWentWrong": "Something went wrong, please contact admin.",
|
||||
"cash": "Cash",
|
||||
"coupon": "Coupon",
|
||||
"couponNotFound": "Coupon not found.",
|
||||
"tapToApply": "Tap To Apply",
|
||||
"home": "Home",
|
||||
"myBookings": "My Bookings",
|
||||
"profile": "profile",
|
||||
"wallet": "Wallet",
|
||||
"cabServiceType": "Cab Service Type",
|
||||
"everyRideVerified": "Every Ride. Every Driver. Verified.",
|
||||
"allDriversIDCheck": "All drivers go through ID checks and background verification for your safety.",
|
||||
"intercity": "Intercity",
|
||||
"aroundTheCity": "Around the city",
|
||||
"rideDetails": "Ride Details",
|
||||
"orderId": "Order Id:",
|
||||
"bookingData": "Booking Date:",
|
||||
"rideAndFareSummary": "Ride & Fare Summary",
|
||||
"updateReview": "Update Review",
|
||||
"addReview": "Add Review",
|
||||
"complain": "Complain",
|
||||
"distance": "Distance",
|
||||
"km": "KM",
|
||||
"duration": "Duration",
|
||||
"howWasTrip": "How was your trip?",
|
||||
"yourFeedbackWillHelp": "Your feedback will help us improve \n driving experience better",
|
||||
"rateFor": "Rate for",
|
||||
"typeComment": "Type comment....",
|
||||
"title": "Title",
|
||||
"typeDescription": "Type Description...",
|
||||
"save": "Save",
|
||||
"popularDestinations": "Popular Destinations",
|
||||
"selectPaymentMethod": "Select Payment Method",
|
||||
"prefferedPayment": "Preferred Payment",
|
||||
"otherPaymentOptions": "Other Payment Options",
|
||||
"rideHistory": "Ride History",
|
||||
"plsLoginToAcc": "Please Log In to Continue",
|
||||
"youAreNotLoggedIn": "You’re not logged in. Please sign in to access your account and explore all features.",
|
||||
"noOrderfound": "No order found",
|
||||
"reset_password_link_sent": "A reset link has been sent to {email}",
|
||||
"pay_amount": "Pay Amount: {amount}"
|
||||
}
|
||||
124
assets/translations/ru.json
Normal file
124
assets/translations/ru.json
Normal file
@@ -0,0 +1,124 @@
|
||||
{
|
||||
"loginToExplore" : "Войдите, чтобы исследовать наш универсальный сервис и делать покупки с удобством.",
|
||||
"emailAddress": "Адрес электронной почты*",
|
||||
"password": "Пароль*",
|
||||
"enterPassword": "Введите пароль",
|
||||
"forgotPassword": "Забыли пароль",
|
||||
"login": "Войти",
|
||||
"orContinueWith": "или продолжить с",
|
||||
"withGoogle": "с Google",
|
||||
"withApple": "с Apple",
|
||||
"dontHaveAccount": "Нет аккаунта?",
|
||||
"signUp": "Зарегистрироваться",
|
||||
"skip": "Пропустить",
|
||||
"signUpToExplore": "Зарегистрируйтесь, чтобы получить доступ ко всем нашим услугам и начать делать покупки, поездки и многое другое.",
|
||||
"firstName": "Имя*",
|
||||
"lastName": "Фамилия*",
|
||||
"enterMobileNumber": "Введите номер телефона",
|
||||
"confirmPassword": "Подтвердите пароль*",
|
||||
"enterConfirmPassword": "Введите подтверждение пароля",
|
||||
"referralCode": "Реферальный код",
|
||||
"enterReferralCode": "Введите реферальный код",
|
||||
"alreadyHaveAccount": "Уже есть аккаунт?",
|
||||
"enterYourregisteredEmail": "Введите свою зарегистрированную почту, чтобы получить ссылку для сброса.",
|
||||
"sendLink": "Отправить ссылку",
|
||||
"rememberPassword": "Вспомнили пароль?",
|
||||
"enterOtpSent": "Введите код, отправленный на ваш телефон",
|
||||
"resendOTP": "Отправить код повторно",
|
||||
"verify": "Подтвердить",
|
||||
"useYourMobileNumber": "Используйте номер телефона для быстрого и безопасного входа.",
|
||||
"sendCode": "Отправить код",
|
||||
"serviceIsUnavailable": "Услуга недоступна по выбранному адресу.",
|
||||
"pickUpLocation": "Место отправления",
|
||||
"destinationLocation": "Место назначения",
|
||||
"continueT": "Продолжить",
|
||||
"plsSelectSourceLocation": "Пожалуйста, выберите место отправления",
|
||||
"plsSelectDestinationLocations": "Пожалуйста, выберите место назначения",
|
||||
"selectVehicleType": "Выберите тип транспорта",
|
||||
"plsSelectVehicleTypeFirst": "Сначала выберите тип транспорта.",
|
||||
"plsSelectPaymentMethod": "Пожалуйста, выберите способ оплаты",
|
||||
"insufficientWallet": "Недостаточно средств в кошельке. Пожалуйста, выберите другой способ оплаты.",
|
||||
"promoCode": "Промокод",
|
||||
"thisOfferNotEligible": "Это предложение недоступно для данного заказа",
|
||||
"viewAll": "Показать все",
|
||||
"writeCoupon": "Введите промокод",
|
||||
"redeemNow": "Применить",
|
||||
"plsEnterCouponCode": "Пожалуйста, введите промокод",
|
||||
"couponApplied": "Промокод успешно применён",
|
||||
"couponExpired": "Срок действия этого промокода истёк",
|
||||
"invalidCouponCode": "Неверный промокод",
|
||||
"orderSummary": "Сводка заказа",
|
||||
"subtotal": "Промежуточный итог",
|
||||
"discount": "Скидка",
|
||||
"orderTotal": "Итого",
|
||||
"confirmBooking": "Подтвердить заказ",
|
||||
"waitingForDriver": "Ожидание водителя....",
|
||||
"cancelRide": "Отменить поездку",
|
||||
"riderCancelledSucces": "Поездка успешно отменена",
|
||||
"failedToCancel": "Не удалось отменить поездку",
|
||||
"pleaseWait": "Пожалуйста, подождите...",
|
||||
"change": "Изменить",
|
||||
"yourSosRequest": "Ваш SOS-запрос отправлен администратору",
|
||||
"yourSosrequestAlreadySubmitted": "Ваш SOS-запрос уже отправлен",
|
||||
"payNow": "Оплатить сейчас",
|
||||
"youDoNothaveSufficientwalletBalance": "Недостаточно средств в кошельке",
|
||||
"somethingWentWrong": "Произошла ошибка, пожалуйста, свяжитесь с администратором.",
|
||||
"cash": "Наличные",
|
||||
"coupon": "Промокод",
|
||||
"couponNotFound": "Промокод не найден.",
|
||||
"tapToApply": "Нажмите, чтобы применить",
|
||||
"home": "Главная",
|
||||
"myBookings": "Мои заказы",
|
||||
"profile": "Профиль",
|
||||
"wallet": "Кошелёк",
|
||||
"cabServiceType": "Тип такси",
|
||||
"everyRideVerified": "Каждая поездка. Каждый водитель. Проверены.",
|
||||
"allDriversIDCheck": "Все водители проходят проверку документов и биографии для вашей безопасности.",
|
||||
"intercity": "Междугородние",
|
||||
"aroundTheCity": "По городу",
|
||||
"rideDetails": "Детали поездки",
|
||||
"orderId": "ID заказа:",
|
||||
"bookingData": "Дата заказа:",
|
||||
"rideAndFareSummary": "Детали поездки и стоимость",
|
||||
"updateReview": "Обновить отзыв",
|
||||
"addReview": "Добавить отзыв",
|
||||
"complain": "Жалоба",
|
||||
"distance": "Расстояние",
|
||||
"km": "км",
|
||||
"duration": "Продолжительность",
|
||||
"howWasTrip": "Как прошла поездка?",
|
||||
"yourFeedbackWillHelp": "Ваш отзыв поможет нам улучшить \n качество поездок",
|
||||
"rateFor": "Оценка для",
|
||||
"typeComment": "Введите комментарий....",
|
||||
"title": "Заголовок",
|
||||
"typeDescription": "Введите описание...",
|
||||
"save": "Сохранить",
|
||||
"popularDestinations": "Популярные направления",
|
||||
"selectPaymentMethod": "Выберите способ оплаты",
|
||||
"prefferedPayment": "Предпочтительный способ оплаты",
|
||||
"otherPaymentOptions": "Другие способы оплаты",
|
||||
"rideHistory": "История поездок",
|
||||
"plsLoginToAcc": "Пожалуйста, войдите, чтобы продолжить",
|
||||
"youAreNotLoggedIn": "Вы не вошли в систему. Пожалуйста, войдите, чтобы получить доступ к аккаунту и функциям.",
|
||||
"noOrderfound": "Заказов не найдено",
|
||||
"reset_password_link_sent": "Ссылка для сброса отправлена на {email}",
|
||||
"pay_amount": "Сумма к оплате: {amount}",
|
||||
"otherServices": "Другие услуги",
|
||||
"foodDelivery": "Доставка еды",
|
||||
"delivery": "Доставка",
|
||||
"bookingTaxi": "Заказ \nТакси",
|
||||
"updateYourWardrobe": "Обновите гардероб",
|
||||
"weDeliverSafely": "Мы доставляем безопасно",
|
||||
"rent": "Аренда",
|
||||
"hugeSelectionOfAds": "Огромный выбор объявлений!",
|
||||
"cosmetics": "Косметика",
|
||||
"moreThan1000Products": "Более 1000 товаров",
|
||||
"foodProducts": "Продукты питания",
|
||||
"enableLocation": "Включите геолокацию",
|
||||
"allowLocation": "Разрешите доступ к геолокации, чтобы найти магазины и услуги рядом с вами.",
|
||||
"useCurrentLocation": "Использовать текущую геолокацию",
|
||||
"setFromMap": "Выбрать на карте",
|
||||
"enterManuallyLocation": "Введите адрес вручную",
|
||||
"changeLanguage": "Изменить язык",
|
||||
"selectPrefferedLanguage": "Выберите предпочитаемый язык для персонализированного использования приложения."
|
||||
}
|
||||
@@ -1,108 +0,0 @@
|
||||
{
|
||||
"loginToExplore" : "Log in to explore your all in one vendor app favourites and shop effortlessly.",
|
||||
"emailAddress": "Email Address*",
|
||||
"password": "Password*",
|
||||
"enterPassword": "Enter password",
|
||||
"forgotPassword": "Forgot Password",
|
||||
"login": "Log in",
|
||||
"orContinueWith": "or continue with",
|
||||
|
||||
|
||||
"withGoogle": "with Google",
|
||||
"withApple": "with Apple",
|
||||
"dontHaveAccount": "Didn't have an account?",
|
||||
"signUp": "Sign up",
|
||||
"skip": "Skip",
|
||||
"signUpToExplore": "Sign up to explore all our services and start shopping, riding, and more.",
|
||||
"firstName": "First Name*",
|
||||
"lastName": "Last Name*",
|
||||
"enterMobileNumber": "Enter Mobile number",
|
||||
"confirmPassword": "Confirm Password*",
|
||||
"enterConfirmPassword": "Enter confirm password",
|
||||
"referralCode": "Referral Code",
|
||||
"enterReferralCode": "Enter referral code",
|
||||
"alreadyHaveAccount":"Already have an account?",
|
||||
"enterYourregisteredEmail": "Enter your registered email to receive a reset link.",
|
||||
"sendLink": "Send Link",
|
||||
"rememberPassword": "Remember Password?",
|
||||
"enterOtpSent": "Enter the OTP sent to your mobile",
|
||||
"resendOTP": "Resend OTP",
|
||||
"verify": "Verify",
|
||||
"useYourMobileNumber": "Use your mobile number to Log in easily and securely.",
|
||||
"sendCode":"Send Code",
|
||||
"serviceIsUnavailable": "Service is unavailable at the selected address.",
|
||||
"pickUpLocation": "Pickup Location",
|
||||
"destinationLocation": "Destination Location",
|
||||
"continueT":"Continue",
|
||||
"plsSelectSourceLocation": "Please select source location",
|
||||
"plsSelectDestinationLocations": "Please select destination location",
|
||||
"selectVehicleType": "Select Your Vehicle Type",
|
||||
"plsSelectVehicleTypeFirst": "Please select a vehicle type first.",
|
||||
"plsSelectPaymentMethod": "Please select a payment method",
|
||||
"insufficientWallet": "Insufficient wallet balance. Please select another payment method.",
|
||||
"promoCode": "Promo code",
|
||||
"thisOfferNotEligible": "This offer not eligible for this booking",
|
||||
"viewAll": "View All",
|
||||
"writeCoupon": "Write coupon Code",
|
||||
"redeemNow": "Redeem now",
|
||||
"plsEnterCouponCode":"Please enter a coupon code",
|
||||
"couponApplied": "Coupon applied successfully",
|
||||
"couponExpired": "This coupon code has been expired",
|
||||
"invalidCouponCode": "Invalid coupon code",
|
||||
"orderSummary": "Order Summary",
|
||||
"subtotal": "Subtotal",
|
||||
"discount": "Discount",
|
||||
"orderTotal": "Order Total",
|
||||
"confirmBooking": "Confirm Booking",
|
||||
"waitingForDriver": "Waiting for driver....",
|
||||
"cancelRide": "Cancel Ride",
|
||||
"riderCancelledSucces": "Ride cancelled successfully",
|
||||
"failedToCancel": "Failed to cancel ride",
|
||||
"pleaseWait": "Please wait...",
|
||||
"change": "Change",
|
||||
"yourSosRequest": "Your SOS request has been submitted to admin",
|
||||
"yourSosrequestAlreadySubmitted": "Your SOS request is already submitted",
|
||||
"payNow": "Pay Now",
|
||||
"youDoNothaveSufficientwalletBalance": "You do not have sufficient wallet balance",
|
||||
"somethingWentWrong": "Something went wrong, please contact admin.",
|
||||
"cash": "Cash",
|
||||
"coupon": "Coupon",
|
||||
"couponNotFound": "Coupon not found.",
|
||||
"tapToApply": "Tap To Apply",
|
||||
"home": "Home",
|
||||
"myBookings": "My Bookings",
|
||||
"profile": "profile",
|
||||
"wallet": "Wallet",
|
||||
"cabServiceType": "Cab Service Type",
|
||||
"everyRideVerified": "Every Ride. Every Driver. Verified.",
|
||||
"allDriversIDCheck": "All drivers go through ID checks and background verification for your safety.",
|
||||
"intercity": "Intercity",
|
||||
"aroundTheCity": "Around the city",
|
||||
"rideDetails": "Ride Details",
|
||||
"orderId": "Order Id:",
|
||||
"bookingData": "Booking Date:",
|
||||
"rideAndFareSummary": "Ride & Fare Summary",
|
||||
"updateReview": "Update Review",
|
||||
"addReview": "Add Review",
|
||||
"complain": "Complain",
|
||||
"distance": "Distance",
|
||||
"km": "KM",
|
||||
"duration": "Duration",
|
||||
"howWasTrip": "How was your trip?",
|
||||
"yourFeedbackWillHelp": "Your feedback will help us improve \n driving experience better",
|
||||
"rateFor": "Rate for",
|
||||
"typeComment": "Type comment....",
|
||||
"title": "Title",
|
||||
"typeDescription": "Type Description...",
|
||||
"save": "Save",
|
||||
"popularDestinations": "Popular Destinations",
|
||||
"selectPaymentMethod": "Select Payment Method",
|
||||
"prefferedPayment": "Preferred Payment",
|
||||
"otherPaymentOptions": "Other Payment Options",
|
||||
"rideHistory": "Ride History",
|
||||
"plsLoginToAcc": "Please Log In to Continue",
|
||||
"youAreNotLoggedIn": "You’re not logged in. Please sign in to access your account and explore all features.",
|
||||
"noOrderfound": "No order found",
|
||||
"reset_password_link_sent": "A reset link has been sent to {email}",
|
||||
"pay_amount": "Pay Amount: {amount}"
|
||||
}
|
||||
124
assets/translations/uz.json
Normal file
124
assets/translations/uz.json
Normal file
@@ -0,0 +1,124 @@
|
||||
{
|
||||
"loginToExplore" : "Barcha xizmatlarimizdan foydalanish va qulay xarid qilish uchun tizimga kiring.",
|
||||
"emailAddress": "Email manzil*",
|
||||
"password": "Parol*",
|
||||
"enterPassword": "Parolni kiriting",
|
||||
"forgotPassword": "Parolni unutdingizmi",
|
||||
"login": "Kirish",
|
||||
"orContinueWith": "yoki davom eting",
|
||||
"withGoogle": "Google orqali",
|
||||
"withApple": "Apple orqali",
|
||||
"dontHaveAccount": "Hisobingiz yo‘qmi?",
|
||||
"signUp": "Ro‘yxatdan o‘tish",
|
||||
"skip": "O‘tkazib yuborish",
|
||||
"signUpToExplore": "Ro‘yxatdan o‘ting va barcha xizmatlarimizdan foydalanishni boshlang.",
|
||||
"firstName": "Ism*",
|
||||
"lastName": "Familiya*",
|
||||
"enterMobileNumber": "Telefon raqamini kiriting",
|
||||
"confirmPassword": "Parolni tasdiqlang*",
|
||||
"enterConfirmPassword": "Tasdiqlash parolini kiriting",
|
||||
"referralCode": "Referal kod",
|
||||
"enterReferralCode": "Referal kodni kiriting",
|
||||
"alreadyHaveAccount": "Hisobingiz bormi?",
|
||||
"enterYourregisteredEmail": "Email manzilingizni kiriting — sizga parolni tiklash havolasi yuboriladi.",
|
||||
"sendLink": "Havolani yuborish",
|
||||
"rememberPassword": "Parol esingizga tushdimi?",
|
||||
"enterOtpSent": "Telefoningizga yuborilgan kodni kiriting",
|
||||
"resendOTP": "Kod qayta yuborilsin",
|
||||
"verify": "Tasdiqlash",
|
||||
"useYourMobileNumber": "Telefon raqamingiz orqali oson va xavfsiz kirishingiz mumkin.",
|
||||
"sendCode": "Kod yuborish",
|
||||
"serviceIsUnavailable": "Tanlangan manzilda xizmat mavjud emas.",
|
||||
"pickUpLocation": "Jo‘nash manzili",
|
||||
"destinationLocation": "Borish manzili",
|
||||
"continueT": "Davom etish",
|
||||
"plsSelectSourceLocation": "Iltimos, jo‘nash manzilini tanlang",
|
||||
"plsSelectDestinationLocations": "Iltimos, borish manzilini tanlang",
|
||||
"selectVehicleType": "Transport turini tanlang",
|
||||
"plsSelectVehicleTypeFirst": "Avval transport turini tanlang.",
|
||||
"plsSelectPaymentMethod": "Iltimos, to‘lov usulini tanlang",
|
||||
"insufficientWallet": "Hamyonda mablag‘ yetarli emas. Boshqa to‘lov usulini tanlang.",
|
||||
"promoCode": "Promo kod",
|
||||
"thisOfferNotEligible": "Bu taklif ushbu buyurtma uchun amal qilmaydi",
|
||||
"viewAll": "Barchasini ko‘rish",
|
||||
"writeCoupon": "Promo kodni kiriting",
|
||||
"redeemNow": "Qo‘llash",
|
||||
"plsEnterCouponCode": "Iltimos, promo kodni kiriting",
|
||||
"couponApplied": "Promo kod muvaffaqiyatli qo‘llandi",
|
||||
"couponExpired": "Ushbu promo kodning muddati tugagan",
|
||||
"invalidCouponCode": "Noto‘g‘ri promo kod",
|
||||
"orderSummary": "Buyurtma tafsilotlari",
|
||||
"subtotal": "Oraliq summa",
|
||||
"discount": "Chegirma",
|
||||
"orderTotal": "Umumiy summa",
|
||||
"confirmBooking": "Buyurtmani tasdiqlash",
|
||||
"waitingForDriver": "Haydovchi kutilmoqda....",
|
||||
"cancelRide": "Safarni bekor qilish",
|
||||
"riderCancelledSucces": "Safar muvaffaqiyatli bekor qilindi",
|
||||
"failedToCancel": "Safarni bekor qilish amalga oshmadi",
|
||||
"pleaseWait": "Iltimos, kuting...",
|
||||
"change": "O‘zgartirish",
|
||||
"yourSosRequest": "Sizning SOS so‘rovingiz administratorga yuborildi",
|
||||
"yourSosrequestAlreadySubmitted": "SOS so‘rovi allaqachon yuborilgan",
|
||||
"payNow": "Hozir to‘lash",
|
||||
"youDoNothaveSufficientwalletBalance": "Hamyonda mablag‘ yetarli emas",
|
||||
"somethingWentWrong": "Xatolik yuz berdi, administrator bilan bog‘laning.",
|
||||
"cash": "Naqd",
|
||||
"coupon": "Promo kod",
|
||||
"couponNotFound": "Promo kod topilmadi.",
|
||||
"tapToApply": "Qo‘llash uchun bosing",
|
||||
"home": "Bosh sahifa",
|
||||
"myBookings": "Buyurtmalarim",
|
||||
"profile": "Profil",
|
||||
"wallet": "Hamyon",
|
||||
"cabServiceType": "Taksi xizmati turi",
|
||||
"everyRideVerified": "Har bir safar. Har bir haydovchi. Tasdiqlangan.",
|
||||
"allDriversIDCheck": "Barcha haydovchilar hujjat va tekshiruvdan o‘tadi — xavfsizligingiz uchun.",
|
||||
"intercity": "Shaharlararo",
|
||||
"aroundTheCity": "Shahar bo‘ylab",
|
||||
"rideDetails": "Safar tafsilotlari",
|
||||
"orderId": "Buyurtma ID:",
|
||||
"bookingData": "Buyurtma sanasi:",
|
||||
"rideAndFareSummary": "Safar va to‘lov tafsilotlari",
|
||||
"updateReview": "Sharhni yangilash",
|
||||
"addReview": "Sharh qoldirish",
|
||||
"complain": "Shikoyat",
|
||||
"distance": "Masofa",
|
||||
"km": "km",
|
||||
"duration": "Davomiylik",
|
||||
"howWasTrip": "Safar qanday o‘tdi?",
|
||||
"yourFeedbackWillHelp": "Fikringiz safar sifatini yanada yaxshilashga yordam beradi",
|
||||
"rateFor": "Baholash:",
|
||||
"typeComment": "Izoh yozing....",
|
||||
"title": "Sarlavha",
|
||||
"typeDescription": "Tavsif yozing...",
|
||||
"save": "Saqlash",
|
||||
"popularDestinations": "Mashhur yo‘nalishlar",
|
||||
"selectPaymentMethod": "To‘lov usulini tanlang",
|
||||
"prefferedPayment": "Afzal to‘lov usuli",
|
||||
"otherPaymentOptions": "Boshqa to‘lov usullari",
|
||||
"rideHistory": "Safar tarixi",
|
||||
"plsLoginToAcc": "Davom etish uchun tizimga kiring",
|
||||
"youAreNotLoggedIn": "Siz tizimga kirmagansiz. Hisobingizga kirib barcha funksiyalardan foydalaning.",
|
||||
"noOrderfound": "Buyurtmalar topilmadi",
|
||||
"reset_password_link_sent": "Parol tiklash havolasi {email} manziliga yuborildi",
|
||||
"pay_amount": "To‘lanadigan summa: {amount}",
|
||||
"otherServices": "Boshqa xizmatlar",
|
||||
"foodDelivery": "Oziq-ovqat yetkazib berish",
|
||||
"delivery": "Yetkazib berish",
|
||||
"bookingTaxi": "Taksi \nBuyurtma",
|
||||
"updateYourWardrobe": "Garderobingizni yangilang",
|
||||
"weDeliverSafely": "Biz xavfsiz yetkazib beramiz",
|
||||
"rent": "Ijara",
|
||||
"hugeSelectionOfAds": "Keng e’lonlar tanlovi!",
|
||||
"cosmetics": "Kosmetika",
|
||||
"moreThan1000Products": "1000 dan ortiq mahsulotlar",
|
||||
"foodProducts": "Oziq-ovqat mahsulotlari",
|
||||
"enableLocation": "Shaxsiylashtirilgan tajriba uchun geolokatsiyani yoqing",
|
||||
"allowLocation": "Yaqin atrofdagi do‘kon va xizmatlarni topish uchun geolokatsiyaga ruxsat bering.",
|
||||
"useCurrentLocation": "Joriy manzildan foydalanish",
|
||||
"setFromMap": "Xaritadan tanlash",
|
||||
"enterManuallyLocation": "Manzilni qo‘lda kiriting",
|
||||
"changeLanguage": "Tilni o‘zgartirish",
|
||||
"selectPrefferedLanguage": "Shaxsiylashtirilgan tajriba uchun afzal tilni tanlang."
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:05002c15a64cf1e0c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:05002c15a64cf1e0c4ba1f","ios":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}
|
||||
{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:e932bc88da6665b3c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:e932bc88da6665b3c4ba1f","ios":"1:893074789710:ios:7dd456b65070f325c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:7dd456b65070f325c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}
|
||||
@@ -1317,6 +1317,8 @@ PODS:
|
||||
- Flutter (1.0.0)
|
||||
- flutter_local_notifications (0.0.1):
|
||||
- Flutter
|
||||
- flutter_localization (0.0.1):
|
||||
- Flutter
|
||||
- flutter_osm_plugin (0.0.1):
|
||||
- Alamofire
|
||||
- Flutter
|
||||
@@ -1500,7 +1502,9 @@ PODS:
|
||||
- Flutter
|
||||
- Polyline (5.1.0)
|
||||
- PromisesObjC (2.4.0)
|
||||
- razorpay-pod (1.4.7)
|
||||
- razorpay-core-pod (1.0.3)
|
||||
- razorpay-pod (1.5.0):
|
||||
- razorpay-core-pod
|
||||
- razorpay_flutter (1.1.10):
|
||||
- Flutter
|
||||
- razorpay-pod
|
||||
@@ -1592,6 +1596,7 @@ DEPENDENCIES:
|
||||
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
|
||||
- Flutter (from `Flutter`)
|
||||
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
||||
- flutter_localization (from `.symlinks/plugins/flutter_localization/ios`)
|
||||
- flutter_osm_plugin (from `.symlinks/plugins/flutter_osm_plugin/ios`)
|
||||
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
|
||||
- geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`)
|
||||
@@ -1651,6 +1656,7 @@ SPEC REPOS:
|
||||
- OSMFlutterFramework
|
||||
- Polyline
|
||||
- PromisesObjC
|
||||
- razorpay-core-pod
|
||||
- razorpay-pod
|
||||
- RecaptchaInterop
|
||||
- Stripe
|
||||
@@ -1682,6 +1688,8 @@ EXTERNAL SOURCES:
|
||||
:path: Flutter
|
||||
flutter_local_notifications:
|
||||
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
||||
flutter_localization:
|
||||
:path: ".symlinks/plugins/flutter_localization/ios"
|
||||
flutter_osm_plugin:
|
||||
:path: ".symlinks/plugins/flutter_osm_plugin/ios"
|
||||
fluttertoast:
|
||||
@@ -1758,13 +1766,14 @@ SPEC CHECKSUMS:
|
||||
FirebaseStorage: 20d6b56fb8a40ebaa03d6a2889fe33dac64adb73
|
||||
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
||||
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
|
||||
flutter_localization: 72299fb6cb4e51cae587bd953ed0b958040b71e6
|
||||
flutter_osm_plugin: 3fb57665b32a81fcffa57c6206658d3a0d0d1a96
|
||||
fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
|
||||
geocoding_ios: 33776c9ebb98d037b5e025bb0e7537f6dd19646e
|
||||
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
|
||||
Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
|
||||
google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
|
||||
google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
|
||||
google_sign_in_ios: 00dfa94252eb10278b64828c81bcb7158a81a53a
|
||||
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
|
||||
GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
|
||||
GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
|
||||
@@ -1773,7 +1782,7 @@ SPEC CHECKSUMS:
|
||||
gRPC-Core: 860978b7db482de8b4f5e10677216309b5ff6330
|
||||
GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
|
||||
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
|
||||
image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
|
||||
image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
|
||||
in_app_review: 7dd1ea365263f834b8464673f9df72c80c17c937
|
||||
leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
|
||||
location: 155caecf9da4f280ab5fe4a55f94ceccfab838f8
|
||||
@@ -1781,15 +1790,16 @@ SPEC CHECKSUMS:
|
||||
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
|
||||
OSMFlutterFramework: 2f1260ac2854d3398b92403f2d5e012b4ca2c620
|
||||
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
|
||||
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
|
||||
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
|
||||
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
|
||||
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
|
||||
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
|
||||
razorpay-pod: 7bbc8748a93377d1705f9119b2f947faa9c9e3e1
|
||||
razorpay-core-pod: ef0309dbf8e3e5a1330f6cad89dcf9226d8ef758
|
||||
razorpay-pod: f634f1b8397eb54d547f25d35291f679545ddf17
|
||||
razorpay_flutter: 0e98e4fcaae27ad50e011d85f66d85e0a008754a
|
||||
RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba
|
||||
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
|
||||
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
|
||||
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
|
||||
sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
|
||||
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
|
||||
Stripe: a4b6584549bac3698733ed564e55b0b067cfda8a
|
||||
@@ -1801,9 +1811,9 @@ SPEC CHECKSUMS:
|
||||
StripePaymentSheet: 7bc20a0ab10d91acc06dc449ab61bb2cf221b0f4
|
||||
StripePaymentsUI: 1590647b3f635a58fb0e7058d86d3e9ff89250d4
|
||||
StripeUICore: a63d95d604e70a5895f9d6b09c49a46757e86353
|
||||
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
|
||||
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
|
||||
video_compress: f2133a07762889d67f0711ac831faa26f956980e
|
||||
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
|
||||
video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
|
||||
webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
|
||||
Yams: e10dae147f517ed57ecae37c5e8681bdf8fcab65
|
||||
|
||||
|
||||
@@ -496,7 +496,7 @@
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = 9J9XV5T2VN;
|
||||
DEVELOPMENT_TEAM = N72LCPWT92;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
|
||||
@@ -504,10 +504,15 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex.customer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MACCATALYST = NO;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = 1;
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
};
|
||||
name = Profile;
|
||||
@@ -683,7 +688,7 @@
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = 9J9XV5T2VN;
|
||||
DEVELOPMENT_TEAM = N72LCPWT92;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
|
||||
@@ -691,11 +696,16 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex999;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MACCATALYST = NO;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = 1;
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
};
|
||||
name = Debug;
|
||||
@@ -708,7 +718,7 @@
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = 9J9XV5T2VN;
|
||||
DEVELOPMENT_TEAM = N72LCPWT92;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
|
||||
@@ -716,10 +726,15 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex.customer;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||
SUPPORTS_MACCATALYST = NO;
|
||||
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = 1;
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
};
|
||||
name = Release;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 986 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 448 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.3 KiB |
@@ -1,134 +1,128 @@
|
||||
{
|
||||
"images": [
|
||||
"images" : [
|
||||
{
|
||||
"filename": "AppIcon@2x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "60x60"
|
||||
"filename" : "Icon-App-20x20@2x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "2x",
|
||||
"size" : "20x20"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon@3x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "60x60"
|
||||
"filename" : "Icon-App-20x20@3x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "3x",
|
||||
"size" : "20x20"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "76x76"
|
||||
"filename" : "Icon-App-29x29@1x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "1x",
|
||||
"size" : "29x29"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon@2x~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "76x76"
|
||||
"filename" : "Icon-App-29x29@2x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "2x",
|
||||
"size" : "29x29"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-83.5@2x~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "83.5x83.5"
|
||||
"filename" : "Icon-App-29x29@3x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "3x",
|
||||
"size" : "29x29"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-40@2x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "40x40"
|
||||
"filename" : "Icon-App-40x40@2x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "2x",
|
||||
"size" : "40x40"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-40@3x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "40x40"
|
||||
"filename" : "Icon-App-40x40@3x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "3x",
|
||||
"size" : "40x40"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-40~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "40x40"
|
||||
"filename" : "Icon-App-60x60@2x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "2x",
|
||||
"size" : "60x60"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-40@2x~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "40x40"
|
||||
"filename" : "Icon-App-60x60@3x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "3x",
|
||||
"size" : "60x60"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-20@2x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "20x20"
|
||||
"filename" : "Icon-App-20x20@1x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "1x",
|
||||
"size" : "20x20"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-20@3x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "20x20"
|
||||
"filename" : "Icon-App-20x20@2x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "2x",
|
||||
"size" : "20x20"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-20~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "20x20"
|
||||
"filename" : "Icon-App-29x29@1x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "1x",
|
||||
"size" : "29x29"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-20@2x~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "20x20"
|
||||
"filename" : "Icon-App-29x29@2x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "2x",
|
||||
"size" : "29x29"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-29.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "1x",
|
||||
"size": "29x29"
|
||||
"filename" : "Icon-App-40x40@1x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "1x",
|
||||
"size" : "40x40"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-29@2x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "29x29"
|
||||
"filename" : "Icon-App-40x40@2x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "2x",
|
||||
"size" : "40x40"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-29@3x.png",
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "29x29"
|
||||
"filename" : "Icon-App-76x76@1x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "1x",
|
||||
"size" : "76x76"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-29~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "29x29"
|
||||
"filename" : "Icon-App-76x76@2x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "2x",
|
||||
"size" : "76x76"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-29@2x~ipad.png",
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "29x29"
|
||||
"filename" : "Icon-App-83.5x83.5@2x.png",
|
||||
"idiom" : "ipad",
|
||||
"scale" : "2x",
|
||||
"size" : "83.5x83.5"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-60@2x~car.png",
|
||||
"idiom": "car",
|
||||
"scale": "2x",
|
||||
"size": "60x60"
|
||||
"filename" : "ItunesArtwork@2x.png",
|
||||
"idiom" : "ios-marketing",
|
||||
"scale" : "1x",
|
||||
"size" : "1024x1024"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon-60@3x~car.png",
|
||||
"idiom": "car",
|
||||
"scale": "3x",
|
||||
"size": "60x60"
|
||||
},
|
||||
{
|
||||
"filename": "AppIcon~ios-marketing.png",
|
||||
"idiom": "ios-marketing",
|
||||
"scale": "1x",
|
||||
"size": "1024x1024"
|
||||
"filename" : "Icon-App-76x76@2x.png",
|
||||
"idiom" : "iphone",
|
||||
"scale" : "2x",
|
||||
"size" : "76x76"
|
||||
}
|
||||
],
|
||||
"info": {
|
||||
"author": "iconkitchen",
|
||||
"version": 1
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 731 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 107 KiB |
6
ios/Runner/Assets.xcassets/Contents.json
Normal file
6
ios/Runner/Assets.xcassets/Contents.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,9 @@
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CLIENT_ID</key>
|
||||
<string>893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com</string>
|
||||
<string>893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com</string>
|
||||
<key>REVERSED_CLIENT_ID</key>
|
||||
<string>com.googleusercontent.apps.893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3</string>
|
||||
<string>com.googleusercontent.apps.893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e</string>
|
||||
<key>API_KEY</key>
|
||||
<string>AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0</string>
|
||||
<key>GCM_SENDER_ID</key>
|
||||
@@ -13,7 +13,7 @@
|
||||
<key>PLIST_VERSION</key>
|
||||
<string>1</string>
|
||||
<key>BUNDLE_ID</key>
|
||||
<string>felix.fondex.uz</string>
|
||||
<string>uz.felix.fondex.customer</string>
|
||||
<key>PROJECT_ID</key>
|
||||
<string>fondexuzb</string>
|
||||
<key>STORAGE_BUCKET</key>
|
||||
@@ -29,7 +29,7 @@
|
||||
<key>IS_SIGNIN_ENABLED</key>
|
||||
<true></true>
|
||||
<key>GOOGLE_APP_ID</key>
|
||||
<string>1:893074789710:ios:510ebf9e4ebed6a8c4ba1f</string>
|
||||
<string>1:893074789710:ios:7dd456b65070f325c4ba1f</string>
|
||||
<key>DATABASE_URL</key>
|
||||
<string>https://fondexuzb-default-rtdb.firebaseio.com</string>
|
||||
</dict>
|
||||
|
||||
@@ -2,41 +2,8 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>15.0</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>com.googleusercontent.apps.841077018919-978flnqdu54q5lb5e56od2jr2oha90ll</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
|
||||
<key>GIDClientID</key>
|
||||
<string>841077018919-978flnqdu54q5lb5e56od2jr2oha90ll.apps.googleusercontent.com</string>
|
||||
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>This app needs access to camera permission</string>
|
||||
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
|
||||
<string>This app needs access to location when open and in the background.</string>
|
||||
<key>NSLocationAlwaysUsageDescription</key>
|
||||
<string>This app needs access to location when in the background.</string>
|
||||
<key>NSLocationWhenInUseUsageDescription</key>
|
||||
<string>This app needs access to location when open.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Used to capture audio for image picker plugin</string>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>This app needs access to your gallery photo.</string>
|
||||
<key>UIBackgroundModes</key>
|
||||
<array>
|
||||
<string>fetch</string>
|
||||
<string>remote-notification</string>
|
||||
</array>
|
||||
|
||||
<key>CADisableMinimumFrameDurationOnPhone</key>
|
||||
<true/>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
@@ -47,6 +14,12 @@
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
<string>ru</string>
|
||||
<string>uz</string>
|
||||
</array>
|
||||
<key>CFBundleName</key>
|
||||
<string>customer</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
@@ -55,10 +28,44 @@
|
||||
<string>$(FLUTTER_BUILD_NAME)</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>com.googleusercontent.apps.841077018919-978flnqdu54q5lb5e56od2jr2oha90ll</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(FLUTTER_BUILD_NUMBER)</string>
|
||||
<key>GIDClientID</key>
|
||||
<string>841077018919-978flnqdu54q5lb5e56od2jr2oha90ll.apps.googleusercontent.com</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>MinimumOSVersion</key>
|
||||
<string>15.0</string>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>This app needs access to camera permission</string>
|
||||
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
|
||||
<string>This app needs access to location when open and in the background.</string>
|
||||
<key>NSLocationAlwaysUsageDescription</key>
|
||||
<string>This app needs access to location when in the background.</string>
|
||||
<key>NSLocationWhenInUseUsageDescription</key>
|
||||
<string>This app needs access to location when open.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Used to capture audio for image picker plugin</string>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>This app needs access to your gallery photo.</string>
|
||||
<key>UIApplicationSupportsIndirectInputEvents</key>
|
||||
<true/>
|
||||
<key>UIBackgroundModes</key>
|
||||
<array>
|
||||
<string>fetch</string>
|
||||
<string>remote-notification</string>
|
||||
</array>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>LaunchScreen</string>
|
||||
<key>UIMainStoryboardFile</key>
|
||||
@@ -76,15 +83,5 @@
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>CADisableMinimumFrameDurationOnPhone</key>
|
||||
<true/>
|
||||
<key>UIApplicationSupportsIndirectInputEvents</key>
|
||||
<true/>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
<string>ru</string>
|
||||
<string>uz</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
class ConstTexts {
|
||||
static String loginToExplore = "logintoExplore";
|
||||
static String loginToExplore = "loginToExplore";
|
||||
static String emailAddress = "emailAddress";
|
||||
static String password = "password";
|
||||
static String enterPassword = "enterPassword";
|
||||
@@ -60,9 +60,11 @@ class ConstTexts {
|
||||
static String pleaseWait = "pleaseWait";
|
||||
static String change = "change";
|
||||
static String yourSosRequest = "yourSosRequest";
|
||||
static String yourSosrequestAlreadySubmitted = "yourSosrequestAlreadySubmitted";
|
||||
static String yourSosrequestAlreadySubmitted =
|
||||
"yourSosrequestAlreadySubmitted";
|
||||
static String payNow = "payNow";
|
||||
static String youDoNothaveSufficientwalletBalance = "youDoNothaveSufficientwalletBalance";
|
||||
static String youDoNothaveSufficientwalletBalance =
|
||||
"youDoNothaveSufficientwalletBalance";
|
||||
static String somethingWentWrong = "somethingWentWrong";
|
||||
static String cash = "cash";
|
||||
static String coupon = "coupon";
|
||||
@@ -102,25 +104,60 @@ class ConstTexts {
|
||||
static String plsLoginToAcc = "plsLoginToAcc";
|
||||
static String youAreNotLoggedIn = "youAreNotLoggedIn";
|
||||
static String noOrderfound = "noOrderfound";
|
||||
// static String yourSosrequestAlreadySubmitted = "yourSosrequestAlreadySubmitted";
|
||||
// static String payNow = "payNow";
|
||||
// static String youDoNothaveSufficientwalletBalance = "youDoNothaveSufficientwalletBalance";
|
||||
// static String somethingWentWrong = "somethingWentWrong";
|
||||
// static String cash = "cash";
|
||||
// static String coupon = "coupon";
|
||||
// static String couponNotFound = "couponNotFound";
|
||||
// static String tapToApply = "tapToApply";
|
||||
// static String home = "home";
|
||||
// static String myBookings = "myBookings";
|
||||
// static String profile = "profile";
|
||||
// static String wallet = "wallet";
|
||||
// static String cabServiceType = "cabServiceType";
|
||||
// static String everyRideVerified = "everyRideVerified";
|
||||
// static String allDriversIDCheck = "allDriversIDCheck";
|
||||
// static String intercity = "intercity";
|
||||
// static String aroundTheCity = "aroundTheCity";
|
||||
// static String rideDetails = "rideDetails";
|
||||
// static String youDoNothaveSufficientwalletBalance = "youDoNothaveSufficientwalletBalance";
|
||||
// static String somethingWentWrong = "somethingWentWrong";
|
||||
static String otherServices = "otherServices";
|
||||
static String foodDelivery = "foodDelivery";
|
||||
static String delivery = "delivery";
|
||||
static String bookingTaxi = "bookingTaxi";
|
||||
static String updateYourWardrobe = "updateYourWardrobe";
|
||||
static String weDeliverSafely = "weDeliverSafely";
|
||||
static String rent = "rent";
|
||||
static String hugeSelectionOfAds = "hugeSelectionOfAds";
|
||||
static String cosmetics = "cosmetics";
|
||||
static String moreThan1000Products = "moreThan1000Products";
|
||||
static String foodProducts = "foodProducts";
|
||||
static String enableLocation = "enableLocation";
|
||||
static String allowLocation = "allowLocation";
|
||||
static String useCurrentLocation = "useCurrentLocation";
|
||||
static String setFromMap = "setFromMap";
|
||||
static String enterManuallyLocation = "enterManuallyLocation";
|
||||
static String changeLanguage = "changeLanguage";
|
||||
static String selectPrefferedLanguage = "selectPrefferedLanguage";
|
||||
static String searchStoreItem = "searchStoreItem";
|
||||
static String category = "category";
|
||||
static String highlightsForU = "highlightsForU";
|
||||
static String newArrival = "newArrivals";
|
||||
static String viewAllArrivals = "View All Arrivals";
|
||||
static String topBrands = "topBrands";
|
||||
static String styleUp = "styleUp";
|
||||
static String additionlOffers = "additionlOffers";
|
||||
static String largestDiscounts = "largestDiscounts";
|
||||
static String newArrivals = "newArrivals";
|
||||
static String popularStores = "popularStores";
|
||||
static String allStores = "allStores";
|
||||
static String alert = "alert";
|
||||
static String cancel = "cancel";
|
||||
static String ok = "ok";
|
||||
static String freeDelivery = "freeDelivery";
|
||||
static String upto = "upto";
|
||||
static String viewCart = "viewCart";
|
||||
static String viewTimings = "viewTimings";
|
||||
static String timingIsNotAdded = "timingIsNotAdded";
|
||||
static String alsoApplicableOnTable = "alsoApplicableOnTable";
|
||||
static String tableBooking = "tableBooking";
|
||||
static String quickConformations = "quickConformations";
|
||||
static String menu = "menu";
|
||||
static String searchAndMore = "searchAndMore";
|
||||
static String veg = "veg";
|
||||
static String nonVeg = "nonVeg";
|
||||
static String favourites = "favourites";
|
||||
static String orders = "orders";
|
||||
static String takeAway = "takeAway";
|
||||
// static String allStores = "allStores";
|
||||
// static String alert = "alert";
|
||||
// static String cancel = "cancel";
|
||||
// static String ok = "ok";
|
||||
// static String freeDelivery = "freeDelivery";
|
||||
// static String upto = "upto";
|
||||
// static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
|
||||
// static String cash = "cash";
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:geolocator/geolocator.dart' as geolocator;
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:mailer/mailer.dart';
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import 'dart:convert';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import '../../models/onprovider_order_model.dart';
|
||||
import '../models/wallet_transaction_model.dart';
|
||||
@@ -75,7 +77,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
Future<void> placeOrder() async {
|
||||
if (!isExtra) {
|
||||
// Normal Order
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
|
||||
onDemandOrderModel.value?.payment_method = selectedPaymentMethod.value;
|
||||
onDemandOrderModel.value?.paymentStatus =
|
||||
@@ -111,7 +113,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
);
|
||||
}
|
||||
|
||||
ShowToastDialog.showToast("OnDemand Service successfully booked".tr());
|
||||
ShowToastDialog.showToast("OnDemand Service successfully booked".tr);
|
||||
}
|
||||
if (selectedPaymentMethod.value == PaymentGateway.wallet.name) {
|
||||
WalletTransactionModel transactionModel = WalletTransactionModel(
|
||||
@@ -123,8 +125,8 @@ class OnDemandPaymentController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: onDemandOrderModel.value!.id,
|
||||
note: "Booking Amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Booking Amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
);
|
||||
|
||||
await FireStoreUtils.setWalletTransaction(transactionModel).then((
|
||||
@@ -161,7 +163,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
isTopup: false,
|
||||
orderId: onDemandOrderModel.value!.id,
|
||||
note: "Booking Extra charge debited",
|
||||
paymentStatus: "success".tr(),
|
||||
paymentStatus: "success".tr,
|
||||
);
|
||||
|
||||
await FireStoreUtils.setWalletTransaction(transactionModel).then((
|
||||
@@ -189,7 +191,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
isTopup: true,
|
||||
orderId: onDemandOrderModel.value?.id,
|
||||
note: 'Extra Charge Amount Credited',
|
||||
paymentStatus: "success".tr(),
|
||||
paymentStatus: "success".tr,
|
||||
);
|
||||
|
||||
await FireStoreUtils.setWalletTransaction(transactionModel).then((
|
||||
@@ -321,7 +323,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
if (paymentIntentData!.containsKey("error")) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
} else {
|
||||
await Stripe.instance.initPaymentSheet(
|
||||
@@ -354,7 +356,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -437,10 +439,10 @@ class OnDemandPaymentController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -472,15 +474,15 @@ class OnDemandPaymentController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
placeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -507,15 +509,15 @@ class OnDemandPaymentController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -557,10 +559,10 @@ class OnDemandPaymentController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -594,11 +596,11 @@ class OnDemandPaymentController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -743,7 +745,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -780,18 +782,18 @@ class OnDemandPaymentController extends GetxController {
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
|
||||
@@ -809,10 +811,10 @@ class OnDemandPaymentController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -853,7 +855,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -901,12 +903,12 @@ class OnDemandPaymentController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -934,7 +936,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
|
||||
accessToken = responseData['access_token'] ?? '';
|
||||
if (accessToken.isEmpty) {
|
||||
ShowToastDialog.showToast("Failed to get access token".tr());
|
||||
ShowToastDialog.showToast("Failed to get access token".tr);
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -946,7 +948,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1001,7 +1003,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1029,13 +1031,13 @@ class OnDemandPaymentController extends GetxController {
|
||||
// () => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken),
|
||||
// )!.then((value) {
|
||||
// if (value == true) {
|
||||
// ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
// ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
// placeOrder();
|
||||
// ();
|
||||
// }
|
||||
// });
|
||||
// } else {
|
||||
// ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
// ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
@@ -1058,7 +1060,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
// // ignore: use_build_context_synchronously
|
||||
// return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
|
||||
// } else {
|
||||
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr());
|
||||
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
|
||||
// return '';
|
||||
// }
|
||||
// }
|
||||
@@ -1099,7 +1101,7 @@ class OnDemandPaymentController extends GetxController {
|
||||
// return '';
|
||||
// }
|
||||
// } else {
|
||||
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr());
|
||||
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
|
||||
// return '';
|
||||
// }
|
||||
// }
|
||||
@@ -1124,11 +1126,11 @@ class OnDemandPaymentController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -42,13 +42,13 @@ import 'package:customer/payment/xenditScreen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_map/flutter_map.dart' as flutterMap;
|
||||
import 'package:flutter_paypal/flutter_paypal.dart';
|
||||
import 'package:flutter_polyline_points/flutter_polyline_points.dart';
|
||||
import 'package:flutter_stripe/flutter_stripe.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:latlong2/latlong.dart' as latlong;
|
||||
@@ -402,7 +402,7 @@ class IntercityHomeController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("pickup"),
|
||||
position: LatLng(pickupLat, pickupLng),
|
||||
infoWindow: InfoWindow(title: "Pickup Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Pickup Location".tr),
|
||||
icon:
|
||||
departureIcon ??
|
||||
BitmapDescriptor.defaultMarkerWithHue(
|
||||
@@ -412,7 +412,7 @@ class IntercityHomeController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("driver"),
|
||||
position: LatLng(driverLat, driverLng),
|
||||
infoWindow: InfoWindow(title: "Driver at Pickup".tr()),
|
||||
infoWindow: InfoWindow(title: "Driver at Pickup".tr),
|
||||
icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
|
||||
),
|
||||
]);
|
||||
@@ -421,7 +421,7 @@ class IntercityHomeController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("destination"),
|
||||
position: LatLng(destLat, destLng),
|
||||
infoWindow: InfoWindow(title: "Destination Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Destination Location".tr),
|
||||
icon:
|
||||
destinationIcon ??
|
||||
BitmapDescriptor.defaultMarkerWithHue(
|
||||
@@ -431,7 +431,7 @@ class IntercityHomeController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("driver"),
|
||||
position: LatLng(driverLat, driverLng),
|
||||
infoWindow: InfoWindow(title: "Driver Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Driver Location".tr),
|
||||
icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
|
||||
),
|
||||
]);
|
||||
@@ -536,7 +536,7 @@ class IntercityHomeController extends GetxController {
|
||||
if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
|
||||
currentOrder.value.paymentMethod = selectedPaymentMethod.value;
|
||||
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment method changed".tr());
|
||||
ShowToastDialog.showToast("Payment method changed".tr);
|
||||
Get.back();
|
||||
Get.back();
|
||||
});
|
||||
@@ -557,8 +557,8 @@ class IntercityHomeController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: currentOrder.value.id,
|
||||
note: "Cab Amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Cab Amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
serviceType: Constant.parcelServiceType,
|
||||
);
|
||||
|
||||
@@ -575,7 +575,7 @@ class IntercityHomeController extends GetxController {
|
||||
}
|
||||
|
||||
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
Get.back();
|
||||
});
|
||||
}
|
||||
@@ -743,7 +743,7 @@ class IntercityHomeController extends GetxController {
|
||||
final LatLng pos = LatLng(lat, lng);
|
||||
final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination');
|
||||
final icon = isDeparture ? departureIcon! : destinationIcon!;
|
||||
final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr();
|
||||
final title = isDeparture ? 'Departure'.tr : 'Destination'.tr;
|
||||
|
||||
if (isDeparture) {
|
||||
departureLatLong.value = pos;
|
||||
@@ -1371,7 +1371,7 @@ class IntercityHomeController extends GetxController {
|
||||
if (paymentIntentData!.containsKey("error")) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
} else {
|
||||
await Stripe.instance.initPaymentSheet(
|
||||
@@ -1404,7 +1404,7 @@ class IntercityHomeController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -1487,10 +1487,10 @@ class IntercityHomeController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -1522,15 +1522,15 @@ class IntercityHomeController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
completeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -1557,15 +1557,15 @@ class IntercityHomeController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -1607,10 +1607,10 @@ class IntercityHomeController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -1644,11 +1644,11 @@ class IntercityHomeController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1776,7 +1776,7 @@ class IntercityHomeController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -1813,18 +1813,18 @@ class IntercityHomeController extends GetxController {
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
|
||||
@@ -1842,10 +1842,10 @@ class IntercityHomeController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1886,7 +1886,7 @@ class IntercityHomeController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1929,13 +1929,13 @@ class IntercityHomeController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1973,7 +1973,7 @@ class IntercityHomeController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -2024,7 +2024,7 @@ class IntercityHomeController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -2050,11 +2050,11 @@ class IntercityHomeController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:customer/models/user_model.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/constant.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/models/advertisement_model.dart';
|
||||
import 'package:customer/models/favourite_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class AdvertisementListController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/models/brands_model.dart';
|
||||
import 'package:customer/models/product_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class AllBrandProductController extends GetxController {
|
||||
RxList<ProductModel> productList = <ProductModel>[].obs;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:customer/models/product_model.dart';
|
||||
import 'package:customer/models/vendor_category_model.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class AllCategoryProductController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -3,12 +3,12 @@ import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart';
|
||||
import 'package:dropdown_textfield/dropdown_textfield.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:geocoding/geocoding.dart';
|
||||
import 'package:geolocator/geolocator.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong;
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
@@ -124,12 +124,12 @@ class BookParcelController extends GetxController {
|
||||
void onCameraClick(BuildContext context) {
|
||||
final action = CupertinoActionSheet(
|
||||
message: Text(
|
||||
'Add your parcel image.'.tr(),
|
||||
'Add your parcel image.'.tr,
|
||||
style: const TextStyle(fontSize: 15.0),
|
||||
),
|
||||
actions: <Widget>[
|
||||
CupertinoActionSheetAction(
|
||||
child: Text('Choose image from gallery'.tr()),
|
||||
child: Text('Choose image from gallery'.tr),
|
||||
onPressed: () async {
|
||||
Navigator.pop(context);
|
||||
final imageList = await _picker.pickMultiImage();
|
||||
@@ -139,7 +139,7 @@ class BookParcelController extends GetxController {
|
||||
},
|
||||
),
|
||||
CupertinoActionSheetAction(
|
||||
child: Text('Take a picture'.tr()),
|
||||
child: Text('Take a picture'.tr),
|
||||
onPressed: () async {
|
||||
Navigator.pop(context);
|
||||
final XFile? photo = await _picker.pickImage(
|
||||
@@ -152,7 +152,7 @@ class BookParcelController extends GetxController {
|
||||
),
|
||||
],
|
||||
cancelButton: CupertinoActionSheetAction(
|
||||
child: Text('Cancel'.tr()),
|
||||
child: Text('Cancel'.tr),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
);
|
||||
@@ -184,39 +184,39 @@ class BookParcelController extends GetxController {
|
||||
|
||||
bool validateFields() {
|
||||
if (senderNameController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter sender name".tr());
|
||||
ShowToastDialog.showToast("Please enter sender name".tr);
|
||||
return false;
|
||||
} else if (senderMobileController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter sender mobile".tr());
|
||||
ShowToastDialog.showToast("Please enter sender mobile".tr);
|
||||
return false;
|
||||
} else if (senderLocationController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter sender address".tr());
|
||||
ShowToastDialog.showToast("Please enter sender address".tr);
|
||||
return false;
|
||||
} else if (receiverNameController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter receiver name".tr());
|
||||
ShowToastDialog.showToast("Please enter receiver name".tr);
|
||||
return false;
|
||||
} else if (receiverMobileController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter receiver mobile".tr());
|
||||
ShowToastDialog.showToast("Please enter receiver mobile".tr);
|
||||
return false;
|
||||
} else if (receiverLocationController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter receiver address".tr());
|
||||
ShowToastDialog.showToast("Please enter receiver address".tr);
|
||||
return false;
|
||||
} else if (isScheduled.value) {
|
||||
if (scheduledDate.value.isEmpty) {
|
||||
ShowToastDialog.showToast("Please select scheduled date".tr());
|
||||
ShowToastDialog.showToast("Please select scheduled date".tr);
|
||||
return false;
|
||||
} else if (scheduledTime.value.isEmpty) {
|
||||
ShowToastDialog.showToast("Please select scheduled time".tr());
|
||||
ShowToastDialog.showToast("Please select scheduled time".tr);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (selectedWeight == null) {
|
||||
ShowToastDialog.showToast("Please select parcel weight".tr());
|
||||
ShowToastDialog.showToast("Please select parcel weight".tr);
|
||||
return false;
|
||||
} else if (senderLocation.value == null || receiverLocation.value == null) {
|
||||
ShowToastDialog.showToast(
|
||||
"Please select both sender and receiver locations".tr(),
|
||||
"Please select both sender and receiver locations".tr,
|
||||
);
|
||||
return false;
|
||||
}
|
||||
@@ -254,7 +254,7 @@ class BookParcelController extends GetxController {
|
||||
if (distance.value < 0.5) {
|
||||
ShowToastDialog.showToast(
|
||||
"Sender's location to receiver's location should be more than 1 km."
|
||||
.tr(),
|
||||
.tr,
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -264,7 +264,7 @@ class BookParcelController extends GetxController {
|
||||
double.parse(selectedWeight!.deliveryCharge.toString()));
|
||||
goToCart();
|
||||
} catch (e) {
|
||||
ShowToastDialog.showToast("Something went wrong while booking.".tr());
|
||||
ShowToastDialog.showToast("Something went wrong while booking.".tr);
|
||||
debugPrint("bookNow error: $e");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,13 +40,13 @@ import 'package:customer/payment/xenditScreen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_map/flutter_map.dart' as flutterMap;
|
||||
import 'package:flutter_paypal/flutter_paypal.dart';
|
||||
import 'package:flutter_polyline_points/flutter_polyline_points.dart';
|
||||
import 'package:flutter_stripe/flutter_stripe.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:latlong2/latlong.dart' as latlong;
|
||||
@@ -393,7 +393,7 @@ class CabBookingController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("pickup"),
|
||||
position: LatLng(pickupLat, pickupLng),
|
||||
infoWindow: InfoWindow(title: "Pickup Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Pickup Location".tr),
|
||||
icon:
|
||||
departureIcon ??
|
||||
BitmapDescriptor.defaultMarkerWithHue(
|
||||
@@ -403,7 +403,7 @@ class CabBookingController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("driver"),
|
||||
position: LatLng(driverLat, driverLng),
|
||||
infoWindow: InfoWindow(title: "Driver at Pickup".tr()),
|
||||
infoWindow: InfoWindow(title: "Driver at Pickup".tr),
|
||||
icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
|
||||
),
|
||||
]);
|
||||
@@ -412,7 +412,7 @@ class CabBookingController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("destination"),
|
||||
position: LatLng(destLat, destLng),
|
||||
infoWindow: InfoWindow(title: "Destination Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Destination Location".tr),
|
||||
icon:
|
||||
destinationIcon ??
|
||||
BitmapDescriptor.defaultMarkerWithHue(
|
||||
@@ -422,7 +422,7 @@ class CabBookingController extends GetxController {
|
||||
Marker(
|
||||
markerId: const MarkerId("driver"),
|
||||
position: LatLng(driverLat, driverLng),
|
||||
infoWindow: InfoWindow(title: "Driver Location".tr()),
|
||||
infoWindow: InfoWindow(title: "Driver Location".tr),
|
||||
icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
|
||||
),
|
||||
]);
|
||||
@@ -527,7 +527,7 @@ class CabBookingController extends GetxController {
|
||||
if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
|
||||
currentOrder.value.paymentMethod = selectedPaymentMethod.value;
|
||||
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment method changed".tr());
|
||||
ShowToastDialog.showToast("Payment method changed".tr);
|
||||
Get.back();
|
||||
Get.back();
|
||||
});
|
||||
@@ -566,7 +566,7 @@ class CabBookingController extends GetxController {
|
||||
}
|
||||
|
||||
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
Get.back();
|
||||
});
|
||||
}
|
||||
@@ -699,7 +699,7 @@ class CabBookingController extends GetxController {
|
||||
Marker(
|
||||
markerId: markerId,
|
||||
infoWindow: InfoWindow(
|
||||
title: '${'Stop'.tr()} ${String.fromCharCode(index + 65)}',
|
||||
title: '${'Stop'.tr} ${String.fromCharCode(index + 65)}',
|
||||
),
|
||||
position: LatLng(lat, lng),
|
||||
icon: stopIcon!,
|
||||
@@ -734,7 +734,7 @@ class CabBookingController extends GetxController {
|
||||
final LatLng pos = LatLng(lat, lng);
|
||||
final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination');
|
||||
final icon = isDeparture ? departureIcon! : destinationIcon!;
|
||||
final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr();
|
||||
final title = isDeparture ? 'Departure'.tr : 'Destination'.tr;
|
||||
|
||||
if (isDeparture) {
|
||||
departureLatLong.value = pos;
|
||||
@@ -1362,7 +1362,7 @@ class CabBookingController extends GetxController {
|
||||
if (paymentIntentData!.containsKey("error")) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
} else {
|
||||
await Stripe.instance.initPaymentSheet(
|
||||
@@ -1395,7 +1395,7 @@ class CabBookingController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -1478,10 +1478,10 @@ class CabBookingController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -1513,15 +1513,15 @@ class CabBookingController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
completeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -1548,15 +1548,15 @@ class CabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -1598,10 +1598,10 @@ class CabBookingController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -1635,11 +1635,11 @@ class CabBookingController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1767,7 +1767,7 @@ class CabBookingController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -1804,18 +1804,18 @@ class CabBookingController extends GetxController {
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
|
||||
@@ -1833,10 +1833,10 @@ class CabBookingController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1877,7 +1877,7 @@ class CabBookingController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1920,13 +1920,13 @@ class CabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1964,7 +1964,7 @@ class CabBookingController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -2015,7 +2015,7 @@ class CabBookingController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -2041,11 +2041,11 @@ class CabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:customer/models/coupon_model.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class CabCouponCodeController extends GetxController {
|
||||
// Add your methods and properties here
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/cab_service_screens/cab_home_screen.dart';
|
||||
import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
|
||||
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../screen_ui/cab_service_screens/my_cab_booking_screen.dart';
|
||||
|
||||
class CabDashboardController extends GetxController {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:customer/models/banner_model.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class CabHomeController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'dart:convert';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/rating_model.dart';
|
||||
import 'package:flutter_polyline_points/flutter_polyline_points.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart' as gmap;
|
||||
import 'package:latlong2/latlong.dart' as osm;
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s
|
||||
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import 'package:customer/screen_ui/rental_service/rental_home_screen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../screen_ui/rental_service/my_rental_booking_screen.dart';
|
||||
|
||||
class CabRentalDashboardControllers extends GetxController {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/models/cab_order_model.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/collection_name.dart';
|
||||
import '../models/rating_model.dart';
|
||||
import '../models/user_model.dart';
|
||||
@@ -73,11 +73,11 @@ class CabReviewController extends GetxController {
|
||||
/// Save / update review
|
||||
Future<void> submitReview() async {
|
||||
if (comment.value.text.trim().isEmpty || ratings.value == 0) {
|
||||
ShowToastDialog.showToast("Please provide rating and comment".tr());
|
||||
ShowToastDialog.showToast("Please provide rating and comment".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
ShowToastDialog.showLoader("Submit in...".tr());
|
||||
ShowToastDialog.showLoader("Submit in...".tr);
|
||||
|
||||
final user = await FireStoreUtils.getUserProfile(
|
||||
order.value?.driverId ?? '',
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'dart:io';
|
||||
import 'dart:math' as maths;
|
||||
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/cart_product_model.dart';
|
||||
import 'package:customer/models/coupon_model.dart';
|
||||
@@ -13,11 +14,11 @@ import 'package:customer/models/user_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:customer/themes/app_them_data.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_paypal/flutter_paypal.dart';
|
||||
import 'package:flutter_stripe/flutter_stripe.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:razorpay_flutter/razorpay_flutter.dart';
|
||||
@@ -416,7 +417,7 @@ class CartController extends GetxController {
|
||||
setOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"You don't have sufficient wallet balance to place order".tr(),
|
||||
"You don't have sufficient wallet balance to place order".tr,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
@@ -425,7 +426,7 @@ class CartController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> setOrder() async {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
|
||||
if ((Constant.isSubscriptionModelApplied == true ||
|
||||
Constant.sectionConstantModel?.adminCommision?.isEnabled == true) &&
|
||||
@@ -438,7 +439,7 @@ class CartController extends GetxController {
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast(
|
||||
"This vendor has reached their maximum order capacity. Please select a different vendor or try again later."
|
||||
.tr(),
|
||||
.tr,
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -508,8 +509,8 @@ class CartController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: orderModel.id,
|
||||
note: "Order Amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Order Amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
);
|
||||
|
||||
await FireStoreUtils.setWalletTransaction(transactionModel).then((
|
||||
@@ -712,7 +713,7 @@ class CartController extends GetxController {
|
||||
if (paymentIntentData!.containsKey("error")) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
} else {
|
||||
await Stripe.instance.initPaymentSheet(
|
||||
@@ -745,7 +746,7 @@ class CartController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -828,10 +829,10 @@ class CartController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -863,15 +864,15 @@ class CartController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
placeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -898,15 +899,15 @@ class CartController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -948,10 +949,10 @@ class CartController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -985,11 +986,11 @@ class CartController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1134,7 +1135,7 @@ class CartController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -1170,18 +1171,18 @@ class CartController extends GetxController {
|
||||
}
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
|
||||
@@ -1199,10 +1200,10 @@ class CartController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1243,7 +1244,7 @@ class CartController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1286,13 +1287,13 @@ class CartController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1330,7 +1331,7 @@ class CartController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1381,7 +1382,7 @@ class CartController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1407,11 +1408,11 @@ class CartController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import '../models/cashback_model.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
class CashbackController extends GetxController {
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import '../models/vendor_category_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class CategoryRestaurantController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/language_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/collection_name.dart';
|
||||
|
||||
class ChangeLanguageController extends GetxController {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import 'dart:async';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
|
||||
import '../models/conversation_model.dart';
|
||||
import '../models/inbox_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
import '../service/send_notification.dart';
|
||||
@@ -104,11 +104,11 @@ class ChatController extends GetxController {
|
||||
|
||||
if (url != null) {
|
||||
if (url.mime.contains('image')) {
|
||||
conversationModel.message = "sent a message".tr();
|
||||
conversationModel.message = "sent a message".tr;
|
||||
} else if (url.mime.contains('video')) {
|
||||
conversationModel.message = "Sent a video".tr();
|
||||
conversationModel.message = "Sent a video".tr;
|
||||
} else if (url.mime.contains('audio')) {
|
||||
conversationModel.message = "Sent a audio".tr();
|
||||
conversationModel.message = "Sent a audio".tr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ class ChatController extends GetxController {
|
||||
// sendMessage('', url, '', 'image');
|
||||
// Get.back();
|
||||
// } on PlatformException catch (e) {
|
||||
// ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e");
|
||||
// ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e");
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../models/cab_order_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import '../themes/show_toast_dialog.dart';
|
||||
@@ -22,7 +21,7 @@ class ComplainController extends GetxController {
|
||||
order.value = args['order'] as CabOrderModel;
|
||||
getComplain();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Order data not found".tr());
|
||||
ShowToastDialog.showToast("Order data not found".tr);
|
||||
Get.back();
|
||||
}
|
||||
}
|
||||
@@ -38,7 +37,7 @@ class ComplainController extends GetxController {
|
||||
comment.value.text = data['description'] ?? '';
|
||||
}
|
||||
} catch (e) {
|
||||
ShowToastDialog.showToast("Failed to load complaint".tr());
|
||||
ShowToastDialog.showToast("Failed to load complaint".tr);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
@@ -47,12 +46,12 @@ class ComplainController extends GetxController {
|
||||
Future<void> submitComplain() async {
|
||||
// Validation
|
||||
if (title.value.text.trim().isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter complaint title".tr());
|
||||
ShowToastDialog.showToast("Please enter complaint title".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
if (comment.value.text.trim().isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter complaint description".tr());
|
||||
ShowToastDialog.showToast("Please enter complaint description".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -82,16 +81,16 @@ class ComplainController extends GetxController {
|
||||
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast(
|
||||
"Your complaint has been submitted to admin".tr(),
|
||||
"Your complaint has been submitted to admin".tr,
|
||||
);
|
||||
Get.back();
|
||||
} else {
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast("Your complaint is already submitted".tr());
|
||||
ShowToastDialog.showToast("Your complaint is already submitted".tr);
|
||||
}
|
||||
} catch (e) {
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast("Something went wrong, please try again".tr());
|
||||
ShowToastDialog.showToast("Something went wrong, please try again".tr);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart';
|
||||
import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
|
||||
import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DashBoardController extends GetxController {
|
||||
RxInt selectedIndex = 0.obs;
|
||||
|
||||
@@ -5,7 +5,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart';
|
||||
import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
|
||||
import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DashBoardEcommerceController extends GetxController {
|
||||
RxInt selectedIndex = 0.obs;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import '../models/dine_in_booking_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DineInBookingController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:customer/models/dine_in_booking_model.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DineInBookingDetailsController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -7,7 +7,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import '../models/banner_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DineInController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import 'dart:async';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/dine_in_booking_model.dart';
|
||||
import 'package:customer/models/favourite_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import '../screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
import '../service/send_notification.dart';
|
||||
@@ -37,9 +38,9 @@ class DineInRestaurantDetailsController extends GetxController {
|
||||
String getLocalizedOccasion(String key) {
|
||||
switch (key) {
|
||||
case "Birthday":
|
||||
return "Birthday".tr();
|
||||
return "Birthday".tr;
|
||||
case "Anniversary":
|
||||
return "Anniversary".tr();
|
||||
return "Anniversary".tr;
|
||||
default:
|
||||
return key;
|
||||
}
|
||||
@@ -65,7 +66,7 @@ class DineInRestaurantDetailsController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> orderBook() async {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
|
||||
DateTime dt = selectedDate.value.toDate();
|
||||
String hour = DateFormat("kk:mm").format(
|
||||
@@ -118,7 +119,7 @@ class DineInRestaurantDetailsController extends GetxController {
|
||||
ShowToastDialog.closeLoader();
|
||||
Get.back();
|
||||
Get.to(const DineInBookingScreen());
|
||||
ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr());
|
||||
ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr);
|
||||
}
|
||||
|
||||
void getRecord() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:customer/models/coupon_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class DiscountRestaurantListController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import 'dart:io';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/user_model.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:image_picker/image_picker.dart';
|
||||
|
||||
import '../themes/show_toast_dialog.dart';
|
||||
@@ -48,7 +49,7 @@ class EditProfileController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> saveData() async {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
if (Constant().hasValidUrl(profileImage.value) == false &&
|
||||
profileImage.value.isNotEmpty) {
|
||||
profileImage.value = await Constant.uploadUserImageToFireStorage(
|
||||
@@ -78,7 +79,7 @@ class EditProfileController extends GetxController {
|
||||
Get.back();
|
||||
profileImage.value = image.path;
|
||||
} on PlatformException catch (e) {
|
||||
ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e");
|
||||
ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../models/user_model.dart';
|
||||
|
||||
class EnterManuallyLocationController extends GetxController {
|
||||
@@ -76,13 +76,13 @@ class EnterManuallyLocationController extends GetxController {
|
||||
String getLocalizedSaveAs(String key) {
|
||||
switch (key) {
|
||||
case 'Home':
|
||||
return 'Home'.tr();
|
||||
return 'Home'.tr;
|
||||
case 'Work':
|
||||
return 'Work'.tr();
|
||||
return 'Work'.tr;
|
||||
case 'Hotel':
|
||||
return 'Hotel'.tr();
|
||||
return 'Hotel'.tr;
|
||||
case 'Other':
|
||||
return 'Other'.tr();
|
||||
return 'Other'.tr;
|
||||
default:
|
||||
return key;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import 'package:customer/models/favourite_model.dart';
|
||||
import 'package:customer/models/product_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class FavouriteController extends GetxController {
|
||||
RxBool favouriteRestaurant = true.obs;
|
||||
|
||||
@@ -4,7 +4,7 @@ import 'package:customer/models/favorite_ondemand_service_model.dart';
|
||||
import 'package:customer/models/provider_serivce_model.dart';
|
||||
import 'package:customer/screen_ui/auth_screens/login_screen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class FavouriteOndemmandController extends GetxController {
|
||||
// Add your controller logic here
|
||||
|
||||
@@ -9,9 +9,9 @@ import 'package:customer/models/favourite_model.dart';
|
||||
import 'package:customer/models/vendor_category_model.dart';
|
||||
import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import '../models/banner_model.dart';
|
||||
import '../models/story_model.dart';
|
||||
@@ -33,7 +33,7 @@ class FoodHomeController extends GetxController {
|
||||
RxBool isLoading = true.obs;
|
||||
RxBool isListView = true.obs;
|
||||
RxBool isPopular = true.obs;
|
||||
RxString selectedOrderTypeValue = "Delivery".tr().obs;
|
||||
RxString selectedOrderTypeValue = "Delivery".tr.obs;
|
||||
|
||||
Rx<PageController> pageController =
|
||||
PageController(viewportFraction: 0.877).obs;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../themes/show_toast_dialog.dart';
|
||||
|
||||
class ForgotPasswordController extends GetxController {
|
||||
@@ -12,32 +12,29 @@ class ForgotPasswordController extends GetxController {
|
||||
final email = emailEditingController.value.text.trim();
|
||||
|
||||
if (email.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter your email address.".tr());
|
||||
ShowToastDialog.showToast("Please enter your email address.".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!GetUtils.isEmail(email)) {
|
||||
ShowToastDialog.showToast("Please enter a valid email address.".tr());
|
||||
ShowToastDialog.showToast("Please enter a valid email address.".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
await FirebaseAuth.instance.sendPasswordResetEmail(email: email);
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast(
|
||||
'reset_password_link_sent'.tr(namedArgs: {'email': email})
|
||||
|
||||
'reset_password_link_sent'.trParams({'email': email}),
|
||||
);
|
||||
Get.back();
|
||||
} on FirebaseAuthException catch (e) {
|
||||
ShowToastDialog.closeLoader();
|
||||
if (e.code == 'user-not-found') {
|
||||
ShowToastDialog.showToast('No user found for that email.'.tr());
|
||||
ShowToastDialog.showToast('No user found for that email.'.tr);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
e.message?.tr() ?? "something_went_wrong".tr(),
|
||||
);
|
||||
ShowToastDialog.showToast(e.message?.tr ?? "something_went_wrong".tr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,10 +3,11 @@ import 'dart:io';
|
||||
import 'dart:math' as maths;
|
||||
import 'dart:math';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/gift_cards_model.dart';
|
||||
import 'package:customer/themes/app_them_data.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:flutter_paypal/flutter_paypal.dart';
|
||||
import 'package:flutter_stripe/flutter_stripe.dart';
|
||||
import 'package:razorpay_flutter/razorpay_flutter.dart';
|
||||
@@ -42,7 +43,7 @@ import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
@@ -99,7 +100,7 @@ class GiftCardController extends GetxController {
|
||||
setOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"You don't have sufficient wallet balance to purchase gift card".tr(),
|
||||
"You don't have sufficient wallet balance to purchase gift card".tr,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
@@ -108,7 +109,7 @@ class GiftCardController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> setOrder() async {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
|
||||
GiftCardsOrderModel giftCardsOrderModel = GiftCardsOrderModel();
|
||||
giftCardsOrderModel.id = const Uuid().v4();
|
||||
giftCardsOrderModel.giftId = selectedGiftCard.value.id.toString();
|
||||
@@ -136,8 +137,8 @@ class GiftCardController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: giftCardsOrderModel.id,
|
||||
note: "Gift card purchase amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Gift card purchase amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
);
|
||||
|
||||
await FireStoreUtils.setWalletTransaction(transactionModel).then((
|
||||
@@ -154,7 +155,7 @@ class GiftCardController extends GetxController {
|
||||
await FireStoreUtils.placeGiftCardOrder(giftCardsOrderModel);
|
||||
ShowToastDialog.closeLoader();
|
||||
Get.off(const HistoryGiftCard());
|
||||
ShowToastDialog.showToast("Gift card Purchases successfully".tr());
|
||||
ShowToastDialog.showToast("Gift card Purchases successfully".tr);
|
||||
}
|
||||
|
||||
String generateGiftCode() {
|
||||
@@ -371,7 +372,7 @@ class GiftCardController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -454,10 +455,10 @@ class GiftCardController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -486,15 +487,15 @@ class GiftCardController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -536,10 +537,10 @@ class GiftCardController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -573,11 +574,11 @@ class GiftCardController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -605,15 +606,15 @@ class GiftCardController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
placeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -759,7 +760,7 @@ class GiftCardController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -796,18 +797,18 @@ class GiftCardController extends GetxController {
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
//Midtrans payment
|
||||
@@ -820,10 +821,10 @@ class GiftCardController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -864,7 +865,7 @@ class GiftCardController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -907,13 +908,13 @@ class GiftCardController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -951,7 +952,7 @@ class GiftCardController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1002,7 +1003,7 @@ class GiftCardController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1028,11 +1029,11 @@ class GiftCardController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
placeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import 'package:customer/models/currency_model.dart';
|
||||
import 'package:customer/models/user_model.dart';
|
||||
import 'package:customer/utils/notification_service.dart';
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/collection_name.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/gift_cards_order_model.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:share_plus/share_plus.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
|
||||
class HistoryGiftCardController extends GetxController {
|
||||
RxList<GiftCardsOrderModel> giftCardsOrderList = <GiftCardsOrderModel>[].obs;
|
||||
@@ -40,7 +40,7 @@ class HistoryGiftCardController extends GetxController {
|
||||
Timestamp date,
|
||||
) async {
|
||||
await Share.share(
|
||||
"${'Gift Code :'.tr()} $giftCode\n${'Gift Pin :'.tr()} $giftPin\n${'Price :'.tr()} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr()} ${date.toDate()}\n\n${'Message'.tr()} : $msg",
|
||||
"${'Gift Code :'.tr} $giftCode\n${'Gift Pin :'.tr} $giftPin\n${'Price :'.tr} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr} ${date.toDate()}\n\n${'Message'.tr} : $msg",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import 'package:customer/models/vendor_model.dart';
|
||||
import 'package:customer/service/cart_provider.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/constant.dart';
|
||||
|
||||
class HomeECommerceController extends GetxController {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'dart:developer';
|
||||
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../models/banner_model.dart';
|
||||
import '../models/parcel_category.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
@@ -6,7 +6,7 @@ import 'package:customer/models/order_model.dart';
|
||||
import 'package:customer/models/user_model.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:latlong2/latlong.dart' as location;
|
||||
import 'package:flutter_map/flutter_map.dart' as flutterMap;
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import 'dart:convert';
|
||||
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_sign_in/google_sign_in.dart';
|
||||
import 'package:sign_in_with_apple/sign_in_with_apple.dart';
|
||||
import '../constant/constant.dart';
|
||||
@@ -33,18 +34,18 @@ class LoginController extends GetxController {
|
||||
final email = emailController.value.text.trim();
|
||||
final password = passwordController.value.text.trim();
|
||||
if (email.isEmpty || !email.contains('@')) {
|
||||
ShowToastDialog.showToast("Please enter a valid email address".tr());
|
||||
ShowToastDialog.showToast("Please enter a valid email address".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
if (password.isEmpty) {
|
||||
ShowToastDialog.showToast("Please enter your password".tr());
|
||||
ShowToastDialog.showToast("Please enter your password".tr);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
isLoading.value = true;
|
||||
ShowToastDialog.showLoader("Logging in...".tr());
|
||||
ShowToastDialog.showLoader("Logging in...".tr);
|
||||
|
||||
final credential = await FirebaseAuth.instance.signInWithEmailAndPassword(
|
||||
email: email,
|
||||
@@ -69,34 +70,34 @@ class LoginController extends GetxController {
|
||||
|
||||
Constant.selectedLocation = defaultAddress;
|
||||
|
||||
Get.offAll(() => const ServiceListScreen());
|
||||
Get.offAll(ServiceListScreen());
|
||||
} else {
|
||||
Get.offAll(() => const LocationPermissionScreen());
|
||||
Get.offAll(LocationPermissionScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user is disabled. Please contact admin.".tr(),
|
||||
"This user is disabled. Please contact admin.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user does not exist in the customer app.".tr(),
|
||||
"This user does not exist in the customer app.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} on FirebaseAuthException catch (e) {
|
||||
if (e.code == 'user-not-found') {
|
||||
ShowToastDialog.showToast("No user found for that email.".tr());
|
||||
ShowToastDialog.showToast("No user found for that email.".tr);
|
||||
} else if (e.code == 'wrong-password') {
|
||||
ShowToastDialog.showToast("Wrong password provided.".tr());
|
||||
ShowToastDialog.showToast("Wrong password provided.".tr);
|
||||
} else if (e.code == 'invalid-email') {
|
||||
ShowToastDialog.showToast("Invalid email.".tr());
|
||||
ShowToastDialog.showToast("Invalid email.".tr);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
e.message?.tr() ?? "Login failed. Please try again.".tr(),
|
||||
e.message?.tr ?? "Login failed. Please try again.".tr,
|
||||
);
|
||||
}
|
||||
} finally {
|
||||
@@ -106,7 +107,7 @@ class LoginController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> loginWithGoogle() async {
|
||||
ShowToastDialog.showLoader("please wait...".tr());
|
||||
ShowToastDialog.showLoader("please wait...".tr);
|
||||
await signInWithGoogle().then((value) async {
|
||||
ShowToastDialog.closeLoader();
|
||||
if (value != null) {
|
||||
@@ -148,23 +149,23 @@ class LoginController extends GetxController {
|
||||
|
||||
Constant.selectedLocation = defaultAddress;
|
||||
|
||||
Get.offAll(() => const ServiceListScreen());
|
||||
Get.offAll(ServiceListScreen());
|
||||
} else {
|
||||
Get.offAll(() => const LocationPermissionScreen());
|
||||
Get.offAll(LocationPermissionScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user is disabled. Please contact admin.".tr(),
|
||||
"This user is disabled. Please contact admin.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user does not exist in the customer app.".tr(),
|
||||
"This user does not exist in the customer app.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} else {
|
||||
UserModel userModel = UserModel();
|
||||
@@ -186,7 +187,7 @@ class LoginController extends GetxController {
|
||||
}
|
||||
|
||||
Future<void> loginWithApple() async {
|
||||
ShowToastDialog.showLoader("please wait...".tr());
|
||||
ShowToastDialog.showLoader("please wait...".tr);
|
||||
await signInWithApple().then((value) async {
|
||||
ShowToastDialog.closeLoader();
|
||||
if (value != null) {
|
||||
@@ -231,23 +232,23 @@ class LoginController extends GetxController {
|
||||
);
|
||||
|
||||
Constant.selectedLocation = defaultAddress;
|
||||
Get.offAll(() => const ServiceListScreen());
|
||||
Get.offAll(ServiceListScreen());
|
||||
} else {
|
||||
Get.offAll(() => const LocationPermissionScreen());
|
||||
Get.offAll(LocationPermissionScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user is disabled. Please contact admin.".tr(),
|
||||
"This user is disabled. Please contact admin.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} else {
|
||||
await FirebaseAuth.instance.signOut();
|
||||
ShowToastDialog.showToast(
|
||||
"This user does not exist in the customer app.".tr(),
|
||||
"This user does not exist in the customer app.".tr,
|
||||
);
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
}
|
||||
} else {
|
||||
// User not in DB → go to signup
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'dart:typed_data';
|
||||
import 'package:customer/constant/constant.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_map/flutter_map.dart' as flutterMap;
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:latlong2/latlong.dart' as location;
|
||||
import '../screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../constant/constant.dart';
|
||||
import '../screen_ui/auth_screens/otp_verification_screen.dart';
|
||||
|
||||
@@ -21,13 +21,13 @@ class MobileLoginController extends GetxController {
|
||||
|
||||
if (mobile.isEmpty || mobile.length != 10) {
|
||||
ShowToastDialog.showToast(
|
||||
"Please enter a valid 10-digit mobile number".tr(),
|
||||
"Please enter a valid 10-digit mobile number".tr,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
ShowToastDialog.showLoader("Sending OTP...".tr());
|
||||
ShowToastDialog.showLoader("Sending OTP...".tr);
|
||||
|
||||
await _auth.verifyPhoneNumber(
|
||||
phoneNumber: '$countryCode$mobile',
|
||||
@@ -37,10 +37,10 @@ class MobileLoginController extends GetxController {
|
||||
verificationFailed: (FirebaseAuthException e) {
|
||||
ShowToastDialog.closeLoader();
|
||||
if (e.code == 'invalid-phone-number') {
|
||||
ShowToastDialog.showToast("Invalid phone number".tr());
|
||||
ShowToastDialog.showToast("Invalid phone number".tr);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
e.message ?? "OTP verification failed".tr(),
|
||||
e.message ?? "OTP verification failed".tr,
|
||||
);
|
||||
}
|
||||
},
|
||||
@@ -57,13 +57,13 @@ class MobileLoginController extends GetxController {
|
||||
},
|
||||
codeAutoRetrievalTimeout: (String verificationId) {
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast("OTP timed out. Please try again.".tr());
|
||||
ShowToastDialog.showToast("OTP timed out. Please try again.".tr);
|
||||
// Optional: Handle timeout
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
ShowToastDialog.closeLoader();
|
||||
ShowToastDialog.showToast("Something went wrong. Please try again.".tr());
|
||||
ShowToastDialog.showToast("Something went wrong. Please try again.".tr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../models/onprovider_order_model.dart';
|
||||
import '../models/worker_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
@@ -34,12 +34,12 @@ import 'package:customer/payment/xenditScreen.dart';
|
||||
import 'package:customer/service/fire_store_utils.dart';
|
||||
import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_paypal/flutter_paypal.dart';
|
||||
import 'package:flutter_stripe/flutter_stripe.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:razorpay_flutter/razorpay_flutter.dart';
|
||||
@@ -139,13 +139,13 @@ class MyCabBookingController extends GetxController {
|
||||
String getLocalizedTabTitle(String tabKey) {
|
||||
switch (tabKey) {
|
||||
case "New":
|
||||
return "New".tr();
|
||||
return "New".tr;
|
||||
case "On Going":
|
||||
return "On Going".tr();
|
||||
return "On Going".tr;
|
||||
case "Completed":
|
||||
return "Completed".tr();
|
||||
return "Completed".tr;
|
||||
case "Cancelled":
|
||||
return "Cancelled".tr();
|
||||
return "Cancelled".tr;
|
||||
default:
|
||||
return tabKey;
|
||||
}
|
||||
@@ -219,7 +219,7 @@ class MyCabBookingController extends GetxController {
|
||||
if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
|
||||
selectedOrder.value.paymentMethod = selectedPaymentMethod.value;
|
||||
await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment method changed".tr());
|
||||
ShowToastDialog.showToast("Payment method changed".tr);
|
||||
Get.back();
|
||||
});
|
||||
} else {
|
||||
@@ -237,8 +237,8 @@ class MyCabBookingController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: selectedOrder.value.id,
|
||||
note: "Cab Amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Cab Amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
serviceType: Constant.parcelServiceType,
|
||||
);
|
||||
|
||||
@@ -253,7 +253,7 @@ class MyCabBookingController extends GetxController {
|
||||
}
|
||||
selectedOrder.value.paymentStatus = true;
|
||||
await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
Get.back();
|
||||
});
|
||||
}
|
||||
@@ -348,7 +348,7 @@ class MyCabBookingController extends GetxController {
|
||||
if (paymentIntentData!.containsKey("error")) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
} else {
|
||||
await Stripe.instance.initPaymentSheet(
|
||||
@@ -381,7 +381,7 @@ class MyCabBookingController extends GetxController {
|
||||
Future<void> displayStripePaymentSheet({required String amount}) async {
|
||||
try {
|
||||
await Stripe.instance.presentPaymentSheet().then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
});
|
||||
} on StripeException catch (e) {
|
||||
@@ -464,10 +464,10 @@ class MyCabBookingController extends GetxController {
|
||||
final data = jsonDecode(response.body);
|
||||
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -499,15 +499,15 @@ class MyCabBookingController extends GetxController {
|
||||
note: "Contact us for any questions on your order.",
|
||||
onSuccess: (Map params) async {
|
||||
completeOrder();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
},
|
||||
onError: (error) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
onCancel: (params) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -534,15 +534,15 @@ class MyCabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -585,10 +585,10 @@ class MyCabBookingController extends GetxController {
|
||||
value,
|
||||
) {
|
||||
if (value) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -622,11 +622,11 @@ class MyCabBookingController extends GetxController {
|
||||
);
|
||||
if (isDone) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed".tr());
|
||||
ShowToastDialog.showToast("Payment Failed".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -754,7 +754,7 @@ class MyCabBookingController extends GetxController {
|
||||
data["body"]["txnToken"].toString().isEmpty) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
}
|
||||
return GetPaymentTxtTokenModel.fromJson(data);
|
||||
@@ -791,18 +791,18 @@ class MyCabBookingController extends GetxController {
|
||||
|
||||
void handlePaymentSuccess(PaymentSuccessResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
}
|
||||
|
||||
void handleExternalWaller(ExternalWalletResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr());
|
||||
ShowToastDialog.showToast("Payment Processing!! via".tr);
|
||||
}
|
||||
|
||||
void handlePaymentError(PaymentFailureResponse response) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr());
|
||||
ShowToastDialog.showToast("Payment Failed!!".tr);
|
||||
}
|
||||
|
||||
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
|
||||
@@ -820,10 +820,10 @@ class MyCabBookingController extends GetxController {
|
||||
if (url != '') {
|
||||
Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -864,7 +864,7 @@ class MyCabBookingController extends GetxController {
|
||||
return responseData['payment_url'];
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"something went wrong, please contact admin.".tr(),
|
||||
"something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -907,13 +907,13 @@ class MyCabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -951,7 +951,7 @@ class MyCabBookingController extends GetxController {
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1002,7 +1002,7 @@ class MyCabBookingController extends GetxController {
|
||||
}
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
"Something went wrong, please contact admin.".tr(),
|
||||
"Something went wrong, please contact admin.".tr,
|
||||
);
|
||||
return '';
|
||||
}
|
||||
@@ -1028,11 +1028,11 @@ class MyCabBookingController extends GetxController {
|
||||
),
|
||||
)!.then((value) {
|
||||
if (value == true) {
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Successful!!".tr);
|
||||
completeOrder();
|
||||
();
|
||||
} else {
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr());
|
||||
ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/controllers/theme_controller.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
import 'package:customer/utils/preferences.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
class MyProfileController extends GetxController {
|
||||
|
||||
@@ -4,8 +4,8 @@ import 'package:customer/constant/constant.dart';
|
||||
import 'package:customer/models/wallet_transaction_model.dart';
|
||||
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
|
||||
import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
|
||||
import 'package:get/get.dart';
|
||||
import '../models/rental_order_model.dart';
|
||||
import '../models/tax_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
@@ -157,7 +157,7 @@ class MyRentalBookingController extends GetxController {
|
||||
if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
|
||||
selectedOrder.value.paymentMethod = selectedPaymentMethod.value;
|
||||
await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment method changed".tr());
|
||||
ShowToastDialog.showToast("Payment method changed".tr);
|
||||
Get.back();
|
||||
Get.back();
|
||||
});
|
||||
@@ -174,8 +174,8 @@ class MyRentalBookingController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
isTopup: false,
|
||||
orderId: selectedOrder.value.id,
|
||||
note: "Rental Amount debited".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Rental Amount debited".tr,
|
||||
paymentStatus: "success".tr,
|
||||
serviceType: Constant.parcelServiceType,
|
||||
);
|
||||
|
||||
@@ -192,7 +192,7 @@ class MyRentalBookingController extends GetxController {
|
||||
}
|
||||
|
||||
await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) {
|
||||
ShowToastDialog.showToast("Payment successfully".tr());
|
||||
ShowToastDialog.showToast("Payment successfully".tr);
|
||||
Get.back();
|
||||
Get.back();
|
||||
});
|
||||
@@ -290,8 +290,8 @@ class MyRentalBookingController extends GetxController {
|
||||
isTopup: true,
|
||||
// refund
|
||||
orderId: order.id,
|
||||
note: "Refund for cancelled booking".tr(),
|
||||
paymentStatus: "success".tr(),
|
||||
note: "Refund for cancelled booking".tr,
|
||||
paymentStatus: "success".tr,
|
||||
serviceType: Constant.parcelServiceType,
|
||||
);
|
||||
|
||||
@@ -301,9 +301,9 @@ class MyRentalBookingController extends GetxController {
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
);
|
||||
}
|
||||
ShowToastDialog.showToast("Booking cancelled successfully".tr());
|
||||
ShowToastDialog.showToast("Booking cancelled successfully".tr);
|
||||
} catch (e) {
|
||||
ShowToastDialog.showToast("Failed to cancel booking: $e".tr());
|
||||
ShowToastDialog.showToast("Failed to cancel booking: $e".tr);
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../models/on_boarding_model.dart';
|
||||
import '../service/fire_store_utils.dart';
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user