diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 43024b7..c49ad18 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
plugins {
id("com.android.application")
// START: FlutterFire Configuration
@@ -8,8 +11,14 @@ plugins {
id("dev.flutter.flutter-gradle-plugin")
}
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
android {
- namespace = "com.emart.customer"
+ namespace = "felix.fondex.uz"
compileSdk = 36
ndkVersion = flutter.ndkVersion
@@ -25,7 +34,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId = "com.emart.customer"
+ applicationId = "felix.fondex.uz"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = 26
@@ -34,11 +43,20 @@ android {
versionName = flutter.versionName
}
+ signingConfigs {
+ create("release") {
+ keyAlias = keystoreProperties["keyAlias"] as String
+ keyPassword = keystoreProperties["keyPassword"] as String
+ storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+ storePassword = keystoreProperties["storePassword"] as String
+ }
+ }
+
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig = signingConfigs.getByName("debug")
+ signingConfig = signingConfigs.getByName("release")
isMinifyEnabled = false
isShrinkResources = false
}
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 4d10887..3b964b4 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -8,9 +8,9 @@
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:893074789710:android:05002c15a64cf1e0c4ba1f",
+ "mobilesdk_app_id": "1:893074789710:android:70c2e98114a8ef1ac4ba1f",
"android_client_info": {
- "package_name": "com.emart.customer"
+ "package_name": "felix.fondex.driver"
}
},
"oauth_client": [
@@ -32,10 +32,46 @@
"client_type": 3
},
{
- "client_id": "893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com",
+ "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
- "bundle_id": "com.emart.customer"
+ "bundle_id": "com.emart.driver"
+ }
+ }
+ ]
+ }
+ }
+ },
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:893074789710:android:e932bc88da6665b3c4ba1f",
+ "android_client_info": {
+ "package_name": "felix.fondex.uz"
+ }
+ },
+ "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"
}
}
]
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 305ac58..1121885 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
-
+
@@ -46,14 +46,14 @@
+ android:scheme="felix.fondex.uz" />
@@ -102,7 +102,7 @@
+ android:scheme="felix.fondex.uz" />
diff --git a/android/app/src/main/kotlin/com/emart/customer/MainActivity.kt b/android/app/src/main/kotlin/com/emart/customer/MainActivity.kt
index 21c78d3..af32cc7 100644
--- a/android/app/src/main/kotlin/com/emart/customer/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/emart/customer/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.emart.customer
+package felix.fondex.uz
import io.flutter.embedding.android.FlutterFragmentActivity
diff --git a/android/app/src/main/res/ic_launcher-web.png b/android/app/src/main/res/ic_launcher-web.png
new file mode 100644
index 0000000..97553a3
Binary files /dev/null and b/android/app/src/main/res/ic_launcher-web.png differ
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 345888d..79d695e 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,4 @@
-
-
+
-
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..79d695e
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index c18ca62..4db8057 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 328a8d4..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 0edd7e3..c4efae6 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 0edd7e3..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..c514656
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png
new file mode 100644
index 0000000..2c35d1c
Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png
new file mode 100644
index 0000000..44892be
Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index b4f1709..ff032c6 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 3d14d2d..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 13a4c4f..e659390 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 13a4c4f..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..b52b03b
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 3cb9936..fc6063d 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index e7f70bb..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index ac80499..ccf837d 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index ac80499..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..6265150
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 0ad321f..8f64f98 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index e1a9322..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 0f79dc8..f9f903b 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 0f79dc8..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1a70683
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 89b8d05..62a0b51 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 2ffee54..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index d3a6e5b..263b3ed 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index d3a6e5b..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..bdf769a
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/play_store_512.png b/android/app/src/main/res/play_store_512.png
deleted file mode 100644
index f0c67d2..0000000
Binary files a/android/app/src/main/res/play_store_512.png and /dev/null differ
diff --git a/android/app/src/main/res/playstore-icon.png b/android/app/src/main/res/playstore-icon.png
new file mode 100644
index 0000000..566d741
Binary files /dev/null and b/android/app/src/main/res/playstore-icon.png differ
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..4db2c8a
--- /dev/null
+++ b/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,3 @@
+
+ #ff643c
+
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
deleted file mode 100644
index d2aa524..0000000
--- a/android/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index afa1e8e..efdcc4a 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 36fd3a3..c4b6403 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -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
diff --git a/assets/images/click_logo.png b/assets/images/click_logo.png
new file mode 100644
index 0000000..1709cdb
Binary files /dev/null and b/assets/images/click_logo.png differ
diff --git a/assets/images/cosmetics_img.png b/assets/images/cosmetics_img.png
new file mode 100644
index 0000000..b4e7a00
Binary files /dev/null and b/assets/images/cosmetics_img.png differ
diff --git a/assets/images/delivery_img.png b/assets/images/delivery_img.png
new file mode 100644
index 0000000..cedb056
Binary files /dev/null and b/assets/images/delivery_img.png differ
diff --git a/assets/images/fondex_logo.png b/assets/images/fondex_logo.png
new file mode 100644
index 0000000..50fc8f2
Binary files /dev/null and b/assets/images/fondex_logo.png differ
diff --git a/assets/images/fondex_logo_main.png b/assets/images/fondex_logo_main.png
new file mode 100644
index 0000000..5d701dd
Binary files /dev/null and b/assets/images/fondex_logo_main.png differ
diff --git a/assets/images/food_img.png b/assets/images/food_img.png
new file mode 100644
index 0000000..b7e9b5c
Binary files /dev/null and b/assets/images/food_img.png differ
diff --git a/assets/images/garderob_img.png b/assets/images/garderob_img.png
new file mode 100644
index 0000000..ef351e1
Binary files /dev/null and b/assets/images/garderob_img.png differ
diff --git a/assets/images/ic_pick_drop_location.png b/assets/images/ic_pick_drop_location.png
new file mode 100644
index 0000000..f384623
Binary files /dev/null and b/assets/images/ic_pick_drop_location.png differ
diff --git a/assets/images/keys_img.png b/assets/images/keys_img.png
new file mode 100644
index 0000000..9a7c835
Binary files /dev/null and b/assets/images/keys_img.png differ
diff --git a/assets/images/location_indicatorl b/assets/images/location_indicatorl
new file mode 100644
index 0000000..a48f948
Binary files /dev/null and b/assets/images/location_indicatorl differ
diff --git a/assets/images/money_logo.png b/assets/images/money_logo.png
new file mode 100644
index 0000000..b8b8421
Binary files /dev/null and b/assets/images/money_logo.png differ
diff --git a/assets/images/outer_city_taxi_option.png b/assets/images/outer_city_taxi_option.png
new file mode 100644
index 0000000..0af0c0d
Binary files /dev/null and b/assets/images/outer_city_taxi_option.png differ
diff --git a/assets/images/payme_logo.png b/assets/images/payme_logo.png
new file mode 100644
index 0000000..5e33868
Binary files /dev/null and b/assets/images/payme_logo.png differ
diff --git a/assets/images/products_img.png b/assets/images/products_img.png
new file mode 100644
index 0000000..85e4a3b
Binary files /dev/null and b/assets/images/products_img.png differ
diff --git a/assets/images/taxi_img.png b/assets/images/taxi_img.png
new file mode 100644
index 0000000..58bfadf
Binary files /dev/null and b/assets/images/taxi_img.png differ
diff --git a/assets/images/taxi_option.png b/assets/images/taxi_option.png
new file mode 100644
index 0000000..340f726
Binary files /dev/null and b/assets/images/taxi_option.png differ
diff --git a/assets/translations/en.json b/assets/translations/en.json
new file mode 100644
index 0000000..eb8d5ad
--- /dev/null
+++ b/assets/translations/en.json
@@ -0,0 +1,157 @@
+{
+ "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}",
+ "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"
+
+}
\ No newline at end of file
diff --git a/assets/translations/ru.json b/assets/translations/ru.json
new file mode 100644
index 0000000..cf45701
--- /dev/null
+++ b/assets/translations/ru.json
@@ -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": "Выберите предпочитаемый язык для персонализированного использования приложения."
+}
diff --git a/assets/translations/uz.json b/assets/translations/uz.json
new file mode 100644
index 0000000..e8c3ee2
--- /dev/null
+++ b/assets/translations/uz.json
@@ -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."
+}
diff --git a/firebase.json b/firebase.json
index 88cc8d5..0e7803d 100644
--- a/firebase.json
+++ b/firebase.json
@@ -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"}}}}}
\ No newline at end of file
+{"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"}}}}}
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d3ba75c..bfc088c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -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
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 844309b..108d164 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -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 = com.emart.customer;
+ 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;
@@ -521,7 +526,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+ PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -539,7 +544,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+ PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -555,7 +560,7 @@
CURRENT_PROJECT_VERSION = 1;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
- PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+ PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uzRunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -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 = com.emart.customer;
+ 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 = com.emart.customer;
+ 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;
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png
deleted file mode 100644
index eeb78fa..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png
deleted file mode 100644
index eeb78fa..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png
deleted file mode 100644
index bb3559a..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png
deleted file mode 100644
index 9cdf922..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png
deleted file mode 100644
index 49f84fc..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png
deleted file mode 100644
index 4fb59b2..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png
deleted file mode 100644
index 4fb59b2..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png
deleted file mode 100644
index 42f31df..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png
deleted file mode 100644
index 49f84fc..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png
deleted file mode 100644
index 17c0afc..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png
deleted file mode 100644
index 17c0afc..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png
deleted file mode 100644
index 3fa4f47..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png
deleted file mode 100644
index eeb78fa..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png
deleted file mode 100644
index 3fa4f47..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png
deleted file mode 100644
index a9c049e..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png
deleted file mode 100644
index 260eb41..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png
deleted file mode 100644
index 3fa4f47..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png
deleted file mode 100644
index d96554e..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png
deleted file mode 100644
index a9c049e..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png
deleted file mode 100644
index c231fe8..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png
deleted file mode 100644
index 812adc6..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index bd04914..0344229 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -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
}
-}
\ No newline at end of file
+}
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 0000000..663f227
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 0000000..c45bdd3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 0000000..1df2afc
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 0000000..321eaed
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 0000000..9e006cf
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 0000000..fe6cc25
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 0000000..c45bdd3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 0000000..f27f1aa
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 0000000..e4f0355
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 0000000..e4f0355
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 0000000..666179c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 0000000..aaf36f3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 0000000..40018a3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 0000000..dfcac43
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
new file mode 100644
index 0000000..2e5a3d8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..73c0059
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
index 59544f2..87acab5 100644
--- a/ios/Runner/GoogleService-Info.plist
+++ b/ios/Runner/GoogleService-Info.plist
@@ -3,9 +3,9 @@
CLIENT_ID
- 893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com
+ 893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3
+ com.googleusercontent.apps.893074789710-tgc677brhj8902uu2nv6k53otbhbnp1e
API_KEY
AIzaSyD6Khoz4y93GCj3mOPi2FoluDipplH1av0
GCM_SENDER_ID
@@ -13,7 +13,7 @@
PLIST_VERSION
1
BUNDLE_ID
- com.emart.customer
+ uz.felix.fondex.customer
PROJECT_ID
fondexuzb
STORAGE_BUCKET
@@ -29,7 +29,7 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:893074789710:ios:510ebf9e4ebed6a8c4ba1f
+ 1:893074789710:ios:7dd456b65070f325c4ba1f
DATABASE_URL
https://fondexuzb-default-rtdb.firebaseio.com
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index b6fcdcb..3cab40b 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,51 +2,24 @@
- MinimumOSVersion
- 15.0
- CFBundleURLTypes
-
-
- CFBundleTypeRole
- Editor
- CFBundleURLSchemes
-
- com.googleusercontent.apps.841077018919-978flnqdu54q5lb5e56od2jr2oha90ll
-
-
-
-
- GIDClientID
- 841077018919-978flnqdu54q5lb5e56od2jr2oha90ll.apps.googleusercontent.com
-
- NSCameraUsageDescription
- This app needs access to camera permission
- NSLocationAlwaysAndWhenInUseUsageDescription
- This app needs access to location when open and in the background.
- NSLocationAlwaysUsageDescription
- This app needs access to location when in the background.
- NSLocationWhenInUseUsageDescription
- This app needs access to location when open.
- NSMicrophoneUsageDescription
- Used to capture audio for image picker plugin
- NSPhotoLibraryUsageDescription
- This app needs access to your gallery photo.
- UIBackgroundModes
-
- fetch
- remote-notification
-
-
+ CADisableMinimumFrameDurationOnPhone
+
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
- Customer
+ Fondex
CFBundleExecutable
$(EXECUTABLE_NAME)
CFBundleIdentifier
$(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
+ CFBundleLocalizations
+
+ en
+ ru
+ uz
+
CFBundleName
customer
CFBundlePackageType
@@ -55,10 +28,44 @@
$(FLUTTER_BUILD_NAME)
CFBundleSignature
????
+ CFBundleURLTypes
+
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLSchemes
+
+ com.googleusercontent.apps.841077018919-978flnqdu54q5lb5e56od2jr2oha90ll
+
+
+
CFBundleVersion
$(FLUTTER_BUILD_NUMBER)
+ GIDClientID
+ 841077018919-978flnqdu54q5lb5e56od2jr2oha90ll.apps.googleusercontent.com
LSRequiresIPhoneOS
+ MinimumOSVersion
+ 15.0
+ NSCameraUsageDescription
+ This app needs access to camera permission
+ NSLocationAlwaysAndWhenInUseUsageDescription
+ This app needs access to location when open and in the background.
+ NSLocationAlwaysUsageDescription
+ This app needs access to location when in the background.
+ NSLocationWhenInUseUsageDescription
+ This app needs access to location when open.
+ NSMicrophoneUsageDescription
+ Used to capture audio for image picker plugin
+ NSPhotoLibraryUsageDescription
+ This app needs access to your gallery photo.
+ UIApplicationSupportsIndirectInputEvents
+
+ UIBackgroundModes
+
+ fetch
+ remote-notification
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -76,9 +83,5 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
diff --git a/lib/constant/const_texts.dart b/lib/constant/const_texts.dart
new file mode 100644
index 0000000..b44803e
--- /dev/null
+++ b/lib/constant/const_texts.dart
@@ -0,0 +1,163 @@
+class ConstTexts {
+ static String loginToExplore = "loginToExplore";
+ static String emailAddress = "emailAddress";
+ static String password = "password";
+ static String enterPassword = "enterPassword";
+ static String forgotPassword = "forgotPassword";
+ static String login = "login";
+ static String orContinueWith = "orContinueWith";
+ static String mobileNumber = "mobileNumber";
+ static String withGoogle = "withGoogle";
+ static String withApple = "withApple";
+ static String dontHaveAccount = "dontHaveAccount";
+ static String signUp = "signUp";
+ static String skip = "skip";
+ static String signUpToExplore = "signUpToExplore";
+ static String firstName = "firstName";
+ static String lastName = "lastName";
+ static String enterMobileNumber = "enterMobileNumber";
+ static String confirmPassword = "confirmPassword";
+ static String enterConfirmPassword = "enterConfirmPassword";
+ static String referralCode = "referralCode";
+ static String enterReferralCode = "enterReferralCode";
+ static String alreadyHaveAccount = "alreadyHaveAccount";
+ static String enterYourregisteredEmail = "enterYourregisteredEmail";
+ static String sendLink = "sendLink";
+ static String rememberPassword = "rememberPassword";
+ static String enterOtpSent = "enterOtpSent";
+ static String resendOTP = "resendOTP";
+ static String verify = "verify";
+ static String useYourMobileNumber = "useYourMobileNumber";
+ static String sendCode = "sendCode";
+ static String serviceIsUnavailable = "serviceIsUnavailable";
+ static String pickUpLocation = "pickUpLocation";
+ static String destinationLocation = "destinationLocation";
+ static String continueT = "continue";
+ static String plsSelectSourceLocation = "plsSelectSourceLocation";
+ static String plsSelectDestinationLocations = "plsSelectDestinationLocations";
+ static String selectVehicleType = "selectVehicleType";
+ static String plsSelectVehicleTypeFirst = "plsSelectVehicleTypeFirst";
+ static String plsSelectPaymentMethod = "plsSelectPaymentMethod";
+ static String insufficientWallet = "insufficientWallet";
+ static String promoCode = "promoCode";
+ static String thisOfferNotEligible = "thisOfferNotEligible";
+ static String viewAll = "viewAll";
+ static String writeCoupon = "writeCoupon";
+ static String redeemNow = "redeemNow";
+ static String plsEnterCouponCode = "plsEnterCouponCode";
+ static String couponApplied = "couponApplied";
+ static String couponExpired = "couponExpired";
+ static String invalidCouponCode = "invalidCouponCode";
+ static String orderSummary = "orderSummary";
+ static String subtotal = "subtotal";
+ static String discount = "discount";
+ static String orderTotal = "orderTotal";
+ static String confirmBooking = "confirmBooking";
+ static String waitingForDriver = "waitingForDriver";
+ static String cancelRide = "cancelRide";
+ static String riderCancelledSucces = "riderCancelledSucces";
+ static String failedToCancel = "failedToCancel";
+ static String pleaseWait = "pleaseWait";
+ static String change = "change";
+ static String yourSosRequest = "yourSosRequest";
+ 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 orderId = "orderId";
+ static String bookingData = "bookingData";
+ static String rideAndFareSummary = "rideAndFareSummary";
+ static String updateReview = "updateReview";
+ static String addReview = "addReview";
+ static String complain = "complain";
+ static String distance = "distance";
+ static String km = "km";
+ static String duration = "duration";
+ static String howWasTrip = "howWasTrip";
+ static String yourFeedbackWillHelp = "yourFeedbackWillHelp";
+ static String rateFor = "rateFor";
+ static String typeComment = "typeComment";
+ static String title = "title";
+ static String typeDescription = "typeDescription";
+ static String save = "save";
+ static String popularDestinations = "popularDestinations";
+ static String selectPaymentMethod = "selectPaymentMethod";
+ static String prefferedPayment = "prefferedPayment";
+ static String otherPaymentOptions = "otherPaymentOptions";
+ static String rideHistory = "rideHistory";
+ static String plsLoginToAcc = "plsLoginToAcc";
+ static String youAreNotLoggedIn = "youAreNotLoggedIn";
+ static String noOrderfound = "noOrderfound";
+ 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";
+}
diff --git a/lib/constant/constant.dart b/lib/constant/constant.dart
index 4d13a6b..10c4e2e 100644
--- a/lib/constant/constant.dart
+++ b/lib/constant/constant.dart
@@ -172,7 +172,10 @@ class Constant {
static bool checkZoneCheck(double latitude, double longLatitude) {
bool isZoneAvailable = false;
for (var element in Constant.zoneList) {
- if (Constant.isPointInPolygon(LatLng(latitude, longLatitude), element.area!)) {
+ if (Constant.isPointInPolygon(
+ LatLng(latitude, longLatitude),
+ element.area!,
+ )) {
isZoneAvailable = true;
break;
} else {
@@ -185,7 +188,10 @@ class Constant {
static String? getZoneId(double latitude, double longLatitude) {
String? zoneId;
for (var element in Constant.zoneList) {
- if (Constant.isPointInPolygon(LatLng(latitude, longLatitude), element.area!)) {
+ if (Constant.isPointInPolygon(
+ LatLng(latitude, longLatitude),
+ element.area!,
+ )) {
zoneId = element.id;
break;
}
@@ -198,13 +204,18 @@ class Constant {
return (rng.nextInt(900000) + 100000).toString(); // 6 digit
}
- static Future checkPermission({required BuildContext context, required Function() onTap}) async {
+ static Future checkPermission({
+ required BuildContext context,
+ required Function() onTap,
+ }) async {
LocationPermission permission = await Geolocator.checkPermission();
if (permission == LocationPermission.denied) {
permission = await Geolocator.requestPermission();
}
if (permission == LocationPermission.denied) {
- ShowToastDialog.showToast("You have to allow location permission to use your location");
+ ShowToastDialog.showToast(
+ "You have to allow location permission to use your location",
+ );
} else if (permission == LocationPermission.deniedForever) {
showDialog(
context: context,
@@ -241,7 +252,10 @@ class Constant {
return isPlanExpire;
}
- static bool isExpireDate({required bool expiryDay, Timestamp? subscriptionExpiryDate}) {
+ static bool isExpireDate({
+ required bool expiryDay,
+ Timestamp? subscriptionExpiryDate,
+ }) {
bool isPlanExpire = false;
if (expiryDay == true) {
isPlanExpire = false;
@@ -301,17 +315,49 @@ class Constant {
String commission = "0";
if (sectionConstantModel!.adminCommision!.isEnabled == true) {
if (vendorModel.adminCommission == null) {
- if (sectionConstantModel!.adminCommision!.commissionType!.toLowerCase() == "Percent".toLowerCase() ||
- sectionConstantModel!.adminCommision!.commissionType?.toLowerCase() == "Percentage".toLowerCase()) {
- commission = (double.parse(price) + (double.parse(price) * double.parse(sectionConstantModel!.adminCommision!.amount.toString()) / 100)).toString();
+ if (sectionConstantModel!.adminCommision!.commissionType!
+ .toLowerCase() ==
+ "Percent".toLowerCase() ||
+ sectionConstantModel!.adminCommision!.commissionType
+ ?.toLowerCase() ==
+ "Percentage".toLowerCase()) {
+ commission =
+ (double.parse(price) +
+ (double.parse(price) *
+ double.parse(
+ sectionConstantModel!.adminCommision!.amount
+ .toString(),
+ ) /
+ 100))
+ .toString();
} else {
- commission = (double.parse(price) + double.parse(sectionConstantModel!.adminCommision!.amount.toString())).toString();
+ commission =
+ (double.parse(price) +
+ double.parse(
+ sectionConstantModel!.adminCommision!.amount.toString(),
+ ))
+ .toString();
}
} else {
- if (vendorModel.adminCommission!.commissionType!.toLowerCase() == "Percent".toLowerCase() || vendorModel.adminCommission!.commissionType?.toLowerCase() == "Percentage".toLowerCase()) {
- commission = (double.parse(price) + (double.parse(price) * double.parse(vendorModel.adminCommission!.amount.toString()) / 100)).toString();
+ if (vendorModel.adminCommission!.commissionType!.toLowerCase() ==
+ "Percent".toLowerCase() ||
+ vendorModel.adminCommission!.commissionType?.toLowerCase() ==
+ "Percentage".toLowerCase()) {
+ commission =
+ (double.parse(price) +
+ (double.parse(price) *
+ double.parse(
+ vendorModel.adminCommission!.amount.toString(),
+ ) /
+ 100))
+ .toString();
} else {
- commission = (double.parse(price) + double.parse(vendorModel.adminCommission!.amount.toString())).toString();
+ commission =
+ (double.parse(price) +
+ double.parse(
+ vendorModel.adminCommission!.amount.toString(),
+ ))
+ .toString();
}
}
} else {
@@ -327,7 +373,10 @@ class Constant {
if (taxModel.type == "fix") {
taxAmount = double.parse(taxModel.tax.toString());
} else {
- taxAmount = (double.parse(amount.toString()) * double.parse(taxModel.tax!.toString())) / 100;
+ taxAmount =
+ (double.parse(amount.toString()) *
+ double.parse(taxModel.tax!.toString())) /
+ 100;
}
}
return taxAmount;
@@ -336,8 +385,12 @@ class Constant {
static double calculateDiscount({String? amount, CouponModel? offerModel}) {
double taxAmount = 0.0;
if (offerModel != null) {
- if (offerModel.discountType == "Percentage" || offerModel.discountType == "percentage") {
- taxAmount = (double.parse(amount.toString()) * double.parse(offerModel.discount.toString())) / 100;
+ if (offerModel.discountType == "Percentage" ||
+ offerModel.discountType == "percentage") {
+ taxAmount =
+ (double.parse(amount.toString()) *
+ double.parse(offerModel.discount.toString())) /
+ 100;
} else {
taxAmount = double.parse(offerModel.discount.toString());
}
@@ -345,11 +398,17 @@ class Constant {
return taxAmount;
}
- static String calculateReview({required String? reviewCount, required String? reviewSum}) {
- if (0 == double.parse(reviewSum.toString()) && 0 == double.parse(reviewSum.toString())) {
+ static String calculateReview({
+ required String? reviewCount,
+ required String? reviewSum,
+ }) {
+ if (0 == double.parse(reviewSum.toString()) &&
+ 0 == double.parse(reviewSum.toString())) {
return "0";
}
- return (double.parse(reviewSum.toString()) / double.parse(reviewCount.toString())).toStringAsFixed(1);
+ return (double.parse(reviewSum.toString()) /
+ double.parse(reviewCount.toString()))
+ .toStringAsFixed(1);
}
static String getUuid() {
@@ -357,13 +416,24 @@ class Constant {
}
static Widget loader() {
- return Center(child: CircularProgressIndicator(color: AppThemeData.primary300));
+ return Center(
+ child: CircularProgressIndicator(color: AppThemeData.primary300),
+ );
}
static Widget showEmptyView({required String message}) {
final themeController = Get.find();
final isDark = themeController.isDark.value;
- return Center(child: Text(message, style: TextStyle(fontFamily: AppThemeData.fontFamily, fontSize: 18, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900)));
+ return Center(
+ child: Text(
+ message,
+ style: TextStyle(
+ fontFamily: AppThemeData.fontFamily,
+ fontSize: 18,
+ color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900,
+ ),
+ ),
+ );
}
static String maskingString(String documentId, int maskingDigit) {
@@ -382,7 +452,8 @@ class Constant {
}
String? validateEmail(String? value) {
- String pattern = r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
+ String pattern =
+ r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
RegExp regExp = RegExp(pattern);
if (value == null || value.isEmpty) {
return "Email is Required";
@@ -393,9 +464,19 @@ class Constant {
}
}
- static String getDistance({required String lat1, required String lng1, required String lat2, required String lng2}) {
+ static String getDistance({
+ required String lat1,
+ required String lng1,
+ required String lat2,
+ required String lng2,
+ }) {
double distance;
- double distanceInMeters = Geolocator.distanceBetween(double.parse(lat1), double.parse(lng1), double.parse(lat2), double.parse(lng2));
+ double distanceInMeters = Geolocator.distanceBetween(
+ double.parse(lat1),
+ double.parse(lng1),
+ double.parse(lat2),
+ double.parse(lng2),
+ );
if (distanceType == "miles") {
distance = distanceInMeters / 1609;
} else {
@@ -405,7 +486,8 @@ class Constant {
}
bool hasValidUrl(String? value) {
- String pattern = r'(http|https)://[\w-]+(\.[\w-]+)+([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?';
+ String pattern =
+ r'(http|https)://[\w-]+(\.[\w-]+)+([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?';
RegExp regExp = RegExp(pattern);
if (value == null || value.isEmpty) {
return false;
@@ -415,10 +497,17 @@ class Constant {
return true;
}
- static Future uploadUserImageToFireStorage(File image, String filePath, String fileName) async {
- Reference upload = FirebaseStorage.instance.ref().child('$filePath/$fileName');
+ static Future uploadUserImageToFireStorage(
+ File image,
+ String filePath,
+ String fileName,
+ ) async {
+ Reference upload = FirebaseStorage.instance.ref().child(
+ '$filePath/$fileName',
+ );
UploadTask uploadTask = upload.putFile(image);
- var downloadUrl = await (await uploadTask.whenComplete(() {})).ref.getDownloadURL();
+ var downloadUrl =
+ await (await uploadTask.whenComplete(() {})).ref.getDownloadURL();
return downloadUrl.toString();
}
@@ -435,14 +524,22 @@ class Constant {
Future getBytesFromAsset(String path, int width) async {
ByteData data = await rootBundle.load(path);
- ui.Codec codec = await ui.instantiateImageCodec(data.buffer.asUint8List(), targetWidth: width);
+ ui.Codec codec = await ui.instantiateImageCodec(
+ data.buffer.asUint8List(),
+ targetWidth: width,
+ );
ui.FrameInfo fi = await codec.getNextFrame();
- return (await fi.image.toByteData(format: ui.ImageByteFormat.png))!.buffer.asUint8List();
+ return (await fi.image.toByteData(
+ format: ui.ImageByteFormat.png,
+ ))!.buffer.asUint8List();
}
static Future selectTime(context) async {
FocusScope.of(context).requestFocus(FocusNode()); //remove focus
- TimeOfDay? newTime = await showTimePicker(context: context, initialTime: TimeOfDay.now());
+ TimeOfDay? newTime = await showTimePicker(
+ context: context,
+ initialTime: TimeOfDay.now(),
+ );
if (newTime != null) {
return newTime;
}
@@ -480,7 +577,11 @@ class Constant {
static int calculateDifference(DateTime date) {
DateTime now = DateTime.now();
- return DateTime(date.year, date.month, date.day).difference(DateTime(now.year, now.month, now.day)).inDays;
+ return DateTime(
+ date.year,
+ date.month,
+ date.day,
+ ).difference(DateTime(now.year, now.month, now.day)).inDays;
}
static String timestampToDate(Timestamp timestamp) {
@@ -509,7 +610,15 @@ class Constant {
}
static DateTime stringToDate(String openDineTime) {
- return DateFormat('HH:mm').parse(DateFormat('HH:mm').format(DateFormat("hh:mm a").parse((Intl.getCurrentLocale() == "en_US") ? openDineTime : openDineTime.toLowerCase())));
+ return DateFormat('HH:mm').parse(
+ DateFormat('HH:mm').format(
+ DateFormat("hh:mm a").parse(
+ (Intl.getCurrentLocale() == "en_US")
+ ? openDineTime
+ : openDineTime.toLowerCase(),
+ ),
+ ),
+ );
}
static LanguageModel getLanguage() {
@@ -527,7 +636,10 @@ class Constant {
int crossings = 0;
for (int i = 0; i < polygon.length; i++) {
int next = (i + 1) % polygon.length;
- if (polygon[i].latitude <= point.latitude && polygon[next].latitude > point.latitude || polygon[i].latitude > point.latitude && polygon[next].latitude <= point.latitude) {
+ if (polygon[i].latitude <= point.latitude &&
+ polygon[next].latitude > point.latitude ||
+ polygon[i].latitude > point.latitude &&
+ polygon[next].latitude <= point.latitude) {
double edgeLong = polygon[next].longitude - polygon[i].longitude;
double edgeLat = polygon[next].latitude - polygon[i].latitude;
double interpol = (point.latitude - polygon[i].latitude) / edgeLat;
@@ -549,7 +661,12 @@ class Constant {
allowInsecure: true,
);
- static Future sendMail({String? subject, String? body, bool? isAdmin = false, List? recipients}) async {
+ static Future sendMail({
+ String? subject,
+ String? body,
+ bool? isAdmin = false,
+ List? recipients,
+ }) async {
// Create our message.
if (mailSettings != null) {
if (isAdmin == true) {
@@ -557,7 +674,10 @@ class Constant {
}
final message =
Message()
- ..from = Address(mailSettings!.userName.toString(), mailSettings!.fromName.toString())
+ ..from = Address(
+ mailSettings!.userName.toString(),
+ mailSettings!.fromName.toString(),
+ )
..recipients = recipients!
..subject = subject
..text = body
@@ -581,10 +701,17 @@ class Constant {
// await connection.send(message);
}
- static Uri createCoordinatesUrl(double latitude, double longitude, [String? label]) {
+ static Uri createCoordinatesUrl(
+ double latitude,
+ double longitude, [
+ String? label,
+ ]) {
Uri uri;
if (kIsWeb) {
- uri = Uri.https('www.google.com', '/maps/search/', {'api': '1', 'query': '$latitude,$longitude'});
+ uri = Uri.https('www.google.com', '/maps/search/', {
+ 'api': '1',
+ 'query': '$latitude,$longitude',
+ });
} else if (Platform.isAndroid) {
var query = '$latitude,$longitude';
if (label != null) query += '($label)';
@@ -594,14 +721,18 @@ class Constant {
if (label != null) params['q'] = label;
uri = Uri.https('maps.apple.com', '/', params);
} else {
- uri = Uri.https('www.google.com', '/maps/search/', {'api': '1', 'query': '$latitude,$longitude'});
+ uri = Uri.https('www.google.com', '/maps/search/', {
+ 'api': '1',
+ 'query': '$latitude,$longitude',
+ });
}
return uri;
}
static Future sendOrderEmail({required OrderModel orderModel}) async {
- EmailTemplateModel? emailTemplateModel = await FireStoreUtils.getEmailTemplates(newOrderPlaced);
+ EmailTemplateModel? emailTemplateModel =
+ await FireStoreUtils.getEmailTemplates(newOrderPlaced);
if (emailTemplateModel != null) {
String firstHTML = """
@@ -618,11 +749,23 @@ class Constant {
""";
String newString = emailTemplateModel.message.toString();
- newString = newString.replaceAll("{username}", "${Constant.userModel!.firstName} ${Constant.userModel!.lastName}");
+ newString = newString.replaceAll(
+ "{username}",
+ "${Constant.userModel!.firstName} ${Constant.userModel!.lastName}",
+ );
newString = newString.replaceAll("{orderid}", orderModel.id.toString());
- newString = newString.replaceAll("{date}", DateFormat('yyyy-MM-dd').format(orderModel.createdAt!.toDate()));
- newString = newString.replaceAll("{address}", orderModel.address!.getFullAddress());
- newString = newString.replaceAll("{paymentmethod}", orderModel.paymentMethod.toString());
+ newString = newString.replaceAll(
+ "{date}",
+ DateFormat('yyyy-MM-dd').format(orderModel.createdAt!.toDate()),
+ );
+ newString = newString.replaceAll(
+ "{address}",
+ orderModel.address!.getFullAddress(),
+ );
+ newString = newString.replaceAll(
+ "{paymentmethod}",
+ orderModel.paymentMethod.toString(),
+ );
double deliveryCharge = 0.0;
double total = 0.0;
@@ -630,7 +773,8 @@ class Constant {
double discount = 0.0;
double taxAmount = 0.0;
double tipValue = 0.0;
- String specialLabel = '(${orderModel.specialDiscount!['special_discount_label']}${orderModel.specialDiscount!['specialType'] == "amount" ? currencyModel!.symbol : "%"})';
+ String specialLabel =
+ '(${orderModel.specialDiscount!['special_discount_label']}${orderModel.specialDiscount!['specialType'] == "amount" ? currencyModel!.symbol : "%"})';
List htmlList = [];
if (orderModel.deliveryCharge != null) {
@@ -640,15 +784,22 @@ class Constant {
tipValue = double.parse(orderModel.tipAmount.toString());
}
for (var element in orderModel.products!) {
- if (element.extrasPrice != null && element.extrasPrice!.isNotEmpty && double.parse(element.extrasPrice!) != 0.0) {
- total += double.parse(element.quantity.toString()) * double.parse(element.extrasPrice!);
+ if (element.extrasPrice != null &&
+ element.extrasPrice!.isNotEmpty &&
+ double.parse(element.extrasPrice!) != 0.0) {
+ total +=
+ double.parse(element.quantity.toString()) *
+ double.parse(element.extrasPrice!);
}
- total += double.parse(element.quantity.toString()) * double.parse(element.price.toString());
+ total +=
+ double.parse(element.quantity.toString()) *
+ double.parse(element.price.toString());
List? addon = element.extras;
String extrasDisVal = '';
for (int i = 0; i < addon!.length; i++) {
- extrasDisVal += '${addon[i].toString().replaceAll("\"", "")} ${(i == addon.length - 1) ? "" : ","}';
+ extrasDisVal +=
+ '${addon[i].toString().replaceAll("\"", "")} ${(i == addon.length - 1) ? "" : ","}';
}
String product = """
@@ -666,7 +817,9 @@ class Constant {
}
if (orderModel.specialDiscount!.isNotEmpty) {
- specialDiscount = double.parse(orderModel.specialDiscount!['special_discount'].toString());
+ specialDiscount = double.parse(
+ orderModel.specialDiscount!['special_discount'].toString(),
+ );
}
if (orderModel.couponId != null && orderModel.couponId!.isNotEmpty) {
@@ -675,35 +828,81 @@ class Constant {
List taxHtmlList = [];
for (var element in taxList) {
- taxAmount = taxAmount + calculateTax(amount: (total - discount - specialDiscount).toString(), taxModel: element);
+ taxAmount =
+ taxAmount +
+ calculateTax(
+ amount: (total - discount - specialDiscount).toString(),
+ taxModel: element,
+ );
String taxHtml =
"""${element.title}: ${amountShow(amount: calculateTax(amount: (total - discount - specialDiscount).toString(), taxModel: element).toString())}${taxList.indexOf(element) == taxList.length - 1 ? "" : "
"}""";
taxHtmlList.add(taxHtml);
}
var totalamount =
- orderModel.deliveryCharge == null || orderModel.deliveryCharge!.isEmpty
+ orderModel.deliveryCharge == null ||
+ orderModel.deliveryCharge!.isEmpty
? total + taxAmount - discount - specialDiscount
- : total + taxAmount + double.parse(orderModel.deliveryCharge!) + double.parse(orderModel.tipAmount!) - discount - specialDiscount;
+ : total +
+ taxAmount +
+ double.parse(orderModel.deliveryCharge!) +
+ double.parse(orderModel.tipAmount!) -
+ discount -
+ specialDiscount;
- newString = newString.replaceAll("{subtotal}", amountShow(amount: total.toString()));
- newString = newString.replaceAll("{coupon}", orderModel.couponId.toString());
- newString = newString.replaceAll("{discountamount}", amountShow(amount: orderModel.discount.toString()));
+ newString = newString.replaceAll(
+ "{subtotal}",
+ amountShow(amount: total.toString()),
+ );
+ newString = newString.replaceAll(
+ "{coupon}",
+ orderModel.couponId.toString(),
+ );
+ newString = newString.replaceAll(
+ "{discountamount}",
+ amountShow(amount: orderModel.discount.toString()),
+ );
newString = newString.replaceAll("{specialcoupon}", specialLabel);
- newString = newString.replaceAll("{specialdiscountamount}", amountShow(amount: specialDiscount.toString()));
- newString = newString.replaceAll("{shippingcharge}", amountShow(amount: deliveryCharge.toString()));
- newString = newString.replaceAll("{tipamount}", amountShow(amount: tipValue.toString()));
- newString = newString.replaceAll("{totalAmount}", amountShow(amount: totalamount.toString()));
+ newString = newString.replaceAll(
+ "{specialdiscountamount}",
+ amountShow(amount: specialDiscount.toString()),
+ );
+ newString = newString.replaceAll(
+ "{shippingcharge}",
+ amountShow(amount: deliveryCharge.toString()),
+ );
+ newString = newString.replaceAll(
+ "{tipamount}",
+ amountShow(amount: tipValue.toString()),
+ );
+ newString = newString.replaceAll(
+ "{totalAmount}",
+ amountShow(amount: totalamount.toString()),
+ );
String tableHTML = htmlList.join();
String lastHTML = "
";
- newString = newString.replaceAll("{productdetails}", firstHTML + tableHTML + lastHTML);
+ newString = newString.replaceAll(
+ "{productdetails}",
+ firstHTML + tableHTML + lastHTML,
+ );
newString = newString.replaceAll("{taxdetails}", taxHtmlList.join());
- newString = newString.replaceAll("{newwalletbalance}.", amountShow(amount: Constant.userModel!.walletAmount.toString()));
+ newString = newString.replaceAll(
+ "{newwalletbalance}.",
+ amountShow(amount: Constant.userModel!.walletAmount.toString()),
+ );
String subjectNewString = emailTemplateModel.subject.toString();
- subjectNewString = subjectNewString.replaceAll("{orderid}", orderModel.id.toString());
- await sendMail(subject: subjectNewString, isAdmin: emailTemplateModel.isSendToAdmin, body: newString, recipients: [Constant.userModel!.email]);
+ subjectNewString = subjectNewString.replaceAll(
+ "{orderid}",
+ orderModel.id.toString(),
+ );
+ await sendMail(
+ subject: subjectNewString,
+ isAdmin: emailTemplateModel.isSendToAdmin,
+ body: newString,
+ recipients: [Constant.userModel!.email],
+ );
}
}
@@ -711,7 +910,12 @@ class Constant {
const R = 6371; // Earth's radius in km
final dLat = _degToRad(lat2 - lat1);
final dLon = _degToRad(lon2 - lon1);
- final a = sin(dLat / 2) * sin(dLat / 2) + cos(_degToRad(lat1)) * cos(_degToRad(lat2)) * sin(dLon / 2) * sin(dLon / 2);
+ final a =
+ sin(dLat / 2) * sin(dLat / 2) +
+ cos(_degToRad(lat1)) *
+ cos(_degToRad(lat2)) *
+ sin(dLon / 2) *
+ sin(dLon / 2);
final c = 2 * atan2(sqrt(a), sqrt(1 - a));
return R * c;
}
@@ -725,13 +929,19 @@ class Constant {
}
/// Calculate tax amount for a single tax model
- static double getTaxValue({required String amount, required TaxModel taxModel}) {
+ static double getTaxValue({
+ required String amount,
+ required TaxModel taxModel,
+ }) {
double taxVal = 0.0;
if (taxModel.enable == true) {
if (taxModel.type == "fix") {
taxVal = double.tryParse(taxModel.tax.toString()) ?? 0.0;
} else {
- taxVal = (double.tryParse(amount) ?? 0.0) * (double.tryParse(taxModel.tax.toString()) ?? 0.0) / 100;
+ taxVal =
+ (double.tryParse(amount) ?? 0.0) *
+ (double.tryParse(taxModel.tax.toString()) ?? 0.0) /
+ 100;
}
}
return taxVal;
@@ -743,10 +953,15 @@ class Constant {
if (response.statusCode != 200) throw Exception("Failed to load image");
final Uint8List bytes = response.bodyBytes;
- final ui.Codec codec = await ui.instantiateImageCodec(bytes, targetWidth: width);
+ final ui.Codec codec = await ui.instantiateImageCodec(
+ bytes,
+ targetWidth: width,
+ );
final ui.FrameInfo frameInfo = await codec.getNextFrame();
- final ByteData? byteData = await frameInfo.image.toByteData(format: ui.ImageByteFormat.png);
+ final ByteData? byteData = await frameInfo.image.toByteData(
+ format: ui.ImageByteFormat.png,
+ );
return byteData!.buffer.asUint8List();
} catch (e) {
print("⚠️ getBytesFromUrl error: $e — using default cab icon");
diff --git a/lib/controllers/0n_demand_payment_controller.dart b/lib/controllers/0n_demand_payment_controller.dart
index 9c496e6..fd66a94 100644
--- a/lib/controllers/0n_demand_payment_controller.dart
+++ b/lib/controllers/0n_demand_payment_controller.dart
@@ -1,5 +1,8 @@
import 'dart:convert';
import 'package:cloud_firestore/cloud_firestore.dart';
+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';
@@ -47,7 +50,9 @@ import '../utils/preferences.dart';
import 'on_demand_dashboard_controller.dart';
class OnDemandPaymentController extends GetxController {
- Rx onDemandOrderModel = Rx(null);
+ Rx onDemandOrderModel = Rx(
+ null,
+ );
RxDouble totalAmount = 0.0.obs;
late bool isExtra;
@@ -72,22 +77,40 @@ class OnDemandPaymentController extends GetxController {
Future 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 = onDemandOrderModel.value?.provider.priceUnit == "Fixed" && selectedPaymentMethod.value == "cod" ? false : true;
+ onDemandOrderModel.value?.paymentStatus =
+ onDemandOrderModel.value?.provider.priceUnit == "Fixed" &&
+ selectedPaymentMethod.value == "cod"
+ ? false
+ : true;
onDemandOrderModel.value?.extraPaymentStatus = true;
- await FireStoreUtils.onDemandOrderPlace(onDemandOrderModel.value!, totalAmount.value);
+ await FireStoreUtils.onDemandOrderPlace(
+ onDemandOrderModel.value!,
+ totalAmount.value,
+ );
if (onDemandOrderModel.value?.status == Constant.orderPlaced) {
- await FireStoreUtils.sendOrderOnDemandServiceEmail(orderModel: onDemandOrderModel.value!);
+ await FireStoreUtils.sendOrderOnDemandServiceEmail(
+ orderModel: onDemandOrderModel.value!,
+ );
- final providerUser = await FireStoreUtils.getUserProfile(onDemandOrderModel.value!.provider.author!);
+ final providerUser = await FireStoreUtils.getUserProfile(
+ onDemandOrderModel.value!.provider.author!,
+ );
if (providerUser != null) {
- final payLoad = {"type": 'provider_order', "orderId": onDemandOrderModel.value?.id};
- await SendNotification.sendFcmMessage(Constant.bookingPlaced, providerUser.fcmToken ?? '', payLoad);
+ final payLoad = {
+ "type": 'provider_order',
+ "orderId": onDemandOrderModel.value?.id,
+ };
+ await SendNotification.sendFcmMessage(
+ Constant.bookingPlaced,
+ providerUser.fcmToken ?? '',
+ payLoad,
+ );
}
ShowToastDialog.showToast("OnDemand Service successfully booked".tr);
@@ -106,16 +129,23 @@ class OnDemandPaymentController extends GetxController {
paymentStatus: "success".tr,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-${totalAmount.value.toString()}", userId: FireStoreUtils.getCurrentUid()).then((value) {});
+ await FireStoreUtils.updateUserWallet(
+ amount: "-${totalAmount.value.toString()}",
+ userId: FireStoreUtils.getCurrentUid(),
+ ).then((value) {});
}
});
}
ShowToastDialog.closeLoader();
Get.offAll(const OnDemandDashboardScreen());
- OnDemandDashboardController controller = Get.put(OnDemandDashboardController());
+ OnDemandDashboardController controller = Get.put(
+ OnDemandDashboardController(),
+ );
controller.selectedIndex.value = 2;
} else {
// Extra Charges Flow
@@ -136,9 +166,14 @@ class OnDemandPaymentController extends GetxController {
paymentStatus: "success".tr,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-${totalAmount.value.toString()}", userId: FireStoreUtils.getCurrentUid()).then((value) {});
+ await FireStoreUtils.updateUserWallet(
+ amount: "-${totalAmount.value.toString()}",
+ userId: FireStoreUtils.getCurrentUid(),
+ ).then((value) {});
}
});
}
@@ -159,9 +194,14 @@ class OnDemandPaymentController extends GetxController {
paymentStatus: "success".tr,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-$totalAmount", userId: FireStoreUtils.getCurrentUid());
+ await FireStoreUtils.updateUserWallet(
+ amount: "-$totalAmount",
+ userId: FireStoreUtils.getCurrentUid(),
+ );
}
});
}
@@ -170,7 +210,9 @@ class OnDemandPaymentController extends GetxController {
ShowToastDialog.closeLoader();
Get.offAll(const OnDemandDashboardScreen());
- OnDemandDashboardController controller = Get.put(OnDemandDashboardController());
+ OnDemandDashboardController controller = Get.put(
+ OnDemandDashboardController(),
+ );
controller.selectedIndex.value = 2;
}
}
@@ -193,19 +235,45 @@ class OnDemandPaymentController extends GetxController {
Future getPaymentSettings() async {
isLoading.value = true;
await FireStoreUtils.getPaymentSettingsData().then((value) {
- stripeModel.value = StripeModel.fromJson(jsonDecode(Preferences.getString(Preferences.stripeSettings)));
- payPalModel.value = PayPalModel.fromJson(jsonDecode(Preferences.getString(Preferences.paypalSettings)));
- payStackModel.value = PayStackModel.fromJson(jsonDecode(Preferences.getString(Preferences.payStack)));
- mercadoPagoModel.value = MercadoPagoModel.fromJson(jsonDecode(Preferences.getString(Preferences.mercadoPago)));
- flutterWaveModel.value = FlutterWaveModel.fromJson(jsonDecode(Preferences.getString(Preferences.flutterWave)));
- paytmModel.value = PaytmModel.fromJson(jsonDecode(Preferences.getString(Preferences.paytmSettings)));
- payFastModel.value = PayFastModel.fromJson(jsonDecode(Preferences.getString(Preferences.payFastSettings)));
- razorPayModel.value = RazorPayModel.fromJson(jsonDecode(Preferences.getString(Preferences.razorpaySettings)));
- midTransModel.value = MidTrans.fromJson(jsonDecode(Preferences.getString(Preferences.midTransSettings)));
- orangeMoneyModel.value = OrangeMoney.fromJson(jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)));
- xenditModel.value = Xendit.fromJson(jsonDecode(Preferences.getString(Preferences.xenditSettings)));
- walletSettingModel.value = WalletSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.walletSettings)));
- cashOnDeliverySettingModel.value = CodSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.codSettings)));
+ stripeModel.value = StripeModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.stripeSettings)),
+ );
+ payPalModel.value = PayPalModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paypalSettings)),
+ );
+ payStackModel.value = PayStackModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payStack)),
+ );
+ mercadoPagoModel.value = MercadoPagoModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.mercadoPago)),
+ );
+ flutterWaveModel.value = FlutterWaveModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.flutterWave)),
+ );
+ paytmModel.value = PaytmModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paytmSettings)),
+ );
+ payFastModel.value = PayFastModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payFastSettings)),
+ );
+ razorPayModel.value = RazorPayModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.razorpaySettings)),
+ );
+ midTransModel.value = MidTrans.fromJson(
+ jsonDecode(Preferences.getString(Preferences.midTransSettings)),
+ );
+ orangeMoneyModel.value = OrangeMoney.fromJson(
+ jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)),
+ );
+ xenditModel.value = Xendit.fromJson(
+ jsonDecode(Preferences.getString(Preferences.xenditSettings)),
+ );
+ walletSettingModel.value = WalletSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.walletSettings)),
+ );
+ cashOnDeliverySettingModel.value = CodSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.codSettings)),
+ );
if (walletSettingModel.value.isEnabled == true) {
selectedPaymentMethod.value = PaymentGateway.wallet.name;
@@ -248,20 +316,32 @@ class OnDemandPaymentController extends GetxController {
Future stripeMakePayment({required String amount}) async {
log(double.parse(amount).toStringAsFixed(0));
try {
- Map? paymentIntentData = await createStripeIntent(amount: amount);
+ Map? paymentIntentData = await createStripeIntent(
+ amount: amount,
+ );
log("stripe Responce====>$paymentIntentData");
if (paymentIntentData!.containsKey("error")) {
Get.back();
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
} else {
await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters(
paymentIntentClientSecret: paymentIntentData['client_secret'],
allowsDelayedPaymentMethods: false,
- googlePay: const PaymentSheetGooglePay(merchantCountryCode: 'US', testEnv: true, currencyCode: "USD"),
+ googlePay: const PaymentSheetGooglePay(
+ merchantCountryCode: 'US',
+ testEnv: true,
+ currencyCode: "USD",
+ ),
customFlow: true,
style: ThemeMode.system,
- appearance: PaymentSheetAppearance(colors: PaymentSheetAppearanceColors(primary: AppThemeData.primary300)),
+ appearance: PaymentSheetAppearance(
+ colors: PaymentSheetAppearanceColors(
+ primary: AppThemeData.primary300,
+ ),
+ ),
merchantDisplayName: 'GoRide',
),
);
@@ -307,7 +387,10 @@ class OnDemandPaymentController extends GetxController {
var response = await http.post(
Uri.parse('https://api.stripe.com/v1/payment_intents'),
body: body,
- headers: {'Authorization': 'Bearer $stripeSecret', 'Content-Type': 'application/x-www-form-urlencoded'},
+ headers: {
+ 'Authorization': 'Bearer $stripeSecret',
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
);
return jsonDecode(response.body);
@@ -317,8 +400,14 @@ class OnDemandPaymentController extends GetxController {
}
//mercadoo
- Future mercadoPagoMakePayment({required BuildContext context, required String amount}) async {
- final headers = {'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}', 'Content-Type': 'application/json'};
+ Future mercadoPagoMakePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
+ final headers = {
+ 'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"items": [
@@ -331,12 +420,20 @@ class OnDemandPaymentController extends GetxController {
},
],
"payer": {"email": Constant.userModel?.email},
- "back_urls": {"failure": "${Constant.globalUrl}payment/failure", "pending": "${Constant.globalUrl}payment/pending", "success": "${Constant.globalUrl}payment/success"},
+ "back_urls": {
+ "failure": "${Constant.globalUrl}payment/failure",
+ "pending": "${Constant.globalUrl}payment/pending",
+ "success": "${Constant.globalUrl}payment/success",
+ },
"auto_return": "approved",
// Automatically return after payment is approved
});
- final response = await http.post(Uri.parse("https://api.mercadopago.com/checkout/preferences"), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse("https://api.mercadopago.com/checkout/preferences"),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
final data = jsonDecode(response.body);
@@ -419,15 +516,23 @@ class OnDemandPaymentController extends GetxController {
}
});
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
}
});
}
//flutter wave Payment Method
- Future flutterWaveInitiatePayment({required BuildContext context, required String amount}) async {
+ Future flutterWaveInitiatePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
final url = Uri.parse('https://api.flutterwave.com/v3/payments');
- final headers = {'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}', 'Content-Type': 'application/json'};
+ final headers = {
+ 'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"tx_ref": _ref,
@@ -435,15 +540,24 @@ class OnDemandPaymentController extends GetxController {
"currency": "NGN",
"redirect_url": "${Constant.globalUrl}payment/success",
"payment_options": "ussd, card, barter, payattitude",
- "customer": {"email": Constant.userModel?.email.toString(), "phonenumber": Constant.userModel?.phoneNumber, "name": Constant.userModel?.fullName()},
- "customizations": {"title": "Payment for Services", "description": "Payment for XYZ services"},
+ "customer": {
+ "email": Constant.userModel?.email.toString(),
+ "phonenumber": Constant.userModel?.phoneNumber,
+ "name": Constant.userModel?.fullName(),
+ },
+ "customizations": {
+ "title": "Payment for Services",
+ "description": "Payment for XYZ services",
+ },
});
final response = await http.post(url, headers: headers, body: body);
if (response.statusCode == 200) {
final data = jsonDecode(response.body);
- Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((value) {
+ Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((
+ value,
+ ) {
if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -472,8 +586,14 @@ class OnDemandPaymentController extends GetxController {
// payFast
void payFastPayment({required BuildContext context, required String amount}) {
- PayStackURLGen.getPayHTML(payFastSettingData: payFastModel.value, amount: amount.toString(), userModel: Constant.userModel!).then((String? value) async {
- bool isDone = await Get.to(PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value));
+ PayStackURLGen.getPayHTML(
+ payFastSettingData: payFastModel.value,
+ amount: amount.toString(),
+ userModel: Constant.userModel!,
+ ).then((String? value) async {
+ bool isDone = await Get.to(
+ PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value),
+ );
if (isDone) {
Get.back();
ShowToastDialog.showToast("Payment successfully".tr);
@@ -493,26 +613,50 @@ class OnDemandPaymentController extends GetxController {
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString()},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ },
);
final data = jsonDecode(response.body);
- await verifyCheckSum(checkSum: data["code"], amount: amount, orderId: orderId).then((value) {
+ await verifyCheckSum(
+ checkSum: data["code"],
+ amount: amount,
+ orderId: orderId,
+ ).then((value) {
initiatePayment(amount: amount, orderId: orderId).then((value) {
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
GetPaymentTxtTokenModel result = value;
- startTransaction(context, txnTokenBy: result.body.txnToken ?? '', orderId: orderId, amount: amount, callBackURL: callback, isStaging: paytmModel.value.isSandboxEnabled);
+ startTransaction(
+ context,
+ txnTokenBy: result.body.txnToken ?? '',
+ orderId: orderId,
+ amount: amount,
+ callBackURL: callback,
+ isStaging: paytmModel.value.isSandboxEnabled,
+ );
});
});
}
- Future startTransaction(context, {required String txnTokenBy, required orderId, required double amount, required callBackURL, required isStaging}) async {
+ Future startTransaction(
+ context, {
+ required String txnTokenBy,
+ required orderId,
+ required double amount,
+ required callBackURL,
+ required isStaging,
+ }) async {
// try {
// var response = AllInOneSdk.startTransaction(
// paytmModel.value.paytmMID.toString(),
@@ -548,24 +692,38 @@ class OnDemandPaymentController extends GetxController {
// }
}
- Future verifyCheckSum({required String checkSum, required double amount, required orderId}) async {
+ Future verifyCheckSum({
+ required String checkSum,
+ required double amount,
+ required orderId,
+ }) async {
String getChecksum = "${Constant.globalUrl}payments/validatechecksum";
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(), "checksum_value": checkSum},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ "checksum_value": checkSum,
+ },
);
final data = jsonDecode(response.body);
return data['status'];
}
- Future initiatePayment({required double amount, required orderId}) async {
+ Future initiatePayment({
+ required double amount,
+ required orderId,
+ }) async {
String initiateURL = "${Constant.globalUrl}payments/initiatepaytmpayment";
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
final response = await http.post(
Uri.parse(initiateURL),
@@ -583,9 +741,12 @@ class OnDemandPaymentController extends GetxController {
);
log(response.body);
final data = jsonDecode(response.body);
- if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) {
+ if (data["body"]["txnToken"] == null ||
+ data["body"]["txnToken"].toString().isEmpty) {
Get.back();
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
}
return GetPaymentTxtTokenModel.fromJson(data);
}
@@ -603,7 +764,10 @@ class OnDemandPaymentController extends GetxController {
'description': 'wallet Topup',
'retry': {'enabled': true, 'max_count': 1},
'send_sms_hash': true,
- 'prefill': {'contact': Constant.userModel?.phoneNumber, 'email': Constant.userModel?.email},
+ 'prefill': {
+ 'contact': Constant.userModel?.phoneNumber,
+ 'email': Constant.userModel?.email,
+ },
'external': {
'wallets': ['paytm'],
},
@@ -638,7 +802,10 @@ class OnDemandPaymentController extends GetxController {
}
//Midtrans payment
- Future midtransMakePayment({required String amount, required BuildContext context}) async {
+ Future midtransMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
await createPaymentLink(amount: amount).then((url) {
ShowToastDialog.closeLoader();
if (url != '') {
@@ -656,15 +823,30 @@ class OnDemandPaymentController extends GetxController {
Future createPaymentLink({required var amount}) async {
var ordersId = const Uuid().v1();
- final url = Uri.parse(midTransModel.value.isSandbox! ? 'https://api.sandbox.midtrans.com/v1/payment-links' : 'https://api.midtrans.com/v1/payment-links');
+ final url = Uri.parse(
+ midTransModel.value.isSandbox!
+ ? 'https://api.sandbox.midtrans.com/v1/payment-links'
+ : 'https://api.midtrans.com/v1/payment-links',
+ );
final response = await http.post(
url,
- headers: {'Accept': 'application/json', 'Content-Type': 'application/json', 'Authorization': generateBasicAuthHeader(midTransModel.value.serverKey!)},
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': generateBasicAuthHeader(
+ midTransModel.value.serverKey!,
+ ),
+ },
body: jsonEncode({
- 'transaction_details': {'order_id': ordersId, 'gross_amount': double.parse(amount.toString()).toInt()},
+ 'transaction_details': {
+ 'order_id': ordersId,
+ 'gross_amount': double.parse(amount.toString()).toInt(),
+ },
'usage_limit': 2,
- "callbacks": {"finish": "https://www.google.com?merchant_order_id=$ordersId"},
+ "callbacks": {
+ "finish": "https://www.google.com?merchant_order_id=$ordersId",
+ },
}),
);
@@ -672,7 +854,9 @@ class OnDemandPaymentController extends GetxController {
final responseData = jsonDecode(response.body);
return responseData['payment_url'];
} else {
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -691,16 +875,33 @@ class OnDemandPaymentController extends GetxController {
static String orderId = '';
static String amount = '';
- Future orangeMakePayment({required String amount, required BuildContext context}) async {
+ Future orangeMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
reset();
var id = const Uuid().v4();
- var paymentURL = await fetchToken(context: context, orderId: id, amount: amount, currency: 'USD');
+ var paymentURL = await fetchToken(
+ context: context,
+ orderId: id,
+ amount: amount,
+ currency: 'USD',
+ );
ShowToastDialog.closeLoader();
if (paymentURL.toString().isNotEmpty) {
- Get.to(() => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken))!.then((value) {
+ Get.to(
+ () => OrangeMoneyScreen(
+ initialURl: paymentURL,
+ accessToken: accessToken,
+ amount: amount,
+ orangePay: orangeMoneyModel.value,
+ orderId: orderId,
+ payToken: payToken,
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -711,13 +912,22 @@ class OnDemandPaymentController extends GetxController {
}
}
- Future fetchToken({required String orderId, required String currency, required BuildContext context, required String amount}) async {
+ Future fetchToken({
+ required String orderId,
+ required String currency,
+ required BuildContext context,
+ required String amount,
+ }) async {
String apiUrl = 'https://api.orange.com/oauth/v3/token';
Map requestBody = {'grant_type': 'client_credentials'};
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': "Basic ${orangeMoneyModel.value.auth ?? ''}", 'Content-Type': 'application/x-www-form-urlencoded', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': "Basic ${orangeMoneyModel.value.auth ?? ''}",
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'Accept': 'application/json',
+ },
body: requestBody,
);
@@ -730,21 +940,36 @@ class OnDemandPaymentController extends GetxController {
return '';
}
- return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
+ 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 '';
}
}
- Future webpayment({required String orderIdData, required BuildContext context, required String currency, required String amountData}) async {
+ Future webpayment({
+ required String orderIdData,
+ required BuildContext context,
+ required String currency,
+ required String amountData,
+ }) async {
orderId = orderIdData;
amount = amountData;
// ✅ Null-safe handling
bool isSandbox = orangeMoneyModel.value.isSandbox ?? false;
- String apiUrl = isSandbox ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment' : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
+ String apiUrl =
+ isSandbox
+ ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment'
+ : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
Map requestBody = {
"merchant_key": orangeMoneyModel.value.merchantKey ?? '',
@@ -760,7 +985,11 @@ class OnDemandPaymentController extends GetxController {
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': 'Bearer $accessToken', 'Content-Type': 'application/json', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': 'Bearer $accessToken',
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
body: json.encode(requestBody),
);
@@ -773,7 +1002,9 @@ 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 '';
}
}
@@ -887,7 +1118,13 @@ class OnDemandPaymentController extends GetxController {
await createXenditInvoice(amount: amount).then((model) {
ShowToastDialog.closeLoader();
if (model.id != null) {
- Get.to(() => XenditScreen(initialURl: model.invoiceUrl ?? '', transId: model.id ?? '', apiKey: xenditModel.value.apiKey!.toString()))!.then((value) {
+ Get.to(
+ () => XenditScreen(
+ initialURl: model.invoiceUrl ?? '',
+ transId: model.id ?? '',
+ apiKey: xenditModel.value.apiKey!.toString(),
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -904,7 +1141,9 @@ class OnDemandPaymentController extends GetxController {
const url = 'https://api.xendit.co/v2/invoices';
var headers = {
'Content-Type': 'application/json',
- 'Authorization': generateBasicAuthHeader(xenditModel.value.apiKey!.toString()),
+ 'Authorization': generateBasicAuthHeader(
+ xenditModel.value.apiKey!.toString(),
+ ),
// 'Cookie': '__cf_bm=yERkrx3xDITyFGiou0bbKY1bi7xEwovHNwxV1vCNbVc-1724155511-1.0.1.1-jekyYQmPCwY6vIJ524K0V6_CEw6O.dAwOmQnHtwmaXO_MfTrdnmZMka0KZvjukQgXu5B.K_6FJm47SGOPeWviQ',
};
@@ -917,7 +1156,11 @@ class OnDemandPaymentController extends GetxController {
});
try {
- final response = await http.post(Uri.parse(url), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse(url),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
XenditModel model = XenditModel.fromJson(jsonDecode(response.body));
diff --git a/lib/controllers/Intercity_home_controller.dart b/lib/controllers/Intercity_home_controller.dart
index 2322405..5528c5e 100644
--- a/lib/controllers/Intercity_home_controller.dart
+++ b/lib/controllers/Intercity_home_controller.dart
@@ -42,6 +42,7 @@ 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:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutterMap;
import 'package:flutter_paypal/flutter_paypal.dart';
@@ -64,10 +65,13 @@ class IntercityHomeController extends GetxController {
late GoogleMapController mapController;
final flutterMap.MapController mapOsmController = flutterMap.MapController();
- final Rx sourceTextEditController = TextEditingController().obs;
- final Rx destinationTextEditController = TextEditingController().obs;
+ final Rx sourceTextEditController =
+ TextEditingController().obs;
+ final Rx destinationTextEditController =
+ TextEditingController().obs;
- final Rx couponCodeTextEditController = TextEditingController().obs;
+ final Rx couponCodeTextEditController =
+ TextEditingController().obs;
final Rx currentLocation = Location().obs;
@@ -141,64 +145,99 @@ class IntercityHomeController extends GetxController {
await getPaymentSettings();
- FireStoreUtils.fireStore.collection(CollectionName.users).doc(FireStoreUtils.getCurrentUid()).snapshots().listen((userSnapshot) async {
- if (!userSnapshot.exists) return;
+ FireStoreUtils.fireStore
+ .collection(CollectionName.users)
+ .doc(FireStoreUtils.getCurrentUid())
+ .snapshots()
+ .listen((userSnapshot) async {
+ if (!userSnapshot.exists) return;
- userModel.value = UserModel.fromJson(userSnapshot.data()!);
+ userModel.value = UserModel.fromJson(userSnapshot.data()!);
- if (userModel.value.inProgressOrderID != null && userModel.value.inProgressOrderID!.isNotEmpty) {
- String? validRideId;
+ if (userModel.value.inProgressOrderID != null &&
+ userModel.value.inProgressOrderID!.isNotEmpty) {
+ String? validRideId;
- for (String id in userModel.value.inProgressOrderID!) {
- final rideDoc = await FireStoreUtils.fireStore.collection(CollectionName.rides).doc(id).get();
+ for (String id in userModel.value.inProgressOrderID!) {
+ final rideDoc =
+ await FireStoreUtils.fireStore
+ .collection(CollectionName.rides)
+ .doc(id)
+ .get();
- if (rideDoc.exists && (rideDoc.data()?['rideType'] ?? '').toString().toLowerCase() == "intercity") {
- validRideId = userModel.value.inProgressOrderID!.first!;
- break;
- }
- }
-
- FireStoreUtils.fireStore.collection(CollectionName.rides).doc(validRideId).snapshots().listen((rideSnapshot) async {
- if (!rideSnapshot.exists) return;
-
- final rideData = rideSnapshot.data()!;
- currentOrder.value = CabOrderModel.fromJson(rideData);
- final status = currentOrder.value.status;
-
- if (status == Constant.driverAccepted || status == Constant.orderInTransit) {
- FireStoreUtils.fireStore.collection(CollectionName.users).doc(currentOrder.value.driverId).snapshots().listen((event) async {
- if (event.exists && event.data() != null) {
- UserModel driverModel0 = UserModel.fromJson(event.data()!);
- driverModel.value = driverModel0;
- await updateDriverRoute(driverModel0);
+ if (rideDoc.exists &&
+ (rideDoc.data()?['rideType'] ?? '')
+ .toString()
+ .toLowerCase() ==
+ "intercity") {
+ validRideId = userModel.value.inProgressOrderID!.first!;
+ break;
}
- });
- }
+ }
- print("Current Ride Status: $status");
- if (status == Constant.orderPlaced || status == Constant.driverPending || status == Constant.driverRejected || (status == Constant.orderAccepted && currentOrder.value.driverId == null)) {
- bottomSheetType.value = 'waitingForDriver';
- } else if (status == Constant.driverAccepted || status == Constant.orderInTransit) {
- bottomSheetType.value = 'driverDetails';
- sourceTextEditController.value.text = currentOrder.value.sourceLocationName ?? '';
- destinationTextEditController.value.text = currentOrder.value.destinationLocationName ?? '';
- selectedPaymentMethod.value = currentOrder.value.paymentMethod ?? '';
- calculateTotalAmountAfterAccept();
- } else if (status == Constant.orderCompleted) {
- userModel.value.inProgressOrderID!.remove(validRideId);
- await FireStoreUtils.updateUser(userModel.value);
+ FireStoreUtils.fireStore
+ .collection(CollectionName.rides)
+ .doc(validRideId)
+ .snapshots()
+ .listen((rideSnapshot) async {
+ if (!rideSnapshot.exists) return;
+
+ final rideData = rideSnapshot.data()!;
+ currentOrder.value = CabOrderModel.fromJson(rideData);
+ final status = currentOrder.value.status;
+
+ if (status == Constant.driverAccepted ||
+ status == Constant.orderInTransit) {
+ FireStoreUtils.fireStore
+ .collection(CollectionName.users)
+ .doc(currentOrder.value.driverId)
+ .snapshots()
+ .listen((event) async {
+ if (event.exists && event.data() != null) {
+ UserModel driverModel0 = UserModel.fromJson(
+ event.data()!,
+ );
+ driverModel.value = driverModel0;
+ await updateDriverRoute(driverModel0);
+ }
+ });
+ }
+
+ print("Current Ride Status: $status");
+ if (status == Constant.orderPlaced ||
+ status == Constant.driverPending ||
+ status == Constant.driverRejected ||
+ (status == Constant.orderAccepted &&
+ currentOrder.value.driverId == null)) {
+ bottomSheetType.value = 'waitingForDriver';
+ } else if (status == Constant.driverAccepted ||
+ status == Constant.orderInTransit) {
+ bottomSheetType.value = 'driverDetails';
+ sourceTextEditController.value.text =
+ currentOrder.value.sourceLocationName ?? '';
+ destinationTextEditController.value.text =
+ currentOrder.value.destinationLocationName ?? '';
+ selectedPaymentMethod.value =
+ currentOrder.value.paymentMethod ?? '';
+ calculateTotalAmountAfterAccept();
+ } else if (status == Constant.orderCompleted) {
+ userModel.value.inProgressOrderID!.remove(validRideId);
+ await FireStoreUtils.updateUser(userModel.value);
+ bottomSheetType.value = 'location';
+ Get.back();
+ }
+ });
+ } else {
bottomSheetType.value = 'location';
- Get.back();
+ if (Constant.currentLocation != null) {
+ setDepartureMarker(
+ Constant.currentLocation!.latitude,
+ Constant.currentLocation!.longitude,
+ );
+ searchPlaceNameOSM();
+ }
}
});
- } else {
- bottomSheetType.value = 'location';
- if (Constant.currentLocation != null) {
- setDepartureMarker(Constant.currentLocation!.latitude, Constant.currentLocation!.longitude);
- searchPlaceNameOSM();
- }
- }
- });
final coupons = await FireStoreUtils.getCabCoupon();
cabCouponList.value = coupons;
@@ -225,18 +264,30 @@ class IntercityHomeController extends GetxController {
if (order.status == Constant.driverAccepted) {
// DRIVER → PICKUP
- await fetchRouteWithWaypoints([latlong.LatLng(driverLat, driverLng), latlong.LatLng(pickupLat, pickupLng)]);
+ await fetchRouteWithWaypoints([
+ latlong.LatLng(driverLat, driverLng),
+ latlong.LatLng(pickupLat, pickupLng),
+ ]);
} else if (order.status == Constant.orderInTransit) {
// PICKUP → DESTINATION
- await fetchRouteWithWaypoints([latlong.LatLng(pickupLat, pickupLng), latlong.LatLng(destLat, destLng)]);
+ await fetchRouteWithWaypoints([
+ latlong.LatLng(pickupLat, pickupLng),
+ latlong.LatLng(destLat, destLng),
+ ]);
}
updateRouteMarkers(driverModel);
} else {
/// For Google Maps
if (order.status == Constant.driverAccepted) {
- await fetchGoogleRouteBetween(LatLng(driverLat, driverLng), LatLng(pickupLat, pickupLng));
+ await fetchGoogleRouteBetween(
+ LatLng(driverLat, driverLng),
+ LatLng(pickupLat, pickupLng),
+ );
} else if (order.status == Constant.orderInTransit) {
- await fetchGoogleRouteBetween(LatLng(pickupLat, pickupLng), LatLng(destLat, destLng));
+ await fetchGoogleRouteBetween(
+ LatLng(pickupLat, pickupLng),
+ LatLng(destLat, destLng),
+ );
}
updateRouteMarkers(driverModel);
}
@@ -260,12 +311,24 @@ class IntercityHomeController extends GetxController {
markers.clear();
osmMarker.clear();
- final departureBytes = await Constant().getBytesFromAsset('assets/images/location_black3x.png', 50);
- final destinationBytes = await Constant().getBytesFromAsset('assets/images/location_orange3x.png', 50);
+ final departureBytes = await Constant().getBytesFromAsset(
+ 'assets/images/location_black3x.png',
+ 50,
+ );
+ final destinationBytes = await Constant().getBytesFromAsset(
+ 'assets/images/location_orange3x.png',
+ 50,
+ );
final driverBytesRaw =
(Constant.sectionConstantModel?.markerIcon?.isNotEmpty ?? false)
- ? await Constant().getBytesFromUrl(Constant.sectionConstantModel!.markerIcon!, width: 120)
- : await Constant().getBytesFromAsset('assets/images/ic_cab.png', 50);
+ ? await Constant().getBytesFromUrl(
+ Constant.sectionConstantModel!.markerIcon!,
+ width: 120,
+ )
+ : await Constant().getBytesFromAsset(
+ 'assets/images/ic_cab.png',
+ 50,
+ );
departureIcon = BitmapDescriptor.fromBytes(departureBytes);
destinationIcon = BitmapDescriptor.fromBytes(destinationBytes);
@@ -274,7 +337,15 @@ class IntercityHomeController extends GetxController {
if (Constant.selectedMapType == 'osm') {
if (order.status == Constant.driverAccepted) {
osmMarker.addAll([
- flutterMap.Marker(point: latlong.LatLng(pickupLat, pickupLng), width: 40, height: 40, child: Image.asset('assets/images/location_black3x.png', width: 40)),
+ flutterMap.Marker(
+ point: latlong.LatLng(pickupLat, pickupLng),
+ width: 40,
+ height: 40,
+ child: Image.asset(
+ 'assets/images/location_black3x.png',
+ width: 40,
+ ),
+ ),
flutterMap.Marker(
point: latlong.LatLng(driverLat, driverLng),
width: 45,
@@ -285,13 +356,26 @@ class IntercityHomeController extends GetxController {
height: 50,
imageUrl: Constant.sectionConstantModel!.markerIcon.toString(),
placeholder: (context, url) => Constant.loader(),
- errorWidget: (context, url, error) => SizedBox(width: 30, height: 30, child: CircularProgressIndicator(strokeWidth: 2)),
+ errorWidget:
+ (context, url, error) => SizedBox(
+ width: 30,
+ height: 30,
+ child: CircularProgressIndicator(strokeWidth: 2),
+ ),
),
),
]);
} else if (order.status == Constant.orderInTransit) {
osmMarker.addAll([
- flutterMap.Marker(point: latlong.LatLng(destLat, destLng), width: 40, height: 40, child: Image.asset('assets/images/location_orange3x.png', width: 40)),
+ flutterMap.Marker(
+ point: latlong.LatLng(destLat, destLng),
+ width: 40,
+ height: 40,
+ child: Image.asset(
+ 'assets/images/location_orange3x.png',
+ width: 40,
+ ),
+ ),
flutterMap.Marker(
point: latlong.LatLng(driverLat, driverLng),
width: 45,
@@ -302,7 +386,12 @@ class IntercityHomeController extends GetxController {
height: 50,
imageUrl: Constant.sectionConstantModel!.markerIcon.toString(),
placeholder: (context, url) => Constant.loader(),
- errorWidget: (context, url, error) => SizedBox(width: 30, height: 30, child: CircularProgressIndicator(strokeWidth: 2)),
+ errorWidget:
+ (context, url, error) => SizedBox(
+ width: 30,
+ height: 30,
+ child: CircularProgressIndicator(strokeWidth: 2),
+ ),
),
),
]);
@@ -314,9 +403,18 @@ class IntercityHomeController extends GetxController {
markerId: const MarkerId("pickup"),
position: LatLng(pickupLat, pickupLng),
infoWindow: InfoWindow(title: "Pickup Location".tr),
- icon: departureIcon ?? BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueGreen),
+ icon:
+ departureIcon ??
+ BitmapDescriptor.defaultMarkerWithHue(
+ BitmapDescriptor.hueGreen,
+ ),
+ ),
+ Marker(
+ markerId: const MarkerId("driver"),
+ position: LatLng(driverLat, driverLng),
+ infoWindow: InfoWindow(title: "Driver at Pickup".tr),
+ icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
),
- Marker(markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), infoWindow: InfoWindow(title: "Driver at Pickup".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker),
]);
} else if (order.status == Constant.orderInTransit) {
markers.addAll([
@@ -324,9 +422,18 @@ class IntercityHomeController extends GetxController {
markerId: const MarkerId("destination"),
position: LatLng(destLat, destLng),
infoWindow: InfoWindow(title: "Destination Location".tr),
- icon: destinationIcon ?? BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueRed),
+ icon:
+ destinationIcon ??
+ BitmapDescriptor.defaultMarkerWithHue(
+ BitmapDescriptor.hueRed,
+ ),
+ ),
+ Marker(
+ markerId: const MarkerId("driver"),
+ position: LatLng(driverLat, driverLng),
+ infoWindow: InfoWindow(title: "Driver Location".tr),
+ icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
),
- Marker(markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), infoWindow: InfoWindow(title: "Driver Location".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker),
]);
}
}
@@ -337,7 +444,10 @@ class IntercityHomeController extends GetxController {
}
}
- Future fetchGoogleRouteBetween(LatLng originPoint, LatLng destPoint) async {
+ Future fetchGoogleRouteBetween(
+ LatLng originPoint,
+ LatLng destPoint,
+ ) async {
final origin = '${originPoint.latitude},${originPoint.longitude}';
final destination = '${destPoint.latitude},${destPoint.longitude}';
final url = Uri.parse(
@@ -354,7 +464,8 @@ class IntercityHomeController extends GetxController {
final route = data['routes'][0];
final encodedPolyline = route['overview_polyline']['points'];
final decodedPoints = PolylinePoints.decodePolyline(encodedPolyline);
- final coordinates = decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
+ final coordinates =
+ decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
addPolyLine(coordinates);
@@ -381,7 +492,12 @@ class IntercityHomeController extends GetxController {
if (currentOrder.value.taxSetting != null) {
for (var element in currentOrder.value.taxSetting!) {
- taxAmount.value = (taxAmount.value + Constant.calculateTax(amount: (subTotal.value - discount.value).toString(), taxModel: element));
+ taxAmount.value =
+ (taxAmount.value +
+ Constant.calculateTax(
+ amount: (subTotal.value - discount.value).toString(),
+ taxModel: element,
+ ));
}
}
@@ -397,11 +513,19 @@ class IntercityHomeController extends GetxController {
subTotal.value = getAmount(selectedVehicleType.value);
if (selectedCouponModel.value.id != null) {
- discount.value = Constant.calculateDiscount(amount: subTotal.value.toString(), offerModel: selectedCouponModel.value);
+ discount.value = Constant.calculateDiscount(
+ amount: subTotal.value.toString(),
+ offerModel: selectedCouponModel.value,
+ );
}
for (var element in Constant.taxList) {
- taxAmount.value = (taxAmount.value + Constant.calculateTax(amount: (subTotal.value - discount.value).toString(), taxModel: element));
+ taxAmount.value =
+ (taxAmount.value +
+ Constant.calculateTax(
+ amount: (subTotal.value - discount.value).toString(),
+ taxModel: element,
+ ));
}
totalAmount.value = (subTotal.value - discount.value) + taxAmount.value;
@@ -438,9 +562,14 @@ class IntercityHomeController extends GetxController {
serviceType: Constant.parcelServiceType,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-${totalAmount.value.toString()}", userId: FireStoreUtils.getCurrentUid());
+ await FireStoreUtils.updateUserWallet(
+ amount: "-${totalAmount.value.toString()}",
+ userId: FireStoreUtils.getCurrentUid(),
+ );
}
});
}
@@ -454,13 +583,25 @@ class IntercityHomeController extends GetxController {
Future placeOrder() async {
DestinationLocation sourceLocation = DestinationLocation(
- latitude: Constant.selectedMapType == 'osm' ? departureLatLongOsm.value.latitude : departureLatLong.value.latitude,
- longitude: Constant.selectedMapType == 'osm' ? departureLatLongOsm.value.longitude : departureLatLong.value.longitude,
+ latitude:
+ Constant.selectedMapType == 'osm'
+ ? departureLatLongOsm.value.latitude
+ : departureLatLong.value.latitude,
+ longitude:
+ Constant.selectedMapType == 'osm'
+ ? departureLatLongOsm.value.longitude
+ : departureLatLong.value.longitude,
);
DestinationLocation destinationLocation = DestinationLocation(
- latitude: Constant.selectedMapType == 'osm' ? destinationLatLongOsm.value.latitude : destinationLatLong.value.latitude,
- longitude: Constant.selectedMapType == 'osm' ? destinationLatLongOsm.value.longitude : destinationLatLong.value.longitude,
+ latitude:
+ Constant.selectedMapType == 'osm'
+ ? destinationLatLongOsm.value.latitude
+ : destinationLatLong.value.latitude,
+ longitude:
+ Constant.selectedMapType == 'osm'
+ ? destinationLatLongOsm.value.longitude
+ : destinationLatLong.value.longitude,
);
CabOrderModel orderModel = CabOrderModel();
@@ -471,7 +612,8 @@ class IntercityHomeController extends GetxController {
orderModel.vehicleType = selectedVehicleType.value;
orderModel.authorID = FireStoreUtils.getCurrentUid();
orderModel.sourceLocationName = sourceTextEditController.value.text;
- orderModel.destinationLocationName = destinationTextEditController.value.text;
+ orderModel.destinationLocationName =
+ destinationTextEditController.value.text;
orderModel.sourceLocation = sourceLocation;
orderModel.destinationLocation = destinationLocation;
@@ -483,11 +625,14 @@ class IntercityHomeController extends GetxController {
orderModel.taxSetting = Constant.taxList;
orderModel.adminCommissionType =
- Constant.sectionConstantModel!.adminCommision != null && Constant.sectionConstantModel!.adminCommision!.isEnabled == true
- ? Constant.sectionConstantModel!.adminCommision!.commissionType.toString()
+ Constant.sectionConstantModel!.adminCommision != null &&
+ Constant.sectionConstantModel!.adminCommision!.isEnabled == true
+ ? Constant.sectionConstantModel!.adminCommision!.commissionType
+ .toString()
: null;
orderModel.adminCommission =
- Constant.sectionConstantModel!.adminCommision != null && Constant.sectionConstantModel!.adminCommision!.isEnabled == true
+ Constant.sectionConstantModel!.adminCommision != null &&
+ Constant.sectionConstantModel!.adminCommision!.isEnabled == true
? Constant.sectionConstantModel!.adminCommision!.amount.toString()
: null;
orderModel.couponCode = couponCodeTextEditController.value.text;
@@ -500,7 +645,9 @@ class IntercityHomeController extends GetxController {
orderModel.roundTrip = false;
orderModel.sectionId = Constant.sectionConstantModel!.id;
orderModel.createdAt = Timestamp.now();
- orderModel.otpCode = (maths.Random().nextInt(9000) + 1000).toString(); // Generate a 4-digit OTP
+ orderModel.otpCode =
+ (maths.Random().nextInt(9000) + 1000)
+ .toString(); // Generate a 4-digit OTP
orderModel.status = Constant.orderPlaced;
orderModel.scheduleDateTime = Timestamp.now();
log("Order Model : ${orderModel.toJson()}");
@@ -515,8 +662,10 @@ class IntercityHomeController extends GetxController {
double getAmount(VehicleType vehicleType) {
final double currentDistance = distance.value;
- if (currentDistance <= (vehicleType.minimum_delivery_charges_within_km ?? 0)) {
- return double.tryParse(vehicleType.minimum_delivery_charges.toString()) ?? 0.0;
+ if (currentDistance <=
+ (vehicleType.minimum_delivery_charges_within_km ?? 0)) {
+ return double.tryParse(vehicleType.minimum_delivery_charges.toString()) ??
+ 0.0;
} else {
return (vehicleType.delivery_charges_per_km ?? 0.0) * currentDistance;
}
@@ -541,28 +690,50 @@ class IntercityHomeController extends GetxController {
void setStopMarker(double lat, double lng, int index) {
if (Constant.selectedMapType == 'osm') {
// Add new stop marker without clearing
- osmMarker.add(flutterMap.Marker(point: latlong.LatLng(lat, lng), width: 40, height: 40, child: stopIconOsm!));
+ osmMarker.add(
+ flutterMap.Marker(
+ point: latlong.LatLng(lat, lng),
+ width: 40,
+ height: 40,
+ child: stopIconOsm!,
+ ),
+ );
getDirections(isStopMarker: true);
} else {
final markerId = MarkerId('Stop $index');
markers.removeWhere((marker) => marker.markerId == markerId);
- markers.add(Marker(markerId: markerId, infoWindow: InfoWindow(title: 'Stop ${String.fromCharCode(index + 65)}'), position: LatLng(lat, lng), icon: stopIcon!));
+ markers.add(
+ Marker(
+ markerId: markerId,
+ infoWindow: InfoWindow(
+ title: 'Stop ${String.fromCharCode(index + 65)}',
+ ),
+ position: LatLng(lat, lng),
+ icon: stopIcon!,
+ ),
+ );
getDirections();
}
}
void _setOsmMarker(double lat, double lng, {required bool isDeparture}) {
- final marker = flutterMap.Marker(point: latlong.LatLng(lat, lng), width: 40, height: 40, child: isDeparture ? departureIconOsm! : destinationIconOsm!);
+ final marker = flutterMap.Marker(
+ point: latlong.LatLng(lat, lng),
+ width: 40,
+ height: 40,
+ child: isDeparture ? departureIconOsm! : destinationIconOsm!,
+ );
if (isDeparture) {
departureLatLongOsm.value = latlong.LatLng(lat, lng);
} else {
destinationLatLongOsm.value = latlong.LatLng(lat, lng);
}
osmMarker.add(marker);
- if (departureLatLongOsm.value.latitude != 0 && destinationLatLongOsm.value.latitude != 0) {
+ if (departureLatLongOsm.value.latitude != 0 &&
+ destinationLatLongOsm.value.latitude != 0) {
getDirections();
animateToSource(lat, lng);
}
@@ -584,14 +755,26 @@ class IntercityHomeController extends GetxController {
markers.removeWhere((marker) => marker.markerId == markerId);
// Add new marker
- markers.add(Marker(markerId: markerId, position: pos, icon: icon, infoWindow: InfoWindow(title: title)));
+ markers.add(
+ Marker(
+ markerId: markerId,
+ position: pos,
+ icon: icon,
+ infoWindow: InfoWindow(title: title),
+ ),
+ );
mapController.animateCamera(CameraUpdate.newLatLngZoom(pos, 14));
- if (departureLatLong.value.latitude != 0 && destinationLatLong.value.latitude != 0) {
+ if (departureLatLong.value.latitude != 0 &&
+ destinationLatLong.value.latitude != 0) {
getDirections();
} else {
- mapController.animateCamera(CameraUpdate.newCameraPosition(CameraPosition(target: LatLng(lat, lng), zoom: 14)));
+ mapController.animateCamera(
+ CameraUpdate.newCameraPosition(
+ CameraPosition(target: LatLng(lat, lng), zoom: 14),
+ ),
+ );
}
}
@@ -600,25 +783,43 @@ class IntercityHomeController extends GetxController {
final wayPoints = [];
// Only add valid source
- if (departureLatLongOsm.value.latitude != 0.0 && departureLatLongOsm.value.longitude != 0.0) {
+ if (departureLatLongOsm.value.latitude != 0.0 &&
+ departureLatLongOsm.value.longitude != 0.0) {
wayPoints.add(departureLatLongOsm.value);
}
// Only add valid destination
- if (destinationLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.longitude != 0.0) {
+ if (destinationLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.longitude != 0.0) {
wayPoints.add(destinationLatLongOsm.value);
}
if (!isStopMarker) osmMarker.clear();
// Add source marker
- if (departureLatLongOsm.value.latitude != 0.0 && departureLatLongOsm.value.longitude != 0.0) {
- osmMarker.add(flutterMap.Marker(point: departureLatLongOsm.value, width: 40, height: 40, child: departureIconOsm!));
+ if (departureLatLongOsm.value.latitude != 0.0 &&
+ departureLatLongOsm.value.longitude != 0.0) {
+ osmMarker.add(
+ flutterMap.Marker(
+ point: departureLatLongOsm.value,
+ width: 40,
+ height: 40,
+ child: departureIconOsm!,
+ ),
+ );
}
// Add destination marker
- if (destinationLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.longitude != 0.0) {
- osmMarker.add(flutterMap.Marker(point: destinationLatLongOsm.value, width: 40, height: 40, child: destinationIconOsm!));
+ if (destinationLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.longitude != 0.0) {
+ osmMarker.add(
+ flutterMap.Marker(
+ point: destinationLatLongOsm.value,
+ width: 40,
+ height: 40,
+ child: destinationIconOsm!,
+ ),
+ );
}
if (wayPoints.length >= 2) {
@@ -631,10 +832,14 @@ class IntercityHomeController extends GetxController {
}
Future fetchGoogleRouteWithWaypoints() async {
- if (departureLatLong.value.latitude == 0.0 || destinationLatLong.value.latitude == 0.0) return;
+ if (departureLatLong.value.latitude == 0.0 ||
+ destinationLatLong.value.latitude == 0.0)
+ return;
- final origin = '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
- final destination = '${destinationLatLong.value.latitude},${destinationLatLong.value.longitude}';
+ final origin =
+ '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
+ final destination =
+ '${destinationLatLong.value.latitude},${destinationLatLong.value.longitude}';
final url = Uri.parse(
'https://maps.googleapis.com/maps/api/directions/json'
@@ -653,7 +858,8 @@ class IntercityHomeController extends GetxController {
// Polyline
final encodedPolyline = route['overview_polyline']['points'];
final decodedPoints = PolylinePoints.decodePolyline(encodedPolyline);
- final coordinates = decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
+ final coordinates =
+ decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
addPolyLine(coordinates);
@@ -685,19 +891,26 @@ class IntercityHomeController extends GetxController {
}
Future fetchRouteWithWaypoints(List points) async {
- final coordinates = points.map((p) => '${p.longitude},${p.latitude}').join(';');
- final url = Uri.parse('https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson');
+ final coordinates = points
+ .map((p) => '${p.longitude},${p.latitude}')
+ .join(';');
+ final url = Uri.parse(
+ 'https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson',
+ );
try {
final response = await http.get(url);
if (response.statusCode == 200) {
final decoded = json.decode(response.body);
- final geometry = decoded['routes'][0]['geometry']['coordinates'] as List;
+ final geometry =
+ decoded['routes'][0]['geometry']['coordinates'] as List;
final dist = decoded['routes'][0]['distance'];
final dur = decoded['routes'][0]['duration'];
routePoints.clear();
- routePoints.addAll(geometry.map((coord) => latlong.LatLng(coord[1], coord[0])));
+ routePoints.addAll(
+ geometry.map((coord) => latlong.LatLng(coord[1], coord[0])),
+ );
if (Constant.distanceType.toLowerCase() == "KM".toLowerCase()) {
distance.value = dist / 1000.00;
@@ -722,7 +935,10 @@ class IntercityHomeController extends GetxController {
void zoomToPolylineOSM() {
if (routePoints.isEmpty) return;
// LatLngBounds requires at least two points
- final bounds = flutterMap.LatLngBounds(routePoints.first, routePoints.first);
+ final bounds = flutterMap.LatLngBounds(
+ routePoints.first,
+ routePoints.first,
+ );
for (final point in routePoints) {
bounds.extend(point);
}
@@ -734,8 +950,10 @@ class IntercityHomeController extends GetxController {
double getBoundsZoomLevel(flutterMap.LatLngBounds bounds) {
// Simple heuristic: zoom out for larger bounds
- final latDiff = (bounds.northEast.latitude - bounds.southWest.latitude).abs();
- final lngDiff = (bounds.northEast.longitude - bounds.southWest.longitude).abs();
+ final latDiff =
+ (bounds.northEast.latitude - bounds.southWest.latitude).abs();
+ final lngDiff =
+ (bounds.northEast.longitude - bounds.southWest.longitude).abs();
double maxDiff = math.max(latDiff, lngDiff);
if (maxDiff < 0.005) return 18.0;
if (maxDiff < 0.01) return 16.0;
@@ -747,7 +965,13 @@ class IntercityHomeController extends GetxController {
void addPolyLine(List points) {
final id = const PolylineId("poly");
- final polyline = Polyline(polylineId: id, color: AppThemeData.primary300, points: points, width: 6, geodesic: true);
+ final polyline = Polyline(
+ polylineId: id,
+ color: AppThemeData.primary300,
+ points: points,
+ width: 6,
+ geodesic: true,
+ );
polyLines[id] = polyline;
if (points.length >= 2) {
@@ -756,7 +980,10 @@ class IntercityHomeController extends GetxController {
}
}
- Future updateCameraLocationToFitPolyline(List points, GoogleMapController? mapController) async {
+ Future updateCameraLocationToFitPolyline(
+ List points,
+ GoogleMapController? mapController,
+ ) async {
if (mapController == null || points.isEmpty) return;
double minLat = points.first.latitude, maxLat = points.first.latitude;
double minLng = points.first.longitude, maxLng = points.first.longitude;
@@ -766,16 +993,24 @@ class IntercityHomeController extends GetxController {
if (p.longitude < minLng) minLng = p.longitude;
if (p.longitude > maxLng) maxLng = p.longitude;
}
- final bounds = LatLngBounds(southwest: LatLng(minLat, minLng), northeast: LatLng(maxLat, maxLng));
+ final bounds = LatLngBounds(
+ southwest: LatLng(minLat, minLng),
+ northeast: LatLng(maxLat, maxLng),
+ );
final cameraUpdate = CameraUpdate.newLatLngBounds(bounds, 50);
await checkCameraLocation(cameraUpdate, mapController);
}
Future animateToSource(double lat, double long) async {
- final hasBothCoords = departureLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.latitude != 0.0;
+ final hasBothCoords =
+ departureLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.latitude != 0.0;
if (hasBothCoords) {
- await calculateZoomLevel(source: departureLatLongOsm.value, destination: destinationLatLongOsm.value);
+ await calculateZoomLevel(
+ source: departureLatLongOsm.value,
+ destination: destinationLatLongOsm.value,
+ );
} else {
mapOsmController.move(latlong.LatLng(lat, long), 10);
}
@@ -783,15 +1018,25 @@ class IntercityHomeController extends GetxController {
RxMap polyLines = {}.obs;
- Future calculateZoomLevel({required latlong.LatLng source, required latlong.LatLng destination, double paddingFraction = 0.001}) async {
+ Future calculateZoomLevel({
+ required latlong.LatLng source,
+ required latlong.LatLng destination,
+ double paddingFraction = 0.001,
+ }) async {
final bounds = flutterMap.LatLngBounds.fromPoints([source, destination]);
final screenSize = Size(Get.width, Get.height * 0.5);
const double worldDimension = 256.0;
const double maxZoom = 10.0;
- double latToRad(double lat) => math.log((1 + math.sin(lat * math.pi / 180)) / (1 - math.sin(lat * math.pi / 180))) / 2;
+ double latToRad(double lat) =>
+ math.log(
+ (1 + math.sin(lat * math.pi / 180)) /
+ (1 - math.sin(lat * math.pi / 180)),
+ ) /
+ 2;
- double computeZoom(double screenPx, double worldPx, double fraction) => math.log(screenPx / worldPx / fraction) / math.ln2;
+ double computeZoom(double screenPx, double worldPx, double fraction) =>
+ math.log(screenPx / worldPx / fraction) / math.ln2;
final north = bounds.northEast.latitude;
final south = bounds.southWest.latitude;
@@ -809,27 +1054,48 @@ class IntercityHomeController extends GetxController {
final latFraction = (latToRad(north) - latToRad(south)) / math.pi;
final lngFraction = ((east - west + 360) % 360) / 360;
- final latZoom = computeZoom(screenSize.height, worldDimension, latFraction + paddingFraction);
- final lngZoom = computeZoom(screenSize.width, worldDimension, lngFraction + paddingFraction);
+ final latZoom = computeZoom(
+ screenSize.height,
+ worldDimension,
+ latFraction + paddingFraction,
+ );
+ final lngZoom = computeZoom(
+ screenSize.width,
+ worldDimension,
+ lngFraction + paddingFraction,
+ );
final zoomLevel = math.min(latZoom, lngZoom).clamp(0.0, maxZoom);
mapOsmController.move(center, zoomLevel);
}
}
- Future updateCameraLocation(LatLng source, LatLng destination, GoogleMapController? mapController) async {
+ Future updateCameraLocation(
+ LatLng source,
+ LatLng destination,
+ GoogleMapController? mapController,
+ ) async {
if (mapController == null) return;
final bounds = LatLngBounds(
- southwest: LatLng(math.min(source.latitude, destination.latitude), math.min(source.longitude, destination.longitude)),
- northeast: LatLng(math.max(source.latitude, destination.latitude), math.max(source.longitude, destination.longitude)),
+ southwest: LatLng(
+ math.min(source.latitude, destination.latitude),
+ math.min(source.longitude, destination.longitude),
+ ),
+ northeast: LatLng(
+ math.max(source.latitude, destination.latitude),
+ math.max(source.longitude, destination.longitude),
+ ),
);
final cameraUpdate = CameraUpdate.newLatLngBounds(bounds, 90);
await checkCameraLocation(cameraUpdate, mapController);
}
- Future checkCameraLocation(CameraUpdate cameraUpdate, GoogleMapController mapController) async {
+ Future checkCameraLocation(
+ CameraUpdate cameraUpdate,
+ GoogleMapController mapController,
+ ) async {
await mapController.animateCamera(cameraUpdate);
final l1 = await mapController.getVisibleRegion();
final l2 = await mapController.getVisibleRegion();
@@ -842,16 +1108,44 @@ class IntercityHomeController extends GetxController {
Future setIcons() async {
try {
if (Constant.selectedMapType == 'osm') {
- departureIconOsm = Image.asset("assets/icons/pickup.png", width: 30, height: 30);
- destinationIconOsm = Image.asset("assets/icons/dropoff.png", width: 30, height: 30);
- taxiIconOsm = Image.asset("assets/icons/ic_taxi.png", width: 30, height: 30);
- stopIconOsm = Image.asset("assets/icons/location.png", width: 26, height: 26);
+ departureIconOsm = Image.asset(
+ "assets/icons/pickup.png",
+ width: 30,
+ height: 30,
+ );
+ destinationIconOsm = Image.asset(
+ "assets/icons/dropoff.png",
+ width: 30,
+ height: 30,
+ );
+ taxiIconOsm = Image.asset(
+ "assets/icons/ic_taxi.png",
+ width: 30,
+ height: 30,
+ );
+ stopIconOsm = Image.asset(
+ "assets/icons/location.png",
+ width: 26,
+ height: 26,
+ );
} else {
const config = ImageConfiguration(size: Size(48, 48));
- departureIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/pickup.png");
- destinationIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/dropoff.png");
- taxiIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/ic_taxi.png");
- stopIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/location.png");
+ departureIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/pickup.png",
+ );
+ destinationIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/dropoff.png",
+ );
+ taxiIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/ic_taxi.png",
+ );
+ stopIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/location.png",
+ );
}
} catch (e) {
print('Error loading icons: $e');
@@ -859,8 +1153,12 @@ class IntercityHomeController extends GetxController {
}
void clearMapDataIfLocationsRemoved() {
- final isSourceEmpty = departureLatLongOsm.value.latitude == 0.0 && departureLatLongOsm.value.longitude == 0.0;
- final isDestinationEmpty = destinationLatLongOsm.value.latitude == 0.0 && destinationLatLongOsm.value.longitude == 0.0;
+ final isSourceEmpty =
+ departureLatLongOsm.value.latitude == 0.0 &&
+ departureLatLongOsm.value.longitude == 0.0;
+ final isDestinationEmpty =
+ destinationLatLongOsm.value.latitude == 0.0 &&
+ destinationLatLongOsm.value.longitude == 0.0;
if (isSourceEmpty || isDestinationEmpty) {
// Clear polylines
@@ -889,7 +1187,9 @@ class IntercityHomeController extends GetxController {
// Remove marker
if (Constant.selectedMapType == 'osm') {
- osmMarker.removeWhere((marker) => marker.point == departureLatLongOsm.value);
+ osmMarker.removeWhere(
+ (marker) => marker.point == departureLatLongOsm.value,
+ );
} else {
markers.removeWhere((marker) => marker.markerId.value == 'Departure');
}
@@ -905,7 +1205,9 @@ class IntercityHomeController extends GetxController {
destinationTextEditController.value.clear();
if (Constant.selectedMapType == 'osm') {
- osmMarker.removeWhere((marker) => marker.point == destinationLatLongOsm.value);
+ osmMarker.removeWhere(
+ (marker) => marker.point == destinationLatLongOsm.value,
+ );
} else {
markers.removeWhere((marker) => marker.markerId.value == 'Destination');
}
@@ -915,9 +1217,16 @@ class IntercityHomeController extends GetxController {
}
Future searchPlaceNameOSM() async {
- final url = Uri.parse('https://nominatim.openstreetmap.org/reverse?lat=${departureLatLongOsm.value.latitude}&lon=${departureLatLongOsm.value.longitude}&format=json');
+ final url = Uri.parse(
+ 'https://nominatim.openstreetmap.org/reverse?lat=${departureLatLongOsm.value.latitude}&lon=${departureLatLongOsm.value.longitude}&format=json',
+ );
- final response = await http.get(url, headers: {'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)'});
+ final response = await http.get(
+ url,
+ headers: {
+ 'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
+ },
+ );
if (response.statusCode == 200) {
log("response.body :: ${response.body}");
@@ -930,7 +1239,9 @@ class IntercityHomeController extends GetxController {
final lat = departureLatLong.value.latitude;
final lng = departureLatLong.value.longitude;
- final url = Uri.parse('https://maps.googleapis.com/maps/api/geocode/json?latlng=$lat,$lng&key=${Constant.mapAPIKey}');
+ final url = Uri.parse(
+ 'https://maps.googleapis.com/maps/api/geocode/json?latlng=$lat,$lng&key=${Constant.mapAPIKey}',
+ );
final response = await http.get(url);
@@ -973,19 +1284,45 @@ class IntercityHomeController extends GetxController {
Future getPaymentSettings() async {
await FireStoreUtils.getPaymentSettingsData().then((value) {
- stripeModel.value = StripeModel.fromJson(jsonDecode(Preferences.getString(Preferences.stripeSettings)));
- payPalModel.value = PayPalModel.fromJson(jsonDecode(Preferences.getString(Preferences.paypalSettings)));
- payStackModel.value = PayStackModel.fromJson(jsonDecode(Preferences.getString(Preferences.payStack)));
- mercadoPagoModel.value = MercadoPagoModel.fromJson(jsonDecode(Preferences.getString(Preferences.mercadoPago)));
- flutterWaveModel.value = FlutterWaveModel.fromJson(jsonDecode(Preferences.getString(Preferences.flutterWave)));
- paytmModel.value = PaytmModel.fromJson(jsonDecode(Preferences.getString(Preferences.paytmSettings)));
- payFastModel.value = PayFastModel.fromJson(jsonDecode(Preferences.getString(Preferences.payFastSettings)));
- razorPayModel.value = RazorPayModel.fromJson(jsonDecode(Preferences.getString(Preferences.razorpaySettings)));
- midTransModel.value = MidTrans.fromJson(jsonDecode(Preferences.getString(Preferences.midTransSettings)));
- orangeMoneyModel.value = OrangeMoney.fromJson(jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)));
- xenditModel.value = Xendit.fromJson(jsonDecode(Preferences.getString(Preferences.xenditSettings)));
- walletSettingModel.value = WalletSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.walletSettings)));
- cashOnDeliverySettingModel.value = CodSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.codSettings)));
+ stripeModel.value = StripeModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.stripeSettings)),
+ );
+ payPalModel.value = PayPalModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paypalSettings)),
+ );
+ payStackModel.value = PayStackModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payStack)),
+ );
+ mercadoPagoModel.value = MercadoPagoModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.mercadoPago)),
+ );
+ flutterWaveModel.value = FlutterWaveModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.flutterWave)),
+ );
+ paytmModel.value = PaytmModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paytmSettings)),
+ );
+ payFastModel.value = PayFastModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payFastSettings)),
+ );
+ razorPayModel.value = RazorPayModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.razorpaySettings)),
+ );
+ midTransModel.value = MidTrans.fromJson(
+ jsonDecode(Preferences.getString(Preferences.midTransSettings)),
+ );
+ orangeMoneyModel.value = OrangeMoney.fromJson(
+ jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)),
+ );
+ xenditModel.value = Xendit.fromJson(
+ jsonDecode(Preferences.getString(Preferences.xenditSettings)),
+ );
+ walletSettingModel.value = WalletSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.walletSettings)),
+ );
+ cashOnDeliverySettingModel.value = CodSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.codSettings)),
+ );
if (walletSettingModel.value.isEnabled == true) {
selectedPaymentMethod.value = PaymentGateway.wallet.name;
@@ -1027,20 +1364,32 @@ class IntercityHomeController extends GetxController {
Future stripeMakePayment({required String amount}) async {
log(double.parse(amount).toStringAsFixed(0));
try {
- Map? paymentIntentData = await createStripeIntent(amount: amount);
+ Map? paymentIntentData = await createStripeIntent(
+ amount: amount,
+ );
log("stripe Responce====>$paymentIntentData");
if (paymentIntentData!.containsKey("error")) {
Get.back();
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
} else {
await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters(
paymentIntentClientSecret: paymentIntentData['client_secret'],
allowsDelayedPaymentMethods: false,
- googlePay: const PaymentSheetGooglePay(merchantCountryCode: 'US', testEnv: true, currencyCode: "USD"),
+ googlePay: const PaymentSheetGooglePay(
+ merchantCountryCode: 'US',
+ testEnv: true,
+ currencyCode: "USD",
+ ),
customFlow: true,
style: ThemeMode.system,
- appearance: PaymentSheetAppearance(colors: PaymentSheetAppearanceColors(primary: AppThemeData.primary300)),
+ appearance: PaymentSheetAppearance(
+ colors: PaymentSheetAppearanceColors(
+ primary: AppThemeData.primary300,
+ ),
+ ),
merchantDisplayName: 'GoRide',
),
);
@@ -1086,7 +1435,10 @@ class IntercityHomeController extends GetxController {
var response = await http.post(
Uri.parse('https://api.stripe.com/v1/payment_intents'),
body: body,
- headers: {'Authorization': 'Bearer $stripeSecret', 'Content-Type': 'application/x-www-form-urlencoded'},
+ headers: {
+ 'Authorization': 'Bearer $stripeSecret',
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
);
return jsonDecode(response.body);
@@ -1096,8 +1448,14 @@ class IntercityHomeController extends GetxController {
}
//mercadoo
- Future mercadoPagoMakePayment({required BuildContext context, required String amount}) async {
- final headers = {'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}', 'Content-Type': 'application/json'};
+ Future mercadoPagoMakePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
+ final headers = {
+ 'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"items": [
@@ -1110,12 +1468,20 @@ class IntercityHomeController extends GetxController {
},
],
"payer": {"email": userModel.value.email},
- "back_urls": {"failure": "${Constant.globalUrl}payment/failure", "pending": "${Constant.globalUrl}payment/pending", "success": "${Constant.globalUrl}payment/success"},
+ "back_urls": {
+ "failure": "${Constant.globalUrl}payment/failure",
+ "pending": "${Constant.globalUrl}payment/pending",
+ "success": "${Constant.globalUrl}payment/success",
+ },
"auto_return": "approved",
// Automatically return after payment is approved
});
- final response = await http.post(Uri.parse("https://api.mercadopago.com/checkout/preferences"), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse("https://api.mercadopago.com/checkout/preferences"),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
final data = jsonDecode(response.body);
@@ -1173,9 +1539,12 @@ class IntercityHomeController extends GetxController {
///PayStack Payment Method
Future payStackPayment(String totalAmount) async {
- await PayStackURLGen.payStackURLGen(amount: (double.parse(totalAmount) * 100).toString(), currency: "ZAR", secretKey: payStackModel.value.secretKey.toString(), userModel: userModel.value).then((
- value,
- ) async {
+ await PayStackURLGen.payStackURLGen(
+ amount: (double.parse(totalAmount) * 100).toString(),
+ currency: "ZAR",
+ secretKey: payStackModel.value.secretKey.toString(),
+ userModel: userModel.value,
+ ).then((value) async {
if (value != null) {
PayStackUrlModel payStackModel0 = value;
Get.to(
@@ -1195,15 +1564,23 @@ class IntercityHomeController extends GetxController {
}
});
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
}
});
}
//flutter wave Payment Method
- Future flutterWaveInitiatePayment({required BuildContext context, required String amount}) async {
+ Future flutterWaveInitiatePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
final url = Uri.parse('https://api.flutterwave.com/v3/payments');
- final headers = {'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}', 'Content-Type': 'application/json'};
+ final headers = {
+ 'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"tx_ref": _ref,
@@ -1216,14 +1593,19 @@ class IntercityHomeController extends GetxController {
"phonenumber": userModel.value.phoneNumber, // Add a real phone number
"name": userModel.value.fullName(), // Add a real customer name
},
- "customizations": {"title": "Payment for Services", "description": "Payment for XYZ services"},
+ "customizations": {
+ "title": "Payment for Services",
+ "description": "Payment for XYZ services",
+ },
});
final response = await http.post(url, headers: headers, body: body);
if (response.statusCode == 200) {
final data = jsonDecode(response.body);
- Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((value) {
+ Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((
+ value,
+ ) {
if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1252,8 +1634,14 @@ class IntercityHomeController extends GetxController {
// payFast
void payFastPayment({required BuildContext context, required String amount}) {
- PayStackURLGen.getPayHTML(payFastSettingData: payFastModel.value, amount: amount.toString(), userModel: userModel.value).then((String? value) async {
- bool isDone = await Get.to(PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value));
+ PayStackURLGen.getPayHTML(
+ payFastSettingData: payFastModel.value,
+ amount: amount.toString(),
+ userModel: userModel.value,
+ ).then((String? value) async {
+ bool isDone = await Get.to(
+ PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value),
+ );
if (isDone) {
Get.back();
ShowToastDialog.showToast("Payment successfully".tr);
@@ -1292,7 +1680,14 @@ class IntercityHomeController extends GetxController {
// });
}
- Future startTransaction(context, {required String txnTokenBy, required orderId, required double amount, required callBackURL, required isStaging}) async {
+ Future startTransaction(
+ context, {
+ required String txnTokenBy,
+ required orderId,
+ required double amount,
+ required callBackURL,
+ required isStaging,
+ }) async {
// try {
// var response = AllInOneSdk.startTransaction(
// paytmModel.value.paytmMID.toString(),
@@ -1328,24 +1723,38 @@ class IntercityHomeController extends GetxController {
// }
}
- Future verifyCheckSum({required String checkSum, required double amount, required orderId}) async {
+ Future verifyCheckSum({
+ required String checkSum,
+ required double amount,
+ required orderId,
+ }) async {
String getChecksum = "${Constant.globalUrl}payments/validatechecksum";
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(), "checksum_value": checkSum},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ "checksum_value": checkSum,
+ },
);
final data = jsonDecode(response.body);
return data['status'];
}
- Future initiatePayment({required double amount, required orderId}) async {
+ Future initiatePayment({
+ required double amount,
+ required orderId,
+ }) async {
String initiateURL = "${Constant.globalUrl}payments/initiatepaytmpayment";
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
final response = await http.post(
Uri.parse(initiateURL),
@@ -1363,9 +1772,12 @@ class IntercityHomeController extends GetxController {
);
log(response.body);
final data = jsonDecode(response.body);
- if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) {
+ if (data["body"]["txnToken"] == null ||
+ data["body"]["txnToken"].toString().isEmpty) {
Get.back();
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
}
return GetPaymentTxtTokenModel.fromJson(data);
}
@@ -1383,7 +1795,10 @@ class IntercityHomeController extends GetxController {
'description': 'wallet Topup',
'retry': {'enabled': true, 'max_count': 1},
'send_sms_hash': true,
- 'prefill': {'contact': userModel.value.phoneNumber, 'email': userModel.value.email},
+ 'prefill': {
+ 'contact': userModel.value.phoneNumber,
+ 'email': userModel.value.email,
+ },
'external': {
'wallets': ['paytm'],
},
@@ -1418,7 +1833,10 @@ class IntercityHomeController extends GetxController {
}
//Midtrans payment
- Future midtransMakePayment({required String amount, required BuildContext context}) async {
+ Future midtransMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
await createPaymentLink(amount: amount).then((url) {
ShowToastDialog.closeLoader();
if (url != '') {
@@ -1436,15 +1854,30 @@ class IntercityHomeController extends GetxController {
Future createPaymentLink({required var amount}) async {
var ordersId = const Uuid().v1();
- final url = Uri.parse(midTransModel.value.isSandbox! ? 'https://api.sandbox.midtrans.com/v1/payment-links' : 'https://api.midtrans.com/v1/payment-links');
+ final url = Uri.parse(
+ midTransModel.value.isSandbox!
+ ? 'https://api.sandbox.midtrans.com/v1/payment-links'
+ : 'https://api.midtrans.com/v1/payment-links',
+ );
final response = await http.post(
url,
- headers: {'Accept': 'application/json', 'Content-Type': 'application/json', 'Authorization': generateBasicAuthHeader(midTransModel.value.serverKey!)},
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': generateBasicAuthHeader(
+ midTransModel.value.serverKey!,
+ ),
+ },
body: jsonEncode({
- 'transaction_details': {'order_id': ordersId, 'gross_amount': double.parse(amount.toString()).toInt()},
+ 'transaction_details': {
+ 'order_id': ordersId,
+ 'gross_amount': double.parse(amount.toString()).toInt(),
+ },
'usage_limit': 2,
- "callbacks": {"finish": "https://www.google.com?merchant_order_id=$ordersId"},
+ "callbacks": {
+ "finish": "https://www.google.com?merchant_order_id=$ordersId",
+ },
}),
);
@@ -1452,7 +1885,9 @@ class IntercityHomeController extends GetxController {
final responseData = jsonDecode(response.body);
return responseData['payment_url'];
} else {
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -1469,13 +1904,30 @@ class IntercityHomeController extends GetxController {
static String orderId = '';
static String amount = '';
- Future orangeMakePayment({required String amount, required BuildContext context}) async {
+ Future orangeMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
reset();
var id = const Uuid().v4();
- var paymentURL = await fetchToken(context: context, orderId: id, amount: amount, currency: 'USD');
+ var paymentURL = await fetchToken(
+ context: context,
+ orderId: id,
+ amount: amount,
+ currency: 'USD',
+ );
ShowToastDialog.closeLoader();
if (paymentURL.toString() != '') {
- Get.to(() => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken))!.then((value) {
+ Get.to(
+ () => OrangeMoneyScreen(
+ initialURl: paymentURL,
+ accessToken: accessToken,
+ amount: amount,
+ orangePay: orangeMoneyModel.value,
+ orderId: orderId,
+ payToken: payToken,
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1487,13 +1939,22 @@ class IntercityHomeController extends GetxController {
}
}
- Future fetchToken({required String orderId, required String currency, required BuildContext context, required String amount}) async {
+ Future fetchToken({
+ required String orderId,
+ required String currency,
+ required BuildContext context,
+ required String amount,
+ }) async {
String apiUrl = 'https://api.orange.com/oauth/v3/token';
Map requestBody = {'grant_type': 'client_credentials'};
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': "Basic ${orangeMoneyModel.value.auth!}", 'Content-Type': 'application/x-www-form-urlencoded', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': "Basic ${orangeMoneyModel.value.auth!}",
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'Accept': 'application/json',
+ },
body: requestBody,
);
@@ -1504,17 +1965,32 @@ class IntercityHomeController extends GetxController {
accessToken = responseData['access_token'];
// ignore: use_build_context_synchronously
- return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
+ 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 '';
}
}
- Future webpayment({required String orderIdData, required BuildContext context, required String currency, required String amountData}) async {
+ Future webpayment({
+ required String orderIdData,
+ required BuildContext context,
+ required String currency,
+ required String amountData,
+ }) async {
orderId = orderIdData;
amount = amountData;
- String apiUrl = orangeMoneyModel.value.isSandbox! == true ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment' : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
+ String apiUrl =
+ orangeMoneyModel.value.isSandbox! == true
+ ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment'
+ : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
Map requestBody = {
"merchant_key": orangeMoneyModel.value.merchantKey ?? '',
"currency": orangeMoneyModel.value.isSandbox == true ? "OUV" : currency,
@@ -1529,7 +2005,11 @@ class IntercityHomeController extends GetxController {
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': 'Bearer $accessToken', 'Content-Type': 'application/json', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': 'Bearer $accessToken',
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
body: json.encode(requestBody),
);
@@ -1543,7 +2023,9 @@ class IntercityHomeController extends GetxController {
return '';
}
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -1560,7 +2042,13 @@ class IntercityHomeController extends GetxController {
await createXenditInvoice(amount: amount).then((model) {
ShowToastDialog.closeLoader();
if (model.id != null) {
- Get.to(() => XenditScreen(initialURl: model.invoiceUrl ?? '', transId: model.id ?? '', apiKey: xenditModel.value.apiKey!.toString()))!.then((value) {
+ Get.to(
+ () => XenditScreen(
+ initialURl: model.invoiceUrl ?? '',
+ transId: model.id ?? '',
+ apiKey: xenditModel.value.apiKey!.toString(),
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1577,7 +2065,9 @@ class IntercityHomeController extends GetxController {
const url = 'https://api.xendit.co/v2/invoices';
var headers = {
'Content-Type': 'application/json',
- 'Authorization': generateBasicAuthHeader(xenditModel.value.apiKey!.toString()),
+ 'Authorization': generateBasicAuthHeader(
+ xenditModel.value.apiKey!.toString(),
+ ),
// 'Cookie': '__cf_bm=yERkrx3xDITyFGiou0bbKY1bi7xEwovHNwxV1vCNbVc-1724155511-1.0.1.1-jekyYQmPCwY6vIJ524K0V6_CEw6O.dAwOmQnHtwmaXO_MfTrdnmZMka0KZvjukQgXu5B.K_6FJm47SGOPeWviQ',
};
@@ -1590,7 +2080,11 @@ class IntercityHomeController extends GetxController {
});
try {
- final response = await http.post(Uri.parse(url), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse(url),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
XenditModel model = XenditModel.fromJson(jsonDecode(response.body));
diff --git a/lib/controllers/address_list_controller.dart b/lib/controllers/address_list_controller.dart
index 3a90915..7efd69a 100644
--- a/lib/controllers/address_list_controller.dart
+++ b/lib/controllers/address_list_controller.dart
@@ -1,6 +1,5 @@
import 'package:customer/models/user_model.dart';
import 'package:get/get.dart';
-
import '../constant/constant.dart';
import '../service/fire_store_utils.dart';
@@ -18,7 +17,9 @@ class AddressListController extends GetxController {
}
Future getUser() async {
- await FireStoreUtils.getUserProfile(FireStoreUtils.getCurrentUid()).then((value) {
+ await FireStoreUtils.getUserProfile(FireStoreUtils.getCurrentUid()).then((
+ value,
+ ) {
if (value != null) {
userModel.value = value;
if (userModel.value.shippingAddress != null) {
diff --git a/lib/controllers/all_brand_product_controller.dart b/lib/controllers/all_brand_product_controller.dart
index 5ffaec1..f167094 100644
--- a/lib/controllers/all_brand_product_controller.dart
+++ b/lib/controllers/all_brand_product_controller.dart
@@ -27,19 +27,27 @@ class AllBrandProductController extends GetxController {
}
Future getProductByCategoryId() async {
- List productDataList = await FireStoreUtils.getProductListByBrandId(brandModel.value.id.toString());
+ List productDataList =
+ await FireStoreUtils.getProductListByBrandId(
+ brandModel.value.id.toString(),
+ );
List vendorList = await FireStoreUtils.getAllStoresFuture();
List allProduct = [];
for (var vendor in vendorList) {
await FireStoreUtils.getAllProducts(vendor.id.toString()).then((value) {
- if (Constant.isSubscriptionModelApplied == true || vendor.adminCommission?.isEnabled == true) {
- if (vendor.subscriptionPlan != null && Constant.isExpire(vendor) == false) {
+ if (Constant.isSubscriptionModelApplied == true ||
+ vendor.adminCommission?.isEnabled == true) {
+ if (vendor.subscriptionPlan != null &&
+ Constant.isExpire(vendor) == false) {
if (vendor.subscriptionPlan?.itemLimit == '-1') {
allProduct.addAll(value);
} else {
int selectedProduct =
- value.length < int.parse(vendor.subscriptionPlan?.itemLimit ?? '0') ? (value.isEmpty ? 0 : (value.length)) : int.parse(vendor.subscriptionPlan?.itemLimit ?? '0');
+ value.length <
+ int.parse(vendor.subscriptionPlan?.itemLimit ?? '0')
+ ? (value.isEmpty ? 0 : (value.length))
+ : int.parse(vendor.subscriptionPlan?.itemLimit ?? '0');
allProduct.addAll(value.sublist(0, selectedProduct));
}
}
@@ -49,7 +57,9 @@ class AllBrandProductController extends GetxController {
});
}
for (var element in productDataList) {
- final bool productIsInList = allProduct.any((product) => product.id == element.id);
+ final bool productIsInList = allProduct.any(
+ (product) => product.id == element.id,
+ );
if (productIsInList) {
productList.add(element);
}
diff --git a/lib/controllers/all_category_product_controller.dart b/lib/controllers/all_category_product_controller.dart
index d5454f6..a1fe34f 100644
--- a/lib/controllers/all_category_product_controller.dart
+++ b/lib/controllers/all_category_product_controller.dart
@@ -25,6 +25,8 @@ class AllCategoryProductController extends GetxController {
}
Future getProductByCategoryId() async {
- productList.value = await FireStoreUtils.getProductListByCategoryId(categoryModel.value.id.toString());
+ productList.value = await FireStoreUtils.getProductListByCategoryId(
+ categoryModel.value.id.toString(),
+ );
}
}
diff --git a/lib/controllers/book_parcel_controller.dart b/lib/controllers/book_parcel_controller.dart
index 7edc29d..3dcf92f 100644
--- a/lib/controllers/book_parcel_controller.dart
+++ b/lib/controllers/book_parcel_controller.dart
@@ -3,6 +3,7 @@ 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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart';
@@ -22,26 +23,39 @@ import '../themes/show_toast_dialog.dart';
class BookParcelController extends GetxController {
// Sender details
- final Rx senderLocationController = TextEditingController().obs;
- final Rx senderNameController = TextEditingController().obs;
- final Rx senderMobileController = TextEditingController().obs;
- final Rx senderWeightController = SingleValueDropDownController().obs;
- final Rx senderNoteController = TextEditingController().obs;
- final Rx senderCountryCodeController = TextEditingController(text: Constant.defaultCountryCode).obs;
+ final Rx senderLocationController =
+ TextEditingController().obs;
+ final Rx senderNameController =
+ TextEditingController().obs;
+ final Rx senderMobileController =
+ TextEditingController().obs;
+ final Rx senderWeightController =
+ SingleValueDropDownController().obs;
+ final Rx senderNoteController =
+ TextEditingController().obs;
+ final Rx senderCountryCodeController =
+ TextEditingController(text: Constant.defaultCountryCode).obs;
// Receiver details
- final Rx receiverLocationController = TextEditingController().obs;
- final Rx receiverNameController = TextEditingController().obs;
- final Rx receiverMobileController = TextEditingController().obs;
- final Rx receiverNoteController = TextEditingController().obs;
- final Rx receiverCountryCodeController = TextEditingController(text: Constant.defaultCountryCode).obs;
+ final Rx receiverLocationController =
+ TextEditingController().obs;
+ final Rx receiverNameController =
+ TextEditingController().obs;
+ final Rx receiverMobileController =
+ TextEditingController().obs;
+ final Rx receiverNoteController =
+ TextEditingController().obs;
+ final Rx receiverCountryCodeController =
+ TextEditingController(text: Constant.defaultCountryCode).obs;
// Delivery type
final RxString selectedDeliveryType = 'now'.obs;
// Scheduled delivery fields
- final Rx scheduledDateController = TextEditingController().obs;
- final Rx scheduledTimeController = TextEditingController().obs;
+ final Rx scheduledDateController =
+ TextEditingController().obs;
+ final Rx scheduledTimeController =
+ TextEditingController().obs;
final RxString scheduledDate = ''.obs;
final RxString scheduledTime = ''.obs;
@@ -82,7 +96,12 @@ class BookParcelController extends GetxController {
}
Future pickScheduledDate(BuildContext context) async {
- final DateTime? picked = await showDatePicker(context: context, initialDate: DateTime.now(), firstDate: DateTime.now(), lastDate: DateTime.now().add(const Duration(days: 365)));
+ final DateTime? picked = await showDatePicker(
+ context: context,
+ initialDate: DateTime.now(),
+ firstDate: DateTime.now(),
+ lastDate: DateTime.now().add(const Duration(days: 365)),
+ );
if (picked != null) {
final formattedDate = "${picked.day}/${picked.month}/${picked.year}";
scheduledDate.value = formattedDate;
@@ -91,7 +110,10 @@ class BookParcelController extends GetxController {
}
Future pickScheduledTime(BuildContext context) async {
- final TimeOfDay? picked = await showTimePicker(context: context, initialTime: TimeOfDay.now());
+ final TimeOfDay? picked = await showTimePicker(
+ context: context,
+ initialTime: TimeOfDay.now(),
+ );
if (picked != null) {
final formattedTime = picked.format(context);
scheduledTime.value = formattedTime;
@@ -101,7 +123,10 @@ class BookParcelController extends GetxController {
void onCameraClick(BuildContext context) {
final action = CupertinoActionSheet(
- message: Text('Add your parcel image.'.tr, style: const TextStyle(fontSize: 15.0)),
+ message: Text(
+ 'Add your parcel image.'.tr,
+ style: const TextStyle(fontSize: 15.0),
+ ),
actions: [
CupertinoActionSheetAction(
child: Text('Choose image from gallery'.tr),
@@ -117,14 +142,19 @@ class BookParcelController extends GetxController {
child: Text('Take a picture'.tr),
onPressed: () async {
Navigator.pop(context);
- final XFile? photo = await _picker.pickImage(source: ImageSource.camera);
+ final XFile? photo = await _picker.pickImage(
+ source: ImageSource.camera,
+ );
if (photo != null) {
images.add(photo);
}
},
),
],
- cancelButton: CupertinoActionSheetAction(child: Text('Cancel'.tr), onPressed: () => Navigator.pop(context)),
+ cancelButton: CupertinoActionSheetAction(
+ child: Text('Cancel'.tr),
+ onPressed: () => Navigator.pop(context),
+ ),
);
showCupertinoModalPopup(context: context, builder: (context) => action);
}
@@ -133,11 +163,18 @@ class BookParcelController extends GetxController {
try {
await Geolocator.requestPermission();
final position = await Geolocator.getCurrentPosition();
- final placemarks = await placemarkFromCoordinates(position.latitude, position.longitude);
+ final placemarks = await placemarkFromCoordinates(
+ position.latitude,
+ position.longitude,
+ );
final place = placemarks.first;
- final address = "${place.name}, ${place.subLocality}, ${place.locality}, ${place.administrativeArea}, ${place.postalCode}, ${place.country}";
+ final address =
+ "${place.name}, ${place.subLocality}, ${place.locality}, ${place.administrativeArea}, ${place.postalCode}, ${place.country}";
- final userLocation = UserLocation(latitude: position.latitude, longitude: position.longitude);
+ final userLocation = UserLocation(
+ latitude: position.latitude,
+ longitude: position.longitude,
+ );
senderLocation.value = userLocation;
senderLocationController.value.text = address;
} catch (e) {
@@ -178,7 +215,9 @@ class BookParcelController extends GetxController {
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);
+ ShowToastDialog.showToast(
+ "Please select both sender and receiver locations".tr,
+ );
return false;
}
return true;
@@ -192,22 +231,37 @@ class BookParcelController extends GetxController {
if (Constant.selectedMapType == 'osm') {
print("Fetching route using OSM");
- print("Sender Location: ${senderLocation.value?.latitude}, ${senderLocation.value?.longitude}");
- print("Receiver Location: ${receiverLocation.value?.latitude}, ${receiverLocation.value?.longitude}");
+ print(
+ "Sender Location: ${senderLocation.value?.latitude}, ${senderLocation.value?.longitude}",
+ );
+ print(
+ "Receiver Location: ${receiverLocation.value?.latitude}, ${receiverLocation.value?.longitude}",
+ );
await fetchRouteWithWaypoints([
- latlong.LatLng(senderLocation.value?.latitude ?? 0.0, senderLocation.value?.longitude ?? 0.0),
- latlong.LatLng(receiverLocation.value?.latitude ?? 0.0, receiverLocation.value?.longitude ?? 0.0),
+ latlong.LatLng(
+ senderLocation.value?.latitude ?? 0.0,
+ senderLocation.value?.longitude ?? 0.0,
+ ),
+ latlong.LatLng(
+ receiverLocation.value?.latitude ?? 0.0,
+ receiverLocation.value?.longitude ?? 0.0,
+ ),
]);
} else {
await fetchGoogleRouteWithWaypoints();
}
if (distance.value < 0.5) {
- ShowToastDialog.showToast("Sender's location to receiver's location should be more than 1 km.".tr);
+ ShowToastDialog.showToast(
+ "Sender's location to receiver's location should be more than 1 km."
+ .tr,
+ );
return;
}
- subTotal.value = (distance.value * double.parse(selectedWeight!.deliveryCharge.toString()));
+ subTotal.value =
+ (distance.value *
+ double.parse(selectedWeight!.deliveryCharge.toString()));
goToCart();
} catch (e) {
ShowToastDialog.showToast("Something went wrong while booking.".tr);
@@ -216,7 +270,10 @@ class BookParcelController extends GetxController {
}
void goToCart() {
- DateTime senderPickup = isScheduled.value ? parseScheduledDateTime(scheduledDate.value, scheduledTime.value) : DateTime.now();
+ DateTime senderPickup =
+ isScheduled.value
+ ? parseScheduledDateTime(scheduledDate.value, scheduledTime.value)
+ : DateTime.now();
print("Sender Pickup: $distance");
ParcelOrderModel order = ParcelOrderModel(
@@ -235,22 +292,42 @@ class BookParcelController extends GetxController {
taxSetting: Constant.taxList,
isSchedule: isScheduled.value,
sourcePoint: G(
- geopoint: GeoPoint(senderLocation.value!.latitude ?? 0.0, senderLocation.value!.longitude ?? 0.0),
- geohash: Geoflutterfire().point(latitude: senderLocation.value!.latitude ?? 0.0, longitude: senderLocation.value!.longitude ?? 0.0).hash,
+ geopoint: GeoPoint(
+ senderLocation.value!.latitude ?? 0.0,
+ senderLocation.value!.longitude ?? 0.0,
+ ),
+ geohash:
+ Geoflutterfire()
+ .point(
+ latitude: senderLocation.value!.latitude ?? 0.0,
+ longitude: senderLocation.value!.longitude ?? 0.0,
+ )
+ .hash,
),
destinationPoint: G(
- geopoint: GeoPoint(receiverLocation.value!.latitude ?? 0.0, receiverLocation.value!.longitude ?? 0.0),
- geohash: Geoflutterfire().point(latitude: receiverLocation.value!.latitude ?? 0.0, longitude: receiverLocation.value!.longitude ?? 0.0).hash,
+ geopoint: GeoPoint(
+ receiverLocation.value!.latitude ?? 0.0,
+ receiverLocation.value!.longitude ?? 0.0,
+ ),
+ geohash:
+ Geoflutterfire()
+ .point(
+ latitude: receiverLocation.value!.latitude ?? 0.0,
+ longitude: receiverLocation.value!.longitude ?? 0.0,
+ )
+ .hash,
),
sender: LocationInformation(
address: senderLocationController.value.text,
name: senderNameController.value.text,
- phone: "(${senderCountryCodeController.value.text}) ${senderMobileController.value.text}",
+ phone:
+ "(${senderCountryCodeController.value.text}) ${senderMobileController.value.text}",
),
receiver: LocationInformation(
address: receiverLocationController.value.text,
name: receiverNameController.value.text,
- phone: "(${receiverCountryCodeController.value.text}) ${receiverMobileController.value.text}",
+ phone:
+ "(${receiverCountryCodeController.value.text}) ${receiverMobileController.value.text}",
),
receiverLatLong: receiverLocation.value,
senderLatLong: senderLocation.value,
@@ -261,7 +338,10 @@ class BookParcelController extends GetxController {
debugPrint("Subtotal: ${subTotal.value}");
debugPrint("Order JSON: ${order.toJson()}");
- Get.to(() => ParcelOrderConfirmationScreen(), arguments: {'parcelOrder': order, 'images': images});
+ Get.to(
+ () => ParcelOrderConfirmationScreen(),
+ arguments: {'parcelOrder': order, 'images': images},
+ );
}
DateTime parseScheduledDateTime(String dateStr, String timeStr) {
@@ -271,7 +351,10 @@ class BookParcelController extends GetxController {
final month = int.parse(dateParts[1]);
final year = int.parse(dateParts[2]);
- final time = TimeOfDay(hour: int.parse(timeStr.split(':')[0]), minute: int.parse(timeStr.split(':')[1].split(' ')[0]));
+ final time = TimeOfDay(
+ hour: int.parse(timeStr.split(':')[0]),
+ minute: int.parse(timeStr.split(':')[1].split(' ')[0]),
+ );
final isPM = timeStr.toLowerCase().contains('pm');
final hour24 = isPM && time.hour < 12 ? time.hour + 12 : time.hour;
@@ -283,9 +366,13 @@ class BookParcelController extends GetxController {
}
Future fetchGoogleRouteWithWaypoints() async {
- final origin = '${senderLocation.value!.latitude},${senderLocation.value!.longitude}';
- final destination = '${receiverLocation.value!.latitude},${receiverLocation.value!.longitude}';
- final url = Uri.parse('https://maps.googleapis.com/maps/api/directions/json?origin=$origin&destination=$destination&mode=driving&key=${Constant.mapAPIKey}');
+ final origin =
+ '${senderLocation.value!.latitude},${senderLocation.value!.longitude}';
+ final destination =
+ '${receiverLocation.value!.latitude},${receiverLocation.value!.longitude}';
+ final url = Uri.parse(
+ 'https://maps.googleapis.com/maps/api/directions/json?origin=$origin&destination=$destination&mode=driving&key=${Constant.mapAPIKey}',
+ );
try {
final response = await http.get(url);
@@ -314,8 +401,12 @@ class BookParcelController extends GetxController {
}
Future fetchRouteWithWaypoints(List points) async {
- final coordinates = points.map((p) => '${p.longitude},${p.latitude}').join(';');
- final url = Uri.parse('https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson');
+ final coordinates = points
+ .map((p) => '${p.longitude},${p.latitude}')
+ .join(';');
+ final url = Uri.parse(
+ 'https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson',
+ );
try {
final response = await http.get(url);
diff --git a/lib/controllers/cab_booking_controller.dart b/lib/controllers/cab_booking_controller.dart
index 9b80a10..f894af3 100644
--- a/lib/controllers/cab_booking_controller.dart
+++ b/lib/controllers/cab_booking_controller.dart
@@ -40,6 +40,7 @@ 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:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutterMap;
import 'package:flutter_paypal/flutter_paypal.dart';
@@ -59,10 +60,13 @@ class CabBookingController extends GetxController {
late GoogleMapController mapController;
final flutterMap.MapController mapOsmController = flutterMap.MapController();
- final Rx sourceTextEditController = TextEditingController().obs;
- final Rx destinationTextEditController = TextEditingController().obs;
+ final Rx sourceTextEditController =
+ TextEditingController().obs;
+ final Rx destinationTextEditController =
+ TextEditingController().obs;
- final Rx couponCodeTextEditController = TextEditingController().obs;
+ final Rx couponCodeTextEditController =
+ TextEditingController().obs;
final Rx currentLocation = Location().obs;
@@ -132,64 +136,99 @@ class CabBookingController extends GetxController {
await getPaymentSettings();
- FireStoreUtils.fireStore.collection(CollectionName.users).doc(FireStoreUtils.getCurrentUid()).snapshots().listen((userSnapshot) async {
- if (!userSnapshot.exists) return;
+ FireStoreUtils.fireStore
+ .collection(CollectionName.users)
+ .doc(FireStoreUtils.getCurrentUid())
+ .snapshots()
+ .listen((userSnapshot) async {
+ if (!userSnapshot.exists) return;
- userModel.value = UserModel.fromJson(userSnapshot.data()!);
+ userModel.value = UserModel.fromJson(userSnapshot.data()!);
- if (userModel.value.inProgressOrderID != null && userModel.value.inProgressOrderID!.isNotEmpty) {
- String? validRideId;
+ if (userModel.value.inProgressOrderID != null &&
+ userModel.value.inProgressOrderID!.isNotEmpty) {
+ String? validRideId;
- for (String id in userModel.value.inProgressOrderID!) {
- final rideDoc = await FireStoreUtils.fireStore.collection(CollectionName.rides).doc(id).get();
+ for (String id in userModel.value.inProgressOrderID!) {
+ final rideDoc =
+ await FireStoreUtils.fireStore
+ .collection(CollectionName.rides)
+ .doc(id)
+ .get();
- if (rideDoc.exists && (rideDoc.data()?['rideType'] ?? '').toString().toLowerCase() == "ride") {
- validRideId = userModel.value.inProgressOrderID!.first!;
- break;
- }
- }
-
- FireStoreUtils.fireStore.collection(CollectionName.rides).doc(validRideId).snapshots().listen((rideSnapshot) async {
- if (!rideSnapshot.exists) return;
-
- final rideData = rideSnapshot.data()!;
- currentOrder.value = CabOrderModel.fromJson(rideData);
- final status = currentOrder.value.status;
-
- if (status == Constant.driverAccepted || status == Constant.orderInTransit) {
- FireStoreUtils.fireStore.collection(CollectionName.users).doc(currentOrder.value.driverId).snapshots().listen((event) async {
- if (event.exists && event.data() != null) {
- UserModel driverModel0 = UserModel.fromJson(event.data()!);
- driverModel.value = driverModel0;
- await updateDriverRoute(driverModel0);
+ if (rideDoc.exists &&
+ (rideDoc.data()?['rideType'] ?? '')
+ .toString()
+ .toLowerCase() ==
+ "ride") {
+ validRideId = userModel.value.inProgressOrderID!.first!;
+ break;
}
- });
- }
+ }
- print("Current Ride Status: $status");
- if (status == Constant.orderPlaced || status == Constant.driverPending || status == Constant.driverRejected || (status == Constant.orderAccepted && currentOrder.value.driverId == null)) {
- bottomSheetType.value = 'waitingForDriver';
- } else if (status == Constant.driverAccepted || status == Constant.orderInTransit) {
- bottomSheetType.value = 'driverDetails';
- sourceTextEditController.value.text = currentOrder.value.sourceLocationName ?? '';
- destinationTextEditController.value.text = currentOrder.value.destinationLocationName ?? '';
- selectedPaymentMethod.value = currentOrder.value.paymentMethod ?? '';
- calculateTotalAmountAfterAccept();
- } else if (status == Constant.orderCompleted) {
- userModel.value.inProgressOrderID!.remove(validRideId);
- await FireStoreUtils.updateUser(userModel.value);
+ FireStoreUtils.fireStore
+ .collection(CollectionName.rides)
+ .doc(validRideId)
+ .snapshots()
+ .listen((rideSnapshot) async {
+ if (!rideSnapshot.exists) return;
+
+ final rideData = rideSnapshot.data()!;
+ currentOrder.value = CabOrderModel.fromJson(rideData);
+ final status = currentOrder.value.status;
+
+ if (status == Constant.driverAccepted ||
+ status == Constant.orderInTransit) {
+ FireStoreUtils.fireStore
+ .collection(CollectionName.users)
+ .doc(currentOrder.value.driverId)
+ .snapshots()
+ .listen((event) async {
+ if (event.exists && event.data() != null) {
+ UserModel driverModel0 = UserModel.fromJson(
+ event.data()!,
+ );
+ driverModel.value = driverModel0;
+ await updateDriverRoute(driverModel0);
+ }
+ });
+ }
+
+ print("Current Ride Status: $status");
+ if (status == Constant.orderPlaced ||
+ status == Constant.driverPending ||
+ status == Constant.driverRejected ||
+ (status == Constant.orderAccepted &&
+ currentOrder.value.driverId == null)) {
+ bottomSheetType.value = 'waitingForDriver';
+ } else if (status == Constant.driverAccepted ||
+ status == Constant.orderInTransit) {
+ bottomSheetType.value = 'driverDetails';
+ sourceTextEditController.value.text =
+ currentOrder.value.sourceLocationName ?? '';
+ destinationTextEditController.value.text =
+ currentOrder.value.destinationLocationName ?? '';
+ selectedPaymentMethod.value =
+ currentOrder.value.paymentMethod ?? '';
+ calculateTotalAmountAfterAccept();
+ } else if (status == Constant.orderCompleted) {
+ userModel.value.inProgressOrderID!.remove(validRideId);
+ await FireStoreUtils.updateUser(userModel.value);
+ bottomSheetType.value = 'location';
+ Get.back();
+ }
+ });
+ } else {
bottomSheetType.value = 'location';
- Get.back();
+ if (Constant.currentLocation != null) {
+ setDepartureMarker(
+ Constant.currentLocation!.latitude,
+ Constant.currentLocation!.longitude,
+ );
+ searchPlaceNameOSM();
+ }
}
});
- } else {
- bottomSheetType.value = 'location';
- if (Constant.currentLocation != null) {
- setDepartureMarker(Constant.currentLocation!.latitude, Constant.currentLocation!.longitude);
- searchPlaceNameOSM();
- }
- }
- });
final coupons = await FireStoreUtils.getCabCoupon();
cabCouponList.value = coupons;
@@ -216,18 +255,30 @@ class CabBookingController extends GetxController {
if (order.status == Constant.driverAccepted) {
// DRIVER → PICKUP
- await fetchRouteWithWaypoints([latlong.LatLng(driverLat, driverLng), latlong.LatLng(pickupLat, pickupLng)]);
+ await fetchRouteWithWaypoints([
+ latlong.LatLng(driverLat, driverLng),
+ latlong.LatLng(pickupLat, pickupLng),
+ ]);
} else if (order.status == Constant.orderInTransit) {
// PICKUP → DESTINATION
- await fetchRouteWithWaypoints([latlong.LatLng(driverLat, driverLng), latlong.LatLng(destLat, destLng)]);
+ await fetchRouteWithWaypoints([
+ latlong.LatLng(driverLat, driverLng),
+ latlong.LatLng(destLat, destLng),
+ ]);
}
updateRouteMarkers(driverModel);
} else {
/// For Google Maps
if (order.status == Constant.driverAccepted) {
- await fetchGoogleRouteBetween(LatLng(driverLat, driverLng), LatLng(pickupLat, pickupLng));
+ await fetchGoogleRouteBetween(
+ LatLng(driverLat, driverLng),
+ LatLng(pickupLat, pickupLng),
+ );
} else if (order.status == Constant.orderInTransit) {
- await fetchGoogleRouteBetween(LatLng(driverLat, driverLng), LatLng(destLat, destLng));
+ await fetchGoogleRouteBetween(
+ LatLng(driverLat, driverLng),
+ LatLng(destLat, destLng),
+ );
}
updateRouteMarkers(driverModel);
}
@@ -251,12 +302,24 @@ class CabBookingController extends GetxController {
markers.clear();
osmMarker.clear();
- final departureBytes = await Constant().getBytesFromAsset('assets/images/location_black3x.png', 50);
- final destinationBytes = await Constant().getBytesFromAsset('assets/images/location_orange3x.png', 50);
+ final departureBytes = await Constant().getBytesFromAsset(
+ 'assets/images/location_black3x.png',
+ 50,
+ );
+ final destinationBytes = await Constant().getBytesFromAsset(
+ 'assets/images/location_orange3x.png',
+ 50,
+ );
final driverBytesRaw =
(Constant.sectionConstantModel?.markerIcon?.isNotEmpty ?? false)
- ? await Constant().getBytesFromUrl(Constant.sectionConstantModel!.markerIcon!, width: 120)
- : await Constant().getBytesFromAsset('assets/images/ic_cab.png', 50);
+ ? await Constant().getBytesFromUrl(
+ Constant.sectionConstantModel!.markerIcon!,
+ width: 120,
+ )
+ : await Constant().getBytesFromAsset(
+ 'assets/images/ic_cab.png',
+ 50,
+ );
departureIcon = BitmapDescriptor.fromBytes(departureBytes);
destinationIcon = BitmapDescriptor.fromBytes(destinationBytes);
@@ -265,7 +328,15 @@ class CabBookingController extends GetxController {
if (Constant.selectedMapType == 'osm') {
if (order.status == Constant.driverAccepted) {
osmMarker.addAll([
- flutterMap.Marker(point: latlong.LatLng(pickupLat, pickupLng), width: 40, height: 40, child: Image.asset('assets/images/location_black3x.png', width: 40)),
+ flutterMap.Marker(
+ point: latlong.LatLng(pickupLat, pickupLng),
+ width: 40,
+ height: 40,
+ child: Image.asset(
+ 'assets/images/location_black3x.png',
+ width: 40,
+ ),
+ ),
flutterMap.Marker(
point: latlong.LatLng(driverLat, driverLng),
width: 45,
@@ -276,13 +347,26 @@ class CabBookingController extends GetxController {
height: 50,
imageUrl: Constant.sectionConstantModel!.markerIcon.toString(),
placeholder: (context, url) => Constant.loader(),
- errorWidget: (context, url, error) => SizedBox(width: 30, height: 30, child: CircularProgressIndicator(strokeWidth: 2)),
+ errorWidget:
+ (context, url, error) => SizedBox(
+ width: 30,
+ height: 30,
+ child: CircularProgressIndicator(strokeWidth: 2),
+ ),
),
),
]);
} else if (order.status == Constant.orderInTransit) {
osmMarker.addAll([
- flutterMap.Marker(point: latlong.LatLng(destLat, destLng), width: 40, height: 40, child: Image.asset('assets/images/location_orange3x.png', width: 40)),
+ flutterMap.Marker(
+ point: latlong.LatLng(destLat, destLng),
+ width: 40,
+ height: 40,
+ child: Image.asset(
+ 'assets/images/location_orange3x.png',
+ width: 40,
+ ),
+ ),
flutterMap.Marker(
point: latlong.LatLng(driverLat, driverLng),
width: 45,
@@ -293,7 +377,12 @@ class CabBookingController extends GetxController {
height: 50,
imageUrl: Constant.sectionConstantModel!.markerIcon.toString(),
placeholder: (context, url) => Constant.loader(),
- errorWidget: (context, url, error) => SizedBox(width: 30, height: 30, child: CircularProgressIndicator(strokeWidth: 2)),
+ errorWidget:
+ (context, url, error) => SizedBox(
+ width: 30,
+ height: 30,
+ child: CircularProgressIndicator(strokeWidth: 2),
+ ),
),
),
]);
@@ -305,9 +394,18 @@ class CabBookingController extends GetxController {
markerId: const MarkerId("pickup"),
position: LatLng(pickupLat, pickupLng),
infoWindow: InfoWindow(title: "Pickup Location".tr),
- icon: departureIcon ?? BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueGreen),
+ icon:
+ departureIcon ??
+ BitmapDescriptor.defaultMarkerWithHue(
+ BitmapDescriptor.hueGreen,
+ ),
+ ),
+ Marker(
+ markerId: const MarkerId("driver"),
+ position: LatLng(driverLat, driverLng),
+ infoWindow: InfoWindow(title: "Driver at Pickup".tr),
+ icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
),
- Marker(markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), infoWindow: InfoWindow(title: "Driver at Pickup".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker),
]);
} else if (order.status == Constant.orderInTransit) {
markers.addAll([
@@ -315,9 +413,18 @@ class CabBookingController extends GetxController {
markerId: const MarkerId("destination"),
position: LatLng(destLat, destLng),
infoWindow: InfoWindow(title: "Destination Location".tr),
- icon: destinationIcon ?? BitmapDescriptor.defaultMarkerWithHue(BitmapDescriptor.hueRed),
+ icon:
+ destinationIcon ??
+ BitmapDescriptor.defaultMarkerWithHue(
+ BitmapDescriptor.hueRed,
+ ),
+ ),
+ Marker(
+ markerId: const MarkerId("driver"),
+ position: LatLng(driverLat, driverLng),
+ infoWindow: InfoWindow(title: "Driver Location".tr),
+ icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
),
- Marker(markerId: const MarkerId("driver"), position: LatLng(driverLat, driverLng), infoWindow: InfoWindow(title: "Driver Location".tr), icon: taxiIcon ?? BitmapDescriptor.defaultMarker),
]);
}
}
@@ -328,7 +435,10 @@ class CabBookingController extends GetxController {
}
}
- Future fetchGoogleRouteBetween(LatLng originPoint, LatLng destPoint) async {
+ Future fetchGoogleRouteBetween(
+ LatLng originPoint,
+ LatLng destPoint,
+ ) async {
final origin = '${originPoint.latitude},${originPoint.longitude}';
final destination = '${destPoint.latitude},${destPoint.longitude}';
final url = Uri.parse(
@@ -345,7 +455,8 @@ class CabBookingController extends GetxController {
final route = data['routes'][0];
final encodedPolyline = route['overview_polyline']['points'];
final decodedPoints = PolylinePoints.decodePolyline(encodedPolyline);
- final coordinates = decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
+ final coordinates =
+ decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
addPolyLine(coordinates);
@@ -372,7 +483,12 @@ class CabBookingController extends GetxController {
if (currentOrder.value.taxSetting != null) {
for (var element in currentOrder.value.taxSetting!) {
- taxAmount.value = (taxAmount.value + Constant.calculateTax(amount: (subTotal.value - discount.value).toString(), taxModel: element));
+ taxAmount.value =
+ (taxAmount.value +
+ Constant.calculateTax(
+ amount: (subTotal.value - discount.value).toString(),
+ taxModel: element,
+ ));
}
}
@@ -388,11 +504,19 @@ class CabBookingController extends GetxController {
subTotal.value = getAmount(selectedVehicleType.value);
if (selectedCouponModel.value.id != null) {
- discount.value = Constant.calculateDiscount(amount: subTotal.value.toString(), offerModel: selectedCouponModel.value);
+ discount.value = Constant.calculateDiscount(
+ amount: subTotal.value.toString(),
+ offerModel: selectedCouponModel.value,
+ );
}
for (var element in Constant.taxList) {
- taxAmount.value = (taxAmount.value + Constant.calculateTax(amount: (subTotal.value - discount.value).toString(), taxModel: element));
+ taxAmount.value =
+ (taxAmount.value +
+ Constant.calculateTax(
+ amount: (subTotal.value - discount.value).toString(),
+ taxModel: element,
+ ));
}
totalAmount.value = (subTotal.value - discount.value) + taxAmount.value;
@@ -429,9 +553,14 @@ class CabBookingController extends GetxController {
serviceType: Constant.parcelServiceType,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-${totalAmount.value.toString()}", userId: FireStoreUtils.getCurrentUid());
+ await FireStoreUtils.updateUserWallet(
+ amount: "-${totalAmount.value.toString()}",
+ userId: FireStoreUtils.getCurrentUid(),
+ );
}
});
}
@@ -445,13 +574,25 @@ class CabBookingController extends GetxController {
Future placeOrder() async {
DestinationLocation sourceLocation = DestinationLocation(
- latitude: Constant.selectedMapType == 'osm' ? departureLatLongOsm.value.latitude : departureLatLong.value.latitude,
- longitude: Constant.selectedMapType == 'osm' ? departureLatLongOsm.value.longitude : departureLatLong.value.longitude,
+ latitude:
+ Constant.selectedMapType == 'osm'
+ ? departureLatLongOsm.value.latitude
+ : departureLatLong.value.latitude,
+ longitude:
+ Constant.selectedMapType == 'osm'
+ ? departureLatLongOsm.value.longitude
+ : departureLatLong.value.longitude,
);
DestinationLocation destinationLocation = DestinationLocation(
- latitude: Constant.selectedMapType == 'osm' ? destinationLatLongOsm.value.latitude : destinationLatLong.value.latitude,
- longitude: Constant.selectedMapType == 'osm' ? destinationLatLongOsm.value.longitude : destinationLatLong.value.longitude,
+ latitude:
+ Constant.selectedMapType == 'osm'
+ ? destinationLatLongOsm.value.latitude
+ : destinationLatLong.value.latitude,
+ longitude:
+ Constant.selectedMapType == 'osm'
+ ? destinationLatLongOsm.value.longitude
+ : destinationLatLong.value.longitude,
);
CabOrderModel orderModel = CabOrderModel();
@@ -462,7 +603,8 @@ class CabBookingController extends GetxController {
orderModel.vehicleType = selectedVehicleType.value;
orderModel.authorID = FireStoreUtils.getCurrentUid();
orderModel.sourceLocationName = sourceTextEditController.value.text;
- orderModel.destinationLocationName = destinationTextEditController.value.text;
+ orderModel.destinationLocationName =
+ destinationTextEditController.value.text;
orderModel.sourceLocation = sourceLocation;
orderModel.destinationLocation = destinationLocation;
@@ -474,11 +616,14 @@ class CabBookingController extends GetxController {
orderModel.taxSetting = Constant.taxList;
orderModel.adminCommissionType =
- Constant.sectionConstantModel!.adminCommision != null && Constant.sectionConstantModel!.adminCommision!.isEnabled == true
- ? Constant.sectionConstantModel!.adminCommision!.commissionType.toString()
+ Constant.sectionConstantModel!.adminCommision != null &&
+ Constant.sectionConstantModel!.adminCommision!.isEnabled == true
+ ? Constant.sectionConstantModel!.adminCommision!.commissionType
+ .toString()
: null;
orderModel.adminCommission =
- Constant.sectionConstantModel!.adminCommision != null && Constant.sectionConstantModel!.adminCommision!.isEnabled == true
+ Constant.sectionConstantModel!.adminCommision != null &&
+ Constant.sectionConstantModel!.adminCommision!.isEnabled == true
? Constant.sectionConstantModel!.adminCommision!.amount.toString()
: null;
orderModel.couponCode = couponCodeTextEditController.value.text;
@@ -491,7 +636,9 @@ class CabBookingController extends GetxController {
orderModel.roundTrip = false;
orderModel.sectionId = Constant.sectionConstantModel!.id;
orderModel.createdAt = Timestamp.now();
- orderModel.otpCode = (maths.Random().nextInt(9000) + 1000).toString(); // Generate a 4-digit OTP
+ orderModel.otpCode =
+ (maths.Random().nextInt(9000) + 1000)
+ .toString(); // Generate a 4-digit OTP
orderModel.status = Constant.orderPlaced;
orderModel.scheduleDateTime = Timestamp.now();
log("Order Model : ${orderModel.toJson()}");
@@ -506,8 +653,10 @@ class CabBookingController extends GetxController {
double getAmount(VehicleType vehicleType) {
final double currentDistance = distance.value;
- if (currentDistance <= (vehicleType.minimum_delivery_charges_within_km ?? 0)) {
- return double.tryParse(vehicleType.minimum_delivery_charges.toString()) ?? 0.0;
+ if (currentDistance <=
+ (vehicleType.minimum_delivery_charges_within_km ?? 0)) {
+ return double.tryParse(vehicleType.minimum_delivery_charges.toString()) ??
+ 0.0;
} else {
return (vehicleType.delivery_charges_per_km ?? 0.0) * currentDistance;
}
@@ -532,28 +681,50 @@ class CabBookingController extends GetxController {
void setStopMarker(double lat, double lng, int index) {
if (Constant.selectedMapType == 'osm') {
// Add new stop marker without clearing
- osmMarker.add(flutterMap.Marker(point: latlong.LatLng(lat, lng), width: 40, height: 40, child: stopIconOsm!));
+ osmMarker.add(
+ flutterMap.Marker(
+ point: latlong.LatLng(lat, lng),
+ width: 40,
+ height: 40,
+ child: stopIconOsm!,
+ ),
+ );
getDirections(isStopMarker: true);
} else {
final markerId = MarkerId('Stop $index');
markers.removeWhere((marker) => marker.markerId == markerId);
- markers.add(Marker(markerId: markerId, infoWindow: InfoWindow(title: '${'Stop'.tr} ${String.fromCharCode(index + 65)}'), position: LatLng(lat, lng), icon: stopIcon!));
+ markers.add(
+ Marker(
+ markerId: markerId,
+ infoWindow: InfoWindow(
+ title: '${'Stop'.tr} ${String.fromCharCode(index + 65)}',
+ ),
+ position: LatLng(lat, lng),
+ icon: stopIcon!,
+ ),
+ );
getDirections();
}
}
void _setOsmMarker(double lat, double lng, {required bool isDeparture}) {
- final marker = flutterMap.Marker(point: latlong.LatLng(lat, lng), width: 40, height: 40, child: isDeparture ? departureIconOsm! : destinationIconOsm!);
+ final marker = flutterMap.Marker(
+ point: latlong.LatLng(lat, lng),
+ width: 40,
+ height: 40,
+ child: isDeparture ? departureIconOsm! : destinationIconOsm!,
+ );
if (isDeparture) {
departureLatLongOsm.value = latlong.LatLng(lat, lng);
} else {
destinationLatLongOsm.value = latlong.LatLng(lat, lng);
}
osmMarker.add(marker);
- if (departureLatLongOsm.value.latitude != 0 && destinationLatLongOsm.value.latitude != 0) {
+ if (departureLatLongOsm.value.latitude != 0 &&
+ destinationLatLongOsm.value.latitude != 0) {
getDirections();
animateToSource(lat, lng);
}
@@ -575,14 +746,26 @@ class CabBookingController extends GetxController {
markers.removeWhere((marker) => marker.markerId == markerId);
// Add new marker
- markers.add(Marker(markerId: markerId, position: pos, icon: icon, infoWindow: InfoWindow(title: title)));
+ markers.add(
+ Marker(
+ markerId: markerId,
+ position: pos,
+ icon: icon,
+ infoWindow: InfoWindow(title: title),
+ ),
+ );
mapController.animateCamera(CameraUpdate.newLatLngZoom(pos, 14));
- if (departureLatLong.value.latitude != 0 && destinationLatLong.value.latitude != 0) {
+ if (departureLatLong.value.latitude != 0 &&
+ destinationLatLong.value.latitude != 0) {
getDirections();
} else {
- mapController.animateCamera(CameraUpdate.newCameraPosition(CameraPosition(target: LatLng(lat, lng), zoom: 14)));
+ mapController.animateCamera(
+ CameraUpdate.newCameraPosition(
+ CameraPosition(target: LatLng(lat, lng), zoom: 14),
+ ),
+ );
}
}
@@ -591,25 +774,43 @@ class CabBookingController extends GetxController {
final wayPoints = [];
// Only add valid source
- if (departureLatLongOsm.value.latitude != 0.0 && departureLatLongOsm.value.longitude != 0.0) {
+ if (departureLatLongOsm.value.latitude != 0.0 &&
+ departureLatLongOsm.value.longitude != 0.0) {
wayPoints.add(departureLatLongOsm.value);
}
// Only add valid destination
- if (destinationLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.longitude != 0.0) {
+ if (destinationLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.longitude != 0.0) {
wayPoints.add(destinationLatLongOsm.value);
}
if (!isStopMarker) osmMarker.clear();
// Add source marker
- if (departureLatLongOsm.value.latitude != 0.0 && departureLatLongOsm.value.longitude != 0.0) {
- osmMarker.add(flutterMap.Marker(point: departureLatLongOsm.value, width: 40, height: 40, child: departureIconOsm!));
+ if (departureLatLongOsm.value.latitude != 0.0 &&
+ departureLatLongOsm.value.longitude != 0.0) {
+ osmMarker.add(
+ flutterMap.Marker(
+ point: departureLatLongOsm.value,
+ width: 40,
+ height: 40,
+ child: departureIconOsm!,
+ ),
+ );
}
// Add destination marker
- if (destinationLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.longitude != 0.0) {
- osmMarker.add(flutterMap.Marker(point: destinationLatLongOsm.value, width: 40, height: 40, child: destinationIconOsm!));
+ if (destinationLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.longitude != 0.0) {
+ osmMarker.add(
+ flutterMap.Marker(
+ point: destinationLatLongOsm.value,
+ width: 40,
+ height: 40,
+ child: destinationIconOsm!,
+ ),
+ );
}
if (wayPoints.length >= 2) {
@@ -622,10 +823,14 @@ class CabBookingController extends GetxController {
}
Future fetchGoogleRouteWithWaypoints() async {
- if (departureLatLong.value.latitude == 0.0 || destinationLatLong.value.latitude == 0.0) return;
+ if (departureLatLong.value.latitude == 0.0 ||
+ destinationLatLong.value.latitude == 0.0)
+ return;
- final origin = '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
- final destination = '${destinationLatLong.value.latitude},${destinationLatLong.value.longitude}';
+ final origin =
+ '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
+ final destination =
+ '${destinationLatLong.value.latitude},${destinationLatLong.value.longitude}';
final url = Uri.parse(
'https://maps.googleapis.com/maps/api/directions/json'
@@ -644,7 +849,8 @@ class CabBookingController extends GetxController {
// Polyline
final encodedPolyline = route['overview_polyline']['points'];
final decodedPoints = PolylinePoints.decodePolyline(encodedPolyline);
- final coordinates = decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
+ final coordinates =
+ decodedPoints.map((e) => LatLng(e.latitude, e.longitude)).toList();
addPolyLine(coordinates);
@@ -676,19 +882,26 @@ class CabBookingController extends GetxController {
}
Future fetchRouteWithWaypoints(List points) async {
- final coordinates = points.map((p) => '${p.longitude},${p.latitude}').join(';');
- final url = Uri.parse('https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson');
+ final coordinates = points
+ .map((p) => '${p.longitude},${p.latitude}')
+ .join(';');
+ final url = Uri.parse(
+ 'https://router.project-osrm.org/route/v1/driving/$coordinates?overview=full&geometries=geojson',
+ );
try {
final response = await http.get(url);
if (response.statusCode == 200) {
final decoded = json.decode(response.body);
- final geometry = decoded['routes'][0]['geometry']['coordinates'] as List;
+ final geometry =
+ decoded['routes'][0]['geometry']['coordinates'] as List;
final dist = decoded['routes'][0]['distance'];
final dur = decoded['routes'][0]['duration'];
routePoints.clear();
- routePoints.addAll(geometry.map((coord) => latlong.LatLng(coord[1], coord[0])));
+ routePoints.addAll(
+ geometry.map((coord) => latlong.LatLng(coord[1], coord[0])),
+ );
if (Constant.distanceType.toLowerCase() == "KM".toLowerCase()) {
distance.value = dist / 1000.00;
@@ -713,7 +926,10 @@ class CabBookingController extends GetxController {
void zoomToPolylineOSM() {
if (routePoints.isEmpty) return;
// LatLngBounds requires at least two points
- final bounds = flutterMap.LatLngBounds(routePoints.first, routePoints.first);
+ final bounds = flutterMap.LatLngBounds(
+ routePoints.first,
+ routePoints.first,
+ );
for (final point in routePoints) {
bounds.extend(point);
}
@@ -725,8 +941,10 @@ class CabBookingController extends GetxController {
double getBoundsZoomLevel(flutterMap.LatLngBounds bounds) {
// Simple heuristic: zoom out for larger bounds
- final latDiff = (bounds.northEast.latitude - bounds.southWest.latitude).abs();
- final lngDiff = (bounds.northEast.longitude - bounds.southWest.longitude).abs();
+ final latDiff =
+ (bounds.northEast.latitude - bounds.southWest.latitude).abs();
+ final lngDiff =
+ (bounds.northEast.longitude - bounds.southWest.longitude).abs();
double maxDiff = math.max(latDiff, lngDiff);
if (maxDiff < 0.005) return 18.0;
if (maxDiff < 0.01) return 16.0;
@@ -738,7 +956,13 @@ class CabBookingController extends GetxController {
void addPolyLine(List points) {
final id = const PolylineId("poly");
- final polyline = Polyline(polylineId: id, color: AppThemeData.primary300, points: points, width: 6, geodesic: true);
+ final polyline = Polyline(
+ polylineId: id,
+ color: AppThemeData.primary300,
+ points: points,
+ width: 6,
+ geodesic: true,
+ );
polyLines[id] = polyline;
if (points.length >= 2) {
@@ -747,7 +971,10 @@ class CabBookingController extends GetxController {
}
}
- Future updateCameraLocationToFitPolyline(List points, GoogleMapController? mapController) async {
+ Future updateCameraLocationToFitPolyline(
+ List points,
+ GoogleMapController? mapController,
+ ) async {
if (mapController == null || points.isEmpty) return;
double minLat = points.first.latitude, maxLat = points.first.latitude;
double minLng = points.first.longitude, maxLng = points.first.longitude;
@@ -757,16 +984,24 @@ class CabBookingController extends GetxController {
if (p.longitude < minLng) minLng = p.longitude;
if (p.longitude > maxLng) maxLng = p.longitude;
}
- final bounds = LatLngBounds(southwest: LatLng(minLat, minLng), northeast: LatLng(maxLat, maxLng));
+ final bounds = LatLngBounds(
+ southwest: LatLng(minLat, minLng),
+ northeast: LatLng(maxLat, maxLng),
+ );
final cameraUpdate = CameraUpdate.newLatLngBounds(bounds, 50);
await checkCameraLocation(cameraUpdate, mapController);
}
Future animateToSource(double lat, double long) async {
- final hasBothCoords = departureLatLongOsm.value.latitude != 0.0 && destinationLatLongOsm.value.latitude != 0.0;
+ final hasBothCoords =
+ departureLatLongOsm.value.latitude != 0.0 &&
+ destinationLatLongOsm.value.latitude != 0.0;
if (hasBothCoords) {
- await calculateZoomLevel(source: departureLatLongOsm.value, destination: destinationLatLongOsm.value);
+ await calculateZoomLevel(
+ source: departureLatLongOsm.value,
+ destination: destinationLatLongOsm.value,
+ );
} else {
mapOsmController.move(latlong.LatLng(lat, long), 10);
}
@@ -774,15 +1009,25 @@ class CabBookingController extends GetxController {
RxMap polyLines = {}.obs;
- Future calculateZoomLevel({required latlong.LatLng source, required latlong.LatLng destination, double paddingFraction = 0.001}) async {
+ Future calculateZoomLevel({
+ required latlong.LatLng source,
+ required latlong.LatLng destination,
+ double paddingFraction = 0.001,
+ }) async {
final bounds = flutterMap.LatLngBounds.fromPoints([source, destination]);
final screenSize = Size(Get.width, Get.height * 0.5);
const double worldDimension = 256.0;
const double maxZoom = 10.0;
- double latToRad(double lat) => math.log((1 + math.sin(lat * math.pi / 180)) / (1 - math.sin(lat * math.pi / 180))) / 2;
+ double latToRad(double lat) =>
+ math.log(
+ (1 + math.sin(lat * math.pi / 180)) /
+ (1 - math.sin(lat * math.pi / 180)),
+ ) /
+ 2;
- double computeZoom(double screenPx, double worldPx, double fraction) => math.log(screenPx / worldPx / fraction) / math.ln2;
+ double computeZoom(double screenPx, double worldPx, double fraction) =>
+ math.log(screenPx / worldPx / fraction) / math.ln2;
final north = bounds.northEast.latitude;
final south = bounds.southWest.latitude;
@@ -800,27 +1045,48 @@ class CabBookingController extends GetxController {
final latFraction = (latToRad(north) - latToRad(south)) / math.pi;
final lngFraction = ((east - west + 360) % 360) / 360;
- final latZoom = computeZoom(screenSize.height, worldDimension, latFraction + paddingFraction);
- final lngZoom = computeZoom(screenSize.width, worldDimension, lngFraction + paddingFraction);
+ final latZoom = computeZoom(
+ screenSize.height,
+ worldDimension,
+ latFraction + paddingFraction,
+ );
+ final lngZoom = computeZoom(
+ screenSize.width,
+ worldDimension,
+ lngFraction + paddingFraction,
+ );
final zoomLevel = math.min(latZoom, lngZoom).clamp(0.0, maxZoom);
mapOsmController.move(center, zoomLevel);
}
}
- Future updateCameraLocation(LatLng source, LatLng destination, GoogleMapController? mapController) async {
+ Future updateCameraLocation(
+ LatLng source,
+ LatLng destination,
+ GoogleMapController? mapController,
+ ) async {
if (mapController == null) return;
final bounds = LatLngBounds(
- southwest: LatLng(math.min(source.latitude, destination.latitude), math.min(source.longitude, destination.longitude)),
- northeast: LatLng(math.max(source.latitude, destination.latitude), math.max(source.longitude, destination.longitude)),
+ southwest: LatLng(
+ math.min(source.latitude, destination.latitude),
+ math.min(source.longitude, destination.longitude),
+ ),
+ northeast: LatLng(
+ math.max(source.latitude, destination.latitude),
+ math.max(source.longitude, destination.longitude),
+ ),
);
final cameraUpdate = CameraUpdate.newLatLngBounds(bounds, 90);
await checkCameraLocation(cameraUpdate, mapController);
}
- Future checkCameraLocation(CameraUpdate cameraUpdate, GoogleMapController mapController) async {
+ Future checkCameraLocation(
+ CameraUpdate cameraUpdate,
+ GoogleMapController mapController,
+ ) async {
await mapController.animateCamera(cameraUpdate);
final l1 = await mapController.getVisibleRegion();
final l2 = await mapController.getVisibleRegion();
@@ -833,16 +1099,44 @@ class CabBookingController extends GetxController {
Future setIcons() async {
try {
if (Constant.selectedMapType == 'osm') {
- departureIconOsm = Image.asset("assets/icons/pickup.png", width: 30, height: 30);
- destinationIconOsm = Image.asset("assets/icons/dropoff.png", width: 30, height: 30);
- taxiIconOsm = Image.asset("assets/icons/ic_taxi.png", width: 30, height: 30);
- stopIconOsm = Image.asset("assets/icons/location.png", width: 26, height: 26);
+ departureIconOsm = Image.asset(
+ "assets/icons/pickup.png",
+ width: 30,
+ height: 30,
+ );
+ destinationIconOsm = Image.asset(
+ "assets/icons/dropoff.png",
+ width: 30,
+ height: 30,
+ );
+ taxiIconOsm = Image.asset(
+ "assets/icons/ic_taxi.png",
+ width: 30,
+ height: 30,
+ );
+ stopIconOsm = Image.asset(
+ "assets/icons/location.png",
+ width: 26,
+ height: 26,
+ );
} else {
const config = ImageConfiguration(size: Size(48, 48));
- departureIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/pickup.png");
- destinationIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/dropoff.png");
- taxiIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/ic_taxi.png");
- stopIcon = await BitmapDescriptor.fromAssetImage(config, "assets/icons/location.png");
+ departureIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/pickup.png",
+ );
+ destinationIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/dropoff.png",
+ );
+ taxiIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/ic_taxi.png",
+ );
+ stopIcon = await BitmapDescriptor.fromAssetImage(
+ config,
+ "assets/icons/location.png",
+ );
}
} catch (e) {
print('Error loading icons: $e');
@@ -850,8 +1144,12 @@ class CabBookingController extends GetxController {
}
void clearMapDataIfLocationsRemoved() {
- final isSourceEmpty = departureLatLongOsm.value.latitude == 0.0 && departureLatLongOsm.value.longitude == 0.0;
- final isDestinationEmpty = destinationLatLongOsm.value.latitude == 0.0 && destinationLatLongOsm.value.longitude == 0.0;
+ final isSourceEmpty =
+ departureLatLongOsm.value.latitude == 0.0 &&
+ departureLatLongOsm.value.longitude == 0.0;
+ final isDestinationEmpty =
+ destinationLatLongOsm.value.latitude == 0.0 &&
+ destinationLatLongOsm.value.longitude == 0.0;
if (isSourceEmpty || isDestinationEmpty) {
// Clear polylines
@@ -880,7 +1178,9 @@ class CabBookingController extends GetxController {
// Remove marker
if (Constant.selectedMapType == 'osm') {
- osmMarker.removeWhere((marker) => marker.point == departureLatLongOsm.value);
+ osmMarker.removeWhere(
+ (marker) => marker.point == departureLatLongOsm.value,
+ );
} else {
markers.removeWhere((marker) => marker.markerId.value == 'Departure');
}
@@ -896,7 +1196,9 @@ class CabBookingController extends GetxController {
destinationTextEditController.value.clear();
if (Constant.selectedMapType == 'osm') {
- osmMarker.removeWhere((marker) => marker.point == destinationLatLongOsm.value);
+ osmMarker.removeWhere(
+ (marker) => marker.point == destinationLatLongOsm.value,
+ );
} else {
markers.removeWhere((marker) => marker.markerId.value == 'Destination');
}
@@ -906,9 +1208,16 @@ class CabBookingController extends GetxController {
}
Future searchPlaceNameOSM() async {
- final url = Uri.parse('https://nominatim.openstreetmap.org/reverse?lat=${departureLatLongOsm.value.latitude}&lon=${departureLatLongOsm.value.longitude}&format=json');
+ final url = Uri.parse(
+ 'https://nominatim.openstreetmap.org/reverse?lat=${departureLatLongOsm.value.latitude}&lon=${departureLatLongOsm.value.longitude}&format=json',
+ );
- final response = await http.get(url, headers: {'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)'});
+ final response = await http.get(
+ url,
+ headers: {
+ 'User-Agent': 'FlutterMapApp/1.0 (menil.siddhiinfosoft@gmail.com)',
+ },
+ );
if (response.statusCode == 200) {
log("response.body :: ${response.body}");
@@ -921,7 +1230,9 @@ class CabBookingController extends GetxController {
final lat = departureLatLong.value.latitude;
final lng = departureLatLong.value.longitude;
- final url = Uri.parse('https://maps.googleapis.com/maps/api/geocode/json?latlng=$lat,$lng&key=${Constant.mapAPIKey}');
+ final url = Uri.parse(
+ 'https://maps.googleapis.com/maps/api/geocode/json?latlng=$lat,$lng&key=${Constant.mapAPIKey}',
+ );
final response = await http.get(url);
@@ -964,19 +1275,45 @@ class CabBookingController extends GetxController {
Future getPaymentSettings() async {
await FireStoreUtils.getPaymentSettingsData().then((value) {
- stripeModel.value = StripeModel.fromJson(jsonDecode(Preferences.getString(Preferences.stripeSettings)));
- payPalModel.value = PayPalModel.fromJson(jsonDecode(Preferences.getString(Preferences.paypalSettings)));
- payStackModel.value = PayStackModel.fromJson(jsonDecode(Preferences.getString(Preferences.payStack)));
- mercadoPagoModel.value = MercadoPagoModel.fromJson(jsonDecode(Preferences.getString(Preferences.mercadoPago)));
- flutterWaveModel.value = FlutterWaveModel.fromJson(jsonDecode(Preferences.getString(Preferences.flutterWave)));
- paytmModel.value = PaytmModel.fromJson(jsonDecode(Preferences.getString(Preferences.paytmSettings)));
- payFastModel.value = PayFastModel.fromJson(jsonDecode(Preferences.getString(Preferences.payFastSettings)));
- razorPayModel.value = RazorPayModel.fromJson(jsonDecode(Preferences.getString(Preferences.razorpaySettings)));
- midTransModel.value = MidTrans.fromJson(jsonDecode(Preferences.getString(Preferences.midTransSettings)));
- orangeMoneyModel.value = OrangeMoney.fromJson(jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)));
- xenditModel.value = Xendit.fromJson(jsonDecode(Preferences.getString(Preferences.xenditSettings)));
- walletSettingModel.value = WalletSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.walletSettings)));
- cashOnDeliverySettingModel.value = CodSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.codSettings)));
+ stripeModel.value = StripeModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.stripeSettings)),
+ );
+ payPalModel.value = PayPalModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paypalSettings)),
+ );
+ payStackModel.value = PayStackModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payStack)),
+ );
+ mercadoPagoModel.value = MercadoPagoModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.mercadoPago)),
+ );
+ flutterWaveModel.value = FlutterWaveModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.flutterWave)),
+ );
+ paytmModel.value = PaytmModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paytmSettings)),
+ );
+ payFastModel.value = PayFastModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payFastSettings)),
+ );
+ razorPayModel.value = RazorPayModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.razorpaySettings)),
+ );
+ midTransModel.value = MidTrans.fromJson(
+ jsonDecode(Preferences.getString(Preferences.midTransSettings)),
+ );
+ orangeMoneyModel.value = OrangeMoney.fromJson(
+ jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)),
+ );
+ xenditModel.value = Xendit.fromJson(
+ jsonDecode(Preferences.getString(Preferences.xenditSettings)),
+ );
+ walletSettingModel.value = WalletSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.walletSettings)),
+ );
+ cashOnDeliverySettingModel.value = CodSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.codSettings)),
+ );
if (walletSettingModel.value.isEnabled == true) {
selectedPaymentMethod.value = PaymentGateway.wallet.name;
@@ -1018,20 +1355,32 @@ class CabBookingController extends GetxController {
Future stripeMakePayment({required String amount}) async {
log(double.parse(amount).toStringAsFixed(0));
try {
- Map? paymentIntentData = await createStripeIntent(amount: amount);
+ Map? paymentIntentData = await createStripeIntent(
+ amount: amount,
+ );
log("stripe Responce====>$paymentIntentData");
if (paymentIntentData!.containsKey("error")) {
Get.back();
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
} else {
await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters(
paymentIntentClientSecret: paymentIntentData['client_secret'],
allowsDelayedPaymentMethods: false,
- googlePay: const PaymentSheetGooglePay(merchantCountryCode: 'US', testEnv: true, currencyCode: "USD"),
+ googlePay: const PaymentSheetGooglePay(
+ merchantCountryCode: 'US',
+ testEnv: true,
+ currencyCode: "USD",
+ ),
customFlow: true,
style: ThemeMode.system,
- appearance: PaymentSheetAppearance(colors: PaymentSheetAppearanceColors(primary: AppThemeData.primary300)),
+ appearance: PaymentSheetAppearance(
+ colors: PaymentSheetAppearanceColors(
+ primary: AppThemeData.primary300,
+ ),
+ ),
merchantDisplayName: 'GoRide',
),
);
@@ -1077,7 +1426,10 @@ class CabBookingController extends GetxController {
var response = await http.post(
Uri.parse('https://api.stripe.com/v1/payment_intents'),
body: body,
- headers: {'Authorization': 'Bearer $stripeSecret', 'Content-Type': 'application/x-www-form-urlencoded'},
+ headers: {
+ 'Authorization': 'Bearer $stripeSecret',
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
);
return jsonDecode(response.body);
@@ -1087,8 +1439,14 @@ class CabBookingController extends GetxController {
}
//mercadoo
- Future mercadoPagoMakePayment({required BuildContext context, required String amount}) async {
- final headers = {'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}', 'Content-Type': 'application/json'};
+ Future mercadoPagoMakePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
+ final headers = {
+ 'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"items": [
@@ -1101,12 +1459,20 @@ class CabBookingController extends GetxController {
},
],
"payer": {"email": userModel.value.email},
- "back_urls": {"failure": "${Constant.globalUrl}payment/failure", "pending": "${Constant.globalUrl}payment/pending", "success": "${Constant.globalUrl}payment/success"},
+ "back_urls": {
+ "failure": "${Constant.globalUrl}payment/failure",
+ "pending": "${Constant.globalUrl}payment/pending",
+ "success": "${Constant.globalUrl}payment/success",
+ },
"auto_return": "approved",
// Automatically return after payment is approved
});
- final response = await http.post(Uri.parse("https://api.mercadopago.com/checkout/preferences"), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse("https://api.mercadopago.com/checkout/preferences"),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
final data = jsonDecode(response.body);
@@ -1164,9 +1530,12 @@ class CabBookingController extends GetxController {
///PayStack Payment Method
Future payStackPayment(String totalAmount) async {
- await PayStackURLGen.payStackURLGen(amount: (double.parse(totalAmount) * 100).toString(), currency: "ZAR", secretKey: payStackModel.value.secretKey.toString(), userModel: userModel.value).then((
- value,
- ) async {
+ await PayStackURLGen.payStackURLGen(
+ amount: (double.parse(totalAmount) * 100).toString(),
+ currency: "ZAR",
+ secretKey: payStackModel.value.secretKey.toString(),
+ userModel: userModel.value,
+ ).then((value) async {
if (value != null) {
PayStackUrlModel payStackModel0 = value;
Get.to(
@@ -1186,15 +1555,23 @@ class CabBookingController extends GetxController {
}
});
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
}
});
}
//flutter wave Payment Method
- Future flutterWaveInitiatePayment({required BuildContext context, required String amount}) async {
+ Future flutterWaveInitiatePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
final url = Uri.parse('https://api.flutterwave.com/v3/payments');
- final headers = {'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}', 'Content-Type': 'application/json'};
+ final headers = {
+ 'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"tx_ref": _ref,
@@ -1207,14 +1584,19 @@ class CabBookingController extends GetxController {
"phonenumber": userModel.value.phoneNumber, // Add a real phone number
"name": userModel.value.fullName(), // Add a real customer name
},
- "customizations": {"title": "Payment for Services", "description": "Payment for XYZ services"},
+ "customizations": {
+ "title": "Payment for Services",
+ "description": "Payment for XYZ services",
+ },
});
final response = await http.post(url, headers: headers, body: body);
if (response.statusCode == 200) {
final data = jsonDecode(response.body);
- Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((value) {
+ Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((
+ value,
+ ) {
if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1243,8 +1625,14 @@ class CabBookingController extends GetxController {
// payFast
void payFastPayment({required BuildContext context, required String amount}) {
- PayStackURLGen.getPayHTML(payFastSettingData: payFastModel.value, amount: amount.toString(), userModel: userModel.value).then((String? value) async {
- bool isDone = await Get.to(PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value));
+ PayStackURLGen.getPayHTML(
+ payFastSettingData: payFastModel.value,
+ amount: amount.toString(),
+ userModel: userModel.value,
+ ).then((String? value) async {
+ bool isDone = await Get.to(
+ PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value),
+ );
if (isDone) {
Get.back();
ShowToastDialog.showToast("Payment successfully".tr);
@@ -1283,7 +1671,14 @@ class CabBookingController extends GetxController {
// });
}
- Future startTransaction(context, {required String txnTokenBy, required orderId, required double amount, required callBackURL, required isStaging}) async {
+ Future startTransaction(
+ context, {
+ required String txnTokenBy,
+ required orderId,
+ required double amount,
+ required callBackURL,
+ required isStaging,
+ }) async {
// try {
// var response = AllInOneSdk.startTransaction(
// paytmModel.value.paytmMID.toString(),
@@ -1319,24 +1714,38 @@ class CabBookingController extends GetxController {
// }
}
- Future verifyCheckSum({required String checkSum, required double amount, required orderId}) async {
+ Future verifyCheckSum({
+ required String checkSum,
+ required double amount,
+ required orderId,
+ }) async {
String getChecksum = "${Constant.globalUrl}payments/validatechecksum";
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(), "checksum_value": checkSum},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ "checksum_value": checkSum,
+ },
);
final data = jsonDecode(response.body);
return data['status'];
}
- Future initiatePayment({required double amount, required orderId}) async {
+ Future initiatePayment({
+ required double amount,
+ required orderId,
+ }) async {
String initiateURL = "${Constant.globalUrl}payments/initiatepaytmpayment";
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
final response = await http.post(
Uri.parse(initiateURL),
@@ -1354,9 +1763,12 @@ class CabBookingController extends GetxController {
);
log(response.body);
final data = jsonDecode(response.body);
- if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) {
+ if (data["body"]["txnToken"] == null ||
+ data["body"]["txnToken"].toString().isEmpty) {
Get.back();
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
}
return GetPaymentTxtTokenModel.fromJson(data);
}
@@ -1374,7 +1786,10 @@ class CabBookingController extends GetxController {
'description': 'wallet Topup',
'retry': {'enabled': true, 'max_count': 1},
'send_sms_hash': true,
- 'prefill': {'contact': userModel.value.phoneNumber, 'email': userModel.value.email},
+ 'prefill': {
+ 'contact': userModel.value.phoneNumber,
+ 'email': userModel.value.email,
+ },
'external': {
'wallets': ['paytm'],
},
@@ -1409,7 +1824,10 @@ class CabBookingController extends GetxController {
}
//Midtrans payment
- Future midtransMakePayment({required String amount, required BuildContext context}) async {
+ Future midtransMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
await createPaymentLink(amount: amount).then((url) {
ShowToastDialog.closeLoader();
if (url != '') {
@@ -1427,15 +1845,30 @@ class CabBookingController extends GetxController {
Future createPaymentLink({required var amount}) async {
var ordersId = const Uuid().v1();
- final url = Uri.parse(midTransModel.value.isSandbox! ? 'https://api.sandbox.midtrans.com/v1/payment-links' : 'https://api.midtrans.com/v1/payment-links');
+ final url = Uri.parse(
+ midTransModel.value.isSandbox!
+ ? 'https://api.sandbox.midtrans.com/v1/payment-links'
+ : 'https://api.midtrans.com/v1/payment-links',
+ );
final response = await http.post(
url,
- headers: {'Accept': 'application/json', 'Content-Type': 'application/json', 'Authorization': generateBasicAuthHeader(midTransModel.value.serverKey!)},
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': generateBasicAuthHeader(
+ midTransModel.value.serverKey!,
+ ),
+ },
body: jsonEncode({
- 'transaction_details': {'order_id': ordersId, 'gross_amount': double.parse(amount.toString()).toInt()},
+ 'transaction_details': {
+ 'order_id': ordersId,
+ 'gross_amount': double.parse(amount.toString()).toInt(),
+ },
'usage_limit': 2,
- "callbacks": {"finish": "https://www.google.com?merchant_order_id=$ordersId"},
+ "callbacks": {
+ "finish": "https://www.google.com?merchant_order_id=$ordersId",
+ },
}),
);
@@ -1443,7 +1876,9 @@ class CabBookingController extends GetxController {
final responseData = jsonDecode(response.body);
return responseData['payment_url'];
} else {
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -1460,13 +1895,30 @@ class CabBookingController extends GetxController {
static String orderId = '';
static String amount = '';
- Future orangeMakePayment({required String amount, required BuildContext context}) async {
+ Future orangeMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
reset();
var id = const Uuid().v4();
- var paymentURL = await fetchToken(context: context, orderId: id, amount: amount, currency: 'USD');
+ var paymentURL = await fetchToken(
+ context: context,
+ orderId: id,
+ amount: amount,
+ currency: 'USD',
+ );
ShowToastDialog.closeLoader();
if (paymentURL.toString() != '') {
- Get.to(() => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken))!.then((value) {
+ Get.to(
+ () => OrangeMoneyScreen(
+ initialURl: paymentURL,
+ accessToken: accessToken,
+ amount: amount,
+ orangePay: orangeMoneyModel.value,
+ orderId: orderId,
+ payToken: payToken,
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1478,13 +1930,22 @@ class CabBookingController extends GetxController {
}
}
- Future fetchToken({required String orderId, required String currency, required BuildContext context, required String amount}) async {
+ Future fetchToken({
+ required String orderId,
+ required String currency,
+ required BuildContext context,
+ required String amount,
+ }) async {
String apiUrl = 'https://api.orange.com/oauth/v3/token';
Map requestBody = {'grant_type': 'client_credentials'};
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': "Basic ${orangeMoneyModel.value.auth!}", 'Content-Type': 'application/x-www-form-urlencoded', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': "Basic ${orangeMoneyModel.value.auth!}",
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'Accept': 'application/json',
+ },
body: requestBody,
);
@@ -1495,17 +1956,32 @@ class CabBookingController extends GetxController {
accessToken = responseData['access_token'];
// ignore: use_build_context_synchronously
- return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
+ 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 '';
}
}
- Future webpayment({required String orderIdData, required BuildContext context, required String currency, required String amountData}) async {
+ Future webpayment({
+ required String orderIdData,
+ required BuildContext context,
+ required String currency,
+ required String amountData,
+ }) async {
orderId = orderIdData;
amount = amountData;
- String apiUrl = orangeMoneyModel.value.isSandbox! == true ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment' : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
+ String apiUrl =
+ orangeMoneyModel.value.isSandbox! == true
+ ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment'
+ : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
Map requestBody = {
"merchant_key": orangeMoneyModel.value.merchantKey ?? '',
"currency": orangeMoneyModel.value.isSandbox == true ? "OUV" : currency,
@@ -1520,7 +1996,11 @@ class CabBookingController extends GetxController {
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': 'Bearer $accessToken', 'Content-Type': 'application/json', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': 'Bearer $accessToken',
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
body: json.encode(requestBody),
);
@@ -1534,7 +2014,9 @@ class CabBookingController extends GetxController {
return '';
}
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -1551,7 +2033,13 @@ class CabBookingController extends GetxController {
await createXenditInvoice(amount: amount).then((model) {
ShowToastDialog.closeLoader();
if (model.id != null) {
- Get.to(() => XenditScreen(initialURl: model.invoiceUrl ?? '', transId: model.id ?? '', apiKey: xenditModel.value.apiKey!.toString()))!.then((value) {
+ Get.to(
+ () => XenditScreen(
+ initialURl: model.invoiceUrl ?? '',
+ transId: model.id ?? '',
+ apiKey: xenditModel.value.apiKey!.toString(),
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder();
@@ -1568,7 +2056,9 @@ class CabBookingController extends GetxController {
const url = 'https://api.xendit.co/v2/invoices';
var headers = {
'Content-Type': 'application/json',
- 'Authorization': generateBasicAuthHeader(xenditModel.value.apiKey!.toString()),
+ 'Authorization': generateBasicAuthHeader(
+ xenditModel.value.apiKey!.toString(),
+ ),
// 'Cookie': '__cf_bm=yERkrx3xDITyFGiou0bbKY1bi7xEwovHNwxV1vCNbVc-1724155511-1.0.1.1-jekyYQmPCwY6vIJ524K0V6_CEw6O.dAwOmQnHtwmaXO_MfTrdnmZMka0KZvjukQgXu5B.K_6FJm47SGOPeWviQ',
};
@@ -1581,7 +2071,11 @@ class CabBookingController extends GetxController {
});
try {
- final response = await http.post(Uri.parse(url), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse(url),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
XenditModel model = XenditModel.fromJson(jsonDecode(response.body));
diff --git a/lib/controllers/cab_coupon_code_controller.dart b/lib/controllers/cab_coupon_code_controller.dart
index 8d57707..12dc0e1 100644
--- a/lib/controllers/cab_coupon_code_controller.dart
+++ b/lib/controllers/cab_coupon_code_controller.dart
@@ -12,10 +12,10 @@ class CabCouponCodeController extends GetxController {
super.onInit();
}
-
- void getData(){
+ void getData() {
getCouponCode();
}
+
RxBool isLoading = true.obs;
RxList cabCouponList = [].obs;
diff --git a/lib/controllers/cab_dashboard_controller.dart b/lib/controllers/cab_dashboard_controller.dart
index 309907f..dc8e92a 100644
--- a/lib/controllers/cab_dashboard_controller.dart
+++ b/lib/controllers/cab_dashboard_controller.dart
@@ -13,18 +13,28 @@ class CabDashboardController extends GetxController {
@override
void onInit() {
- // TODO: implement onInit
getTaxList();
if (Constant.walletSetting == false) {
- pageList.value = [CabHomeScreen(), const MyCabBookingScreen(), const ProfileScreen()];
+ pageList.value = [
+ CabHomeScreen(),
+ const MyCabBookingScreen(),
+ const ProfileScreen(),
+ ];
} else {
- pageList.value = [CabHomeScreen(), const MyCabBookingScreen(), const WalletScreen(), const ProfileScreen()];
+ pageList.value = [
+ CabHomeScreen(),
+ const MyCabBookingScreen(),
+ const WalletScreen(),
+ const ProfileScreen(),
+ ];
}
super.onInit();
}
Future getTaxList() async {
- await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((value) {
+ await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((
+ value,
+ ) {
if (value != null) {
Constant.taxList = value;
}
diff --git a/lib/controllers/cab_order_details_controller.dart b/lib/controllers/cab_order_details_controller.dart
index 0106e98..a16cdfd 100644
--- a/lib/controllers/cab_order_details_controller.dart
+++ b/lib/controllers/cab_order_details_controller.dart
@@ -56,14 +56,18 @@ class CabOrderDetailsController extends GetxController {
Future fetchDriverDetails() async {
if (cabOrder.value.driverId != null) {
- await FireStoreUtils.getUserProfile(cabOrder.value.driverId ?? '').then((value) {
+ await FireStoreUtils.getUserProfile(cabOrder.value.driverId ?? '').then((
+ value,
+ ) {
if (value != null) {
driverUser.value = value;
}
});
print(driverUser.value.toJson());
- await FireStoreUtils.getReviewsbyID(cabOrder.value.id.toString()).then((value) {
+ await FireStoreUtils.getReviewsbyID(cabOrder.value.id.toString()).then((
+ value,
+ ) {
if (value != null) {
ratingModel.value = value;
}
@@ -79,7 +83,12 @@ class CabOrderDetailsController extends GetxController {
if (cabOrder.value.taxSetting != null) {
for (var element in cabOrder.value.taxSetting!) {
- taxAmount.value = (taxAmount.value + Constant.calculateTax(amount: (subTotal.value - discount.value).toString(), taxModel: element));
+ taxAmount.value =
+ (taxAmount.value +
+ Constant.calculateTax(
+ amount: (subTotal.value - discount.value).toString(),
+ taxModel: element,
+ ));
}
}
@@ -94,8 +103,20 @@ class CabOrderDetailsController extends GetxController {
final destLng = cabOrder.value.destinationLocation!.longitude;
googleMarkers.value = {
- gmap.Marker(markerId: const gmap.MarkerId('source'), position: gmap.LatLng(sourceLat!, sourceLng!), icon: gmap.BitmapDescriptor.defaultMarkerWithHue(gmap.BitmapDescriptor.hueGreen)),
- gmap.Marker(markerId: const gmap.MarkerId('destination'), position: gmap.LatLng(destLat!, destLng!), icon: gmap.BitmapDescriptor.defaultMarkerWithHue(gmap.BitmapDescriptor.hueRed)),
+ gmap.Marker(
+ markerId: const gmap.MarkerId('source'),
+ position: gmap.LatLng(sourceLat!, sourceLng!),
+ icon: gmap.BitmapDescriptor.defaultMarkerWithHue(
+ gmap.BitmapDescriptor.hueGreen,
+ ),
+ ),
+ gmap.Marker(
+ markerId: const gmap.MarkerId('destination'),
+ position: gmap.LatLng(destLat!, destLng!),
+ icon: gmap.BitmapDescriptor.defaultMarkerWithHue(
+ gmap.BitmapDescriptor.hueRed,
+ ),
+ ),
};
}
@@ -104,7 +125,8 @@ class CabOrderDetailsController extends GetxController {
final src = cabOrder.value.sourceLocation;
final dest = cabOrder.value.destinationLocation;
- final url = "https://maps.googleapis.com/maps/api/directions/json?origin=${src!.latitude},${src.longitude}&destination=${dest!.latitude},${dest.longitude}&key=$googleApiKey";
+ final url =
+ "https://maps.googleapis.com/maps/api/directions/json?origin=${src!.latitude},${src.longitude}&destination=${dest!.latitude},${dest.longitude}&key=$googleApiKey";
final response = await http.get(Uri.parse(url));
final data = jsonDecode(response.body);
@@ -113,9 +135,19 @@ class CabOrderDetailsController extends GetxController {
final points = data["routes"][0]["overview_polyline"]["points"];
final polylinePoints = PolylinePoints.decodePolyline(points);
- final polylineCoords = polylinePoints.map((p) => gmap.LatLng(p.latitude, p.longitude)).toList();
+ final polylineCoords =
+ polylinePoints
+ .map((p) => gmap.LatLng(p.latitude, p.longitude))
+ .toList();
- googlePolylines.value = {gmap.Polyline(polylineId: const gmap.PolylineId("google_route"), color: AppThemeData.onDemandDark100, width: 5, points: polylineCoords)};
+ googlePolylines.value = {
+ gmap.Polyline(
+ polylineId: const gmap.PolylineId("google_route"),
+ color: AppThemeData.onDemandDark100,
+ width: 5,
+ points: polylineCoords,
+ ),
+ };
}
}
@@ -124,15 +156,20 @@ class CabOrderDetailsController extends GetxController {
final src = cabOrder.value.sourceLocation;
final dest = cabOrder.value.destinationLocation;
- final url = "http://router.project-osrm.org/route/v1/driving/${src!.longitude},${src.latitude};${dest!.longitude},${dest.latitude}?overview=full&geometries=geojson";
+ final url =
+ "http://router.project-osrm.org/route/v1/driving/${src!.longitude},${src.latitude};${dest!.longitude},${dest.latitude}?overview=full&geometries=geojson";
final response = await http.get(Uri.parse(url));
final data = jsonDecode(response.body);
if (data["routes"].isNotEmpty) {
- final coords = data["routes"][0]["geometry"]["coordinates"] as List;
+ final coords =
+ data["routes"][0]["geometry"]["coordinates"] as List;
- osmPolyline.value = coords.map((c) => osm.LatLng(c[1].toDouble(), c[0].toDouble())).toList();
+ osmPolyline.value =
+ coords
+ .map((c) => osm.LatLng(c[1].toDouble(), c[0].toDouble()))
+ .toList();
}
}
}
diff --git a/lib/controllers/cab_rental_dashboard_controllers.dart b/lib/controllers/cab_rental_dashboard_controllers.dart
index add5017..c7f5b95 100644
--- a/lib/controllers/cab_rental_dashboard_controllers.dart
+++ b/lib/controllers/cab_rental_dashboard_controllers.dart
@@ -4,7 +4,6 @@ import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_scr
import 'package:customer/screen_ui/rental_service/rental_home_screen.dart';
import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart';
-
import '../screen_ui/rental_service/my_rental_booking_screen.dart';
class CabRentalDashboardControllers extends GetxController {
@@ -17,15 +16,26 @@ class CabRentalDashboardControllers extends GetxController {
// TODO: implement onInit
getTaxList();
if (Constant.walletSetting == false) {
- pageList.value = [RentalHomeScreen(), MyRentalBookingScreen(), const ProfileScreen()];
+ pageList.value = [
+ RentalHomeScreen(),
+ MyRentalBookingScreen(),
+ const ProfileScreen(),
+ ];
} else {
- pageList.value = [RentalHomeScreen(), MyRentalBookingScreen(), const WalletScreen(), const ProfileScreen()];
+ pageList.value = [
+ RentalHomeScreen(),
+ MyRentalBookingScreen(),
+ const WalletScreen(),
+ const ProfileScreen(),
+ ];
}
super.onInit();
}
Future getTaxList() async {
- await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((value) {
+ await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((
+ value,
+ ) {
if (value != null) {
Constant.taxList = value;
}
diff --git a/lib/controllers/cab_review_controller.dart b/lib/controllers/cab_review_controller.dart
index 8815b61..baa473b 100644
--- a/lib/controllers/cab_review_controller.dart
+++ b/lib/controllers/cab_review_controller.dart
@@ -1,5 +1,6 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/cab_order_model.dart';
+
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../constant/collection_name.dart';
@@ -43,12 +44,17 @@ class CabReviewController extends GetxController {
}
});
- await FireStoreUtils.getUserProfile(order.value?.driverId ?? '').then((value) {
+ await FireStoreUtils.getUserProfile(order.value?.driverId ?? '').then((
+ value,
+ ) {
if (value != null) {
driverUser.value = value;
- final int userReviewsCount = int.tryParse(driverUser.value!.reviewsCount?.toString() ?? "0") ?? 0;
- final int userReviewsSum = int.tryParse(driverUser.value!.reviewsSum?.toString() ?? "0") ?? 0;
+ final int userReviewsCount =
+ int.tryParse(driverUser.value!.reviewsCount?.toString() ?? "0") ??
+ 0;
+ final int userReviewsSum =
+ int.tryParse(driverUser.value!.reviewsSum?.toString() ?? "0") ?? 0;
if (ratingModel.value != null) {
final int oldRating = ratingModel.value?.rating?.toInt() ?? 0;
@@ -73,7 +79,9 @@ class CabReviewController extends GetxController {
ShowToastDialog.showLoader("Submit in...".tr);
- final user = await FireStoreUtils.getUserProfile(order.value?.driverId ?? '');
+ final user = await FireStoreUtils.getUserProfile(
+ order.value?.driverId ?? '',
+ );
if (user != null) {
user.reviewsCount = (futureCount.value + 1).toString();
@@ -90,7 +98,8 @@ class CabReviewController extends GetxController {
driverId: ratingModel.value!.driverId,
customerId: ratingModel.value!.customerId,
vendorId: ratingModel.value?.vendorId,
- uname: "${Constant.userModel?.firstName ?? ''} ${Constant.userModel?.lastName ?? ''}",
+ uname:
+ "${Constant.userModel?.firstName ?? ''} ${Constant.userModel?.lastName ?? ''}",
profile: Constant.userModel?.profilePictureURL,
createdAt: Timestamp.now(),
);
@@ -101,7 +110,8 @@ class CabReviewController extends GetxController {
}
} else {
/// New review
- final docRef = FireStoreUtils.fireStore.collection(CollectionName.itemsReview).doc();
+ final docRef =
+ FireStoreUtils.fireStore.collection(CollectionName.itemsReview).doc();
final newRating = RatingModel(
id: docRef.id,
comment: comment.value.text,
@@ -110,7 +120,8 @@ class CabReviewController extends GetxController {
orderId: order.value?.id,
driverId: order.value?.driverId.toString(),
customerId: Constant.userModel?.id,
- uname: "${Constant.userModel?.firstName ?? ''} ${Constant.userModel?.lastName ?? ''}",
+ uname:
+ "${Constant.userModel?.firstName ?? ''} ${Constant.userModel?.lastName ?? ''}",
profile: Constant.userModel?.profilePictureURL,
createdAt: Timestamp.now(),
);
diff --git a/lib/controllers/cart_controller.dart b/lib/controllers/cart_controller.dart
index 4335f0f..b4cbca6 100644
--- a/lib/controllers/cart_controller.dart
+++ b/lib/controllers/cart_controller.dart
@@ -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,6 +14,7 @@ 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:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart';
@@ -107,7 +109,9 @@ class CartController extends GetxController {
cartItem.addAll(event);
if (cartItem.isNotEmpty) {
- await FireStoreUtils.getVendorById(cartItem.first.vendorID.toString()).then((value) {
+ await FireStoreUtils.getVendorById(
+ cartItem.first.vendorID.toString(),
+ ).then((value) {
if (value != null) {
vendorModel.value = value;
}
@@ -115,9 +119,14 @@ class CartController extends GetxController {
}
calculatePrice();
});
- selectedFoodType.value = Preferences.getString(Preferences.foodDeliveryType, defaultValue: "Delivery");
+ selectedFoodType.value = Preferences.getString(
+ Preferences.foodDeliveryType,
+ defaultValue: "Delivery",
+ );
- await FireStoreUtils.getUserProfile(FireStoreUtils.getCurrentUid()).then((value) {
+ await FireStoreUtils.getUserProfile(FireStoreUtils.getCurrentUid()).then((
+ value,
+ ) {
if (value != null) {
userModel.value = value;
}
@@ -126,16 +135,22 @@ class CartController extends GetxController {
await FireStoreUtils.getDeliveryCharge().then((value) {
if (value != null) {
deliveryChargeModel.value = value;
- print("===> Delivery Charge Model: ${deliveryChargeModel.value.toJson()}");
+ print(
+ "===> Delivery Charge Model: ${deliveryChargeModel.value.toJson()}",
+ );
calculatePrice();
}
});
- await FireStoreUtils.getAllVendorPublicCoupons(vendorModel.value.id.toString()).then((value) {
+ await FireStoreUtils.getAllVendorPublicCoupons(
+ vendorModel.value.id.toString(),
+ ).then((value) {
couponList.value = value;
});
- await FireStoreUtils.getAllVendorCoupons(vendorModel.value.id.toString()).then((value) {
+ await FireStoreUtils.getAllVendorCoupons(
+ vendorModel.value.id.toString(),
+ ).then((value) {
allCouponList.value = value;
});
}
@@ -149,8 +164,11 @@ class CartController extends GetxController {
totalAmount.value = 0.0;
if (cartItem.isNotEmpty) {
- if (Constant.sectionConstantModel!.serviceTypeFlag == "ecommerce-service") {
- deliveryCharges.value = double.parse(Constant.sectionConstantModel!.delivery_charge ?? "0");
+ if (Constant.sectionConstantModel!.serviceTypeFlag ==
+ "ecommerce-service") {
+ deliveryCharges.value = double.parse(
+ Constant.sectionConstantModel!.delivery_charge ?? "0",
+ );
} else {
if (selectedFoodType.value == "Delivery") {
totalDistance.value = double.parse(
@@ -161,26 +179,50 @@ class CartController extends GetxController {
lng2: vendorModel.value.longitude.toString(),
),
);
- if (vendorModel.value.isSelfDelivery == true && Constant.isSelfDeliveryFeature == true) {
+ if (vendorModel.value.isSelfDelivery == true &&
+ Constant.isSelfDeliveryFeature == true) {
deliveryCharges.value = 0.0;
} else if (deliveryChargeModel.value.vendorCanModify == false) {
- if (totalDistance.value > deliveryChargeModel.value.minimumDeliveryChargesWithinKm!) {
- deliveryCharges.value = totalDistance.value * deliveryChargeModel.value.deliveryChargesPerKm!;
+ if (totalDistance.value >
+ deliveryChargeModel.value.minimumDeliveryChargesWithinKm!) {
+ deliveryCharges.value =
+ totalDistance.value *
+ deliveryChargeModel.value.deliveryChargesPerKm!;
} else {
- deliveryCharges.value = (deliveryChargeModel.value.minimumDeliveryCharges)!.toDouble();
+ deliveryCharges.value =
+ (deliveryChargeModel.value.minimumDeliveryCharges)!
+ .toDouble();
}
} else {
if (vendorModel.value.deliveryCharge != null) {
- if (totalDistance.value > vendorModel.value.deliveryCharge!.minimumDeliveryChargesWithinKm!) {
- deliveryCharges.value = (totalDistance.value * vendorModel.value.deliveryCharge!.deliveryChargesPerKm!).toDouble();
+ if (totalDistance.value >
+ vendorModel
+ .value
+ .deliveryCharge!
+ .minimumDeliveryChargesWithinKm!) {
+ deliveryCharges.value =
+ (totalDistance.value *
+ vendorModel
+ .value
+ .deliveryCharge!
+ .deliveryChargesPerKm!)
+ .toDouble();
} else {
- deliveryCharges.value = vendorModel.value.deliveryCharge!.minimumDeliveryCharges!.toDouble();
+ deliveryCharges.value =
+ vendorModel.value.deliveryCharge!.minimumDeliveryCharges!
+ .toDouble();
}
} else {
- if (totalDistance.value > deliveryChargeModel.value.minimumDeliveryChargesWithinKm!) {
- deliveryCharges.value = (totalDistance.value * deliveryChargeModel.value.deliveryChargesPerKm!).toDouble();
+ if (totalDistance.value >
+ deliveryChargeModel.value.minimumDeliveryChargesWithinKm!) {
+ deliveryCharges.value =
+ (totalDistance.value *
+ deliveryChargeModel.value.deliveryChargesPerKm!)
+ .toDouble();
} else {
- deliveryCharges.value = deliveryChargeModel.value.minimumDeliveryCharges!.toDouble();
+ deliveryCharges.value =
+ deliveryChargeModel.value.minimumDeliveryCharges!
+ .toDouble();
}
}
}
@@ -194,21 +236,29 @@ class CartController extends GetxController {
if (double.parse(element.discountPrice.toString()) <= 0) {
subTotal.value =
subTotal.value +
- double.parse(element.price.toString()) * double.parse(element.quantity.toString()) +
- (double.parse(element.extrasPrice.toString()) * double.parse(element.quantity.toString()));
+ double.parse(element.price.toString()) *
+ double.parse(element.quantity.toString()) +
+ (double.parse(element.extrasPrice.toString()) *
+ double.parse(element.quantity.toString()));
} else {
subTotal.value =
subTotal.value +
- double.parse(element.discountPrice.toString()) * double.parse(element.quantity.toString()) +
- (double.parse(element.extrasPrice.toString()) * double.parse(element.quantity.toString()));
+ double.parse(element.discountPrice.toString()) *
+ double.parse(element.quantity.toString()) +
+ (double.parse(element.extrasPrice.toString()) *
+ double.parse(element.quantity.toString()));
}
}
if (selectedCouponModel.value.id != null) {
- couponAmount.value = Constant.calculateDiscount(amount: subTotal.value.toString(), offerModel: selectedCouponModel.value);
+ couponAmount.value = Constant.calculateDiscount(
+ amount: subTotal.value.toString(),
+ offerModel: selectedCouponModel.value,
+ );
}
- if (vendorModel.value.specialDiscountEnable == true && Constant.specialDiscountOffer == true) {
+ if (vendorModel.value.specialDiscountEnable == true &&
+ Constant.specialDiscountOffer == true) {
final now = DateTime.now();
var day = DateFormat('EEEE', 'en_US').format(now);
var date = DateFormat('dd-MM-yyyy').format(now);
@@ -217,13 +267,20 @@ class CartController extends GetxController {
if (element.timeslot!.isNotEmpty) {
for (var element in element.timeslot!) {
if (element.discountType == "delivery") {
- var start = DateFormat("dd-MM-yyyy HH:mm").parse("$date ${element.from}");
- var end = DateFormat("dd-MM-yyyy HH:mm").parse("$date ${element.to}");
+ var start = DateFormat(
+ "dd-MM-yyyy HH:mm",
+ ).parse("$date ${element.from}");
+ var end = DateFormat(
+ "dd-MM-yyyy HH:mm",
+ ).parse("$date ${element.to}");
if (isCurrentDateInRange(start, end)) {
- specialDiscount.value = double.parse(element.discount.toString());
+ specialDiscount.value = double.parse(
+ element.discount.toString(),
+ );
specialType.value = element.type.toString();
if (element.type == "percentage") {
- specialDiscountAmount.value = subTotal * specialDiscount.value / 100;
+ specialDiscountAmount.value =
+ subTotal * specialDiscount.value / 100;
} else {
specialDiscountAmount.value = specialDiscount.value;
}
@@ -239,10 +296,23 @@ class CartController extends GetxController {
}
for (var element in Constant.taxList) {
- taxAmount.value = taxAmount.value + Constant.calculateTax(amount: (subTotal.value - couponAmount.value - specialDiscountAmount.value).toString(), taxModel: element);
+ taxAmount.value =
+ taxAmount.value +
+ Constant.calculateTax(
+ amount:
+ (subTotal.value -
+ couponAmount.value -
+ specialDiscountAmount.value)
+ .toString(),
+ taxModel: element,
+ );
}
- totalAmount.value = (subTotal.value - couponAmount.value - specialDiscountAmount.value) + taxAmount.value + deliveryCharges.value + deliveryTips.value;
+ totalAmount.value =
+ (subTotal.value - couponAmount.value - specialDiscountAmount.value) +
+ taxAmount.value +
+ deliveryCharges.value +
+ deliveryTips.value;
getCashback();
}
@@ -263,17 +333,31 @@ class CartController extends GetxController {
if (startDate == null || endDate == null) continue;
- final withinDateRange = startDate.toDate().isBefore(now) && endDate.toDate().isAfter(now);
- final meetsMinAmount = orderTotal >= (cashback.minimumPurchaseAmount ?? 0);
+ final withinDateRange =
+ startDate.toDate().isBefore(now) && endDate.toDate().isAfter(now);
+ final meetsMinAmount =
+ orderTotal >= (cashback.minimumPurchaseAmount ?? 0);
final allPayment = cashback.allPayment ?? false;
- final paymentMatch = allPayment || (cashback.paymentMethods ?? []).contains(paymentMethod);
+ final paymentMatch =
+ allPayment ||
+ (cashback.paymentMethods ?? []).contains(paymentMethod);
final allCustomer = cashback.allCustomer ?? false;
- final customerMatch = allCustomer || (cashback.customerIds ?? []).contains(FireStoreUtils.getCurrentUid());
+ final customerMatch =
+ allCustomer ||
+ (cashback.customerIds ?? []).contains(
+ FireStoreUtils.getCurrentUid(),
+ );
- final redeemData = await FireStoreUtils.getRedeemedCashbacks(cashback.id ?? '');
+ final redeemData = await FireStoreUtils.getRedeemedCashbacks(
+ cashback.id ?? '',
+ );
final underLimit = redeemData.length < (cashback.redeemLimit ?? 0);
- if (withinDateRange && meetsMinAmount && paymentMatch && customerMatch && underLimit) {
+ if (withinDateRange &&
+ meetsMinAmount &&
+ paymentMatch &&
+ customerMatch &&
+ underLimit) {
eligibleCashbacks.add(cashback);
}
}
@@ -311,7 +395,11 @@ class CartController extends GetxController {
}
}
- Future addToCart({required CartProductModel cartProductModel, required bool isIncrement, required int quantity}) async {
+ Future addToCart({
+ required CartProductModel cartProductModel,
+ required bool isIncrement,
+ required int quantity,
+ }) async {
if (isIncrement) {
cartProvider.addToCart(Get.context!, cartProductModel, quantity);
} else {
@@ -324,10 +412,13 @@ class CartController extends GetxController {
Future placeOrder() async {
if (selectedPaymentMethod.value == PaymentGateway.wallet.name) {
- if (double.parse(userModel.value.walletAmount.toString()) >= totalAmount.value) {
+ if (double.parse(userModel.value.walletAmount.toString()) >=
+ totalAmount.value) {
setOrder();
} else {
- ShowToastDialog.showToast("You don't have sufficient wallet balance to place order".tr);
+ ShowToastDialog.showToast(
+ "You don't have sufficient wallet balance to place order".tr,
+ );
}
} else {
setOrder();
@@ -335,13 +426,21 @@ class CartController extends GetxController {
}
Future setOrder() async {
- ShowToastDialog.showLoader("Please wait...".tr);
+ ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr);
- if ((Constant.isSubscriptionModelApplied == true || Constant.sectionConstantModel?.adminCommision?.isEnabled == true) && vendorModel.value.subscriptionPlan != null) {
- await FireStoreUtils.getVendorById(vendorModel.value.id!).then((vender) async {
- if (vender?.subscriptionTotalOrders == '0' || vender?.subscriptionTotalOrders == null) {
+ if ((Constant.isSubscriptionModelApplied == true ||
+ Constant.sectionConstantModel?.adminCommision?.isEnabled == true) &&
+ vendorModel.value.subscriptionPlan != null) {
+ await FireStoreUtils.getVendorById(vendorModel.value.id!).then((
+ vender,
+ ) async {
+ if (vender?.subscriptionTotalOrders == '0' ||
+ vender?.subscriptionTotalOrders == null) {
ShowToastDialog.closeLoader();
- ShowToastDialog.showToast("This vendor has reached their maximum order capacity. Please select a different vendor or try again later.".tr);
+ ShowToastDialog.showToast(
+ "This vendor has reached their maximum order capacity. Please select a different vendor or try again later."
+ .tr,
+ );
return;
}
});
@@ -355,7 +454,11 @@ class CartController extends GetxController {
tempProduc.add(tempCart);
}
- Map specialDiscountMap = {'special_discount': specialDiscountAmount.value, 'special_discount_label': specialDiscount.value, 'specialType': specialType.value};
+ Map specialDiscountMap = {
+ 'special_discount': specialDiscountAmount.value,
+ 'special_discount_label': specialDiscount.value,
+ 'specialType': specialType.value,
+ };
OrderModel orderModel = OrderModel();
orderModel.id = Constant.getUuid();
@@ -390,8 +493,12 @@ class CartController extends GetxController {
orderModel.notes = reMarkController.value.text;
orderModel.takeAway = selectedFoodType.value == "Delivery" ? false : true;
orderModel.createdAt = Timestamp.now();
- orderModel.scheduleTime = deliveryType.value == "schedule" ? Timestamp.fromDate(scheduleDateTime.value) : null;
- orderModel.cashback = bestCashback.value.id == null ? null : bestCashback.value;
+ orderModel.scheduleTime =
+ deliveryType.value == "schedule"
+ ? Timestamp.fromDate(scheduleDateTime.value)
+ : null;
+ orderModel.cashback =
+ bestCashback.value.id == null ? null : bestCashback.value;
if (selectedPaymentMethod.value == PaymentGateway.wallet.name) {
WalletTransactionModel transactionModel = WalletTransactionModel(
id: Constant.getUuid(),
@@ -406,33 +513,57 @@ class CartController extends GetxController {
paymentStatus: "success".tr,
);
- await FireStoreUtils.setWalletTransaction(transactionModel).then((value) async {
+ await FireStoreUtils.setWalletTransaction(transactionModel).then((
+ value,
+ ) async {
if (value == true) {
- await FireStoreUtils.updateUserWallet(amount: "-${totalAmount.value.toString()}", userId: FireStoreUtils.getCurrentUid()).then((value) {});
+ await FireStoreUtils.updateUserWallet(
+ amount: "-${totalAmount.value.toString()}",
+ userId: FireStoreUtils.getCurrentUid(),
+ ).then((value) {});
}
});
}
for (int i = 0; i < tempProduc.length; i++) {
- await FireStoreUtils.getProductById(tempProduc[i].id!.split('~').first).then((value) async {
+ await FireStoreUtils.getProductById(
+ tempProduc[i].id!.split('~').first,
+ ).then((value) async {
ProductModel? productModel = value;
if (tempProduc[i].variantInfo != null) {
if (productModel!.itemAttribute != null) {
- for (int j = 0; j < productModel.itemAttribute!.variants!.length; j++) {
- if (productModel.itemAttribute!.variants![j].variantId == tempProduc[i].id!.split('~').last) {
- if (productModel.itemAttribute!.variants![j].variantQuantity != "-1") {
- productModel.itemAttribute!.variants![j].variantQuantity = (int.parse(productModel.itemAttribute!.variants![j].variantQuantity.toString()) - tempProduc[i].quantity!).toString();
+ for (
+ int j = 0;
+ j < productModel.itemAttribute!.variants!.length;
+ j++
+ ) {
+ if (productModel.itemAttribute!.variants![j].variantId ==
+ tempProduc[i].id!.split('~').last) {
+ if (productModel.itemAttribute!.variants![j].variantQuantity !=
+ "-1") {
+ productModel.itemAttribute!.variants![j].variantQuantity =
+ (int.parse(
+ productModel
+ .itemAttribute!
+ .variants![j]
+ .variantQuantity
+ .toString(),
+ ) -
+ tempProduc[i].quantity!)
+ .toString();
}
}
}
} else {
if (productModel.quantity != -1) {
- productModel.quantity = (productModel.quantity! - tempProduc[i].quantity!);
+ productModel.quantity =
+ (productModel.quantity! - tempProduc[i].quantity!);
}
}
} else {
if (productModel!.quantity != -1) {
- productModel.quantity = (productModel.quantity! - tempProduc[i].quantity!);
+ productModel.quantity =
+ (productModel.quantity! - tempProduc[i].quantity!);
}
}
@@ -450,18 +581,31 @@ class CartController extends GetxController {
await FireStoreUtils.setCashbackRedeemModel(cashbackRedeemModel);
}
await FireStoreUtils.setOrder(orderModel).then((value) async {
- await FireStoreUtils.getUserProfile(orderModel.vendor!.author.toString()).then((value) async {
+ await FireStoreUtils.getUserProfile(
+ orderModel.vendor!.author.toString(),
+ ).then((value) async {
if (value != null) {
if (orderModel.scheduleTime != null) {
- await SendNotification.sendFcmMessage(Constant.scheduleOrder, value.fcmToken ?? '', {});
+ await SendNotification.sendFcmMessage(
+ Constant.scheduleOrder,
+ value.fcmToken ?? '',
+ {},
+ );
} else {
- await SendNotification.sendFcmMessage(Constant.newOrderPlaced, value.fcmToken ?? '', {});
+ await SendNotification.sendFcmMessage(
+ Constant.newOrderPlaced,
+ value.fcmToken ?? '',
+ {},
+ );
}
}
});
await Constant.sendOrderEmail(orderModel: orderModel);
ShowToastDialog.closeLoader();
- Get.off(const OrderPlacingScreen(), arguments: {"orderModel": orderModel});
+ Get.off(
+ const OrderPlacingScreen(),
+ arguments: {"orderModel": orderModel},
+ );
});
}
@@ -482,19 +626,45 @@ class CartController extends GetxController {
Future getPaymentSettings() async {
await FireStoreUtils.getPaymentSettingsData().then((value) {
- stripeModel.value = StripeModel.fromJson(jsonDecode(Preferences.getString(Preferences.stripeSettings)));
- payPalModel.value = PayPalModel.fromJson(jsonDecode(Preferences.getString(Preferences.paypalSettings)));
- payStackModel.value = PayStackModel.fromJson(jsonDecode(Preferences.getString(Preferences.payStack)));
- mercadoPagoModel.value = MercadoPagoModel.fromJson(jsonDecode(Preferences.getString(Preferences.mercadoPago)));
- flutterWaveModel.value = FlutterWaveModel.fromJson(jsonDecode(Preferences.getString(Preferences.flutterWave)));
- paytmModel.value = PaytmModel.fromJson(jsonDecode(Preferences.getString(Preferences.paytmSettings)));
- payFastModel.value = PayFastModel.fromJson(jsonDecode(Preferences.getString(Preferences.payFastSettings)));
- razorPayModel.value = RazorPayModel.fromJson(jsonDecode(Preferences.getString(Preferences.razorpaySettings)));
- midTransModel.value = MidTrans.fromJson(jsonDecode(Preferences.getString(Preferences.midTransSettings)));
- orangeMoneyModel.value = OrangeMoney.fromJson(jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)));
- xenditModel.value = Xendit.fromJson(jsonDecode(Preferences.getString(Preferences.xenditSettings)));
- walletSettingModel.value = WalletSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.walletSettings)));
- cashOnDeliverySettingModel.value = CodSettingModel.fromJson(jsonDecode(Preferences.getString(Preferences.codSettings)));
+ stripeModel.value = StripeModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.stripeSettings)),
+ );
+ payPalModel.value = PayPalModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paypalSettings)),
+ );
+ payStackModel.value = PayStackModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payStack)),
+ );
+ mercadoPagoModel.value = MercadoPagoModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.mercadoPago)),
+ );
+ flutterWaveModel.value = FlutterWaveModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.flutterWave)),
+ );
+ paytmModel.value = PaytmModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.paytmSettings)),
+ );
+ payFastModel.value = PayFastModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.payFastSettings)),
+ );
+ razorPayModel.value = RazorPayModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.razorpaySettings)),
+ );
+ midTransModel.value = MidTrans.fromJson(
+ jsonDecode(Preferences.getString(Preferences.midTransSettings)),
+ );
+ orangeMoneyModel.value = OrangeMoney.fromJson(
+ jsonDecode(Preferences.getString(Preferences.orangeMoneySettings)),
+ );
+ xenditModel.value = Xendit.fromJson(
+ jsonDecode(Preferences.getString(Preferences.xenditSettings)),
+ );
+ walletSettingModel.value = WalletSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.walletSettings)),
+ );
+ cashOnDeliverySettingModel.value = CodSettingModel.fromJson(
+ jsonDecode(Preferences.getString(Preferences.codSettings)),
+ );
if (walletSettingModel.value.isEnabled == true) {
selectedPaymentMethod.value = PaymentGateway.wallet.name;
@@ -536,20 +706,32 @@ class CartController extends GetxController {
Future stripeMakePayment({required String amount}) async {
log(double.parse(amount).toStringAsFixed(0));
try {
- Map? paymentIntentData = await createStripeIntent(amount: amount);
+ Map? paymentIntentData = await createStripeIntent(
+ amount: amount,
+ );
log("stripe Responce====>$paymentIntentData");
if (paymentIntentData!.containsKey("error")) {
Get.back();
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
} else {
await Stripe.instance.initPaymentSheet(
paymentSheetParameters: SetupPaymentSheetParameters(
paymentIntentClientSecret: paymentIntentData['client_secret'],
allowsDelayedPaymentMethods: false,
- googlePay: const PaymentSheetGooglePay(merchantCountryCode: 'US', testEnv: true, currencyCode: "USD"),
+ googlePay: const PaymentSheetGooglePay(
+ merchantCountryCode: 'US',
+ testEnv: true,
+ currencyCode: "USD",
+ ),
customFlow: true,
style: ThemeMode.system,
- appearance: PaymentSheetAppearance(colors: PaymentSheetAppearanceColors(primary: AppThemeData.primary300)),
+ appearance: PaymentSheetAppearance(
+ colors: PaymentSheetAppearanceColors(
+ primary: AppThemeData.primary300,
+ ),
+ ),
merchantDisplayName: 'GoRide',
),
);
@@ -595,7 +777,10 @@ class CartController extends GetxController {
var response = await http.post(
Uri.parse('https://api.stripe.com/v1/payment_intents'),
body: body,
- headers: {'Authorization': 'Bearer $stripeSecret', 'Content-Type': 'application/x-www-form-urlencoded'},
+ headers: {
+ 'Authorization': 'Bearer $stripeSecret',
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
);
return jsonDecode(response.body);
@@ -605,8 +790,14 @@ class CartController extends GetxController {
}
//mercadoo
- Future mercadoPagoMakePayment({required BuildContext context, required String amount}) async {
- final headers = {'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}', 'Content-Type': 'application/json'};
+ Future mercadoPagoMakePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
+ final headers = {
+ 'Authorization': 'Bearer ${mercadoPagoModel.value.accessToken}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"items": [
@@ -619,12 +810,20 @@ class CartController extends GetxController {
},
],
"payer": {"email": userModel.value.email},
- "back_urls": {"failure": "${Constant.globalUrl}payment/failure", "pending": "${Constant.globalUrl}payment/pending", "success": "${Constant.globalUrl}payment/success"},
+ "back_urls": {
+ "failure": "${Constant.globalUrl}payment/failure",
+ "pending": "${Constant.globalUrl}payment/pending",
+ "success": "${Constant.globalUrl}payment/success",
+ },
"auto_return": "approved",
// Automatically return after payment is approved
});
- final response = await http.post(Uri.parse("https://api.mercadopago.com/checkout/preferences"), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse("https://api.mercadopago.com/checkout/preferences"),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
final data = jsonDecode(response.body);
@@ -682,9 +881,12 @@ class CartController extends GetxController {
///PayStack Payment Method
Future payStackPayment(String totalAmount) async {
- await PayStackURLGen.payStackURLGen(amount: (double.parse(totalAmount) * 100).toString(), currency: "ZAR", secretKey: payStackModel.value.secretKey.toString(), userModel: userModel.value).then((
- value,
- ) async {
+ await PayStackURLGen.payStackURLGen(
+ amount: (double.parse(totalAmount) * 100).toString(),
+ currency: "ZAR",
+ secretKey: payStackModel.value.secretKey.toString(),
+ userModel: userModel.value,
+ ).then((value) async {
if (value != null) {
PayStackUrlModel payStackModel0 = value;
Get.to(
@@ -704,15 +906,23 @@ class CartController extends GetxController {
}
});
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
}
});
}
//flutter wave Payment Method
- Future flutterWaveInitiatePayment({required BuildContext context, required String amount}) async {
+ Future flutterWaveInitiatePayment({
+ required BuildContext context,
+ required String amount,
+ }) async {
final url = Uri.parse('https://api.flutterwave.com/v3/payments');
- final headers = {'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}', 'Content-Type': 'application/json'};
+ final headers = {
+ 'Authorization': 'Bearer ${flutterWaveModel.value.secretKey}',
+ 'Content-Type': 'application/json',
+ };
final body = jsonEncode({
"tx_ref": _ref,
@@ -725,14 +935,19 @@ class CartController extends GetxController {
"phonenumber": userModel.value.phoneNumber, // Add a real phone number
"name": userModel.value.fullName(), // Add a real customer name
},
- "customizations": {"title": "Payment for Services", "description": "Payment for XYZ services"},
+ "customizations": {
+ "title": "Payment for Services",
+ "description": "Payment for XYZ services",
+ },
});
final response = await http.post(url, headers: headers, body: body);
if (response.statusCode == 200) {
final data = jsonDecode(response.body);
- Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((value) {
+ Get.to(MercadoPagoScreen(initialURl: data['data']['link']))!.then((
+ value,
+ ) {
if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -761,8 +976,14 @@ class CartController extends GetxController {
// payFast
void payFastPayment({required BuildContext context, required String amount}) {
- PayStackURLGen.getPayHTML(payFastSettingData: payFastModel.value, amount: amount.toString(), userModel: userModel.value).then((String? value) async {
- bool isDone = await Get.to(PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value));
+ PayStackURLGen.getPayHTML(
+ payFastSettingData: payFastModel.value,
+ amount: amount.toString(),
+ userModel: userModel.value,
+ ).then((String? value) async {
+ bool isDone = await Get.to(
+ PayFastScreen(htmlData: value!, payFastSettingData: payFastModel.value),
+ );
if (isDone) {
Get.back();
ShowToastDialog.showToast("Payment successfully".tr);
@@ -782,26 +1003,50 @@ class CartController extends GetxController {
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString()},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ },
);
final data = jsonDecode(response.body);
- await verifyCheckSum(checkSum: data["code"], amount: amount, orderId: orderId).then((value) {
+ await verifyCheckSum(
+ checkSum: data["code"],
+ amount: amount,
+ orderId: orderId,
+ ).then((value) {
initiatePayment(amount: amount, orderId: orderId).then((value) {
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
GetPaymentTxtTokenModel result = value;
- startTransaction(context, txnTokenBy: result.body.txnToken ?? '', orderId: orderId, amount: amount, callBackURL: callback, isStaging: paytmModel.value.isSandboxEnabled);
+ startTransaction(
+ context,
+ txnTokenBy: result.body.txnToken ?? '',
+ orderId: orderId,
+ amount: amount,
+ callBackURL: callback,
+ isStaging: paytmModel.value.isSandboxEnabled,
+ );
});
});
}
- Future startTransaction(context, {required String txnTokenBy, required orderId, required double amount, required callBackURL, required isStaging}) async {
+ Future startTransaction(
+ context, {
+ required String txnTokenBy,
+ required orderId,
+ required double amount,
+ required callBackURL,
+ required isStaging,
+ }) async {
// try {
// var response = AllInOneSdk.startTransaction(
// paytmModel.value.paytmMID.toString(),
@@ -837,24 +1082,38 @@ class CartController extends GetxController {
// }
}
- Future verifyCheckSum({required String checkSum, required double amount, required orderId}) async {
+ Future verifyCheckSum({
+ required String checkSum,
+ required double amount,
+ required orderId,
+ }) async {
String getChecksum = "${Constant.globalUrl}payments/validatechecksum";
final response = await http.post(
Uri.parse(getChecksum),
headers: {},
- body: {"mid": paytmModel.value.paytmMID.toString(), "order_id": orderId, "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(), "checksum_value": checkSum},
+ body: {
+ "mid": paytmModel.value.paytmMID.toString(),
+ "order_id": orderId,
+ "key_secret": paytmModel.value.pAYTMMERCHANTKEY.toString(),
+ "checksum_value": checkSum,
+ },
);
final data = jsonDecode(response.body);
return data['status'];
}
- Future initiatePayment({required double amount, required orderId}) async {
+ Future initiatePayment({
+ required double amount,
+ required orderId,
+ }) async {
String initiateURL = "${Constant.globalUrl}payments/initiatepaytmpayment";
String callback = "";
if (paytmModel.value.isSandboxEnabled == true) {
- callback = "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw-stage.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
} else {
- callback = "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
+ callback =
+ "${callback}https://securegw.paytm.in/theia/paytmCallback?ORDER_ID=$orderId";
}
final response = await http.post(
Uri.parse(initiateURL),
@@ -872,9 +1131,12 @@ class CartController extends GetxController {
);
log(response.body);
final data = jsonDecode(response.body);
- if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) {
+ if (data["body"]["txnToken"] == null ||
+ data["body"]["txnToken"].toString().isEmpty) {
Get.back();
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
}
return GetPaymentTxtTokenModel.fromJson(data);
}
@@ -892,7 +1154,10 @@ class CartController extends GetxController {
'description': 'wallet Topup',
'retry': {'enabled': true, 'max_count': 1},
'send_sms_hash': true,
- 'prefill': {'contact': userModel.value.phoneNumber, 'email': userModel.value.email},
+ 'prefill': {
+ 'contact': userModel.value.phoneNumber,
+ 'email': userModel.value.email,
+ },
'external': {
'wallets': ['paytm'],
},
@@ -926,7 +1191,10 @@ class CartController extends GetxController {
}
//Midtrans payment
- Future midtransMakePayment({required String amount, required BuildContext context}) async {
+ Future midtransMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
await createPaymentLink(amount: amount).then((url) {
ShowToastDialog.closeLoader();
if (url != '') {
@@ -944,15 +1212,30 @@ class CartController extends GetxController {
Future createPaymentLink({required var amount}) async {
var ordersId = const Uuid().v1();
- final url = Uri.parse(midTransModel.value.isSandbox! ? 'https://api.sandbox.midtrans.com/v1/payment-links' : 'https://api.midtrans.com/v1/payment-links');
+ final url = Uri.parse(
+ midTransModel.value.isSandbox!
+ ? 'https://api.sandbox.midtrans.com/v1/payment-links'
+ : 'https://api.midtrans.com/v1/payment-links',
+ );
final response = await http.post(
url,
- headers: {'Accept': 'application/json', 'Content-Type': 'application/json', 'Authorization': generateBasicAuthHeader(midTransModel.value.serverKey!)},
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ 'Authorization': generateBasicAuthHeader(
+ midTransModel.value.serverKey!,
+ ),
+ },
body: jsonEncode({
- 'transaction_details': {'order_id': ordersId, 'gross_amount': double.parse(amount.toString()).toInt()},
+ 'transaction_details': {
+ 'order_id': ordersId,
+ 'gross_amount': double.parse(amount.toString()).toInt(),
+ },
'usage_limit': 2,
- "callbacks": {"finish": "https://www.google.com?merchant_order_id=$ordersId"},
+ "callbacks": {
+ "finish": "https://www.google.com?merchant_order_id=$ordersId",
+ },
}),
);
@@ -960,7 +1243,9 @@ class CartController extends GetxController {
final responseData = jsonDecode(response.body);
return responseData['payment_url'];
} else {
- ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -977,13 +1262,30 @@ class CartController extends GetxController {
static String orderId = '';
static String amount = '';
- Future orangeMakePayment({required String amount, required BuildContext context}) async {
+ Future orangeMakePayment({
+ required String amount,
+ required BuildContext context,
+ }) async {
reset();
var id = const Uuid().v4();
- var paymentURL = await fetchToken(context: context, orderId: id, amount: amount, currency: 'USD');
+ var paymentURL = await fetchToken(
+ context: context,
+ orderId: id,
+ amount: amount,
+ currency: 'USD',
+ );
ShowToastDialog.closeLoader();
if (paymentURL.toString() != '') {
- Get.to(() => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken))!.then((value) {
+ Get.to(
+ () => OrangeMoneyScreen(
+ initialURl: paymentURL,
+ accessToken: accessToken,
+ amount: amount,
+ orangePay: orangeMoneyModel.value,
+ orderId: orderId,
+ payToken: payToken,
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -995,13 +1297,22 @@ class CartController extends GetxController {
}
}
- Future fetchToken({required String orderId, required String currency, required BuildContext context, required String amount}) async {
+ Future fetchToken({
+ required String orderId,
+ required String currency,
+ required BuildContext context,
+ required String amount,
+ }) async {
String apiUrl = 'https://api.orange.com/oauth/v3/token';
Map requestBody = {'grant_type': 'client_credentials'};
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': "Basic ${orangeMoneyModel.value.auth!}", 'Content-Type': 'application/x-www-form-urlencoded', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': "Basic ${orangeMoneyModel.value.auth!}",
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'Accept': 'application/json',
+ },
body: requestBody,
);
@@ -1012,17 +1323,32 @@ class CartController extends GetxController {
accessToken = responseData['access_token'];
// ignore: use_build_context_synchronously
- return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
+ 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 '';
}
}
- Future webpayment({required String orderIdData, required BuildContext context, required String currency, required String amountData}) async {
+ Future webpayment({
+ required String orderIdData,
+ required BuildContext context,
+ required String currency,
+ required String amountData,
+ }) async {
orderId = orderIdData;
amount = amountData;
- String apiUrl = orangeMoneyModel.value.isSandbox! == true ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment' : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
+ String apiUrl =
+ orangeMoneyModel.value.isSandbox! == true
+ ? 'https://api.orange.com/orange-money-webpay/dev/v1/webpayment'
+ : 'https://api.orange.com/orange-money-webpay/cm/v1/webpayment';
Map requestBody = {
"merchant_key": orangeMoneyModel.value.merchantKey ?? '',
"currency": orangeMoneyModel.value.isSandbox == true ? "OUV" : currency,
@@ -1037,7 +1363,11 @@ class CartController extends GetxController {
var response = await http.post(
Uri.parse(apiUrl),
- headers: {'Authorization': 'Bearer $accessToken', 'Content-Type': 'application/json', 'Accept': 'application/json'},
+ headers: {
+ 'Authorization': 'Bearer $accessToken',
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json',
+ },
body: json.encode(requestBody),
);
@@ -1051,7 +1381,9 @@ class CartController extends GetxController {
return '';
}
} else {
- ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
+ ShowToastDialog.showToast(
+ "Something went wrong, please contact admin.".tr,
+ );
return '';
}
}
@@ -1068,7 +1400,13 @@ class CartController extends GetxController {
await createXenditInvoice(amount: amount).then((model) {
ShowToastDialog.closeLoader();
if (model.id != null) {
- Get.to(() => XenditScreen(initialURl: model.invoiceUrl ?? '', transId: model.id ?? '', apiKey: xenditModel.value.apiKey!.toString()))!.then((value) {
+ Get.to(
+ () => XenditScreen(
+ initialURl: model.invoiceUrl ?? '',
+ transId: model.id ?? '',
+ apiKey: xenditModel.value.apiKey!.toString(),
+ ),
+ )!.then((value) {
if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder();
@@ -1085,7 +1423,9 @@ class CartController extends GetxController {
const url = 'https://api.xendit.co/v2/invoices';
var headers = {
'Content-Type': 'application/json',
- 'Authorization': generateBasicAuthHeader(xenditModel.value.apiKey!.toString()),
+ 'Authorization': generateBasicAuthHeader(
+ xenditModel.value.apiKey!.toString(),
+ ),
// 'Cookie': '__cf_bm=yERkrx3xDITyFGiou0bbKY1bi7xEwovHNwxV1vCNbVc-1724155511-1.0.1.1-jekyYQmPCwY6vIJ524K0V6_CEw6O.dAwOmQnHtwmaXO_MfTrdnmZMka0KZvjukQgXu5B.K_6FJm47SGOPeWviQ',
};
@@ -1098,7 +1438,11 @@ class CartController extends GetxController {
});
try {
- final response = await http.post(Uri.parse(url), headers: headers, body: body);
+ final response = await http.post(
+ Uri.parse(url),
+ headers: headers,
+ body: body,
+ );
if (response.statusCode == 200 || response.statusCode == 201) {
XenditModel model = XenditModel.fromJson(jsonDecode(response.body));
diff --git a/lib/controllers/category_restaurant_controller.dart b/lib/controllers/category_restaurant_controller.dart
index bd8e41a..dbf3077 100644
--- a/lib/controllers/category_restaurant_controller.dart
+++ b/lib/controllers/category_restaurant_controller.dart
@@ -33,9 +33,10 @@ class CategoryRestaurantController extends GetxController {
}
Future getRestaurant() async {
- FireStoreUtils.getAllNearestRestaurantByCategoryId(categoryId: vendorCategoryModel.value.id.toString(), isDining: dineIn.value).listen((
- event,
- ) async {
+ FireStoreUtils.getAllNearestRestaurantByCategoryId(
+ categoryId: vendorCategoryModel.value.id.toString(),
+ isDining: dineIn.value,
+ ).listen((event) async {
allNearestRestaurant.clear();
allNearestRestaurant.addAll(event);
});
@@ -46,7 +47,10 @@ class CategoryRestaurantController extends GetxController {
if (value != null) {
for (int i = 0; i < value.length; i++) {
if (Constant.isPointInPolygon(
- LatLng(Constant.selectedLocation.location!.latitude ?? 0.0, Constant.selectedLocation.location!.longitude ?? 0.0),
+ LatLng(
+ Constant.selectedLocation.location!.latitude ?? 0.0,
+ Constant.selectedLocation.location!.longitude ?? 0.0,
+ ),
value[i].area!,
)) {
Constant.selectedZone = value[i];
diff --git a/lib/controllers/change_language_controller.dart b/lib/controllers/change_language_controller.dart
index aad7891..2b89879 100644
--- a/lib/controllers/change_language_controller.dart
+++ b/lib/controllers/change_language_controller.dart
@@ -3,7 +3,6 @@ import 'package:customer/models/language_model.dart';
import '../service/fire_store_utils.dart';
import 'package:customer/utils/preferences.dart';
import 'package:get/get.dart';
-
import '../constant/collection_name.dart';
class ChangeLanguageController extends GetxController {
@@ -20,24 +19,30 @@ class ChangeLanguageController extends GetxController {
}
Future getLanguage() async {
- await FireStoreUtils.fireStore.collection(CollectionName.settings).doc("languages").get().then((event) {
- if (event.exists) {
- List languageListTemp = event.data()!["list"];
- for (var element in languageListTemp) {
- LanguageModel languageModel = LanguageModel.fromJson(element);
- languageList.add(languageModel);
- }
+ await FireStoreUtils.fireStore
+ .collection(CollectionName.settings)
+ .doc("languages")
+ .get()
+ .then((event) {
+ if (event.exists) {
+ List languageListTemp = event.data()!["list"];
+ for (var element in languageListTemp) {
+ LanguageModel languageModel = LanguageModel.fromJson(element);
+ languageList.add(languageModel);
+ }
- if (Preferences.getString(Preferences.languageCodeKey).toString().isNotEmpty) {
- LanguageModel pref = Constant.getLanguage();
- for (var element in languageList) {
- if (element.slug == pref.slug) {
- selectedLanguage.value = element;
+ if (Preferences.getString(
+ Preferences.languageCodeKey,
+ ).toString().isNotEmpty) {
+ LanguageModel pref = Constant.getLanguage();
+ for (var element in languageList) {
+ if (element.slug == pref.slug) {
+ selectedLanguage.value = element;
+ }
+ }
}
}
- }
- }
- });
+ });
isLoading.value = false;
}
diff --git a/lib/controllers/chat_controller.dart b/lib/controllers/chat_controller.dart
index bf091d8..1923bef 100644
--- a/lib/controllers/chat_controller.dart
+++ b/lib/controllers/chat_controller.dart
@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
+
import 'package:image_picker/image_picker.dart';
import '../models/conversation_model.dart';
@@ -20,7 +21,11 @@ class ChatController extends GetxController {
void onInit() {
// TODO: implement onInit
if (scrollController.hasClients) {
- Timer(const Duration(milliseconds: 500), () => scrollController.jumpTo(scrollController.position.maxScrollExtent));
+ Timer(
+ const Duration(milliseconds: 500),
+ () =>
+ scrollController.jumpTo(scrollController.position.maxScrollExtent),
+ );
}
getArgument();
super.onInit();
@@ -46,14 +51,20 @@ class ChatController extends GetxController {
customerProfileImage.value = argumentData['customerProfileImage'] ?? "";
restaurantId.value = argumentData['restaurantId'];
restaurantName.value = argumentData['restaurantName'];
- restaurantProfileImage.value = argumentData['restaurantProfileImage'] ?? "";
+ restaurantProfileImage.value =
+ argumentData['restaurantProfileImage'] ?? "";
token.value = argumentData['token'] ?? "";
chatType.value = argumentData['chatType'];
}
isLoading.value = false;
}
- Future sendMessage(String message, Url? url, String videoThumbnail, String messageType) async {
+ Future sendMessage(
+ String message,
+ Url? url,
+ String videoThumbnail,
+ String messageType,
+ ) async {
InboxModel inboxModel = InboxModel(
lastSenderId: customerId.value,
customerId: customerId.value,
@@ -112,18 +123,23 @@ class ChatController extends GetxController {
}
//await SendNotification.sendChatFcmMessage(customerName.value, conversationModel.message.toString(), token.value, {});
- await SendNotification.sendChatFcmMessage(customerName.value, conversationModel.message.toString(), token.value, {
- "type": "chat",
- "chatType": chatType.value,
- "orderId": orderId.value,
- "customerId": customerId.value,
- "customerName": customerName.value,
- "customerProfileImage": customerProfileImage.value,
- "restaurantId": restaurantId.value,
- "restaurantName": restaurantName.value,
- "restaurantProfileImage": restaurantProfileImage.value,
- "token": token.value,
- });
+ await SendNotification.sendChatFcmMessage(
+ customerName.value,
+ conversationModel.message.toString(),
+ token.value,
+ {
+ "type": "chat",
+ "chatType": chatType.value,
+ "orderId": orderId.value,
+ "customerId": customerId.value,
+ "customerName": customerName.value,
+ "customerProfileImage": customerProfileImage.value,
+ "restaurantId": restaurantId.value,
+ "restaurantName": restaurantName.value,
+ "restaurantProfileImage": restaurantProfileImage.value,
+ "token": token.value,
+ },
+ );
}
final ImagePicker imagePicker = ImagePicker();
diff --git a/lib/controllers/complain_controller.dart b/lib/controllers/complain_controller.dart
index 4d22e89..5fa362e 100644
--- a/lib/controllers/complain_controller.dart
+++ b/lib/controllers/complain_controller.dart
@@ -29,7 +29,9 @@ class ComplainController extends GetxController {
Future getComplain() async {
isLoading.value = true;
try {
- final data = await FireStoreUtils.getRideComplainData(order.value.id ?? '');
+ final data = await FireStoreUtils.getRideComplainData(
+ order.value.id ?? '',
+ );
if (data != null) {
title.value.text = data['title'] ?? '';
comment.value.text = data['description'] ?? '';
@@ -58,7 +60,9 @@ class ComplainController extends GetxController {
try {
// Check if complaint already exists
- bool exists = await FireStoreUtils.isRideComplainAdded(order.value.id ?? '');
+ bool exists = await FireStoreUtils.isRideComplainAdded(
+ order.value.id ?? '',
+ );
if (!exists) {
await FireStoreUtils.setRideComplain(
@@ -66,13 +70,19 @@ class ComplainController extends GetxController {
title: title.value.text.trim(),
description: comment.value.text.trim(),
customerID: order.value.authorID ?? '',
- customerName: "${order.value.author?.firstName ?? ''} ${order.value.author?.lastName ?? ''}".trim(),
+ customerName:
+ "${order.value.author?.firstName ?? ''} ${order.value.author?.lastName ?? ''}"
+ .trim(),
driverID: order.value.driverId ?? '',
- driverName: "${order.value.driver?.firstName ?? ''} ${order.value.driver?.lastName ?? ''}".trim(),
+ driverName:
+ "${order.value.driver?.firstName ?? ''} ${order.value.driver?.lastName ?? ''}"
+ .trim(),
);
ShowToastDialog.closeLoader();
- ShowToastDialog.showToast("Your complaint has been submitted to admin".tr);
+ ShowToastDialog.showToast(
+ "Your complaint has been submitted to admin".tr,
+ );
Get.back();
} else {
ShowToastDialog.closeLoader();
diff --git a/lib/controllers/dash_board_controller.dart b/lib/controllers/dash_board_controller.dart
index ae6445f..f336ca5 100644
--- a/lib/controllers/dash_board_controller.dart
+++ b/lib/controllers/dash_board_controller.dart
@@ -19,22 +19,46 @@ class DashBoardController extends GetxController {
getTaxList();
if (Constant.sectionConstantModel!.theme == "theme_2") {
if (Constant.walletSetting == false) {
- pageList.value = [const HomeScreen(), const FavouriteScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeScreen(),
+ const FavouriteScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
} else {
- pageList.value = [const HomeScreen(), const FavouriteScreen(), const WalletScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeScreen(),
+ const FavouriteScreen(),
+ const WalletScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
}
} else {
if (Constant.walletSetting == false) {
- pageList.value = [const HomeScreenTwo(), const FavouriteScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeScreenTwo(),
+ const FavouriteScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
} else {
- pageList.value = [const HomeScreenTwo(), const FavouriteScreen(), const WalletScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeScreenTwo(),
+ const FavouriteScreen(),
+ const WalletScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
}
}
super.onInit();
}
Future getTaxList() async {
- await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((value) {
+ await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((
+ value,
+ ) {
if (value != null) {
Constant.taxList = value;
}
diff --git a/lib/controllers/dash_board_ecommarce_controller.dart b/lib/controllers/dash_board_ecommarce_controller.dart
index 02bb9ce..b690994 100644
--- a/lib/controllers/dash_board_ecommarce_controller.dart
+++ b/lib/controllers/dash_board_ecommarce_controller.dart
@@ -17,15 +17,28 @@ class DashBoardEcommerceController extends GetxController {
// TODO: implement onInit
getTaxList();
if (Constant.walletSetting == false) {
- pageList.value = [const HomeECommerceScreen(), const FavouriteScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeECommerceScreen(),
+ const FavouriteScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
} else {
- pageList.value = [const HomeECommerceScreen(), const FavouriteScreen(), const WalletScreen(), const OrderScreen(), const ProfileScreen()];
+ pageList.value = [
+ const HomeECommerceScreen(),
+ const FavouriteScreen(),
+ const WalletScreen(),
+ const OrderScreen(),
+ const ProfileScreen(),
+ ];
}
super.onInit();
}
Future getTaxList() async {
- await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((value) {
+ await FireStoreUtils.getTaxList(Constant.sectionConstantModel!.id).then((
+ value,
+ ) {
if (value != null) {
Constant.taxList = value;
}
diff --git a/lib/controllers/dine_in_booking_controller.dart b/lib/controllers/dine_in_booking_controller.dart
index e273284..482e3cd 100644
--- a/lib/controllers/dine_in_booking_controller.dart
+++ b/lib/controllers/dine_in_booking_controller.dart
@@ -18,16 +18,12 @@ class DineInBookingController extends GetxController {
}
Future getDineInBooking() async {
- await FireStoreUtils.getDineInBooking(true).then(
- (value) {
- featureList.value = value;
- },
- );
- await FireStoreUtils.getDineInBooking(false).then(
- (value) {
- historyList.value = value;
- },
- );
+ await FireStoreUtils.getDineInBooking(true).then((value) {
+ featureList.value = value;
+ });
+ await FireStoreUtils.getDineInBooking(false).then((value) {
+ historyList.value = value;
+ });
isLoading.value = false;
}
diff --git a/lib/controllers/dine_in_controller.dart b/lib/controllers/dine_in_controller.dart
index b582900..d4d5339 100644
--- a/lib/controllers/dine_in_controller.dart
+++ b/lib/controllers/dine_in_controller.dart
@@ -28,7 +28,8 @@ class DineInController extends GetxController {
RxList popularRestaurantList = [].obs;
RxList bannerBottomModel = [].obs;
- Rx pageBottomController = PageController(viewportFraction: 0.877).obs;
+ Rx pageBottomController =
+ PageController(viewportFraction: 0.877).obs;
RxInt currentBottomPage = 0.obs;
RxList favouriteList = [].obs;
@@ -37,7 +38,9 @@ class DineInController extends GetxController {
isLoading.value = true;
await getZone();
- FireStoreUtils.getAllNearestRestaurant(isDining: true).listen((event) async {
+ FireStoreUtils.getAllNearestRestaurant(isDining: true).listen((
+ event,
+ ) async {
newArrivalRestaurantList.clear();
allNearestRestaurant.clear();
popularRestaurantList.clear();
@@ -47,12 +50,21 @@ class DineInController extends GetxController {
popularRestaurantList.addAll(event);
popularRestaurantList.sort(
- (a, b) => Constant.calculateReview(reviewCount: b.reviewsCount.toString(), reviewSum: b.reviewsSum.toString())
- .compareTo(Constant.calculateReview(reviewCount: a.reviewsCount.toString(), reviewSum: a.reviewsSum.toString())),
+ (a, b) => Constant.calculateReview(
+ reviewCount: b.reviewsCount.toString(),
+ reviewSum: b.reviewsSum.toString(),
+ ).compareTo(
+ Constant.calculateReview(
+ reviewCount: a.reviewsCount.toString(),
+ reviewSum: a.reviewsSum.toString(),
+ ),
+ ),
);
newArrivalRestaurantList.sort(
- (a, b) => (b.createdAt ?? Timestamp.now()).toDate().compareTo((a.createdAt ?? Timestamp.now()).toDate()),
+ (a, b) => (b.createdAt ?? Timestamp.now()).toDate().compareTo(
+ (a.createdAt ?? Timestamp.now()).toDate(),
+ ),
);
});
@@ -61,23 +73,17 @@ class DineInController extends GetxController {
}
Future getCategory() async {
- await FireStoreUtils.getHomeVendorCategory().then(
- (value) {
- vendorCategoryModel.value = value;
- },
- );
+ await FireStoreUtils.getHomeVendorCategory().then((value) {
+ vendorCategoryModel.value = value;
+ });
- await FireStoreUtils.getHomeBottomBanner().then(
- (value) {
- bannerBottomModel.value = value;
- },
- );
+ await FireStoreUtils.getHomeBottomBanner().then((value) {
+ bannerBottomModel.value = value;
+ });
if (Constant.userModel != null) {
- await FireStoreUtils.getFavouriteRestaurant().then(
- (value) {
- favouriteList.value = value;
- },
- );
+ await FireStoreUtils.getFavouriteRestaurant().then((value) {
+ favouriteList.value = value;
+ });
}
}
@@ -85,7 +91,13 @@ class DineInController extends GetxController {
await FireStoreUtils.getZone().then((value) {
if (value != null) {
for (int i = 0; i < value.length; i++) {
- if (Constant.isPointInPolygon(LatLng(Constant.selectedLocation.location!.latitude ?? 0.0, Constant.selectedLocation.location!.longitude ?? 0.0), value[i].area!)) {
+ if (Constant.isPointInPolygon(
+ LatLng(
+ Constant.selectedLocation.location!.latitude ?? 0.0,
+ Constant.selectedLocation.location!.longitude ?? 0.0,
+ ),
+ value[i].area!,
+ )) {
Constant.selectedZone = value[i];
Constant.isZoneAvailable = true;
break;
@@ -96,5 +108,4 @@ class DineInController extends GetxController {
}
});
}
-
}
diff --git a/lib/controllers/dine_in_restaurant_details_controller.dart b/lib/controllers/dine_in_restaurant_details_controller.dart
index 478b3f8..34b3715 100644
--- a/lib/controllers/dine_in_restaurant_details_controller.dart
+++ b/lib/controllers/dine_in_restaurant_details_controller.dart
@@ -1,9 +1,11 @@
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 '../screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart';
import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart';
@@ -14,9 +16,11 @@ import '../service/send_notification.dart';
import '../themes/show_toast_dialog.dart';
class DineInRestaurantDetailsController extends GetxController {
- Rx searchEditingController = TextEditingController().obs;
+ Rx searchEditingController =
+ TextEditingController().obs;
- Rx additionRequestController = TextEditingController().obs;
+ Rx additionRequestController =
+ TextEditingController().obs;
RxBool isLoading = true.obs;
RxBool firstVisit = false.obs;
@@ -41,6 +45,7 @@ class DineInRestaurantDetailsController extends GetxController {
return key;
}
}
+
RxString selectedOccasion = "".obs;
RxList dateList = [].obs;
@@ -61,33 +66,56 @@ class DineInRestaurantDetailsController extends GetxController {
}
Future