first commit

# Conflicts:
#	ios/Podfile.lock
#	ios/Runner/Info.plist

README.md

@@ -1,7 +1,7 @@
 # citycards_customer
 
 A new Flutter project.
-
+    
 ## Getting Started
 
 This project is a starting point for a Flutter application.
@@ -12,7 +12,7 @@ A few resources to get you started if this is your first Flutter project:
 - [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
 
 For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
+[online documentation](https://docs.flutter.dev/),which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
 
 <h1>Figma Link</h1>

android/app/build.gradle.kts

@@ -35,10 +35,16 @@ android {
             // 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")
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 }
 
 flutter {
     source = "../.."
-}
+}

android/app/proguard-rules.pro

@@ -0,0 +1,15 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+
+# Keep Stripe Push Provisioning classes
+-keep class com.stripe.android.pushProvisioning.** { *; }
+-dontwarn com.stripe.android.pushProvisioning.**
+
+# Keep Stripe SDK
+-keep class com.stripe.android.** { *; }
+-dontwarn com.stripe.android.**
+
+# Keep React Native Stripe SDK
+-keep class com.reactnativestripesdk.** { *; }
+-dontwarn com.reactnativestripesdk.**

android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,8 @@
     <application
         android:label="CityCard Customer"
         android:name="${applicationName}"
+        android:allowBackup="false"
+        android:fullBackupContent="false"
         android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"

android/app/src/main/kotlin/com/citycards_customer/citycards_customer/MainActivity.kt

@@ -1,5 +1,5 @@
 package com.citycards_customer.citycards_customer
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity : FlutterActivity()
+class MainActivity : FlutterFragmentActivity()

assets/intro/city_cards_splash_screen.json

@@ -0,0 +1,141 @@
+[{
+  "version": "1.0",
+  "image": {
+    "name": "frames/frame002.png",
+    "baseName": "frame002.png",
+    "permissions": 664,
+    "format": "PNG",
+    "formatDescription": "Portable Network Graphics",
+    "mimeType": "image/png",
+    "class": "DirectClass",
+    "geometry": {
+      "width": 1868,
+      "height": 3840,
+      "x": 0,
+      "y": 0
+    },
+    "resolution": {
+      "x": 370753,
+      "y": 370798
+    },
+    "printSize": {
+      "x": 0.00503839,
+      "y": 0.010356
+    },
+    "units": "Undefined",
+    "type": "TrueColor",
+    "endianness": "Undefined",
+    "colorspace": "sRGB",
+    "depth": 8,
+    "baseDepth": 8,
+    "channelDepth": {
+      "red": 8,
+      "green": 8,
+      "blue": 1
+    },
+    "pixels": 7173120,
+    "imageStatistics": {
+      "Overall": {
+        "min": 67,
+        "max": 255,
+        "mean": 142.829,
+        "median": 140,
+        "standardDeviation": 17.1849,
+        "kurtosis": 37.2771,
+        "skewness": 4.24387,
+        "entropy": 0.291301
+      }
+    },
+    "channelStatistics": {
+      "red": {
+        "min": 174,
+        "max": 255,
+        "mean": 237.888,
+        "median": 238,
+        "standardDeviation": 2.65253,
+        "kurtosis": 41.5763,
+        "skewness": 0.61346,
+        "entropy": 0.338084
+      },
+      "green": {
+        "min": 73,
+        "max": 255,
+        "mean": 94.2729,
+        "median": 90,
+        "standardDeviation": 24.5069,
+        "kurtosis": 35.19,
+        "skewness": 6.06676,
+        "entropy": 0.237928
+      },
+      "blue": {
+        "min": 67,
+        "max": 255,
+        "mean": 96.325,
+        "median": 92,
+        "standardDeviation": 24.3954,
+        "kurtosis": 35.0649,
+        "skewness": 6.05138,
+        "entropy": 0.297891
+      }
+    },
+    "renderingIntent": "Perceptual",
+    "gamma": 0.454545,
+    "chromaticity": {
+      "redPrimary": {
+        "x": 0.64,
+        "y": 0.33
+      },
+      "greenPrimary": {
+        "x": 0.3,
+        "y": 0.6
+      },
+      "bluePrimary": {
+        "x": 0.15,
+        "y": 0.06
+      },
+      "whitePrimary": {
+        "x": 0.3127,
+        "y": 0.329
+      }
+    },
+    "matteColor": "#BDBDBDBDBDBD",
+    "backgroundColor": "#FFFFFFFFFFFF",
+    "borderColor": "#DFDFDFDFDFDF",
+    "transparentColor": "#000000000000",
+    "interlace": "None",
+    "intensity": "Undefined",
+    "compose": "Over",
+    "pageGeometry": {
+      "width": 1868,
+      "height": 3840,
+      "x": 0,
+      "y": 0
+    },
+    "dispose": "Undefined",
+    "iterations": 0,
+    "scene": 1,
+    "scenes": 2,
+    "compression": "Zip",
+    "orientation": "Undefined",
+    "properties": {
+      "date:create": "2026-02-18T13:36:29+00:00",
+      "date:modify": "2026-02-18T13:36:29+00:00",
+      "date:timestamp": "2026-02-18T13:36:29+00:00",
+      "png:IHDR.bit-depth-orig": "8",
+      "png:IHDR.bit_depth": "8",
+      "png:IHDR.color-type-orig": "2",
+      "png:IHDR.color_type": "2 (Truecolor)",
+      "png:IHDR.interlace_method": "0 (Not interlaced)",
+      "png:IHDR.width,height": "1868, 3840",
+      "png:pHYs": "x_res=370753, y_res=370798, units=0",
+      "signature": "7fb181e6439aa51f6eb134a4991711167b5850e80e40ae5cb0c67cf29c118dfe"
+    },
+    "tainted": false,
+    "filesize": "3422B",
+    "numberPixels": "7.17312M",
+    "pixelsPerSecond": "2.74974MB",
+    "userTime": "2.880u",
+    "elapsedTime": "0:03.608",
+    "version": "ImageMagick 7.1.1-41 Q16-HDRI x86_64 22504 https://imagemagick.org"
+  }
+}]

ios/Podfile.lock

@@ -1,4 +1,6 @@
 PODS:
+  - app_links (7.0.0):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_angle (0.3.8):
     - Flutter
@@ -7,6 +9,8 @@ PODS:
   - flutter_native_splash (2.4.3):
     - Flutter
   - FlutterAngle (0.0.8)
+  - geocoding_ios (1.0.5):
+    - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
     - FlutterMacOS
@@ -16,83 +20,287 @@ PODS:
     - Flutter
     - Google-Maps-iOS-Utils (< 7.0, >= 5.0)
     - GoogleMaps (< 10.0, >= 8.4)
+  - google_mlkit_commons (0.11.1):
+    - Flutter
+    - MLKitVision (~> 10.0.0)
+  - google_mlkit_translation (0.13.1):
+    - Flutter
+    - google_mlkit_commons
+    - GoogleMLKit/Translate (~> 9.0.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - GoogleMaps (9.4.0):
     - GoogleMaps/Maps (= 9.4.0)
   - GoogleMaps/Maps (9.4.0)
+  - GoogleMLKit/MLKitCore (9.0.0):
+    - MLKitCommon (~> 14.0.0)
+  - GoogleMLKit/Translate (9.0.0):
+    - GoogleMLKit/MLKitCore
+    - MLKitTranslate (~> 8.0.0)
+  - GoogleToolboxForMac/Defines (4.2.1)
+  - GoogleToolboxForMac/Logger (4.2.1):
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - GoogleToolboxForMac/StringEncoding (4.2.1):
+    - GoogleToolboxForMac/Defines (= 4.2.1)
+  - GoogleUtilities/Environment (8.1.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/UserDefaults (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GTMSessionFetcher/Core (3.5.0)
   - image_picker_ios (0.0.1):
     - Flutter
+  - MLImage (1.0.0-beta8)
+  - MLKitCommon (14.0.0):
+    - GoogleDataTransport (~> 10.0)
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+  - MLKitNaturalLanguage (10.0.0):
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GoogleToolboxForMac/StringEncoding (< 5.0, >= 4.2.1)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+    - MLKitCommon (~> 14.0)
+  - MLKitTranslate (8.0.0):
+    - MLKitNaturalLanguage (~> 10.0)
+    - SSZipArchive (< 3.0, >= 2.5.5)
+  - MLKitVision (10.0.0):
+    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
+    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
+    - MLImage (= 1.0.0-beta8)
+    - MLKitCommon (~> 14.0)
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - open_filex (0.0.2):
+    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - PromisesObjC (2.4.0)
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sqflite_darwin (0.0.4):
+    - Flutter
+    - FlutterMacOS
+  - SSZipArchive (2.6.0)
+  - Stripe (25.0.1):
+    - StripeApplePay (= 25.0.1)
+    - StripeCore (= 25.0.1)
+    - StripePayments (= 25.0.1)
+    - StripePaymentsUI (= 25.0.1)
+    - StripeUICore (= 25.0.1)
+  - stripe_ios (0.0.1):
+    - Flutter
+    - Stripe (~> 25.0.1)
+    - stripe_ios/stripe_ios (= 0.0.1)
+    - stripe_ios/stripe_objc (= 0.0.1)
+    - StripeApplePay (~> 25.0.1)
+    - StripeFinancialConnections (~> 25.0.1)
+    - StripePayments (~> 25.0.1)
+    - StripePaymentSheet (~> 25.0.1)
+    - StripePaymentsUI (~> 25.0.1)
+  - stripe_ios/stripe_ios (0.0.1):
+    - Flutter
+    - Stripe (~> 25.0.1)
+    - stripe_ios/stripe_objc
+    - StripeApplePay (~> 25.0.1)
+    - StripeFinancialConnections (~> 25.0.1)
+    - StripePayments (~> 25.0.1)
+    - StripePaymentSheet (~> 25.0.1)
+    - StripePaymentsUI (~> 25.0.1)
+  - stripe_ios/stripe_objc (0.0.1):
+    - Flutter
+    - Stripe (~> 25.0.1)
+    - StripeApplePay (~> 25.0.1)
+    - StripeFinancialConnections (~> 25.0.1)
+    - StripePayments (~> 25.0.1)
+    - StripePaymentSheet (~> 25.0.1)
+    - StripePaymentsUI (~> 25.0.1)
+  - StripeApplePay (25.0.1):
+    - StripeCore (= 25.0.1)
+  - StripeCore (25.0.1)
+  - StripeFinancialConnections (25.0.1):
+    - StripeCore (= 25.0.1)
+    - StripeUICore (= 25.0.1)
+  - StripePayments (25.0.1):
+    - StripeCore (= 25.0.1)
+    - StripePayments/Stripe3DS2 (= 25.0.1)
+  - StripePayments/Stripe3DS2 (25.0.1):
+    - StripeCore (= 25.0.1)
+  - StripePaymentSheet (25.0.1):
+    - StripeApplePay (= 25.0.1)
+    - StripeCore (= 25.0.1)
+    - StripePayments (= 25.0.1)
+    - StripePaymentsUI (= 25.0.1)
+  - StripePaymentsUI (25.0.1):
+    - StripeCore (= 25.0.1)
+    - StripePayments (= 25.0.1)
+    - StripeUICore (= 25.0.1)
+  - StripeUICore (25.0.1):
+    - StripeCore (= 25.0.1)
   - three_js_sensors (0.1.2):
     - Flutter
+  - url_launcher_ios (0.0.1):
+    - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
     - FlutterMacOS
 
 DEPENDENCIES:
+  - app_links (from `.symlinks/plugins/app_links/ios`)
   - Flutter (from `Flutter`)
   - flutter_angle (from `.symlinks/plugins/flutter_angle/darwin`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`)
+  - google_mlkit_translation (from `.symlinks/plugins/google_mlkit_translation/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
+  - stripe_ios (from `.symlinks/plugins/stripe_ios/ios`)
   - three_js_sensors (from `.symlinks/plugins/three_js_sensors/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
 SPEC REPOS:
   trunk:
     - FlutterAngle
     - Google-Maps-iOS-Utils
+    - GoogleDataTransport
     - GoogleMaps
+    - GoogleMLKit
+    - GoogleToolboxForMac
+    - GoogleUtilities
+    - GTMSessionFetcher
+    - MLImage
+    - MLKitCommon
+    - MLKitNaturalLanguage
+    - MLKitTranslate
+    - MLKitVision
+    - nanopb
+    - PromisesObjC
+    - SSZipArchive
+    - Stripe
+    - StripeApplePay
+    - StripeCore
+    - StripeFinancialConnections
+    - StripePayments
+    - StripePaymentSheet
+    - StripePaymentsUI
+    - StripeUICore
 
 EXTERNAL SOURCES:
+  app_links:
+    :path: ".symlinks/plugins/app_links/ios"
   Flutter:
     :path: Flutter
   flutter_angle:
     :path: ".symlinks/plugins/flutter_angle/darwin"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
+  geocoding_ios:
+    :path: ".symlinks/plugins/geocoding_ios/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/darwin"
   google_maps_flutter_ios:
     :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  google_mlkit_commons:
+    :path: ".symlinks/plugins/google_mlkit_commons/ios"
+  google_mlkit_translation:
+    :path: ".symlinks/plugins/google_mlkit_translation/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
+  open_filex:
+    :path: ".symlinks/plugins/open_filex/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
+  stripe_ios:
+    :path: ".symlinks/plugins/stripe_ios/ios"
   three_js_sensors:
     :path: ".symlinks/plugins/three_js_sensors/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
     :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
+  app_links: 6d01271b3907b0ee7325c5297c75d697c4226c4d
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_angle: 7b1a2b3e733221bf2e0325e42fc3edf95b5d44c4
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_angle: fc44e198cea1f07e1a5919bad1484049fab65c96
+  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
   FlutterAngle: c810891af800750361b1d0e7cc944f2338d5ae18
-  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
+  geocoding_ios: eafacae6ad11a1eb56681f7d11df602a5fd49416
+  geolocator_apple: 66b711889fd333205763b83c9dcf0a57a28c7afd
   Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
-  google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
+  google_maps_flutter_ios: e31555a04d1986ab130f2b9f24b6cdc861acc6d3
+  google_mlkit_commons: 1e6ef6605d7281f35baf2b355e6049b9984fd624
+  google_mlkit_translation: 8a0e84c632121250843e9bab526cb926a2a2a7b7
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  three_js_sensors: f516b092803411e05b1e3dc7625efa36acd8f455
-  video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
+  GoogleMLKit: b1eee21a41c57704fe72483b15c85cb2c0cd7444
+  GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  MLImage: 0de5c6c2bf9e93b80ef752e2797f0836f03b58c0
+  MLKitCommon: 47d47b50a031d00db62f1b0efe5a1d8b09a3b2e6
+  MLKitNaturalLanguage: 498154f2461f97abb00eb161eb773670ffc46250
+  MLKitTranslate: fcb283a2cbaaa595e1cf1d3fedffcea2e97a1168
+  MLKitVision: 39a5a812db83c4a0794445088e567f3631c11961
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
+  Stripe: 4728e3e0dd8df134e4a420ab504e929a93a815f0
+  stripe_ios: c552a249333c2e810e02539140dba366c7f0683f
+  StripeApplePay: 43997281ace138a1c75a8f2d7be11925ea28644c
+  StripeCore: 457c30e2fd3a7c4b274a5ad53d1ff03661eef2a0
+  StripeFinancialConnections: 8c2e326f767fb014b53174b3a5f8592c0a45fa56
+  StripePayments: 6955de4298a5265e66f02cffcc7954475ac7f6c8
+  StripePaymentSheet: 3f93ce6ea84afde770d3c7e18a9b8f99aed63896
+  StripePaymentsUI: 626726a01255a6458c35436f7f6431dacee82684
+  StripeUICore: 30f8352fd7a5cf1541b7777a57b3ad1133bf6763
+  three_js_sensors: ab5f24fbeb97ab5c5ce2978c3e63a25d67a076f5
+  url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
+  video_player_avfoundation: 7993f492ae0bd77edaea24d9dc051d8bb2cd7c86
 
 PODFILE CHECKSUM: 1857a7cdb7dfafe45f2b0e9a9af44644190f7506
 

ios/Runner.xcodeproj/project.pbxproj

@@ -7,15 +7,15 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00C1AB7B0C8F1922F3F1AE65 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		60A4FC1A895BADD3C1597C0B /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E2BCDF72F2D56D34CC9E967 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		81D638B66EB4658C8192CA0D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		C9496C6E1D2E0AEA2083C14C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D485254B2B32B84B17D20864 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -44,13 +44,13 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		18E5A2491D54EBB2484B6D9E /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4FD33ADDA221C4BBA29FA3D6 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		5C263389B0D2FA3EC95111B1 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		6E2BCDF72F2D56D34CC9E967 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6F51EB881CD063E2C9A71BA6 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -61,10 +61,10 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B691822B373AD22ECA93B798 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		D56ABB8F306EF9F6809C0C1E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		9EEFD1F245CF2AAD027ADE1E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		D485254B2B32B84B17D20864 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D719B3676BADD267F44F4A59 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		D8B9C9F2F3A8FEF639B5A528 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,7 +72,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				00C1AB7B0C8F1922F3F1AE65 /* Pods_Runner.framework in Frameworks */,
+				C9496C6E1D2E0AEA2083C14C /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -80,13 +80,22 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				81D638B66EB4658C8192CA0D /* Pods_RunnerTests.framework in Frameworks */,
+				60A4FC1A895BADD3C1597C0B /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		227A5CBF4270AAC4960A7CAF /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				D485254B2B32B84B17D20864 /* Pods_Runner.framework */,
+				6E2BCDF72F2D56D34CC9E967 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -95,24 +104,15 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
-		5D45FB84C63476582408C414 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */,
-				445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		6D4A73F1E55857ADBD000C6A /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				B691822B373AD22ECA93B798 /* Pods-Runner.debug.xcconfig */,
-				4FD33ADDA221C4BBA29FA3D6 /* Pods-Runner.release.xcconfig */,
-				D56ABB8F306EF9F6809C0C1E /* Pods-Runner.profile.xcconfig */,
-				E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */,
-				626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */,
-				C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */,
+				9EEFD1F245CF2AAD027ADE1E /* Pods-Runner.debug.xcconfig */,
+				D8B9C9F2F3A8FEF639B5A528 /* Pods-Runner.release.xcconfig */,
+				D719B3676BADD267F44F4A59 /* Pods-Runner.profile.xcconfig */,
+				6F51EB881CD063E2C9A71BA6 /* Pods-RunnerTests.debug.xcconfig */,
+				18E5A2491D54EBB2484B6D9E /* Pods-RunnerTests.release.xcconfig */,
+				5C263389B0D2FA3EC95111B1 /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -136,7 +136,7 @@
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				6D4A73F1E55857ADBD000C6A /* Pods */,
-				5D45FB84C63476582408C414 /* Frameworks */,
+				227A5CBF4270AAC4960A7CAF /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -171,7 +171,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				BC66FA7BADCD3982DC87655E /* [CP] Check Pods Manifest.lock */,
+				FCD91A1B9B088634E06F7C98 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
 				CF8A29BE993C0C902CB143AF /* Frameworks */,
@@ -190,15 +190,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				3825EC0F330C0B58EA2A8981 /* [CP] Check Pods Manifest.lock */,
+				8B4387D9368AF1A601B17194 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				41FC0A605EBADE26C841287E /* [CP] Embed Pods Frameworks */,
-				D10E98BB568B7005161E1ABD /* [CP] Copy Pods Resources */,
+				CA082AA85EC21FFAA42CE12F /* [CP] Embed Pods Frameworks */,
+				3F2F0E04CC81D63DDD8C37A9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -270,7 +270,40 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3825EC0F330C0B58EA2A8981 /* [CP] Check Pods Manifest.lock */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		3F2F0E04CC81D63DDD8C37A9 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8B4387D9368AF1A601B17194 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -292,23 +325,22 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
-			name = "Thin Binary";
+			name = "Run Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		41FC0A605EBADE26C841287E /* [CP] Embed Pods Frameworks */ = {
+		CA082AA85EC21FFAA42CE12F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -325,22 +357,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-		BC66FA7BADCD3982DC87655E /* [CP] Check Pods Manifest.lock */ = {
+		FCD91A1B9B088634E06F7C98 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -362,23 +379,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D10E98BB568B7005161E1ABD /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -515,7 +515,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = 6F51EB881CD063E2C9A71BA6 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -533,7 +533,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = 18E5A2491D54EBB2484B6D9E /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -549,7 +549,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = 5C263389B0D2FA3EC95111B1 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;

ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner/Info.plist

@@ -1,59 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>Citycards Customer</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>citycards_customer</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0.0</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleVersion</key>
-		<string>3</string>
-		<key>LSRequiresIPhoneOS</key>
-		<true/>
-		<key>NSCameraUsageDescription</key>
-		<string>We need access to your camera for taking photos for profile and to build a postcard.</string>
-		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-		<string>Citycard customer needs your location to find the closest place you can visit.</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>Citycard customer needs your location to find the closest place you can visit.</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>We need access to your camera for taking photos for profile and to build a postcard.</string>
-		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true/>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UIStatusBarHidden</key>
-		<false/>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-	</dict>
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>NSCameraUsageDescription</key>
+    <string>Scan your card to add it automatically</string>
+    <key>NSCameraUsageDescription</key>
+    <string>To scan cards</string>
+	<key>CFBundleDisplayName</key>
+	<string>Citycards Customer</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>citycards_customer</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>3</string>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>To scan cards</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Citycard customer needs your location to find the closest place you can visit.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Citycard customer needs your location to find the closest place you can visit.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>We need access to your camera for taking photos for profile and to build a postcard.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
 </plist>

lib/StripePayment/bloc/stripe_payment_bloc.dart

@@ -0,0 +1,237 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
+
+import '../repository/stripe_service.dart';
+import 'stripe_payment_event.dart';
+import 'stripe_payment_state.dart';
+
+class StripePaymentBloc extends Bloc<StripePaymentEvent, StripePaymentState> {
+  final StripeService _stripeService;
+
+  // 🔒 Flag to prevent re-initialization after success
+  bool _paymentCompleted = false;
+
+  StripePaymentBloc({
+    StripeService? stripeService,
+  })  : _stripeService = stripeService ?? StripeService(),
+        super(const StripePaymentInitial()) {
+    on<InitiatePayment>(_onInitiatePayment);
+    on<InitiatePaymentWithClientSecret>(_onInitiatePaymentWithClientSecret);
+    on<CancelPaymentEvent>(_onCancelPayment);
+    on<ResetPaymentState>(_onResetPaymentState);
+    on<RetryPaymentEvent>(_onRetryPayment);
+  }
+
+  Future<void> _onInitiatePayment(
+      InitiatePayment event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🛑 Prevent re-initialization if payment already completed
+    if (_paymentCompleted) {
+      debugPrint('⚠️ Payment already completed. Ignoring re-initialization.');
+      return;
+    }
+
+    try {
+      emit(const StripePaymentLoading(
+        message: 'Creating payment intent...',
+      ));
+
+      /// Stripe expects smallest currency unit
+      /// USD → cents, INR → paise
+      final int stripeAmount = (event.amount * 100).toInt();
+
+      // 1️⃣ Create PaymentIntent from backend
+      final clientSecret = await _stripeService.createPaymentIntent(
+        amount: stripeAmount,
+        currency: event.currency,
+      );
+
+      emit(const StripePaymentLoading(
+        message: 'Initializing payment sheet...',
+      ));
+
+      // 2️⃣ Init Payment Sheet
+      await Stripe.instance.initPaymentSheet(
+        paymentSheetParameters: SetupPaymentSheetParameters(
+          paymentIntentClientSecret: clientSecret,
+          merchantDisplayName: "CityCards",
+          style: ThemeMode.light,
+          allowsDelayedPaymentMethods: true,
+        ),
+      );
+      await Stripe.instance.presentPaymentSheet();
+      emit(const StripePaymentSheetReady());
+
+      emit(const StripePaymentLoading(
+        message: 'Processing payment...',
+      ));
+
+      // 3️⃣ Show Payment Sheet
+      await Stripe.instance.presentPaymentSheet();
+
+      // ✅ SUCCESS - Mark as completed
+      _paymentCompleted = true;
+      emit(const StripePaymentSuccess());
+    } on StripeException catch (e) {
+      _handleStripeException(e, emit);
+    } catch (e) {
+      emit(StripePaymentFailure(
+        error: 'An unexpected error occurred: ${e.toString()}',
+        isRetryable: true,
+      ));
+    }
+  }
+
+  /// Handle payment with clientSecret directly from backend
+  Future<void> _onInitiatePaymentWithClientSecret(
+      InitiatePaymentWithClientSecret event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🛑 Prevent re-initialization if payment already completed
+    if (_paymentCompleted) {
+      debugPrint('⚠️ Payment already completed. Ignoring re-initialization.');
+      return;
+    }
+
+    try {
+      emit(const StripePaymentLoading(
+        message: 'Initializing payment...',
+      ));
+
+      // 1️⃣ Init Payment Sheet with clientSecret from backend
+      await Stripe.instance.initPaymentSheet(
+        paymentSheetParameters: SetupPaymentSheetParameters(
+          paymentIntentClientSecret: event.clientSecret,
+          merchantDisplayName: "CityCards",
+          style: ThemeMode.light,
+          allowsDelayedPaymentMethods: true,
+
+        ),
+      );
+
+      emit(const StripePaymentSheetReady());
+
+      emit(const StripePaymentLoading(
+        message: 'Processing payment...',
+      ));
+
+      // 2️⃣ Show Payment Sheet
+      await Stripe.instance.presentPaymentSheet();
+
+      // ✅ SUCCESS - Mark as completed
+      _paymentCompleted = true;
+      emit(const StripePaymentSuccess());
+    } on StripeException catch (e) {
+      _handleStripeException(e, emit);
+    } catch (e) {
+      emit(StripePaymentFailure(
+        error: 'An unexpected error occurred: ${e.toString()}',
+        isRetryable: true,
+      ));
+    }
+  }
+
+  /// Handle payment cancellation
+  void _onCancelPayment(
+      CancelPaymentEvent event,
+      Emitter<StripePaymentState> emit,
+      ) {
+    // Only emit cancelled if not already completed
+    if (!_paymentCompleted) {
+      emit(const StripePaymentCancelled(
+        message: 'Payment cancelled by user',
+      ));
+    }
+  }
+
+  /// Handle payment retry
+  Future<void> _onRetryPayment(
+      RetryPaymentEvent event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🔄 Reset completion flag for retry
+    _paymentCompleted = false;
+
+    // Reset state first
+    emit(const StripePaymentInitial());
+
+    // Then initiate payment again
+    add(InitiatePaymentWithClientSecret(
+      clientSecret: event.clientSecret,
+    ));
+  }
+
+  /// Reset payment state back to initial
+  void _onResetPaymentState(
+      ResetPaymentState event,
+      Emitter<StripePaymentState> emit,
+      ) {
+    // 🔄 Reset completion flag
+    _paymentCompleted = false;
+    emit(const StripePaymentInitial());
+  }
+
+  /// Centralized Stripe exception handling
+  void _handleStripeException(
+      StripeException e,
+      Emitter<StripePaymentState> emit,
+      ) {
+    final errorCode = e.error.code;
+    final errorMessage = e.error.localizedMessage ?? 'Payment failed';
+
+    // Handle cancellation separately
+    if (errorCode == FailureCode.Canceled) {
+      emit(StripePaymentCancelled(
+        message: errorMessage,
+      ));
+      return;
+    }
+
+    // Handle different error types
+    switch (errorCode) {
+      case FailureCode.Failed:
+        emit(StripePaymentFailure(
+          error: errorMessage,
+          errorCode: errorCode.toString(),
+          isRetryable: true,
+        ));
+        break;
+
+      case FailureCode.Timeout:
+        emit(const StripePaymentFailure(
+          error: 'Payment timed out. Please try again.',
+          errorCode: 'timeout',
+          isRetryable: true,
+        ));
+        break;
+
+      default:
+        emit(StripePaymentFailure(
+          error: errorMessage,
+          errorCode: errorCode?.toString(),
+          isRetryable: _isRetryableError(errorCode),
+        ));
+    }
+  }
+
+  /// Determine if an error is retryable
+  bool _isRetryableError(FailureCode? errorCode) {
+    if (errorCode == null) return true;
+
+    // Non-retryable errors
+    const nonRetryableErrors = [
+      // Add specific non-retryable error codes here if needed
+    ];
+
+    return !nonRetryableErrors.contains(errorCode);
+  }
+
+  @override
+  Future<void> close() {
+    // Reset flag on bloc disposal
+    _paymentCompleted = false;
+    return super.close();
+  }
+}

lib/StripePayment/bloc/stripe_payment_event.dart

@@ -0,0 +1,55 @@
+import 'package:equatable/equatable.dart';
+
+abstract class StripePaymentEvent extends Equatable {
+  const StripePaymentEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class InitiatePayment extends StripePaymentEvent {
+  final double amount;
+  final String currency;
+
+  const InitiatePayment({
+    required this.amount,
+    required this.currency,
+  });
+
+  @override
+  List<Object?> get props => [amount, currency];
+}
+
+/// Event to initiate payment with clientSecret from backend
+class InitiatePaymentWithClientSecret extends StripePaymentEvent {
+  final String clientSecret;
+
+  const InitiatePaymentWithClientSecret({
+    required this.clientSecret,
+  });
+
+  @override
+  List<Object?> get props => [clientSecret];
+}
+
+/// Event to cancel ongoing payment
+class CancelPaymentEvent extends StripePaymentEvent {
+  const CancelPaymentEvent();
+}
+
+/// Event to reset payment state back to initial
+class ResetPaymentState extends StripePaymentEvent {
+  const ResetPaymentState();
+}
+
+/// Event to retry failed payment
+class RetryPaymentEvent extends StripePaymentEvent {
+  final String clientSecret;
+
+  const RetryPaymentEvent({
+    required this.clientSecret,
+  });
+
+  @override
+  List<Object?> get props => [clientSecret];
+}

lib/StripePayment/bloc/stripe_payment_state.dart

@@ -0,0 +1,96 @@
+import 'package:equatable/equatable.dart';
+
+abstract class StripePaymentState extends Equatable {
+  const StripePaymentState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+/// Initial state before any payment action
+class StripePaymentInitial extends StripePaymentState {
+  const StripePaymentInitial();
+}
+
+/// Payment is being processed
+class StripePaymentLoading extends StripePaymentState {
+  final String? message;
+
+  const StripePaymentLoading({
+    this.message,
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment sheet is initialized and ready to be presented
+class StripePaymentSheetReady extends StripePaymentState {
+  const StripePaymentSheetReady();
+}
+
+/// Payment was successful
+class StripePaymentSuccess extends StripePaymentState {
+  final String message;
+  final String? paymentIntentId;
+
+  const StripePaymentSuccess({
+    this.message = 'Payment Successful',
+    this.paymentIntentId,
+  });
+
+  @override
+  List<Object?> get props => [message, paymentIntentId];
+}
+
+/// Payment failed
+class StripePaymentFailure extends StripePaymentState {
+  final String error;
+  final String? errorCode;
+  final bool isRetryable;
+
+  const StripePaymentFailure({
+    required this.error,
+    this.errorCode,
+    this.isRetryable = true,
+  });
+
+  @override
+  List<Object?> get props => [error, errorCode, isRetryable];
+}
+
+/// Payment was cancelled by user
+class StripePaymentCancelled extends StripePaymentState {
+  final String message;
+
+  const StripePaymentCancelled({
+    this.message = 'Payment Cancelled',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment requires additional authentication (3D Secure, etc.)
+class StripePaymentRequiresAction extends StripePaymentState {
+  final String message;
+
+  const StripePaymentRequiresAction({
+    this.message = 'Additional authentication required',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment is processing on the backend
+class StripePaymentProcessing extends StripePaymentState {
+  final String message;
+
+  const StripePaymentProcessing({
+    this.message = 'Payment is being processed...',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}

lib/StripePayment/repository/stripe_service.dart

@@ -0,0 +1,97 @@
+import 'package:dio/dio.dart';
+
+class StripeService {
+  final Dio _dio = Dio(
+    BaseOptions(
+      headers: {
+        "Content-Type": "application/json",
+      },
+    ),
+  );
+
+  // ⚠️ TEMPORARY FALLBACK - Use secret key directly
+  // TODO: Remove this and use backend when ready!
+  final String _stripeSecretKey = ''; // ← ADD YOUR SECRET KEY
+
+  Future<String> createPaymentIntent({
+    required int amount,
+    required String currency,
+  }) async {
+    try {
+      // 🔥 DIRECT STRIPE API CALL (Temporary fallback)
+      final response = await _dio.post(
+        'https://api.stripe.com/v1/payment_intents',
+        data: {
+          'amount': amount.toString(),
+          'currency': currency,
+          'automatic_payment_methods[enabled]': 'true',
+        },
+        options: Options(
+          headers: {
+            'Authorization': 'Bearer $_stripeSecretKey',
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+          contentType: Headers.formUrlEncodedContentType,
+        ),
+      );
+
+      if (response.data == null || response.data['client_secret'] == null) {
+        throw Exception('Invalid response from Stripe');
+      }
+
+      return response.data['client_secret'];
+    } on DioException catch (e) {
+      if (e.response != null) {
+        print('Stripe API Error: ${e.response?.data}');
+        throw Exception('Stripe error: ${e.response?.data['error']?['message'] ?? e.message}');
+      }
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      print('Payment Intent Error: $e');
+      throw Exception('Failed to create payment intent: $e');
+    }
+  }
+}
+
+/*
+🔒 PRODUCTION VERSION (Use this when backend is ready):
+
+import 'package:citycards_customer/networkApiServices/api_urls.dart';
+import 'package:dio/dio.dart';
+
+class StripeService {
+  final Dio _dio = Dio(
+    BaseOptions(
+      baseUrl: ApiUrls.baseUrl,
+      headers: {
+        "Content-Type": "application/json",
+      },
+    ),
+  );
+
+  Future<String> createPaymentIntent({
+    required int amount,
+    required String currency,
+  }) async {
+    try {
+      final response = await _dio.post(
+        "/create-payment-intent",
+        data: {
+          "amount": amount,
+          "currency": currency,
+        },
+      );
+
+      if (response.data == null || response.data['clientSecret'] == null) {
+        throw Exception('Invalid response from server');
+      }
+
+      return response.data['clientSecret'];
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Failed to create payment intent: $e');
+    }
+  }
+}
+*/

lib/StripePayment/view/stripe_payment.dart

@@ -0,0 +1,475 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../bloc/stripe_payment_bloc.dart';
+import '../bloc/stripe_payment_event.dart';
+import '../bloc/stripe_payment_state.dart';
+import '../repository/stripe_service.dart';
+
+/// 🎯 Reusable Stripe Payment Screen
+///
+/// This widget handles Stripe payment flow and can be used across different features
+/// like postcards, subscriptions, bookings, etc.
+class StripePaymentScreen extends StatelessWidget {
+  /// Client secret from your backend payment intent
+  final String clientSecret;
+
+  /// Amount to display (optional)
+  final double? amount;
+
+  /// Currency symbol (default: \$)
+  final String currencySymbol;
+
+  /// Custom title for the payment screen
+  final String? title;
+
+  /// Custom loading message
+  final String loadingMessage;
+
+  /// Custom success message
+  final String successMessage;
+
+  /// Custom failure message prefix
+  final String failureMessage;
+
+  /// Callback when payment succeeds
+  final VoidCallback? onPaymentSuccess;
+
+  /// Callback when payment fails
+  final void Function(String error)? onPaymentFailure;
+
+  /// Callback when payment is cancelled
+  final VoidCallback? onPaymentCancelled;
+
+  /// Primary color for the UI
+  final Color primaryColor;
+
+  /// Success icon color
+  final Color successColor;
+
+  /// Error icon color
+  final Color errorColor;
+
+  /// Custom height ratio (0.0 to 1.0)
+  final double heightRatio;
+
+  /// Whether to show close button during loading
+  final bool showCloseButtonDuringLoading;
+
+  /// Custom widget to show above the status (optional)
+  final Widget? headerWidget;
+
+  /// Custom widget to show below the status (optional)
+  final Widget? footerWidget;
+
+  const StripePaymentScreen({
+    super.key,
+    required this.clientSecret,
+    this.amount,
+    this.currencySymbol = '\$',
+    this.title,
+    this.loadingMessage = 'Processing payment...',
+    this.successMessage = 'Payment Successful!',
+    this.failureMessage = 'Payment Failed',
+    this.onPaymentSuccess,
+    this.onPaymentFailure,
+    this.onPaymentCancelled,
+    this.primaryColor = const Color(0xFFF95F62),
+    this.successColor = Colors.green,
+    this.errorColor = Colors.red,
+    this.heightRatio = 0.5,
+    this.showCloseButtonDuringLoading = false,
+    this.headerWidget,
+    this.footerWidget,
+  });
+
+  /// 🚀 Static method to show as bottom sheet
+  static Future<bool?> showAsBottomSheet({
+    required BuildContext context,
+    required String clientSecret,
+    double? amount,
+    String currencySymbol = '\$',
+    String? title,
+    String loadingMessage = 'Processing payment...',
+    String successMessage = 'Payment Successful!',
+    String failureMessage = 'Payment Failed',
+    VoidCallback? onPaymentSuccess,
+    void Function(String error)? onPaymentFailure,
+    VoidCallback? onPaymentCancelled,
+    Color primaryColor = const Color(0xFFF95F62),
+    Color successColor = Colors.green,
+    Color errorColor = Colors.red,
+    double heightRatio = 0.5,
+    bool isDismissible = false,
+    bool enableDrag = false,
+    bool showCloseButtonDuringLoading = false,
+    Widget? headerWidget,
+    Widget? footerWidget,
+  }) async {
+    return await showModalBottomSheet<bool>(
+      context: context,
+      isDismissible: isDismissible,
+      enableDrag: enableDrag,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (bottomSheetContext) {
+        return BlocProvider(
+          create: (_) => StripePaymentBloc(stripeService: StripeService())
+            ..add(InitiatePaymentWithClientSecret(clientSecret: clientSecret)),
+          child: StripePaymentScreen(
+            clientSecret: clientSecret,
+            amount: amount,
+            currencySymbol: currencySymbol,
+            title: title,
+            loadingMessage: loadingMessage,
+            successMessage: successMessage,
+            failureMessage: failureMessage,
+            onPaymentSuccess: onPaymentSuccess,
+            onPaymentFailure: onPaymentFailure,
+            onPaymentCancelled: onPaymentCancelled,
+            primaryColor: primaryColor,
+            successColor: successColor,
+            errorColor: errorColor,
+            heightRatio: heightRatio,
+            showCloseButtonDuringLoading: showCloseButtonDuringLoading,
+            headerWidget: headerWidget,
+            footerWidget: footerWidget,
+          ),
+        );
+      },
+    );
+  }
+
+  /// 🚀 Static method to show as full screen dialog
+  static Future<bool?> showAsDialog({
+    required BuildContext context,
+    required String clientSecret,
+    double? amount,
+    String currencySymbol = '\$',
+    String? title,
+    String loadingMessage = 'Processing payment...',
+    String successMessage = 'Payment Successful!',
+    String failureMessage = 'Payment Failed',
+    VoidCallback? onPaymentSuccess,
+    void Function(String error)? onPaymentFailure,
+    VoidCallback? onPaymentCancelled,
+    Color primaryColor = const Color(0xFFF95F62),
+    Color successColor = Colors.green,
+    Color errorColor = Colors.red,
+    bool barrierDismissible = false,
+    bool showCloseButtonDuringLoading = false,
+    Widget? headerWidget,
+    Widget? footerWidget,
+  }) async {
+    return await showDialog<bool>(
+      context: context,
+      barrierDismissible: barrierDismissible,
+      builder: (dialogContext) {
+        return BlocProvider(
+          create: (_) => StripePaymentBloc(stripeService: StripeService())
+            ..add(InitiatePaymentWithClientSecret(clientSecret: clientSecret)),
+          child: Dialog(
+            backgroundColor: Colors.transparent,
+            child: StripePaymentScreen(
+              clientSecret: clientSecret,
+              amount: amount,
+              currencySymbol: currencySymbol,
+              title: title,
+              loadingMessage: loadingMessage,
+              successMessage: successMessage,
+              failureMessage: failureMessage,
+              onPaymentSuccess: onPaymentSuccess,
+              onPaymentFailure: onPaymentFailure,
+              onPaymentCancelled: onPaymentCancelled,
+              primaryColor: primaryColor,
+              successColor: successColor,
+              errorColor: errorColor,
+              heightRatio: 1.0,
+              showCloseButtonDuringLoading: showCloseButtonDuringLoading,
+              headerWidget: headerWidget,
+              footerWidget: footerWidget,
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<StripePaymentBloc, StripePaymentState>(
+      // 🔒 CRITICAL: Only listen when state actually changes to prevent duplicate triggers
+      listenWhen: (previous, current) {
+        // Don't re-trigger if both states are the same success state
+        if (previous is StripePaymentSuccess && current is StripePaymentSuccess) {
+          debugPrint('⚠️ Preventing duplicate success listener');
+          return false;
+        }
+        return true;
+      },
+      listener: (context, state) {
+        if (state is StripePaymentSuccess) {
+          debugPrint('✅ Payment Success - Calling callback');
+          // ✅ Call the callback first
+          onPaymentSuccess?.call();
+          // ✅ Then auto-close and return true after 1.5 seconds
+          Future.delayed(const Duration(milliseconds: 1500), () {
+            if (context.mounted) {
+              Navigator.of(context).pop(true);
+            }
+          });
+        } else if (state is StripePaymentFailure) {
+          debugPrint('❌ Payment Failure - ${state.error}');
+          onPaymentFailure?.call(state.error);
+          // Auto-close after 2 seconds on failure
+          Future.delayed(const Duration(seconds: 2), () {
+            if (context.mounted) {
+              Navigator.of(context).pop(false);
+            }
+          });
+        } else if (state is StripePaymentCancelled) {
+          debugPrint('🚫 Payment Cancelled');
+          onPaymentCancelled?.call();
+          Navigator.of(context).pop(false);
+        }
+      },
+      buildWhen: (previous, current) {
+        // 🔒 Prevent unnecessary rebuilds on duplicate success states
+        if (previous is StripePaymentSuccess && current is StripePaymentSuccess) {
+          return false;
+        }
+        return true;
+      },
+      builder: (context, state) {
+        return Container(
+          height: heightRatio == 1.0
+              ? MediaQuery.of(context).size.height
+              : MediaQuery.of(context).size.height * heightRatio,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: heightRatio == 1.0
+                ? null
+                : const BorderRadius.only(
+              topLeft: Radius.circular(20),
+              topRight: Radius.circular(20),
+            ),
+          ),
+          child: Stack(
+            children: [
+              // Main content
+              Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(24.0),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      // Custom header widget
+                      if (headerWidget != null) ...[
+                        headerWidget!,
+                        const SizedBox(height: 16),
+                      ],
+
+                      // Title
+                      if (title != null) ...[
+                        Text(
+                          title!,
+                          style: TextStyle(
+                            fontSize: 20.sp,
+                            fontWeight: FontWeight.w600,
+                            color: const Color(0xFF333333),
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        const SizedBox(height: 8),
+                      ],
+
+                      // Amount display
+                      if (amount != null) ...[
+                        Text(
+                          '$currencySymbol${amount!.toStringAsFixed(2)}',
+                          style: TextStyle(
+                            fontSize: 32.sp,
+                            fontWeight: FontWeight.w700,
+                            color: primaryColor,
+                          ),
+                        ),
+                        const SizedBox(height: 24),
+                      ],
+
+                      // Payment status
+                      _buildPaymentStatus(context, state),
+
+                      // Custom footer widget
+                      if (footerWidget != null) ...[
+                        const SizedBox(height: 16),
+                        footerWidget!,
+                      ],
+                    ],
+                  ),
+                ),
+              ),
+
+              // Close button (only show when allowed)
+              if (_shouldShowCloseButton(state))
+                Positioned(
+                  top: 16,
+                  right: 16,
+                  child: IconButton(
+                    onPressed: () {
+                      if (state is StripePaymentLoading) {
+                        // Cancel payment if loading
+                        context
+                            .read<StripePaymentBloc>()
+                            .add(CancelPaymentEvent());
+                      } else {
+                        Navigator.of(context).pop(false);
+                      }
+                    },
+                    icon: Icon(
+                      Icons.close,
+                      color: Colors.grey[600],
+                      size: 24,
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  /// Build payment status widget based on state
+  Widget _buildPaymentStatus(BuildContext context, StripePaymentState state) {
+    if (state is StripePaymentLoading) {
+      return Column(
+        children: [
+          CircularProgressIndicator(
+            color: Color(0xffF95F62),
+            strokeWidth: 3,
+            valueColor: AlwaysStoppedAnimation<Color>(primaryColor),
+          ),
+          const SizedBox(height: 24),
+          Text(
+            loadingMessage,
+            style: const TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w500,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    } else if (state is StripePaymentSuccess) {
+      return Column(
+        children: [
+          Icon(
+            Icons.check_circle,
+            color: successColor,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            successMessage,
+            style: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    } else if (state is StripePaymentFailure) {
+      return Column(
+        children: [
+          Icon(
+            Icons.error,
+            color: errorColor,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            failureMessage,
+            style: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            state.error,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 14,
+              color: Colors.grey[600],
+            ),
+          ),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: () {
+              // Retry payment
+              context.read<StripePaymentBloc>().add(
+                RetryPaymentEvent(
+                  clientSecret: clientSecret,
+                ),
+              );
+            },
+            style: ElevatedButton.styleFrom(
+              backgroundColor: primaryColor,
+              padding: const EdgeInsets.symmetric(
+                horizontal: 32,
+                vertical: 12,
+              ),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+            child: const Text(
+              'Retry Payment',
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 14,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        ],
+      );
+    } else if (state is StripePaymentCancelled) {
+      return Column(
+        children: [
+          Icon(
+            Icons.cancel,
+            color: Colors.orange,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          const Text(
+            'Payment Cancelled',
+            style: TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+
+  /// Determine if close button should be shown
+  bool _shouldShowCloseButton(StripePaymentState state) {
+    if (state is StripePaymentLoading) {
+      return showCloseButtonDuringLoading;
+    }
+    // Show for failure and cancelled states
+    return state is StripePaymentFailure || state is StripePaymentCancelled;
+  }
+}

lib/add_details/add_details_view.dart

@@ -2,184 +2,293 @@ import 'package:citycards_customer/common_packages/app_bar.dart';
 import 'package:citycards_customer/common_packages/custom_filled_button.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/common_packages/custom_textfield.dart';
-import 'package:citycards_customer/core/route_constants.dart';
+import 'package:country_code_picker/country_code_picker.dart'; // ✅ NEW IMPORT
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:phone_numbers_parser/phone_numbers_parser.dart'; // ✅ NEW IMPORT
 
-class AddDetailsView extends StatelessWidget {
-  AddDetailsView({super.key});
+import '../checkout/bloc/pass_purchase_details_bloc.dart';
+import '../checkout/bloc/pass_purchase_details_event.dart';
+import '../checkout/bloc/pass_purchase_details_state.dart';
 
+class AddDetailsView extends StatefulWidget {
+  final int bookingId;
+
+  const AddDetailsView({super.key, required this.bookingId});
+
+  @override
+  State<AddDetailsView> createState() => _AddDetailsViewState();
+}
+
+class _AddDetailsViewState extends State<AddDetailsView> {
   final TextEditingController firstNameController = TextEditingController();
   final TextEditingController lastNameController = TextEditingController();
   final TextEditingController emailController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
-  final TextEditingController addressController = TextEditingController();
+  final TextEditingController cityController = TextEditingController();
+  final TextEditingController countryController = TextEditingController();
+
+  String _selectedIsdCode = '+61'; // ✅ NEW: tracks selected country dial code
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      body: SafeArea(
-        child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: 20.w),
-          child: Column(
-            children: [
-              CommonAppBar(
-                isWhiteLogo: false,
-                isProfilePage: false,
-                showCart: false,
-                showDivider: true,
-              ),
-              Row(
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.pop(context);
-                    },
-                    child: Icon(Icons.arrow_back, size: 24.sp),
-                  ),
-                  SizedBox(width: 8.w),
-                  Text(
-                    "Add details",
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ],
-              ),
-              SizedBox(height: 42.h),
-              Align(
-                alignment: Alignment.centerLeft,
-                child: CustomText(
-                  text: "Tell us about yourself",
-                  size: 18.sp,
-                  weight: FontWeight.w500,
-                ),
-              ),
-              SizedBox(height: 12.h),
+  void dispose() {
+    firstNameController.dispose();
+    lastNameController.dispose();
+    emailController.dispose();
+    countryController.dispose();
+    phoneController.dispose();
+    cityController.dispose();
+    super.dispose();
+  }
 
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "First Name",
-                  hint: "Enter your first name",
-                  controller: firstNameController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Last Name",
-                  hint: "Enter your last name",
-                  controller: lastNameController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Email",
-                  hint: "Enter your email address",
-                  controller: emailController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Phone Number",
-                  hint: "Enter your phone number",
-                  controller: phoneController,
-                ),
-              ),
+  bool _isValidEmail(String email) {
+    final emailRegex = RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
+    return emailRegex.hasMatch(email);
+  }
 
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "City",
-                  hint: "Enter the name of your city",
-                  controller: phoneController,
-                ),
-              ),
+  // ✅ UPDATED: now validates phone using phone_numbers_parser against the selected ISD code
+  bool _isValidPhone(String phone) {
+    try {
+      final fullNumber = '$_selectedIsdCode$phone';
+      final parsed = PhoneNumber.parse(fullNumber);
+      return parsed.isValid();
+    } catch (_) {
+      return false;
+    }
+  }
 
-              Padding(
-                padding: EdgeInsets.only(bottom: 12.h, left: 12.w, right: 12.w),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    CustomText(text: "Country", size: 14.sp),
-                    SizedBox(height: 6.h),
-                    Container(
-                      height: 42.h,
-                      padding: EdgeInsets.symmetric(horizontal: 24.w),
-                      decoration: BoxDecoration(
-                        color: const Color(0xFFFFF5F5),
-                        borderRadius: BorderRadius.circular(8.r),
-                        border: Border.all(
-                          color: const Color(0xBBC83B61).withOpacity(0.4),
-                          width: 0.4.w,
-                        ),
-                      ),
-                      child: DropdownButtonHideUnderline(
-                        child: StatefulBuilder(
-                          builder: (context, setState) {
-                            String? selectedCountry;
-                            return DropdownButton<String>(
-                              value: selectedCountry,
-                              isExpanded: true,
-                              icon: const Icon(
-                                Icons.keyboard_arrow_down,
-                                color: Color(0xFF8E8E8E),
-                              ),
-                              hint: Text(
-                                "Select your country",
-                                style: TextStyle(
-                                  fontSize: 12.sp,
-                                  color: Color(0xFF8E8E8E),
-                                ),
-                              ),
-                              style: TextStyle(
-                                fontSize: 14.sp,
-                                color: const Color(0xFF2D3134),
-                              ),
-                              onChanged: (value) {
-                                setState(() {
-                                  selectedCountry = value;
-                                });
-                              },
-                              items: ["India", "USA", "UK", "Canada"].map((
-                                value,
-                              ) {
-                                return DropdownMenuItem<String>(
-                                  value: value,
-                                  child: Text(
-                                    value,
-                                    style: TextStyle(fontSize: 14.sp),
-                                  ),
-                                );
-                              }).toList(),
-                            );
-                          },
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
+  void _handleSubmit(BuildContext context, bool isSubmitting) {
+    if (isSubmitting) return;
 
-              const Spacer(),
-
-              CustomFilledButton(
-                onTap: () {
-
-                },
-                label: "Continue",
-                width: double.infinity,
-              ),
-              SizedBox(height: 50.h),
-            ],
-          ),
+    if (firstNameController.text.isEmpty ||
+        lastNameController.text.isEmpty ||
+        emailController.text.isEmpty ||
+        phoneController.text.isEmpty ||
+        cityController.text.isEmpty ||
+        countryController.text.isEmpty) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Please fill all fields'),
+          backgroundColor: Colors.red,
         ),
+      );
+      return;
+    }
+
+    if (!_isValidEmail(emailController.text)) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Please enter a valid email address'),
+          backgroundColor: Colors.red,
+        ),
+      );
+      return;
+    }
+
+    // ✅ UPDATED: error message now shows the selected ISD code
+    if (!_isValidPhone(phoneController.text)) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Enter a valid phone number for $_selectedIsdCode'),
+          backgroundColor: Colors.red,
+        ),
+      );
+      return;
+    }
+
+    context.read<PurchaseDetailsBloc>().add(
+      SubmitUserDetailsEvent(
+        bookingId: widget.bookingId,
+        isForSelf: false,
+        recipientFirstName: firstNameController.text,
+        recipientLastName: lastNameController.text,
+        isdCode: _selectedIsdCode,
+        recipientEmail: emailController.text,
+        recipientPhone: phoneController.text,
+        city: cityController.text,
+        country: countryController.text,
       ),
     );
   }
-}
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => PurchaseDetailsBloc(),
+      child: BlocConsumer<PurchaseDetailsBloc, PurchaseDetailsState>(
+        listener: (context, state) {
+          if (state is PurchaseDetailsSubmitted) {
+            Navigator.of(context).pop('success');
+          }
+
+          if (state is PurchaseDetailsError) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(state.errorMessage ?? 'Failed to submit details'),
+                backgroundColor: Colors.red,
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          final isSubmitting = state.isSubmittingDetails;
+
+          return Scaffold(
+            backgroundColor: Colors.white,
+            body: SafeArea(
+              child: SingleChildScrollView(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 20.w),
+                  child: Column(
+                    children: [
+                      CommonAppBar(
+                        isWhiteLogo: false,
+                        isProfilePage: false,
+                        showCart: false,
+                        showDivider: true,
+                      ),
+                      Row(
+                        children: [
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.pop(context);
+                            },
+                            child: Icon(Icons.arrow_back, size: 24.sp),
+                          ),
+                          SizedBox(width: 8.w),
+                          Text(
+                            "Add details",
+                            style: TextStyle(
+                              fontSize: 12.sp,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ],
+                      ),
+                      SizedBox(height: 42.h),
+                      Align(
+                        alignment: Alignment.centerLeft,
+                        child: CustomText(
+                          text: "Tell us about the recipient",
+                          size: 18.sp,
+                          weight: FontWeight.w500,
+                        ),
+                      ),
+                      SizedBox(height: 12.h),
+
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "First Name *",
+                          hint: "Enter recipient's first name",
+                          controller: firstNameController,
+                          onlyLetters: true,
+                          maxLength: 50,
+                          noSpace: true,
+                          isFirstLetterCapital: true,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Last Name *",
+                          hint: "Enter recipient's last name",
+                          controller: lastNameController,
+                          onlyLetters: true,
+                          maxLength: 50,
+                          noSpace: true,
+                          isFirstLetterCapital: true,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Email *",
+                          hint: "Enter recipient's email address",
+                          controller: emailController,
+                          keyboardType: TextInputType.emailAddress,
+                        ),
+                      ),
+
+                      // ✅ NEW: Phone field with CountryCodePicker (replaces plain CustomTextField)
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Phone Number *",
+                          hint: "Enter phone number",
+                          controller: phoneController,
+                          keyboardType: TextInputType.phone,
+                          maxLength: 12,
+                          numbersOnly: true,
+                          prefixWidget: CountryCodePicker(
+                            onChanged: (country) {
+                              setState(() => _selectedIsdCode = country.dialCode!);
+                            },
+                            initialSelection: 'AU',
+                            favorite: const ['+61', '+1', '+44', '+91'],
+                            showCountryOnly: false,
+                            showOnlyCountryWhenClosed: false,
+                            alignLeft: false,
+                            flagWidth: 24.w,
+                            padding: EdgeInsets.symmetric(horizontal: 8.w),
+                            textStyle: TextStyle(
+                              fontSize: 13.sp,
+                              color: const Color(0xFF2D3134),
+                            ),
+                            dialogTextStyle: TextStyle(fontSize: 14.sp),
+                            searchDecoration: const InputDecoration(
+                              hintText: 'Search country...',
+                              prefixIcon: Icon(Icons.search),
+                            ),
+                          ),
+                        ),
+                      ),
+                      // ✅ END of new phone field
+
+                      SizedBox(height: 8.h),
+
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "City *",
+                          hint: "Enter the name of the city",
+                          controller: cityController,
+                          maxLength: 50,
+                          onlyLetters: true,
+                          isFirstLetterCapital: true,
+                        ),
+                      ),
+
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Country *",
+                          hint: "Enter country name",
+                          controller: countryController,
+                          maxLength: 50,
+                          onlyLetters: true,
+                          isFirstLetterCapital: true,
+                        ),
+                      ),
+
+                      SizedBox(height: 24.h),
+
+                      CustomFilledButton(
+                        onTap: () => _handleSubmit(context, isSubmitting),
+                        label: isSubmitting ? "Submitting..." : "Continue",
+                        width: double.infinity,
+                      ),
+
+                      SizedBox(height: 50.h),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/attraction_details/attraction_details_view.dart

@@ -1,484 +0,0 @@
-import 'package:citycards_customer/attraction_details/share_bottomsheet.dart';
-import 'package:citycards_customer/common_packages/app_bar.dart';
-import 'package:citycards_customer/common_packages/custom_text.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-import '../core/route_constants.dart';
-
-class AttractionDetailsView extends StatelessWidget {
-  const AttractionDetailsView({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      body: SafeArea(
-        child: SingleChildScrollView(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-
-              Stack(
-                children: [
-                  Image.asset(
-                    'assets/images/koh_rong_samloem_banner.png',
-                    height: 377.h,
-                    width: double.infinity,
-                    fit: BoxFit.cover,
-                  ),
-                  Positioned(
-                    top: 0,
-                    left: 0,
-                    right: 0,
-                    child: SafeArea(
-                      child: Padding(
-                        padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-
-                            CommonAppBar(isWhiteLogo: true, isProfilePage: false, showDivider: true,),
-
-                            SizedBox(height: 10.h),
-
-                            Row(
-                              children: [
-                                GestureDetector(
-                                  onTap: () => Navigator.pop(context),
-                                  child: Icon(
-                                    Icons.arrow_back,
-                                    size: 24.sp,
-                                    color: Colors.white,
-                                  ),
-                                ),
-                                SizedBox(width: 8.w),
-                                Text(
-                                  "Koh Rong Samloem",
-                                  style: TextStyle(
-                                    fontSize: 14.sp,
-                                    fontWeight: FontWeight.w600,
-                                    color: Colors.white,
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-
-                  Positioned(
-                    bottom: 31.h,
-                    left: 12.w,
-                    child: Text(
-                      "Koh Rong\nSamloem",
-                      style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 44.sp,
-                        fontWeight: FontWeight.w500,
-                        height: 1.2,
-                      ),
-                    ),
-                  ),
-
-                  Positioned(
-                    bottom: 31.h,
-                    right: 17.w,
-                    child: GestureDetector(
-                      onTap: () {
-                        showModalBottomSheet(
-                          context: context,
-                          isScrollControlled: true,
-                          backgroundColor: Colors.transparent,
-                          builder: (context) => const ShareBottomSheet(),
-                        );
-                      },
-                      child: Container(
-                        height: 36.h,
-                        width: 36.w,
-                        decoration: BoxDecoration(
-                          color: Colors.white,
-                          borderRadius: BorderRadius.circular(20.r),
-                        ),
-                        child: Center(
-                          child: Icon(
-                            Icons.share_sharp,
-                            color: Colors.black,
-                            size: 18.sp,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-
-              // About Section
-              Padding(
-                padding: EdgeInsets.only(left: 16.w, right: 16.w, top: 30.h),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      "About",
-                      style: TextStyle(
-                        fontSize: 18.sp,
-                        fontWeight: FontWeight.w400,
-                      ),
-                    ),
-                    SizedBox(height: 12.32.h),
-                    Text(
-                      "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non...",
-                      style: TextStyle(
-                        color: Color(0xFF262626),
-                        fontWeight: FontWeight.w400,
-                        fontSize: 14.sp,
-                        height: 1.5,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              SizedBox(height: 41.h),
-              // Booking Section
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 16.w),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      "How to make a booking?",
-                      style: TextStyle(
-                        fontSize: 18.sp,
-                        fontWeight: FontWeight.w400,
-                      ),
-                    ),
-                    SizedBox(height: 16.h),
-                    Container(
-                      padding: EdgeInsets.symmetric(
-                        horizontal: 12.w,
-                        vertical: 12.h,
-                      ),
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(8.r),
-                        border: Border.all(color: Color(0xFFF95F62)),
-                      ),
-                      child: Row(
-                        children: [
-                          Icon(
-                            Icons.call,
-                            color: Color(0xFFF95F62),
-                            size: 32.w,
-                          ),
-                          SizedBox(width: 16.w),
-                          Expanded(
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                CustomText(
-                                  text: "Contact Number",
-                                  color: Colors.black.withOpacity(.6),
-                                  size: 12.sp,
-                                  weight: FontWeight.w500,
-                                ),
-                                SizedBox(height: 6.h),
-                                CustomText(
-                                  text: "+1012 3456 789",
-                                  color: Colors.black,
-                                  size: 14.sp,
-                                  weight: FontWeight.w600,
-                                ),
-
-                                SizedBox(height: 6.h),
-                                CustomText(
-                                  text: "Tap to call",
-                                  color: Colors.black.withOpacity(.4),
-                                  size: 12.sp,
-                                  weight: FontWeight.w400,
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    SizedBox(height: 16.h),
-                    Container(
-                      padding: EdgeInsets.symmetric(
-                        horizontal: 12.w,
-                        vertical: 12.h,
-                      ),
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(8.r),
-                        border: Border.all(color: Color(0xFFF95F62)),
-                      ),
-                      child: Row(
-                        children: [
-                          Icon(
-                            Icons.email_sharp,
-                            color: Color(0xFFF95F62),
-                            size: 32.w,
-                          ),
-                          SizedBox(width: 16.w),
-                          Expanded(
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                CustomText(
-                                  text: "Email",
-                                  color: Colors.black.withOpacity(.6),
-                                  size: 12.sp,
-                                  weight: FontWeight.w500,
-                                ),
-                                SizedBox(height: 6.h),
-                                CustomText(
-                                  text: "CityCards24@gmail.com",
-                                  color: Colors.black,
-                                  size: 14.sp,
-                                  weight: FontWeight.w600,
-                                ),
-
-                                SizedBox(height: 6.h),
-                                CustomText(
-                                  text: "Tap to email",
-                                  color: Colors.black.withOpacity(.4),
-                                  size: 12.sp,
-                                  weight: FontWeight.w400,
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    SizedBox(height: 16.h),
-
-                    InkWell(
-                      onTap: (){
-                        Navigator.of(context).pushNamed(RouteConstants.makeBooking);
-                      },
-                      child: Container(
-                        padding: EdgeInsets.symmetric(
-                          horizontal: 24.w,
-                          vertical: 18.h,
-                        ),
-                        decoration: BoxDecoration(
-                          color: Color(0xFFF95F62),
-                          borderRadius: BorderRadius.circular(10.r),
-                        ),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  CustomText(
-                                    text: "Via CityCards",
-                                    size: 16.sp,
-                                    weight: FontWeight.w500,
-                                    color: Colors.white,
-                                  ),
-                                  SizedBox(height: 8.h),
-                                  CustomText(
-                                    text: "Create a booking via app",
-                                    size: 11.sp,
-                                    weight: FontWeight.w400,
-                                    color: Colors.white,
-                                  ),
-                                ],
-                              ),
-                            ),
-
-                            Icon(
-                              Icons.arrow_forward_ios_outlined,
-                              color: Colors.white,
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-
-                    SizedBox(height: 30.h),
-
-                    Divider(color: Colors.black.withOpacity(0.2)),
-                    SizedBox(height: 30.h),
-                    Text(
-                      "What is included",
-                      style: TextStyle(
-                        fontSize: 24.sp,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                    SizedBox(height: 4.h),
-
-                    Wrap(
-                      runSpacing: 16.h,
-                      spacing: 16.w,
-                      children: [
-                        includedBox(
-                          "assets/icons/bus.png",
-                          "Bus",
-                          "Transportation",
-                        ),
-                        includedBox(
-                          "assets/icons/clock.png",
-                          "2 day 1 night",
-                          "Duration",
-                        ),
-                        includedBox(
-                          "assets/icons/bx_qr.png",
-                          "TAC200812695",
-                          "Product code",
-                        ),
-                      ],
-                    ),
-                    SizedBox(height: 30.h),
-
-                    Divider(color: Colors.black.withOpacity(0.2)),
-                    SizedBox(height: 30.h),
-                    Text(
-                      "Exact Location",
-                      style: TextStyle(
-                        fontSize: 18.sp,
-                        fontWeight: FontWeight.w400,
-                      ),
-                    ),
-                    SizedBox(height: 8.h),
-
-                    CustomText(
-                      text: "View the location on map",
-                      size: 12.sp,
-                      color: Colors.black.withOpacity(.6),
-                    ),
-                    SizedBox(height: 17.h),
-
-                    ClipRRect(
-                      borderRadius: BorderRadius.circular(13.54.r),
-                      child: Image.asset(
-                        height: 178.7.h,
-                        width: double.infinity,
-                        "assets/images/attra_detail_map.png",
-                        fit: BoxFit.cover,
-                      ),
-                    ),
-
-                    SizedBox(height: 17.h),
-
-                    CustomText(
-                      text:
-                          "Angkor Mails Hotel \nNR6, Krong Siem Reap Cambodia",
-                      size: 12.sp,
-                      color: Colors.black.withOpacity(0.6),
-                    ),
-
-                    SizedBox(height: 30.h),
-
-                    Divider(color: Colors.black.withOpacity(0.2)),
-                    SizedBox(height: 30.h),
-                    Text(
-                      "People frequently ask",
-                      style: TextStyle(
-                        fontSize: 18.sp,
-                        fontWeight: FontWeight.w400,
-                      ),
-                    ),
-
-                    SizedBox(height: 15.h),
-
-                    faqBox(
-                      "About this place",
-                      "Lorem ipsum dolor sit amet, consectetur adipiscing elit. A id diam nisl, non justo, in odio...",
-                    ),
-
-                    SizedBox(height: 15.h),
-
-                    faqBox(
-                      "Term and condition",
-                      "Lorem ipsum dolor sit amet, consectetur adipiscing elit. A id diam nisl, non justo, in odio...",
-                    ),
-                    SizedBox(height: 15.h),
-
-                    faqBox(
-                      "Cancellation Policy",
-                      "Lorem ipsum dolor sit amet, consectetur adipiscing elit. A id diam nisl, non justo, in odio...",
-                    ),
-                  ],
-                ),
-              ),
-
-              SizedBox(height: 24.h),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget includedBox(String icon, String title, String disc) {
-    return Container(
-      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 10.h),
-      decoration: BoxDecoration(
-        color: Color(0xFFFFF5F5),
-        borderRadius: BorderRadius.circular(10.r),
-        border: Border.all(color: Color(0xFFFDCDCE)),
-      ),
-      child: IntrinsicWidth(
-        child: Row(
-          children: [
-            Image.asset(icon, scale: 4),
-            SizedBox(width: 16.w),
-            Column(
-              children: [
-                CustomText(
-                  text: title,
-                  size: 16.sp,
-                  weight: FontWeight.w500,
-                  color: Color(0xFF212121),
-                ),
-                SizedBox(height: 4.h),
-                CustomText(
-                  text: disc,
-                  size: 11.sp,
-                  weight: FontWeight.w400,
-                  color: Color(0xFF666666),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget faqBox(String title, String desc) {
-    return Container(
-      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
-      decoration: BoxDecoration(
-        color: Color(0xFFFFF5F5),
-        border: Border.all(color: Color(0xFFFDCDCE)),
-        borderRadius: BorderRadius.circular(10.r),
-      ),
-      child: Column(
-        children: [
-          Row(
-            children: [
-              CustomText(
-                text: title,
-                size: 16.sp,
-                weight: FontWeight.w500,
-                color: Color(0xFF212121),
-              ),
-              SizedBox(width: 20.w),
-              Icon(Icons.arrow_forward_ios_outlined, size: 18.sp),
-            ],
-          ),
-          SizedBox(height: 9.h),
-          CustomText(text: desc, size: 11.sp, color: Color(0xFF7D7D7D)),
-        ],
-      ),
-    );
-  }
-}

lib/attraction_details/bloc/attraction_details_bloc.dart

@@ -0,0 +1,40 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'attraction_details_event.dart';
+import 'attraction_details_state.dart';
+import '../repository/attraction_details_repository.dart';
+
+class AttractionDetailsBloc
+    extends Bloc<AttractionDetailsEvent, AttractionDetailsState> {
+  final AttractionDetailsRepository repository;
+
+  AttractionDetailsBloc({
+    required this.repository,
+  }) : super(AttractionDetailsInitial()) {
+    on<FetchAttractionDetails>(_onFetchAttractionDetails);
+  }
+
+  Future<void> _onFetchAttractionDetails(
+      FetchAttractionDetails event,
+      Emitter<AttractionDetailsState> emit,
+      ) async {
+    emit(AttractionDetailsLoading());
+
+    try {
+      final response = await repository.fetchAttractionDetails(
+        attractionId: event.attractionId,
+      );
+
+      emit(
+        AttractionDetailsLoaded(
+          attractionDetails: response,
+        ),
+      );
+    } catch (e) {
+      emit(
+        AttractionDetailsError(
+          message: e.toString(),
+        ),
+      );
+    }
+  }
+}

lib/attraction_details/bloc/attraction_details_event.dart

@@ -0,0 +1,19 @@
+import 'package:equatable/equatable.dart';
+
+abstract class AttractionDetailsEvent extends Equatable {
+  const AttractionDetailsEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class FetchAttractionDetails extends AttractionDetailsEvent {
+  final int attractionId;
+
+  const FetchAttractionDetails({
+    required this.attractionId,
+  });
+
+  @override
+  List<Object?> get props => [attractionId];
+}

lib/attraction_details/bloc/attraction_details_state.dart

@@ -0,0 +1,36 @@
+import 'package:equatable/equatable.dart';
+
+import '../models/attraction_details_model.dart';
+
+abstract class AttractionDetailsState extends Equatable {
+  const AttractionDetailsState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class AttractionDetailsInitial extends AttractionDetailsState {}
+
+class AttractionDetailsLoading extends AttractionDetailsState {}
+
+class AttractionDetailsLoaded extends AttractionDetailsState {
+  final AttractionDetailsModel attractionDetails;
+
+  const AttractionDetailsLoaded({
+    required this.attractionDetails,
+  });
+
+  @override
+  List<Object?> get props => [attractionDetails];
+}
+
+class AttractionDetailsError extends AttractionDetailsState {
+  final String message;
+
+  const AttractionDetailsError({
+    required this.message,
+  });
+
+  @override
+  List<Object?> get props => [message];
+}

lib/attraction_details/models/attraction_details_model.dart

@@ -0,0 +1,246 @@
+class AttractionDetailsModel {
+  final int id;
+  final String title;
+  final String description;
+  final int cityXid;
+  final int? cardTypeXid;
+  final int partnerXid;
+  final String productCode;
+  final String subTitle;
+  final String urlSlug;
+  final bool isBookingRequired;
+  final bool isPartnerAccess;
+  final String bookingEmail;
+  final String bookingPhoneNumber;
+  final String address;
+  final double latitudeCoordinate;
+  final double longitudeCoordinate;
+  final double ticketPriceAdult;
+  final double ticketPriceChild;
+  final int durations;
+  final int groupSize;
+  final String ageRange;
+  final String seoTitle;
+  final String seoDescription;
+  final String attractionStatus;
+  final bool isActive;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final List<AttractionGallery> attractionGalleries;
+  final List<AttractionInclusion> attractionInclusions;
+  final List<AttractionFaq> attractionFaqs;
+
+  AttractionDetailsModel({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.cityXid,
+    this.cardTypeXid,
+    required this.partnerXid,
+    required this.productCode,
+    required this.subTitle,
+    required this.urlSlug,
+    required this.isBookingRequired,
+    required this.isPartnerAccess,
+    required this.bookingEmail,
+    required this.bookingPhoneNumber,
+    required this.address,
+    required this.latitudeCoordinate,
+    required this.longitudeCoordinate,
+    required this.ticketPriceAdult,
+    required this.ticketPriceChild,
+    required this.durations,
+    required this.groupSize,
+    required this.ageRange,
+    required this.seoTitle,
+    required this.seoDescription,
+    required this.attractionStatus,
+    required this.isActive,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.attractionGalleries,
+    required this.attractionInclusions,
+    required this.attractionFaqs,
+  });
+
+  factory AttractionDetailsModel.fromJson(Map<String, dynamic> json) {
+    return AttractionDetailsModel(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? 'N/A',
+      description: json['description'] ?? 'N/A',
+      cityXid: json['cityXid'] ?? 0,
+      cardTypeXid: json['cardTypeXid'],
+      partnerXid: json['partnerXid'] ?? 0,
+      productCode: json['productCode'] ?? 'N/A',
+      subTitle: json['subTitle'] ?? 'N/A',
+      urlSlug: json['urlSlug'] ?? 'N/A',
+      isBookingRequired: json['isBookingRequired'] ?? false,
+      isPartnerAccess: json['isPartnerAccess'] ?? false,
+      bookingEmail: json['bookingEmail'] ?? 'N/A',
+      bookingPhoneNumber: json['bookingPhoneNumber'] ?? 'N/A',
+      address: json['address'] ?? 'N/A',
+      latitudeCoordinate: json['latitudeCoordinate'] != null
+          ? (json['latitudeCoordinate'] as num).toDouble()
+          : 0.0,
+      longitudeCoordinate: json['longitudeCoordinate'] != null
+          ? (json['longitudeCoordinate'] as num).toDouble()
+          : 0.0,
+      ticketPriceAdult: json['ticketPriceAdult'] != null
+          ? (json['ticketPriceAdult'] as num).toDouble()
+          : 0.0,
+      ticketPriceChild: json['ticketPriceChild'] != null
+          ? (json['ticketPriceChild'] as num).toDouble()
+          : 0.0,
+      durations: json['durations'] ?? 0,
+      groupSize: json['groupSize'] ?? 0,
+      ageRange: json['ageRange'] ?? 'N/A',
+      seoTitle: json['seoTitle'] ?? 'N/A',
+      seoDescription: json['seoDescription'] ?? 'N/A',
+      attractionStatus: json['attractionStatus'] ?? 'N/A',
+      isActive: json['isActive'] ?? false,
+      createdAt: json['createdAt'] != null
+          ? DateTime.parse(json['createdAt'])
+          : DateTime.now(),
+      updatedAt: json['updatedAt'] != null
+          ? DateTime.parse(json['updatedAt'])
+          : DateTime.now(),
+      attractionGalleries: json['attractionGalleries'] != null
+          ? (json['attractionGalleries'] as List)
+          .map((e) => AttractionGallery.fromJson(e))
+          .toList()
+          : [],
+      attractionInclusions: json['attractionInclusions'] != null
+          ? (json['attractionInclusions'] as List)
+          .map((e) => AttractionInclusion.fromJson(e))
+          .toList()
+          : [],
+      attractionFaqs: json['attractionFaqs'] != null
+          ? (json['attractionFaqs'] as List)
+          .map((e) => AttractionFaq.fromJson(e))
+          .toList()
+          : [],
+    );
+  }
+}
+
+/// =======================
+/// Attraction Gallery
+/// =======================
+class AttractionGallery {
+  final int id;
+  final int attractionXid;
+  final String fileType;
+  final String filePathUrl;
+  final String altText;
+  final bool isCoverImage;
+  final bool isActive;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+
+  AttractionGallery({
+    required this.id,
+    required this.attractionXid,
+    required this.fileType,
+    required this.filePathUrl,
+    required this.altText,
+    required this.isCoverImage,
+    required this.isActive,
+    required this.createdAt,
+    required this.updatedAt,
+  });
+
+  factory AttractionGallery.fromJson(Map<String, dynamic> json) {
+    return AttractionGallery(
+      id: json['id'] ?? 0,
+      attractionXid: json['attractionXid'] ?? 0,
+      fileType: json['fileType'] ?? 'N/A',
+      filePathUrl: json['filePathUrl'] ?? 'N/A',
+      altText: json['altText'] ?? 'N/A',
+      isCoverImage: json['isCoverImage'] ?? false,
+      isActive: json['isActive'] ?? false,
+      createdAt: json['createdAt'] != null
+          ? DateTime.parse(json['createdAt'])
+          : DateTime.now(),
+      updatedAt: json['updatedAt'] != null
+          ? DateTime.parse(json['updatedAt'])
+          : DateTime.now(),
+    );
+  }
+}
+
+/// =======================
+/// Attraction Inclusion
+/// =======================
+class AttractionInclusion {
+  final int id;
+  final int attractionXid;
+  final String title;
+  final String description;
+  final int? iconXid;
+  final bool isInclusion;
+  final bool isActive;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+
+  AttractionInclusion({
+    required this.id,
+    required this.attractionXid,
+    required this.title,
+    required this.description,
+    this.iconXid,
+    required this.isInclusion,
+    required this.isActive,
+    required this.createdAt,
+    required this.updatedAt,
+  });
+
+  factory AttractionInclusion.fromJson(Map<String, dynamic> json) {
+    return AttractionInclusion(
+      id: json['id'] ?? 0,
+      attractionXid: json['attractionXid'] ?? 0,
+      title: json['title'] ?? 'N/A',
+      description: json['description'] ?? 'N/A',
+      iconXid: json['iconXid'],
+      isInclusion: json['isInclusion'] ?? false,
+      isActive: json['isActive'] ?? false,
+      createdAt: json['createdAt'] != null
+          ? DateTime.parse(json['createdAt'])
+          : DateTime.now(),
+      updatedAt: json['updatedAt'] != null
+          ? DateTime.parse(json['updatedAt'])
+          : DateTime.now(),
+    );
+  }
+}
+
+/// =======================
+/// Attraction FAQ
+/// =======================
+class AttractionFaq {
+  final int id;
+  final int attractionXid;
+  final String faqQuestion;
+  final String faqAnswer;
+  final int displayOrder;
+  final bool isActive;
+
+  AttractionFaq({
+    required this.id,
+    required this.attractionXid,
+    required this.faqQuestion,
+    required this.faqAnswer,
+    required this.displayOrder,
+    required this.isActive,
+  });
+
+  factory AttractionFaq.fromJson(Map<String, dynamic> json) {
+    return AttractionFaq(
+      id: json['id'] ?? 0,
+      attractionXid: json['attractionXid'] ?? 0,
+      faqQuestion: json['faqQuestion'] ?? 'N/A',
+      faqAnswer: json['faqAnswer'] ?? 'N/A',
+      displayOrder: json['displayOrder'] ?? 0,
+      isActive: json['isActive'] ?? false,
+    );
+  }
+}

lib/attraction_details/repository/attraction_details_repository.dart

@@ -0,0 +1,17 @@
+import '../models/attraction_details_model.dart';
+import '../../networkApiServices/network_api_services.dart';
+import '../../networkApiServices/api_urls.dart';
+class AttractionDetailsRepository {
+  final NetworkApiService _apiService = NetworkApiService();
+
+  /// Fetch attraction details by attractionId
+  Future<AttractionDetailsModel> fetchAttractionDetails({
+    required int attractionId,
+  }) async {
+    final response = await _apiService.getApi(
+      url: '${ApiUrls.attractionDetails}/$attractionId',
+    );
+
+    return AttractionDetailsModel.fromJson(response.data);
+  }
+}

lib/attraction_details/views/attraction_details_view.dart

@@ -0,0 +1,593 @@
+import 'package:citycards_customer/attraction_details/widgets/share_bottomsheet.dart';
+import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/custom_text.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:share_plus/share_plus.dart';
+
+import '../../core/route_constants.dart';
+import '../bloc/attraction_details_bloc.dart';
+import '../bloc/attraction_details_event.dart';
+import '../bloc/attraction_details_state.dart';
+import '../repository/attraction_details_repository.dart';
+
+class AttractionDetailsView extends StatelessWidget {
+  final int? attractionId;
+
+  const AttractionDetailsView({
+    super.key,
+    required this.attractionId,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => AttractionDetailsBloc(
+        repository: AttractionDetailsRepository(),
+      )..add(FetchAttractionDetails(attractionId: attractionId??0)),
+      child: BlocBuilder<AttractionDetailsBloc, AttractionDetailsState>(
+        builder: (context, state) {
+          if (state is AttractionDetailsLoading) {
+            return Scaffold(
+              backgroundColor: Colors.white,
+              body: Center(
+                child: CircularProgressIndicator(color: Color(0xffF95F62)),
+              ),
+            );
+          }
+
+          if (state is AttractionDetailsError) {
+            return Scaffold(
+              backgroundColor: Colors.white,
+              body: Center(
+                child: Text(
+                  state.message,
+                  style: TextStyle(color: Colors.red),
+                ),
+              ),
+            );
+          }
+
+          if (state is AttractionDetailsLoaded) {
+            final attraction = state.attractionDetails;
+            final coverImage = attraction.attractionGalleries
+                .firstWhere(
+                  (gallery) => gallery.isCoverImage,
+              orElse: () => attraction.attractionGalleries.first,
+            )
+                .filePathUrl;
+
+            return Scaffold(
+              backgroundColor: Colors.white,
+              body: SafeArea(
+                child: SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Stack(
+                        children: [
+                          Image.network(
+                            coverImage,
+                            height: 377.h,
+                            width: double.infinity,
+                            fit: BoxFit.cover,
+                            errorBuilder: (context, error, stackTrace) {
+                              return Image.asset(
+                                'assets/images/koh_rong_samloem_banner.png',
+                                height: 377.h,
+                                width: double.infinity,
+                                fit: BoxFit.cover,
+                              );
+                            },
+                          ),
+                          Positioned(
+                            top: 0,
+                            left: 0,
+                            right: 0,
+                            child: SafeArea(
+                              child: Padding(
+                                padding: EdgeInsets.symmetric(
+                                    horizontal: 20.w, vertical: 10.h),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    CommonAppBar(
+                                      isWhiteLogo: true,
+                                      isProfilePage: false,
+                                      showDivider: true,
+                                    ),
+                                    SizedBox(height: 10.h),
+                                    Row(
+                                      children: [
+                                        GestureDetector(
+                                          onTap: () => Navigator.pop(context),
+                                          child: Icon(
+                                            Icons.arrow_back,
+                                            size: 24.sp,
+                                            color: Colors.white,
+                                          ),
+                                        ),
+                                        SizedBox(width: 8.w),
+                                        Expanded(
+                                          child: Text(
+                                            attraction.title,
+                                            style: TextStyle(
+                                              fontSize: 14.sp,
+                                              fontWeight: FontWeight.w600,
+                                              color: Colors.white,
+                                            ),
+                                            maxLines: 1,
+                                            overflow: TextOverflow.ellipsis,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ),
+                          Positioned(
+                            bottom: 31.h,
+                            left: 12.w,
+                            right: 60.w, // Add this - leaves space for share button
+                            child: Text(
+                              attraction.title,
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 44.sp,
+                                fontWeight: FontWeight.w500,
+                                height: 1.2,
+                              ),
+                              maxLines: 2,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                          Positioned(
+                            bottom: 31.h,
+                            right: 17.w,
+                            child: GestureDetector(
+                              onTap: () {
+                                Share.share(
+                                  'www.google.com',
+                                  subject: 'Check this out',
+                                );
+                              },
+                              child: Container(
+                                height: 36.h,
+                                width: 36.w,
+                                decoration: BoxDecoration(
+                                  color: Colors.white,
+                                  borderRadius: BorderRadius.circular(20.r),
+                                ),
+                                child: Center(
+                                  child: Icon(
+                                    Icons.share_sharp,
+                                    color: Colors.black,
+                                    size: 18.sp,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          )
+                        ],
+                      ),
+
+                      // About Section
+                      Padding(
+                        padding:
+                        EdgeInsets.only(left: 16.w, right: 16.w, top: 20.h),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              "About",
+                              style: TextStyle(
+                                fontSize: 18.sp,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                            SizedBox(height: 12.32.h),
+                            Text(
+                              attraction.description,
+                              style: TextStyle(
+                                color: Color(0xFF262626),
+                                fontWeight: FontWeight.w400,
+                                fontSize: 14.sp,
+                                height: 1.5,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      SizedBox(height: 41.h),
+
+                      // Booking Section
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 16.w),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            // Text(
+                            //   "How to make a booking?",
+                            //   style: TextStyle(
+                            //     fontSize: 18.sp,
+                            //     fontWeight: FontWeight.w400,
+                            //   ),
+                            // ),
+                            // SizedBox(height: 16.h),
+                            // Container(
+                            //   padding: EdgeInsets.symmetric(
+                            //     horizontal: 12.w,
+                            //     vertical: 12.h,
+                            //   ),
+                            //   decoration: BoxDecoration(
+                            //     borderRadius: BorderRadius.circular(8.r),
+                            //     border: Border.all(color: Color(0xFFF95F62)),
+                            //   ),
+                            //   child: Row(
+                            //     children: [
+                            //       Icon(
+                            //         Icons.call,
+                            //         color: Color(0xFFF95F62),
+                            //         size: 32.w,
+                            //       ),
+                            //       SizedBox(width: 16.w),
+                            //       Expanded(
+                            //         child: Column(
+                            //           crossAxisAlignment:
+                            //           CrossAxisAlignment.start,
+                            //           children: [
+                            //             CustomText(
+                            //               text: "Contact Number",
+                            //               color: Colors.black.withOpacity(.6),
+                            //               size: 12.sp,
+                            //               weight: FontWeight.w500,
+                            //             ),
+                            //             SizedBox(height: 6.h),
+                            //             CustomText(
+                            //               text: attraction.bookingPhoneNumber??"N/A",
+                            //               color: Colors.black,
+                            //               size: 14.sp,
+                            //               weight: FontWeight.w600,
+                            //             ),
+                            //             SizedBox(height: 6.h),
+                            //             CustomText(
+                            //               text: "Tap to call",
+                            //               color: Colors.black.withOpacity(.4),
+                            //               size: 12.sp,
+                            //               weight: FontWeight.w400,
+                            //             ),
+                            //           ],
+                            //         ),
+                            //       ),
+                            //     ],
+                            //   ),
+                            // ),
+                            // SizedBox(height: 16.h),
+                            // Container(
+                            //   padding: EdgeInsets.symmetric(
+                            //     horizontal: 12.w,
+                            //     vertical: 12.h,
+                            //   ),
+                            //   decoration: BoxDecoration(
+                            //     borderRadius: BorderRadius.circular(8.r),
+                            //     border: Border.all(color: Color(0xFFF95F62)),
+                            //   ),
+                            //   child: Row(
+                            //     children: [
+                            //       Icon(
+                            //         Icons.email_sharp,
+                            //         color: Color(0xFFF95F62),
+                            //         size: 32.w,
+                            //       ),
+                            //       SizedBox(width: 16.w),
+                            //       Expanded(
+                            //         child: Column(
+                            //           crossAxisAlignment:
+                            //           CrossAxisAlignment.start,
+                            //           children: [
+                            //             CustomText(
+                            //               text: "Email",
+                            //               color: Colors.black.withOpacity(.6),
+                            //               size: 12.sp,
+                            //               weight: FontWeight.w500,
+                            //             ),
+                            //             SizedBox(height: 6.h),
+                            //             CustomText(
+                            //               text: attraction.bookingEmail??"N/A",
+                            //               color: Colors.black,
+                            //               size: 14.sp,
+                            //               weight: FontWeight.w600,
+                            //             ),
+                            //             SizedBox(height: 6.h),
+                            //             CustomText(
+                            //               text: "Tap to email",
+                            //               color: Colors.black.withOpacity(.4),
+                            //               size: 12.sp,
+                            //               weight: FontWeight.w400,
+                            //             ),
+                            //           ],
+                            //         ),
+                            //       ),
+                            //     ],
+                            //   ),
+                            // ),
+                            // SizedBox(height: 16.h),
+                            // InkWell(
+                            //   onTap: () {
+                            //     Navigator.of(context)
+                            //         .pushNamed(RouteConstants.makeBooking);
+                            //   },
+                            //   child: Container(
+                            //     padding: EdgeInsets.symmetric(
+                            //       horizontal: 24.w,
+                            //       vertical: 18.h,
+                            //     ),
+                            //     decoration: BoxDecoration(
+                            //       color: Color(0xFFF95F62),
+                            //       borderRadius: BorderRadius.circular(10.r),
+                            //     ),
+                            //     child: Row(
+                            //       mainAxisAlignment:
+                            //       MainAxisAlignment.spaceBetween,
+                            //       children: [
+                            //         Expanded(
+                            //           child: Column(
+                            //             crossAxisAlignment:
+                            //             CrossAxisAlignment.start,
+                            //             children: [
+                            //               CustomText(
+                            //                 text: "Via CityCards",
+                            //                 size: 16.sp,
+                            //                 weight: FontWeight.w500,
+                            //                 color: Colors.white,
+                            //               ),
+                            //               SizedBox(height: 8.h),
+                            //               CustomText(
+                            //                 text: "Create a booking via app",
+                            //                 size: 11.sp,
+                            //                 weight: FontWeight.w400,
+                            //                 color: Colors.white,
+                            //               ),
+                            //             ],
+                            //           ),
+                            //         ),
+                            //         Icon(
+                            //           Icons.arrow_forward_ios_outlined,
+                            //           color: Colors.white,
+                            //         ),
+                            //       ],
+                            //     ),
+                            //   ),
+                            // ),
+                            // SizedBox(height: 30.h),
+                            Divider(color: Colors.black.withOpacity(0.2)),
+                            SizedBox(height: 30.h),
+                            Text(
+                              "What is included",
+                              style: TextStyle(
+                                fontSize: 24.sp,
+                                fontWeight: FontWeight.w500,
+                              ),
+                            ),
+                            SizedBox(height: 4.h),
+
+                            // Dynamic Inclusions from API
+                            Wrap(
+                              runSpacing: 16.h,
+                              spacing: 16.w,
+                              children: attraction.attractionInclusions
+                                  .where((inclusion) => inclusion.isInclusion)
+                                  .map(
+                                    (inclusion) => includedBox(
+                                  "assets/icons/bus.png",
+                                  inclusion.title,
+                                  inclusion.description,
+                                ),
+                              )
+                                  .toList(),
+                            ),
+                            SizedBox(height: 30.h),
+                            // Divider(color: Colors.black.withOpacity(0.2)),
+                            SizedBox(height: 30.h),
+                            Text(
+                              "Exact Location",
+                              style: TextStyle(
+                                fontSize: 18.sp,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                            SizedBox(height: 8.h),
+                            CustomText(
+                              text: "View the location on map",
+                              size: 12.sp,
+                              color: Colors.black.withOpacity(.6),
+                            ),
+                            SizedBox(height: 17.h),
+                            Container(
+                              height: 178.7.h,
+                              width: double.infinity,
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.circular(13.54.r),
+                                border: Border.all(
+                                  color: Colors.grey.withOpacity(0.3),
+                                ),
+                              ),
+                              child: ClipRRect(
+                                borderRadius: BorderRadius.circular(13.54.r),
+                                child: FlutterMap(
+                                  options: MapOptions(
+                                    initialCenter: LatLng(
+                                      attraction.latitudeCoordinate,
+                                      attraction.longitudeCoordinate,
+                                    ),
+                                    initialZoom: 15.0,
+                                    interactionOptions: InteractionOptions(
+                                      flags: InteractiveFlag.all & ~InteractiveFlag.rotate,
+                                    ),
+                                  ),
+                                  children: [
+                                    TileLayer(
+                                      urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                                      userAgentPackageName: 'com.example.citycards_customer',
+                                    ),
+                                    MarkerLayer(
+                                      markers: [
+                                        Marker(
+                                          point: LatLng(
+                                            attraction.latitudeCoordinate,
+                                            attraction.longitudeCoordinate,
+                                          ),
+                                          width: 40.w,
+                                          height: 40.h,
+                                          child: Icon(
+                                            Icons.location_on,
+                                            color: Color(0xFFF95F62),
+                                            size: 40.sp,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                            SizedBox(height: 17.h),
+                            CustomText(
+                              text: attraction.address,
+                              size: 12.sp,
+                              color: Colors.black.withOpacity(0.6),
+                            ),
+                            SizedBox(height: 30.h),
+                            Divider(color: Colors.black.withOpacity(0.2)),
+                            SizedBox(height: 30.h),
+                            Text(
+                              "People frequently ask",
+                              style: TextStyle(
+                                fontSize: 18.sp,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                            SizedBox(height: 15.h),
+                            Column(
+                              children: attraction.attractionFaqs.map((faq) {
+                                return Padding(
+                                  padding: EdgeInsets.only(bottom: 15.h),
+                                  child: faqBox(
+                                    title: faq.faqQuestion,
+                                    desc: faq.faqAnswer,
+                                  ),
+                                );
+                              }).toList(),
+                            ),
+
+                          ],
+                        ),
+                      ),
+                      SizedBox(height: 24.h),
+                    ],
+                  ),
+                ),
+              ),
+            );
+          }
+
+          return Scaffold(
+            backgroundColor: Colors.white,
+            body: Center(
+              child: Text("Something went wrong"),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget includedBox(String icon, String title, String disc) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 10.h),
+      decoration: BoxDecoration(
+        color: Color(0xFFFFF5F5),
+        borderRadius: BorderRadius.circular(10.r),
+        border: Border.all(color: Color(0xFFFDCDCE)),
+      ),
+      child: Row(
+        children: [
+          Image.asset(icon, scale: 4),
+          SizedBox(width: 16.w),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                CustomText(
+                  text: title,
+                  size: 16.sp,
+                  weight: FontWeight.w500,
+                  color: Color(0xFF212121),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                SizedBox(height: 4.h),
+                CustomText(
+                  text: disc,
+                  size: 11.sp,
+                  weight: FontWeight.w400,
+                  color: Color(0xFF666666),
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget faqBox({
+    required String title,
+    required String desc,
+  }) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFF5F5),
+        border: Border.all(color: const Color(0xFFFDCDCE)),
+        borderRadius: BorderRadius.circular(10.r),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Expanded(
+                child: CustomText(
+                  text: title,
+                  size: 16.sp,
+                  weight: FontWeight.w500,
+                  color: const Color(0xFF212121),
+                ),
+              ),
+              SizedBox(width: 20.w),
+              Icon(
+                Icons.arrow_forward_ios_outlined,
+                size: 18.sp,
+                color: Colors.black,
+              ),
+            ],
+          ),
+          SizedBox(height: 9.h),
+          CustomText(
+            text: desc,
+            size: 11.sp,
+            color: const Color(0xFF7D7D7D),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/attraction_details/widgets/share_bottomsheet.dart

@@ -26,15 +26,18 @@ class ShareBottomSheet extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
+          // drag handle
           Container(
             height: 4.h,
             width: 47.w,
-            margin: EdgeInsets.only(bottom: 16),
+            margin: EdgeInsets.only(bottom: 16.h),
             decoration: BoxDecoration(
-              color: Color(0xFF222222),
+              color: const Color(0xFF222222),
               borderRadius: BorderRadius.circular(8),
             ),
           ),
+
+          // link field
           TextField(
             readOnly: true,
             decoration: InputDecoration(
@@ -51,7 +54,10 @@ class ShareBottomSheet extends StatelessWidget {
               ),
             ),
           ),
+
           SizedBox(height: 20.h),
+
+          // grid
           GridView.builder(
             shrinkWrap: true,
             physics: const NeverScrollableScrollPhysics(),
@@ -67,7 +73,16 @@ class ShareBottomSheet extends StatelessWidget {
               return Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Image.asset(item['icon']!, width: 55.w),
+                  // FIXED SIZE ICON CONTAINER
+                  Container(
+                    width: 55.w,
+                    height: 55.w,
+                    alignment: Alignment.center,
+                    child: Image.asset(
+                      item['icon']!,
+                      fit: BoxFit.contain,
+                    ),
+                  ),
                   SizedBox(height: 8.h),
                   Text(
                     item['title']!,
@@ -78,26 +93,32 @@ class ShareBottomSheet extends StatelessWidget {
               );
             },
           ),
+
           const SizedBox(height: 20),
+
+          // page indicator
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: List.generate(
               4,
-              (index) => Container(
+                  (index) => Container(
                 margin: const EdgeInsets.symmetric(horizontal: 3),
                 width: 8.w,
                 height: 8.h,
                 decoration: BoxDecoration(
-                  color: index == 0 ? Color(0xFF676363) : Colors.white,
-                  border: Border.all(color: Color(0xFF676363)),
+                  color: index == 0
+                      ? const Color(0xFF676363)
+                      : Colors.white,
+                  border: Border.all(color: const Color(0xFF676363)),
                   shape: BoxShape.circle,
                 ),
               ),
             ),
           ),
+
           SizedBox(height: 10.h),
         ],
       ),
     );
   }
-}
+}

lib/attractions/blocs/attractions_bloc.dart

@@ -1,34 +1,70 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../models/attraction_model.dart';
 import '../repository/attractions_repository.dart';
-
-part 'attractions_event.dart';
-part 'attractions_state.dart';
+import 'attractions_event.dart';
+import 'attractions_state.dart';
 
 class AttractionsBloc extends Bloc<AttractionsEvent, AttractionsState> {
   final AttractionsRepository repository;
 
-  AttractionsBloc(this.repository) : super(AttractionsInitial()) {
-    on<LoadAttractions>((event, emit) {
-      final attractions = repository.fetchAttractions();
-      emit(AttractionsLoaded(attractions));
-    });
-
-    on<LoadMyPassAttraction>((event, emit) {
-      final attractions = repository.fetchMyPassAttraction();
-      emit(AttractionsLoaded(attractions));
-    });
-
-    on<SearchAttractions>((event, emit) {
-      if (state is AttractionsLoaded) {
-        final currentState = state as AttractionsLoaded;
-        final filtered = currentState.attractions
-            .where((a) =>
-        a.title.toLowerCase().contains(event.query.toLowerCase()) ||
-            a.location.toLowerCase().contains(event.query.toLowerCase()))
-            .toList();
-        emit(AttractionsLoaded(filtered));
-      }
-    });
+  AttractionsBloc({required this.repository}) : super(AttractionsInitial()) {
+    on<FetchAttractionsByCategory>(_onFetchAttractionsByCategory);
+    on<SearchAttractions>(_onSearchAttractions);
   }
-}
+
+  Future<void> _onFetchAttractionsByCategory(
+      FetchAttractionsByCategory event,
+      Emitter<AttractionsState> emit,
+      ) async {
+    emit(AttractionsLoading());
+
+    try {
+      final AttractionsResponse response =
+      await repository.fetchAttractionsByCategory(
+        categoryXid: event.categoryXid,
+      );
+
+      final allAttractions = response.attractions ?? [];
+
+      emit(
+        AttractionsLoaded(
+          attractions: allAttractions,
+          allAttractions: allAttractions,
+          categories: response.categories ?? [],
+          selectedCategoryId: event.categoryXid,
+          searchQuery: '',
+        ),
+      );
+    } catch (e) {
+      emit(AttractionsError(e.toString()));
+    }
+  }
+
+  void _onSearchAttractions(
+      SearchAttractions event,
+      Emitter<AttractionsState> emit,
+      ) {
+    final currentState = state;
+    if (currentState is! AttractionsLoaded) return;
+
+    final query = event.query.trim().toLowerCase();
+
+    final filtered = query.isEmpty
+        ? currentState.allAttractions
+        : currentState.allAttractions.where((attraction) {
+      final name = (attraction.title ?? '').toLowerCase();
+      final description = (attraction.description ?? '').toLowerCase();
+      return name.contains(query) || description.contains(query);
+    }).toList();
+
+    emit(
+      AttractionsLoaded(
+        attractions: filtered,
+        allAttractions: currentState.allAttractions,
+        categories: currentState.categories,
+        selectedCategoryId: currentState.selectedCategoryId,
+        searchQuery: event.query,
+      ),
+    );
+  }
+}

lib/attractions/blocs/attractions_event.dart

@@ -1,12 +1,26 @@
-part of 'attractions_bloc.dart';
+import 'package:equatable/equatable.dart';
 
-abstract class AttractionsEvent {}
+abstract class AttractionsEvent extends Equatable {
+  const AttractionsEvent();
 
-class LoadAttractions extends AttractionsEvent {}
+  @override
+  List<Object?> get props => [];
+}
 
-class LoadMyPassAttraction extends AttractionsEvent {}
+class FetchAttractionsByCategory extends AttractionsEvent {
+  final int? categoryXid;
+
+  const FetchAttractionsByCategory({this.categoryXid});
+
+  @override
+  List<Object?> get props => [categoryXid];
+}
 
 class SearchAttractions extends AttractionsEvent {
   final String query;
-  SearchAttractions(this.query);
-}
+
+  const SearchAttractions(this.query);
+
+  @override
+  List<Object?> get props => [query];
+}

lib/attractions/blocs/attractions_state.dart

@@ -1,10 +1,47 @@
-part of 'attractions_bloc.dart';
+import 'package:equatable/equatable.dart';
+import '../models/attraction_model.dart';
 
-abstract class AttractionsState {}
+abstract class AttractionsState extends Equatable {
+  const AttractionsState();
+
+  @override
+  List<Object?> get props => [];
+}
 
 class AttractionsInitial extends AttractionsState {}
 
+class AttractionsLoading extends AttractionsState {}
+
 class AttractionsLoaded extends AttractionsState {
   final List<Attraction> attractions;
-  AttractionsLoaded(this.attractions);
+  final List<Attraction> allAttractions; // Keep full list for local filtering
+  final List<Category> categories;
+  final int? selectedCategoryId;
+  final String searchQuery;
+
+  const AttractionsLoaded({
+    required this.attractions,
+    required this.allAttractions,
+    required this.categories,
+    this.selectedCategoryId,
+    this.searchQuery = '',
+  });
+
+  @override
+  List<Object?> get props => [
+    attractions,
+    allAttractions,
+    categories,
+    selectedCategoryId,
+    searchQuery,
+  ];
 }
+
+class AttractionsError extends AttractionsState {
+  final String message;
+
+  const AttractionsError(this.message);
+
+  @override
+  List<Object?> get props => [message];
+}

lib/attractions/models/attraction_model.dart

@@ -1,19 +1,299 @@
+/* -------------------- RESPONSE -------------------- */
+
+class AttractionsResponse {
+  final List<Attraction> attractions;
+  final List<Category> categories;
+
+  AttractionsResponse({
+    required this.attractions,
+    required this.categories,
+  });
+
+  factory AttractionsResponse.fromJson(Map<String, dynamic> json) {
+    return AttractionsResponse(
+      attractions: (json['attractions'] as List<dynamic>?)
+          ?.map((e) => Attraction.fromJson(e))
+          .toList() ??
+          [],
+      categories: (json['categories'] as List<dynamic>?)
+          ?.map((e) => Category.fromJson(e))
+          .toList() ??
+          [],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'attractions': attractions.map((e) => e.toJson()).toList(),
+      'categories': categories.map((e) => e.toJson()).toList(),
+    };
+  }
+}
+
+/* -------------------- ATTRACTION -------------------- */
+
 class Attraction {
+  final int id;
   final String title;
-  final String location;
-  final String price;
-  final String image;
-  final List<String> tags;
-  final bool isBookingRequired;
   final String description;
+  final String urlSlug;
+  final num cityXid;
+  final num cardTypeXid;
+  final num partnerXid;
+  final String productCode;
+
+  final bool isBookingRequired;
+  final bool isPartnerAccess;
+  final String bookingEmail;
+  final String bookingPhoneNumber;
+
+  final num latitudeCoordinate;
+  final num longitudeCoordinate;
+  final String address;
+
+  final num? ticketPriceAdult;
+  final num? ticketPriceChild;
+  final num durations;
+  final num groupSize;
+  final String ageRange;
+
+  final String seoTitle;
+  final String seoDescription;
+  final String attractionStatus;
+  final bool isActive;
+
+  final String createdAt;
+  final String updatedAt;
+
+  final List<CardModel> cards;
+  final List<Category> categories;
+  final List<Gallery> galleries;
 
   Attraction({
+    required this.id,
     required this.title,
-    required this.location,
-    required this.price,
-    required this.image,
-    required this.tags,
+    required this.description,
+    required this.urlSlug,
+    required this.cityXid,
+    required this.cardTypeXid,
+    required this.partnerXid,
+    required this.productCode,
     required this.isBookingRequired,
-    required this.description
+    required this.isPartnerAccess,
+    required this.bookingEmail,
+    required this.bookingPhoneNumber,
+    required this.latitudeCoordinate,
+    required this.longitudeCoordinate,
+    required this.address,
+    this.ticketPriceAdult,
+    this.ticketPriceChild,
+    required this.durations,
+    required this.groupSize,
+    required this.ageRange,
+    required this.seoTitle,
+    required this.seoDescription,
+    required this.attractionStatus,
+    required this.isActive,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.cards,
+    required this.categories,
+    required this.galleries,
   });
+
+  factory Attraction.fromJson(Map<String, dynamic> json) {
+    return Attraction(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? '',
+      description: json['description'] ?? '',
+      urlSlug: json['urlSlug'] ?? '',
+      cityXid: json['cityXid'] ?? 0,
+      cardTypeXid: json['cardTypeXid'] ?? 0,
+      partnerXid: json['partnerXid'] ?? 0,
+      productCode: json['productCode'] ?? '',
+      isBookingRequired: json['isBookingRequired'] ?? false,
+      isPartnerAccess: json['isPartnerAccess'] ?? false,
+      bookingEmail: json['bookingEmail'] ?? '',
+      bookingPhoneNumber: json['bookingPhonenumber'] ?? '',
+      latitudeCoordinate: (json['latitudeCoordinate'] as num?) ?? 0,
+      longitudeCoordinate: (json['longitudeCoordinate'] as num?) ?? 0,
+      address: json['address'] ?? '',
+      ticketPriceAdult: json['ticketPriceAdult'] as num?,
+      ticketPriceChild: json['ticketPriceChild'] as num?,
+      durations: json['durations'] ?? 0,
+      groupSize: json['groupSize'] ?? 0,
+      ageRange: json['ageRange'] ?? '',
+      seoTitle: json['seoTitle'] ?? '',
+      seoDescription: json['seoDescription'] ?? '',
+      attractionStatus: json['attractionStatus'] ?? '',
+      isActive: json['isActive'] ?? false,
+      createdAt: json['createdAt'] ?? '',
+      updatedAt: json['updatedAt'] ?? '',
+      cards: (json['cards'] as List<dynamic>?)
+          ?.map((e) => CardModel.fromJson(e))
+          .toList() ??
+          [],
+      categories: (json['categories'] as List<dynamic>?)
+          ?.map((e) => Category.fromJson(e))
+          .toList() ??
+          [],
+      galleries: (json['galleries'] as List<dynamic>?)
+          ?.map((e) => Gallery.fromJson(e))
+          .toList() ??
+          [],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'title': title,
+      'description': description,
+      'urlSlug': urlSlug,
+      'cityXid': cityXid,
+      'cardTypeXid': cardTypeXid,
+      'partnerXid': partnerXid,
+      'productCode': productCode,
+      'isBookingRequired': isBookingRequired,
+      'isPartnerAccess': isPartnerAccess,
+      'bookingEmail': bookingEmail,
+      'bookingPhonenumber': bookingPhoneNumber,
+      'latitudeCoordinate': latitudeCoordinate,
+      'longitudeCoordinate': longitudeCoordinate,
+      'address': address,
+      'ticketPriceAdult': ticketPriceAdult,
+      'ticketPriceChild': ticketPriceChild,
+      'durations': durations,
+      'groupSize': groupSize,
+      'ageRange': ageRange,
+      'seoTitle': seoTitle,
+      'seoDescription': seoDescription,
+      'attractionStatus': attractionStatus,
+      'isActive': isActive,
+      'createdAt': createdAt,
+      'updatedAt': updatedAt,
+      'cards': cards.map((e) => e.toJson()).toList(),
+      'categories': categories.map((e) => e.toJson()).toList(),
+      'galleries': galleries.map((e) => e.toJson()).toList(),
+    };
+  }
+
+  /// 🟢 Helper: Cover image URL (UI-safe)
+  String get coverImageUrl {
+    if (galleries.isEmpty) return '';
+    return galleries
+        .firstWhere(
+          (g) => g.isCoverImage,
+      orElse: () => galleries.first,
+    )
+        .filePathUrl;
+  }
 }
+
+/* -------------------- CARD -------------------- */
+
+class CardModel {
+  final int id;
+  final String title;
+  final num cardTypeXid;
+  final num adultPrice;
+  final num childPrice;
+  final String cardStatus;
+
+  CardModel({
+    required this.id,
+    required this.title,
+    required this.cardTypeXid,
+    required this.adultPrice,
+    required this.childPrice,
+    required this.cardStatus,
+  });
+
+  factory CardModel.fromJson(Map<String, dynamic> json) {
+    return CardModel(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? '',
+      cardTypeXid: json['cardTypeXid'] ?? 0,
+      adultPrice: json['adultPrice'] ?? 0,
+      childPrice: json['childPrice'] ?? 0,
+      cardStatus: json['cardStatus'] ?? '',
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'title': title,
+      'cardTypeXid': cardTypeXid,
+      'adultPrice': adultPrice,
+      'childPrice': childPrice,
+      'cardStatus': cardStatus,
+    };
+  }
+}
+
+/* -------------------- GALLERY -------------------- */
+
+class Gallery {
+  final int id;
+  final String fileType;
+  final String filePathUrl;
+  final String altText;
+  final bool isCoverImage;
+
+  Gallery({
+    required this.id,
+    required this.fileType,
+    required this.filePathUrl,
+    required this.altText,
+    required this.isCoverImage,
+  });
+
+  factory Gallery.fromJson(Map<String, dynamic> json) {
+    return Gallery(
+      id: json['id'] ?? 0,
+      fileType: json['fileType'] ?? '',
+      filePathUrl: json['filePathUrl'] ?? '',
+      altText: json['altText'] ?? '',
+      isCoverImage: json['isCoverImage'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'fileType': fileType,
+      'filePathUrl': filePathUrl,
+      'altText': altText,
+      'isCoverImage': isCoverImage,
+    };
+  }
+
+  bool get hasImage => filePathUrl.isNotEmpty;
+}
+
+/* -------------------- CATEGORY -------------------- */
+
+class Category {
+  final int id;
+  final String categoryName;
+
+  Category({
+    required this.id,
+    required this.categoryName,
+  });
+
+  factory Category.fromJson(Map<String, dynamic> json) {
+    return Category(
+      id: json['id'] ?? 0,
+      categoryName: json['categoryName'] ?? '',
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'categoryName': categoryName,
+    };
+  }
+}

lib/attractions/repository/attractions_repository.dart

@@ -1,115 +1,26 @@
-import 'package:citycards_customer/common_packages/common_app_texts.dart';
-
+import 'package:citycards_customer/networkApiServices/api_urls.dart';
+import '../../networkApiServices/network_api_services.dart';
 import '../models/attraction_model.dart';
 
 class AttractionsRepository {
-  List<Attraction> fetchAttractions() {
-    return [
-      Attraction(
-        title: "Koh Rong Samloem",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_1.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: false,
-        description:
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Siem Reap",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_2.jpg",
-        tags: ["Unlimited Card"],
-        isBookingRequired: false,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Dart Palace",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_3.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: false,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Koh Rong Samloem",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_4.jpg",
-        tags: ["${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: false,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Dart Palace",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_5.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: false,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-    ];
-  }
+  final NetworkApiService _apiServices = NetworkApiService();
 
-  List<Attraction> fetchMyPassAttraction() {
-    return [
-      Attraction(
-        title: "Koh Rong Samloem",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_1.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: true,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Siem Reap",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_2.jpg",
-        tags: ["Unlimited Card"],
-        isBookingRequired: true,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Dart Palace",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_3.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: true,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Koh Rong Samloem",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_4.jpg",
-        tags: ["${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: true,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-      Attraction(
-        title: "Dart Palace",
-        location: "Krong Siem Reap",
-        price: "\$25",
-        image: "assets/dummy/dummy_5.jpg",
-        tags: ["Unlimited Card", "${CommonAppText.selectiveCard} Card"],
-        isBookingRequired: true,
-        description:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis. Proin sed aliquet rhoncus ut pellentesque ullamcorper sit eget ac.Sit nisi, cras amet varius eget egestas pellentesque. Cursus gravida euismod non... ",
-      ),
-    ];
+  /// Fetch attractions by categoryXid (optional)
+  Future<AttractionsResponse> fetchAttractionsByCategory({
+    int? categoryXid, // Make it nullable
+  }) async {
+    try {
+      // Build URL with or without categoryXid
+      String url = ApiUrls.attractionsList;
+      if (categoryXid != null) {
+        url = '$url?categoryXid=$categoryXid';
+      }
+
+      final response = await _apiServices.getApi(url: url);
+
+      return AttractionsResponse.fromJson(response.data);
+    } catch (e) {
+      throw Exception('Failed to fetch attractions: $e');
+    }
   }
-}
+}

lib/attractions/views/attractions_page_view.dart

@@ -3,8 +3,11 @@ import 'package:citycards_customer/common_packages/back_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+
 import '../../common_packages/custom_search_field.dart';
 import '../blocs/attractions_bloc.dart';
+import '../blocs/attractions_event.dart';
+import '../blocs/attractions_state.dart';
 import '../repository/attractions_repository.dart';
 import '../widget/attraction_card.dart';
 import '../widget/filter_chip.dart';
@@ -17,14 +20,13 @@ class AttractionsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (_) {
-        final bloc = AttractionsBloc(AttractionsRepository());
+        final bloc = AttractionsBloc(
+          repository: AttractionsRepository(),
+        );
 
-        // 🔥 Trigger event based on source
-        if (source == "home") {
-          bloc.add(LoadAttractions());
-        } else if (source == "qrPass") {
-          bloc.add(LoadMyPassAttraction());
-        }
+        bloc.add(
+          const FetchAttractionsByCategory(), // No categoryXid parameter
+        );
 
         return bloc;
       },
@@ -41,42 +43,72 @@ class AttractionsPage extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     // App bar
-                    CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true),
+                    CommonAppBar(
+                      isWhiteLogo: false,
+                      isProfilePage: false,
+                      showDivider: true,
+                    ),
                     backWidget(context, "Your Attraction", Colors.black),
                     const SizedBox(height: 20),
 
-                    // 🔍 Search field
+                    // 🔍 Search field (UI kept, logic disabled)
                     CommonSearchField(
                       hint: "Search attractions...",
                       hintColor: Colors.grey.shade500,
                       onChanged: (value) {
-                        if (value.isEmpty) {
-                          bloc.add(LoadAttractions());
-                        } else {
-                          bloc.add(SearchAttractions(value));
-                        }
+                        bloc.add(SearchAttractions(value));
                       },
                     ),
 
                     const SizedBox(height: 16),
 
-                    // 🏝️ Category chips row
-                    SingleChildScrollView(
-                      scrollDirection: Axis.horizontal,
-                      child: Row(
-                        children: [
-                          buildCategoryChip("Beach"),
-                          buildCategoryChip("Hike"),
-                          buildCategoryChip("Popular"),
-                          buildCategoryChip("Best in Summer"),
-                        ],
+                    // 🏖️ Category chips row - DYNAMIC
+                    if (state is AttractionsLoaded)
+                      SingleChildScrollView(
+                        scrollDirection: Axis.horizontal,
+                        child: Row(
+                          children: state.categories
+                              .map(
+                                (category) => buildCategoryChip(
+                              category.categoryName ?? '',
+                              isSelected: state.selectedCategoryId == category.id,
+                              onTap: () {
+                                bloc.add(
+                                  FetchAttractionsByCategory(
+                                    categoryXid: category.id,
+                                  ),
+                                );
+                              },
+                            ),
+                          )
+                              .toList(),
+                        ),
                       ),
-                    ),
+                    // else
+                    // // Show placeholder chips while loading
+                    //   SingleChildScrollView(
+                    //     scrollDirection: Axis.horizontal,
+                    //     child: Row(
+                    //       children: [
+                    //         buildCategoryChip("Beach", isSelected: true, onTap: () {}),
+                    //         buildCategoryChip("Hike", isSelected: false, onTap: () {}),
+                    //         buildCategoryChip("Adventure", isSelected: false, onTap: () {}),
+                    //         buildCategoryChip("Best in Summer", isSelected: false, onTap: () {}),
+                    //       ],
+                    //     ),
+                    //   ),
 
                     const SizedBox(height: 10),
 
-                    // 🏙️ Attraction list
-                    if (state is AttractionsLoaded)
+                    // 🙏️ Attraction list
+                    if (state is AttractionsLoading)
+                      const Center(
+                        child: Padding(
+                          padding: EdgeInsets.only(top: 60),
+                          child: CircularProgressIndicator(color: Color(0xffF95F62)),
+                        ),
+                      )
+                    else if (state is AttractionsLoaded)
                       state.attractions.isEmpty
                           ? Center(
                         child: Padding(
@@ -84,7 +116,7 @@ class AttractionsPage extends StatelessWidget {
                           child: Text(
                             "No attractions found",
                             style: TextStyle(
-                              color: Colors.grey[600],
+                              color: Colors.grey,
                               fontSize: 14.sp,
                             ),
                           ),
@@ -92,17 +124,28 @@ class AttractionsPage extends StatelessWidget {
                       )
                           : Column(
                         children: state.attractions
-                            .map((attraction) => AttractionCard(
-                                attraction: attraction))
+                            .map(
+                              (attraction) => AttractionCard(
+                            attraction: attraction,
+                          ),
+                        )
                             .toList(),
                       )
-                    else
-                      const Center(
-                        child: Padding(
-                          padding: EdgeInsets.only(top: 60),
-                          child: CircularProgressIndicator(),
-                        ),
-                      ),
+                    else if (state is AttractionsError)
+                        Center(
+                          child: Padding(
+                            padding: const EdgeInsets.only(top: 60),
+                            child: Text(
+                              state.message,
+                              style: TextStyle(
+                                color: Colors.red,
+                                fontSize: 14.sp,
+                              ),
+                            ),
+                          ),
+                        )
+                      else
+                        const SizedBox(),
                   ],
                 ),
               ),
@@ -112,4 +155,4 @@ class AttractionsPage extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/attractions/widget/attraction_card.dart

@@ -1,4 +1,6 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 import '../../common_packages/common_app_texts.dart';
 import '../../core/route_constants.dart';
@@ -10,64 +12,95 @@ class AttractionCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    /// CARD TITLES (instead of categories)
+    final List<String> tags = attraction.cards
+        .map((e) => e.title)
+        .where((e) => e.isNotEmpty)
+        .toList();
+
+    /// GALLERY IMAGE (handled safely in model)
+    final String imageUrl = attraction.coverImageUrl;
+
     return InkWell(
-      onTap: (){
-        Navigator.of(context).pushNamed(RouteConstants.attractionDetails);
+      onTap: () {
+        Navigator.of(context).pushNamed(
+          RouteConstants.attractionDetails,
+          arguments: attraction.id,
+        );
       },
       child: Container(
-        margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
-        padding: const EdgeInsets.all(12),
+        margin: EdgeInsets.symmetric(vertical: 8.h, horizontal: 8.w),
+        padding: EdgeInsets.all(12.w),
         decoration: BoxDecoration(
           border: Border.all(color: const Color(0xffFDCDCE)),
-          borderRadius: BorderRadius.circular(15),
-          color: Color(0xffFFF5F5),
+          borderRadius: BorderRadius.circular(15.r),
+          color: const Color(0xffFFF5F5),
         ),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
+            /// IMAGE (network with fallback)
             ClipRRect(
-              borderRadius: BorderRadius.circular(8),
-              child: Image.asset(
-                attraction.image,
-                height: 94,
-                width: 94,
+              borderRadius: BorderRadius.circular(8.r),
+              child: imageUrl.isNotEmpty
+                  ? CachedNetworkImage(
+                imageUrl: imageUrl,
+                height: 94.h,
+                width: 94.w,
                 fit: BoxFit.cover,
-              ),
+                placeholder: (context, url) => _imageFallback(),
+                errorWidget: (_, __, ___) => _imageFallback(),
+              )
+                  : _imageFallback(),
             ),
-            const SizedBox(width: 10),
+
+            SizedBox(width: 10.w),
+
+            /// CONTENT
             Expanded(
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
                     attraction.title,
-                    style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
-                  ),
-                  const SizedBox(height: 6),
-                  Text(
-                    attraction.location,
-                    style: GoogleFonts.poppins(
-                      fontSize: 12,
-                      fontWeight: FontWeight.w400,
-                      color: Color(0xff464646),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 16.sp,
+                      fontWeight: FontWeight.w500,
                     ),
                   ),
-                  const SizedBox(height: 6),
+
+                  SizedBox(height: 6.h),
+
+                  Text(
+                    attraction.address,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: GoogleFonts.poppins(
+                      fontSize: 12.sp,
+                      fontWeight: FontWeight.w400,
+                      color: const Color(0xff464646),
+                    ),
+                  ),
+
+                  SizedBox(height: 6.h),
+
                   Text.rich(
                     TextSpan(
                       children: [
                         TextSpan(
-                          text: "from ${attraction.price}",
-                          style: const TextStyle(
-                            fontSize: 12,
+                          text: "\$${attraction.ticketPriceAdult}",
+                          style: TextStyle(
+                            fontSize: 12.sp,
                             fontWeight: FontWeight.w600,
                             color: Colors.black,
                           ),
                         ),
-                        const TextSpan(
+                        TextSpan(
                           text: "/person",
                           style: TextStyle(
-                            fontSize: 10,
+                            fontSize: 10.sp,
                             color: Colors.black,
                             fontWeight: FontWeight.w400,
                           ),
@@ -75,63 +108,47 @@ class AttractionCard extends StatelessWidget {
                       ],
                     ),
                   ),
-                  const SizedBox(height: 6),
-                  attraction.isBookingRequired == false
-                      ? Wrap(
-                          spacing: 6,
-                          children: attraction.tags
-                              .map(
-                                (tag) => Container(
-                                  padding: const EdgeInsets.symmetric(
-                                    horizontal: 10,
-                                    vertical: 4,
-                                  ),
-                                  decoration: BoxDecoration(
-                                    color: tag == "${CommonAppText.selectiveCard} Card"
-                                        ? const Color(0xffF95FAF).withOpacity(0.1)
-                                        : const Color(
-                                            0xffF95F62,
-                                          ).withOpacity(0.1),
-                                    border: Border.all(
-                                      color: tag == "${CommonAppText.selectiveCard} Card"
-                                          ? const Color(0xffF95FAF)
-                                          : const Color(0xffF95F62),
-                                    ),
-                                    borderRadius: BorderRadius.circular(20),
-                                  ),
-                                  child: Text(
-                                    tag,
-                                    style: GoogleFonts.poppins(
-                                      fontSize: 11,
-                                      color: Color(0xff1A1A1A),
-                                      fontWeight: FontWeight.w400,
-                                    ),
-                                  ),
-                                ),
-                              )
-                              .toList(),
-                        )
-                      : Container(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 10,
-                            vertical: 4,
+
+                  SizedBox(height: 6.h),
+                  /// TAGS (CARD TITLES)
+                  Wrap(
+                    spacing: 6.w,
+                    runSpacing: 6.h,
+                    children: tags
+                        .map(
+                          (tag) => Container(
+                        padding: EdgeInsets.symmetric(
+                          horizontal: 10.w,
+                          vertical: 4.h,
+                        ),
+                        decoration: BoxDecoration(
+                          color: tag ==
+                              "${CommonAppText.selectiveCard} Card"
+                              ? const Color(0xffF95FAF)
+                              .withOpacity(0.1)
+                              : const Color(0xffF95F62)
+                              .withOpacity(0.1),
+                          border: Border.all(
+                            color: tag ==
+                                "${CommonAppText.selectiveCard} Card"
+                                ? const Color(0xffF95FAF)
+                                : const Color(0xffF95F62),
                           ),
-                          decoration: BoxDecoration(
-                            color: Color(0xffC1D2F8),
-                            border: Border.all(
-                              color: Color(0xff2563EB),
-                            ),
-                            borderRadius: BorderRadius.circular(20),
-                          ),
-                          child: Text(
-                            "Booking Required",
-                            style: GoogleFonts.poppins(
-                              fontSize: 11,
-                              color: Color(0xff1A1A1A),
-                              fontWeight: FontWeight.w400,
-                            ),
+                          borderRadius:
+                          BorderRadius.circular(20.r),
+                        ),
+                        child: Text(
+                          tag,
+                          style: GoogleFonts.poppins(
+                            fontSize: 11.sp,
+                            color: const Color(0xff1A1A1A),
+                            fontWeight: FontWeight.w400,
                           ),
                         ),
+                      ),
+                    )
+                        .toList(),
+                  )
                 ],
               ),
             ),
@@ -140,4 +157,18 @@ class AttractionCard extends StatelessWidget {
       ),
     );
   }
+
+  /// SAME PLACEHOLDER AS BEFORE
+  Widget _imageFallback() {
+    return Container(
+      height: 94.h,
+      width: 94.w,
+      color: Colors.grey.shade200,
+      child: Icon(
+        Icons.image_not_supported_outlined,
+        size: 28.sp,
+        color: Colors.grey,
+      ),
+    );
+  }
 }

lib/attractions/widget/filter_chip.dart

@@ -1,20 +1,33 @@
-import "package:flutter/material.dart";
+import 'package:flutter/material.dart';
 
-Widget buildCategoryChip(String label) {
-  return Container(
-    margin: const EdgeInsets.only(right: 8),
-    padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-    decoration: BoxDecoration(
-      color: const Color(0xffF95F62),
-      borderRadius: BorderRadius.circular(40),
-    ),
-    child: Text(
-      label,
-      style: const TextStyle(
-        color: Colors.white,
-        fontSize: 13,
-        fontWeight: FontWeight.w500,
+Widget buildCategoryChip(
+    String label, {
+      required bool isSelected,
+      VoidCallback? onTap,
+    }) {
+  const Color redColor = Color(0xffF95F62);
+
+  return GestureDetector(
+    onTap: onTap,
+    child: Container(
+      margin: const EdgeInsets.only(right: 8),
+      padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 8),
+      decoration: BoxDecoration(
+        color: isSelected ? redColor : redColor.withValues(alpha: 0.15),
+        borderRadius: BorderRadius.circular(40),
+        border: Border.all(
+          color: redColor,
+          width: 1,
+        ),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: isSelected ? Colors.white : redColor,
+          fontSize: 13,
+          fontWeight: FontWeight.w500,
+        ),
       ),
     ),
   );
-}
+}

lib/buy_a_pass/bloc/buy_pass_bloc.dart

@@ -0,0 +1,111 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../repository/buy_pass_repository.dart';
+import 'buy_pass_event.dart';
+import 'buy_pass_state.dart';
+
+class BuyPassBloc extends Bloc<BuyPassEvent, BuyPassState> {
+  final BuyPassRepository repository;
+
+  BuyPassBloc({required this.repository}) : super(BuyPassInitial()) {
+    /// Handle fetch buy pass data event
+    on<FetchBuyPassData>(_onFetchBuyPassData);
+
+    /// Handle change selected card event
+    on<ChangeSelectedCard>(_onChangeSelectedCard);
+
+    /// Handle update adult count event
+    on<UpdateAdultCount>(_onUpdateAdultCount);
+
+    /// Handle update child count event
+    on<UpdateChildCount>(_onUpdateChildCount);
+
+    /// Handle update validity duration event
+    on<UpdateValidityDuration>(_onUpdateValidityDuration);
+    on<AddToCartLoading>((event, emit) {
+      if (state is BuyPassLoaded) {
+        emit((state as BuyPassLoaded).copyWith(isAddingToCart: true));
+      }
+    });
+
+    on<AddToCartDone>((event, emit) {
+      if (state is BuyPassLoaded) {
+        emit((state as BuyPassLoaded).copyWith(isAddingToCart: false));
+      }
+    });// ✅ Added
+  }
+
+  /// Fetch buy pass data from repository
+  Future<void> _onFetchBuyPassData(
+      FetchBuyPassData event,
+      Emitter<BuyPassState> emit,
+      ) async {
+    emit(BuyPassLoading());
+
+    try {
+      final data = await repository.fetchBuyPass();
+      emit(BuyPassLoaded(data: data));
+    } catch (e) {
+      emit(BuyPassError(e.toString()));
+    }
+  }
+
+  /// Change selected card
+  void _onChangeSelectedCard(
+      ChangeSelectedCard event,
+      Emitter<BuyPassState> emit,
+      ) {
+    if (state is BuyPassLoaded) {
+      final currentState = state as BuyPassLoaded;
+      final newCard = currentState.data.cards[event.cardIndex];
+
+      emit(currentState.copyWith(
+        selectedCardIndex: event.cardIndex,
+        adultCount: 1, // Reset counts when changing card
+        childCount: 1,
+        validityDuration: newCard.minNumber, // ✅ Reset to new card's minNumber
+      ));
+    }
+  }
+
+  /// Update adult count
+  void _onUpdateAdultCount(
+      UpdateAdultCount event,
+      Emitter<BuyPassState> emit,
+      ) {
+    if (state is BuyPassLoaded) {
+      final currentState = state as BuyPassLoaded;
+      if (event.count >= 0) {
+        emit(currentState.copyWith(adultCount: event.count));
+      }
+    }
+  }
+
+  /// Update child count
+  void _onUpdateChildCount(
+      UpdateChildCount event,
+      Emitter<BuyPassState> emit,
+      ) {
+    if (state is BuyPassLoaded) {
+      final currentState = state as BuyPassLoaded;
+      if (event.count >= 0) {
+        emit(currentState.copyWith(childCount: event.count));
+      }
+    }
+  }
+
+  /// Update validity duration (days/attractions)
+  void _onUpdateValidityDuration(
+      UpdateValidityDuration event,
+      Emitter<BuyPassState> emit,
+      ) {
+    if (state is BuyPassLoaded) {
+      final currentState = state as BuyPassLoaded;
+      final card = currentState.selectedCard;
+
+      // Validate that duration is within min and max range
+      if (event.duration >= card.minNumber && event.duration <= card.maxNumber) {
+        emit(currentState.copyWith(validityDuration: event.duration));
+      }
+    }
+  }
+}

lib/buy_a_pass/bloc/buy_pass_event.dart

@@ -0,0 +1,34 @@
+abstract class BuyPassEvent {}
+
+/// Event to fetch buy pass data from API
+class FetchBuyPassData extends BuyPassEvent {}
+
+/// Event to change the selected card pass
+class ChangeSelectedCard extends BuyPassEvent {
+  final int cardIndex;
+
+  ChangeSelectedCard(this.cardIndex);
+}
+
+/// Event to update adult count
+class UpdateAdultCount extends BuyPassEvent {
+  final int count;
+
+  UpdateAdultCount(this.count);
+}
+
+/// Event to update child count
+class UpdateChildCount extends BuyPassEvent {
+  final int count;
+
+  UpdateChildCount(this.count);
+}
+
+/// Event to update validity duration (days/attractions)
+class UpdateValidityDuration extends BuyPassEvent {
+  final int duration;
+
+  UpdateValidityDuration(this.duration);
+}
+class AddToCartLoading extends BuyPassEvent {}
+class AddToCartDone extends BuyPassEvent {}

lib/buy_a_pass/bloc/buy_pass_state.dart

@@ -0,0 +1,64 @@
+import '../models/buy_pass_model.dart';
+
+abstract class BuyPassState {}
+
+/// Initial state
+class BuyPassInitial extends BuyPassState {}
+
+/// Loading state
+class BuyPassLoading extends BuyPassState {}
+
+/// Success state with data
+class BuyPassLoaded extends BuyPassState {
+  final BuyPassModel data;
+  final int selectedCardIndex;
+  final int adultCount;
+  final int childCount;
+  final int validityDuration;
+  final bool isAddingToCart;
+
+  BuyPassLoaded({
+    required this.data,
+    this.selectedCardIndex = 0,
+    this.adultCount = 1,
+    this.childCount = 1,
+    int? validityDuration,
+    this.isAddingToCart = false, // ✅ default false, NOT required
+  }) : validityDuration = validityDuration ?? data.cards[selectedCardIndex].minNumber;
+
+  /// Method to copy state with updated values
+  BuyPassLoaded copyWith({
+    BuyPassModel? data,
+    int? selectedCardIndex,
+    int? adultCount,
+    int? childCount,
+    int? validityDuration,
+    bool? isAddingToCart,
+  }) {
+    return BuyPassLoaded(
+      data: data ?? this.data,
+      selectedCardIndex: selectedCardIndex ?? this.selectedCardIndex,
+      adultCount: adultCount ?? this.adultCount,
+      childCount: childCount ?? this.childCount,
+      validityDuration: validityDuration ?? this.validityDuration,
+      isAddingToCart: isAddingToCart ?? this.isAddingToCart,
+    );
+  }
+
+  /// Get currently selected card
+  CardPass get selectedCard => data.cards[selectedCardIndex];
+
+  /// Calculate total price
+  double get totalPrice {
+    final card = selectedCard;
+    return ((card.adultPrice * adultCount) + (card.childPrice * childCount)) *
+        validityDuration.toDouble();
+  }
+}
+
+/// Error state
+class BuyPassError extends BuyPassState {
+  final String message;
+
+  BuyPassError(this.message);
+}

lib/buy_a_pass/models/buy_pass_model.dart

@@ -0,0 +1,328 @@
+import 'dart:convert';
+
+/// ---------- MAIN RESPONSE MODEL ----------
+BuyPassModel buyPassModelFromJson(String str) =>
+    BuyPassModel.fromJson(json.decode(str));
+
+String buyPassModelToJson(BuyPassModel data) =>
+    json.encode(data.toJson());
+
+class BuyPassModel {
+  City city;
+  List<Offer> offers;
+  List<CardPass> cards;
+  List<Attraction> attractions;
+
+  BuyPassModel({
+    required this.city,
+    required this.offers,
+    required this.cards,
+    required this.attractions,
+  });
+
+  factory BuyPassModel.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return BuyPassModel(
+      city: City.fromJson(json['city']),
+      offers: json['offers'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['offers'])
+          .map((e) => Offer.fromJson(e))
+          .toList(),
+      cards: json['cards'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['cards'])
+          .map((e) => CardPass.fromJson(e))
+          .toList(),
+      attractions: json['attractions'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['attractions'])
+          .map((e) => Attraction.fromJson(e))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "city": city.toJson(),
+    "offers": offers.map((e) => e.toJson()).toList(),
+    "cards": cards.map((e) => e.toJson()).toList(),
+    "attractions": attractions.map((e) => e.toJson()).toList(),
+  };
+}
+
+/// ---------- CITY ----------
+class City {
+  int id;
+  String name;
+  String slug;
+  String tagLine;
+  String description;
+  String bestTimeToVisit;
+  String priceRange;
+  num individualTicketAmount;
+  num cityCardTicketAmount;
+  HeroBanner heroBanner;
+
+  City({
+    required this.id,
+    required this.name,
+    required this.slug,
+    required this.tagLine,
+    required this.description,
+    required this.bestTimeToVisit,
+    required this.priceRange,
+    required this.individualTicketAmount,
+    required this.cityCardTicketAmount,
+    required this.heroBanner,
+  });
+
+  factory City.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return City(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      name: json['name']?.toString() ?? "",
+      slug: json['slug']?.toString() ?? "",
+      tagLine: json['tagLine']?.toString() ?? "",
+      description: json['description']?.toString() ?? "",
+      bestTimeToVisit: json['bestTimeToVisit']?.toString() ?? "",
+      priceRange: json['priceRange']?.toString() ?? "",
+      individualTicketAmount: json['individualTicketAmount'] ?? 0,
+      cityCardTicketAmount: json['cityCardTicketAmount'] ?? 0,
+      heroBanner: HeroBanner.fromJson(json['heroBanner']),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "name": name,
+    "slug": slug,
+    "tagLine": tagLine,
+    "description": description,
+    "bestTimeToVisit": bestTimeToVisit,
+    "priceRange": priceRange,
+    "individualTicketAmount": individualTicketAmount,
+    "cityCardTicketAmount": cityCardTicketAmount,
+    "heroBanner": heroBanner.toJson(),
+  };
+}
+
+/// ---------- HERO BANNER ----------
+class HeroBanner {
+  String title;
+  String image;
+
+  HeroBanner({
+    required this.title,
+    required this.image,
+  });
+
+  factory HeroBanner.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return HeroBanner(
+      title: json['title']?.toString() ?? "",
+      image: json['image']?.toString() ?? "",
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "title": title,
+    "image": image,
+  };
+}
+
+/// ---------- OFFER ----------
+class Offer {
+  int id;
+  String title;
+  String offerCode;
+  String description;
+  String redemptionLink;
+  String websiteBannerImage;
+  String mobileBannerImage;
+  String passType;
+  DateTime startDateTime;
+  DateTime endDateTime;
+  String offerStatus;
+  bool applyToPasses;
+
+  Offer({
+    required this.id,
+    required this.title,
+    required this.offerCode,
+    required this.description,
+    required this.redemptionLink,
+    required this.websiteBannerImage,
+    required this.mobileBannerImage,
+    required this.passType,
+    required this.startDateTime,
+    required this.endDateTime,
+    required this.offerStatus,
+    required this.applyToPasses,
+  });
+
+  factory Offer.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return Offer(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      title: json['title']?.toString() ?? "",
+      offerCode: json['offerCode']?.toString() ?? "",
+      description: json['description']?.toString() ?? "",
+      redemptionLink: json['redemptionLink']?.toString() ?? "",
+      websiteBannerImage: json['websiteBannerImage']?.toString() ?? "",
+      mobileBannerImage: json['mobileBannerImage']?.toString() ?? "",
+      passType: json['passType']?.toString() ?? "",
+      startDateTime: DateTime.tryParse(json['startDateTime'] ?? "") ??
+          DateTime.fromMillisecondsSinceEpoch(0),
+      endDateTime: DateTime.tryParse(json['endDateTime'] ?? "") ??
+          DateTime.fromMillisecondsSinceEpoch(0),
+      offerStatus: json['offerStatus']?.toString() ?? "",
+      applyToPasses: json['applyToPasses'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "title": title,
+    "offerCode": offerCode,
+    "description": description,
+    "redemptionLink": redemptionLink,
+    "websiteBannerImage": websiteBannerImage,
+    "mobileBannerImage": mobileBannerImage,
+    "passType": passType,
+    "startDateTime": startDateTime.toIso8601String(),
+    "endDateTime": endDateTime.toIso8601String(),
+    "offerStatus": offerStatus,
+    "applyToPasses": applyToPasses,
+  };
+}
+
+/// ---------- CARD PASS ----------
+class CardPass {
+  int id;
+  String title;
+  String description;
+  int validityDuration;
+  num adultPrice;
+  num childPrice;
+  int minNumber;
+  int maxNumber;
+  CardType cardType;
+  List<Offer> offers;
+
+  CardPass({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.validityDuration,
+    required this.adultPrice,
+    required this.childPrice,
+    required this.minNumber,
+    required this.maxNumber,
+    required this.cardType,
+    required this.offers,
+  });
+
+  factory CardPass.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return CardPass(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      title: json['title']?.toString() ?? "",
+      description: json['description']?.toString() ?? "",
+      validityDuration: (json['validityDuration'] as num?)?.toInt() ?? 0,
+      adultPrice: json['adultPrice'] ?? 0,
+      childPrice: json['childPrice'] ?? 0,
+      minNumber: (json['minNumber'] as num?)?.toInt() ?? 0,
+      maxNumber: (json['maxNumber'] as num?)?.toInt() ?? 0,
+      cardType: CardType.fromJson(json['cardType']),
+      offers: json['offers'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['offers'])
+          .map((e) => Offer.fromJson(e))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "title": title,
+    "description": description,
+    "validityDuration": validityDuration,
+    "adultPrice": adultPrice,
+    "childPrice": childPrice,
+    "minNumber": minNumber,
+    "maxNumber": maxNumber,
+    "cardType": cardType.toJson(),
+    "offers": offers.map((e) => e.toJson()).toList(),
+  };
+}
+
+/// ---------- CARD TYPE ----------
+class CardType {
+  int id;
+  String name;
+  String displayName;
+
+  CardType({
+    required this.id,
+    required this.name,
+    required this.displayName,
+  });
+
+  factory CardType.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return CardType(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      name: json['name']?.toString() ?? "",
+      displayName: json['displayName']?.toString() ?? "",
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "name": name,
+    "displayName": displayName,
+  };
+}
+
+/// ---------- ATTRACTION ----------
+class Attraction {
+  int id;
+  String title;
+  String slug;
+  String thumbnail;
+  num startingFrom;
+
+  Attraction({
+    required this.id,
+    required this.title,
+    required this.slug,
+    required this.thumbnail,
+    required this.startingFrom,
+  });
+
+  factory Attraction.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return Attraction(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      title: json['title']?.toString() ?? "",
+      slug: json['slug']?.toString() ?? "",
+      thumbnail: json['thumbnail']?.toString() ?? "",
+      startingFrom: json['startingFrom'] ?? 0,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "title": title,
+    "slug": slug,
+    "thumbnail": thumbnail,
+    "startingFrom": startingFrom,
+  };
+}

lib/buy_a_pass/models/checkout_model.dart

@@ -0,0 +1,43 @@
+/// Model to pass checkout data from Buy Pass screen to Checkout screen
+import 'package:flutter/material.dart';
+
+class CheckoutData {
+  final String cityName;
+  final String heroImage;
+  final String cardTypeName; // "unlimited_card" or "selective_pass"
+  final String cardDisplayName; // "Unlimited" or "Selective"
+  final Color themeColor;
+  final int adultCount;
+  final int childCount;
+  final num adultPrice;        // Changed from double to num
+  final num childPrice;        // Changed from double to num
+  final int validityDuration; // Days or attractions count
+  final num totalPrice;        // Changed from double to num
+  final String? description;
+
+  CheckoutData({
+    required this.cityName,
+    required this.heroImage,
+    required this.cardTypeName,
+    required this.cardDisplayName,
+    required this.themeColor,
+    required this.adultCount,
+    required this.childCount,
+    required this.adultPrice,
+    required this.childPrice,
+    required this.validityDuration,
+    required this.totalPrice,
+    this.description,
+  });
+
+  // Calculate quantity (total adults + children)
+  int get totalQuantity => adultCount + childCount;
+
+  // Check if it's unlimited card
+  bool get isUnlimitedCard => cardTypeName == "unlimited_card";
+
+  // Get validity label
+  String get validityLabel => isUnlimitedCard
+      ? "$validityDuration Days"
+      : "$validityDuration Attractions";
+}

lib/buy_a_pass/repository/buy_pass_repository.dart

@@ -0,0 +1,54 @@
+import 'package:citycards_customer/localPreference/local_preference.dart';
+import '../models/buy_pass_model.dart';
+import '../../networkApiServices/network_api_services.dart';
+import '../../networkApiServices/api_urls.dart';
+
+class BuyPassRepository {
+  final NetworkApiService _apiService = NetworkApiService();
+
+  /// Fetch Buy A Pass data using selected cityId
+  Future<BuyPassModel> fetchBuyPass() async {
+    final int cityId = await LocalPreference.getSelectedCityId();
+
+    final response = await _apiService.getApi(
+      url: '${ApiUrls.buyAPass}/$cityId',
+    );
+
+    return BuyPassModel.fromJson(response.data);
+  }
+
+  /// Add Passes to Cart
+  Future<Map<String, dynamic>> addToCartPasses({
+    required int cityXid,
+    required int cardTypeXid,
+    required int cardXid,
+    required String cardMode, // flexi / fixed
+    required int totalAdult,
+    required int totalChild,
+    required int noOfAttractions,
+    required int noOfDays,
+    required double baseAmount,
+  }) async {
+    try {
+      final response = await _apiService.postApi(
+        url: ApiUrls.addToCartPasses,
+        data: {
+          "cityXid": cityXid,
+          "cardTypeXid": cardTypeXid,
+          "cardXid": cardXid,
+          "cardMode": cardMode,
+          "totalAdult": totalAdult,
+          "totalChild": totalChild,
+          "baseAmount": baseAmount,
+          "taxAmount": 2, // Fixed tax amount
+          "noOfAttractions": noOfAttractions,
+          "noOfDays": noOfDays,
+        },
+      );
+
+      return response.data as Map<String, dynamic>;
+    } catch (e) {
+      throw Exception('Failed to add passes to cart: $e');
+    }
+  }
+}

lib/buy_a_pass/view/buy_pass_view.dart

@@ -6,229 +6,501 @@ import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/core/route_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-import '../../common_packages/common_app_texts.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../networkApiServices/api_urls.dart';
+import '../bloc/buy_pass_bloc.dart';
+import '../bloc/buy_pass_event.dart';
+import '../bloc/buy_pass_state.dart';
+import '../repository/buy_pass_repository.dart';
 
 class BuyPassView extends StatelessWidget {
-  BuyPassView({super.key});
+  const BuyPassView({super.key});
 
-  final availableAttraction = [
-    {"image": "assets/images/aa1.png", "name": "Mystic Falls"},
-    {"image": "assets/images/aa2.png", "name": "Whispering Pines"},
-    {"image": "assets/images/aa3.png", "name": "Enchanted Oasis"},
-    {"image": "assets/images/aa4.png", "name": "Serenity Cove"},
-  ];
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => BuyPassBloc(repository: BuyPassRepository())
+        ..add(FetchBuyPassData()),
+      child: const BuyPassContent(),
+    );
+  }
+}
 
-  final offers = [
-    {
-      "image": "assets/images/aa1.png",
-      "title": "Astor Hotels Ultra Deluxe",
-      "description": "15% Discount on all treatments for first-time clients",
-    },
-    {
-      "image": "assets/images/aa2.png",
-      "title": "Green Valley Spa Lux",
-      "description": "20% off on spa memberships and treatments",
-    },
-  ];
+class BuyPassContent extends StatefulWidget {
+  const BuyPassContent({super.key});
 
+  @override
+  State<BuyPassContent> createState() => _BuyPassContentState();
+}
+
+class _BuyPassContentState extends State<BuyPassContent> {
+  late PageController _pageController;@override
+  void initState() {
+    super.initState();
+    _pageController = PageController(viewportFraction: 0.85);
+  }
+
+  @override
+  void dispose() {
+    _pageController.dispose();
+    super.dispose();
+  }
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
       body: SafeArea(
-        child: SingleChildScrollView(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.0.w),
-                child: CommonAppBar(isWhiteLogo: false, isProfilePage: true,showDivider: true,),
-              ),
-
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.0.w),
-                child: Row(
-                  children: [
-                    GestureDetector(
-                      onTap: () {
-                        Navigator.pop(context);
-                      },
-                      child: Icon(Icons.arrow_back),
-                    ),
-                    SizedBox(width: 8.w),
-                    CustomText(text: "Buy a Pass", size: 12.sp),
-                  ],
-                ),
-              ),
-
-              SizedBox(height: 22.h),
-
-              Padding(
-                padding: EdgeInsets.only(left: 20.0.w),
-                child: SingleChildScrollView(
-                  scrollDirection: Axis.horizontal,
-                  child: Row(
-                    children: [
-                      PassCardView(themeColor: Color(0xFFF97316)),
-                      SizedBox(width: 12.w),
-                      PassCardView(themeColor: Color(0xFF1E8AF6),),
-                    ],
-                  ),
-                ),
-              ),
-
-              SizedBox(height: 40.h),
-              FeatureTable(),
-              SizedBox(height: 30.h),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.w),
-                child: Divider(color: Colors.black.withOpacity(0.1)),
-              ),
-              SizedBox(height: 30.h),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.0.w),
-                child: CustomText(text: "Available Attractions", size: 18.sp),
-              ),
-              SizedBox(height: 12.h),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.w),
-                child: SingleChildScrollView(
-                  scrollDirection: Axis.horizontal,
-                  child: Row(
-                    children: [
-                      ...availableAttraction.map((item) {
-                        return Padding(
-                          padding: EdgeInsets.only(right: 12.w),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Container(
-                                height: 104.h,
-                                width: 104.w,
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(8.r),
-                                ),
-                                child: ClipRRect(
-                                  borderRadius: BorderRadius.circular(8.r),
-                                  child: Image.asset(
-                                    item["image"]!,
-                                    fit: BoxFit.cover,
-                                  ),
-                                ),
-                              ),
-
-                              CustomText(text: item["name"]!, size: 12.sp),
-                            ],
-                          ),
-                        );
-                      }),
-                    ],
-                  ),
-                ),
-              ),
-              SizedBox(height: 20.h),
-
-              Align(
-                alignment: Alignment.center,
-                child: CustomText(
-                  text: "View All",
-                  size: 12.sp,
+        child: BlocBuilder<BuyPassBloc, BuyPassState>(
+          builder: (context, state) {
+            if (state is BuyPassLoading) {
+              return const Center(
+                child: CircularProgressIndicator(
                   color: Color(0xFFF95F62),
                 ),
-              ),
-              SizedBox(height: 30.h),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.w),
-                child: Divider(color: Colors.black.withOpacity(0.1)),
-              ),
-              SizedBox(height: 40.h),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20.w),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              );
+            }
+
+            if (state is BuyPassError) {
+              return Center(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    CustomText(text: "Card Offers", size: 18.sp),
-                    GestureDetector(
-                      onTap: (){
-                        Navigator.pushNamed(context,RouteConstants.searchOffer);
+                    Icon(Icons.error_outline, size: 60.sp, color: Colors.red),
+                    SizedBox(height: 16.h),
+                    CustomText(
+                      text: "Error loading data",
+                      size: 16.sp,
+                      color: Colors.red,
+                    ),
+                    SizedBox(height: 8.h),
+                    CustomText(
+                      text: state.message,
+                      size: 12.sp,
+                      color: Colors.grey,
+                    ),
+                    SizedBox(height: 20.h),
+                    ElevatedButton(
+                      onPressed: () {
+                        context.read<BuyPassBloc>().add(FetchBuyPassData());
                       },
-                      child: CustomText(
-                        text: "View All",
-                        size: 14.sp,
-                        color: Color(0xFFFF5757),
-                      ),
+                      child: const Text("Retry"),
                     ),
                   ],
                 ),
-              ),
-              SizedBox(height: 16.h),
-              Container(
-                height: 262.h,
-                padding: EdgeInsets.symmetric(horizontal: 20.w),
-                child: GridView.builder(
-                  physics: NeverScrollableScrollPhysics(),
-                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                    crossAxisCount: 2,
-                    crossAxisSpacing: 16.w,
-                    childAspectRatio: 0.66,
-                  ),
-                  itemCount: 2,
-                  itemBuilder: (context, index) {
-                    final offer = offers[index];
-                    return Container(
-                      padding: EdgeInsets.symmetric(
-                        horizontal: 6.w,
-                        vertical: 6.h,
+              );
+            }
+
+            if (state is BuyPassLoaded) {
+              final data = state.data;
+              final selectedCard = state.selectedCard;
+
+              return SingleChildScrollView(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.0.w),
+                      child: CommonAppBar(
+                        isWhiteLogo: false,
+                        isProfilePage: true,
+                        showDivider: true,
                       ),
-                      decoration: BoxDecoration(
-                        border: Border.all(
-                          color: Color(0xFFF95F62).withOpacity(.24),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.0.w),
+                      child: GestureDetector(
+                        onTap: () {
+                          Navigator.pop(context);
+                        },
+                        child: Row(
+                          children: [
+                            const Icon(Icons.arrow_back),
+                            SizedBox(width: 8.w),
+                            CustomText(text: "Buy a Card", size: 12.sp),
+                          ],
                         ),
-                        borderRadius: BorderRadius.circular(12.sp),
                       ),
-                      child: Column(
-                        children: [
-                          ClipRRect(
-                            borderRadius: BorderRadius.circular(8.sp),
-                            child: Image.asset(
-                              offer["image"] ?? "",
-                              width: double.infinity,
-                              height: 120.5.h,
-                              fit: BoxFit.cover,
+                    ),
+                    SizedBox(height: 22.h),
+
+                    // Pass Cards Horizontal List
+                    // Pass Cards Horizontal List
+                    SizedBox(
+                      height: 140.h,
+                      child: PageView.builder(
+                        controller: PageController(viewportFraction: 0.92),
+                        itemCount: data.cards.length,
+                        onPageChanged: (index) {
+                          context.read<BuyPassBloc>().add(ChangeSelectedCard(index));
+                        },
+                        itemBuilder: (context, index) {
+                          final card = data.cards[index];
+                          return Padding(
+                            padding: EdgeInsets.symmetric(horizontal: 8.w),
+                            child: PassCardView(
+                              themeColor: card.cardType.name == "selective_pass"
+                                  ? const Color(0xFFF95FAF)
+                                  : const Color(0xFFF95F62),
+                              city: data.city.name,
+                              heroImage: data.city.heroBanner.image,
+                              adultPrice: card.adultPrice,
+                              childPrice: card.childPrice,
+                              cardType: card.cardType.displayName,
+                              description: card.description,
+                              isSelected: false,
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+
+                    SizedBox(height: 30.h),
+
+                    // Payment Card
+                    // ✅ UPDATED PAYMENT CARD SECTION IN buy_pass_view.dart
+// Replace the existing PaymentCard widget (around line 154) with this:
+
+                    Center(
+                      child: PaymentCard(
+                        city: data.city.name,
+                        heroImage: data.city.heroBanner.image,
+                        cardType: selectedCard.cardType.name,
+                        cardDisplayName: selectedCard.cardType.displayName,
+                        themeColor: selectedCard.cardType.name == "selective_pass"
+                            ? Color(0xFFF95FAF)   // pink for flexi/selective pass
+                            : Color(0xFFF95F62),
+                        adultPrice: selectedCard.adultPrice.toDouble(),
+                        childPrice: selectedCard.childPrice.toDouble(),
+                        adults: state.adultCount,
+                        children: state.childCount,
+                        totalPrice: state.totalPrice,
+                        minNumber: selectedCard.minNumber,
+                        maxNumber: selectedCard.maxNumber,
+                        selectedValue: state.validityDuration,
+                        description: selectedCard.description,
+                        // ✅ NEW: Add these 3 required parameters
+                        cityXid: data.city.id,
+                        cardTypeXid: selectedCard.cardType.id,
+                        cardXid: selectedCard.id,
+                        // ✅ END NEW PARAMETERS
+                        onAdultChanged: (count) {
+                          context.read<BuyPassBloc>().add(
+                            UpdateAdultCount(count),
+                          );
+                        },
+                        onChildChanged: (count) {
+                          context.read<BuyPassBloc>().add(
+                            UpdateChildCount(count),
+                          );
+                        },
+                        onValidityChanged: (duration) {
+                          context.read<BuyPassBloc>().add(
+                            UpdateValidityDuration(duration),
+                          );
+                        },
+                      ),
+                    ),
+
+                    SizedBox(height: 20.h),
+                    FeatureTable(),
+                    SizedBox(height: 30.h),
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.w),
+                      child: Divider(color: Colors.black.withOpacity(0.1)),
+                    ),
+                    SizedBox(height: 40.h),
+
+                    // Card Offers Section
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.w),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          CustomText(text: "Member Privileges", size: 18.sp),
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.pushNamed(
+                                  context, RouteConstants.searchOffer);
+                            },
+                            child: CustomText(
+                              text: "View All",
+                              size: 14.sp,
+                              color: Color(0xFFFF5757),
                             ),
-                          ),
-                          SizedBox(height: 8.h),
-                          CustomText(text: offer["title"] ?? "", size: 18.sp),
-                          SizedBox(height: 8.h),
-                          CustomText(
-                            text: offer["description"] ?? "",
-                            color: Colors.black.withOpacity(.6),
-                            size: 12.sp,
-                            maxLines: 2,
-                            overflow: TextOverflow.ellipsis,
                           ),
                         ],
                       ),
-                    );
-                  },
-                ),
-              ),
+                    ),
+                    SizedBox(height: 16.h),
 
-              SizedBox(height: 41.h),
-              Center(
-                child: PaymentCard(
-                  city: 'Melbourne',
-                  tag: '${CommonAppText.selectiveCard} Card',
-                  oldPrice: 120,
-                  newPrice: 90,
+                    // Offers Grid (from selected card's offers)
+                    if (selectedCard.offers.isNotEmpty)
+                      Container(
+                        height: 262.h,
+                        padding: EdgeInsets.symmetric(horizontal: 20.w),
+                        child: GridView.builder(
+                          physics: const NeverScrollableScrollPhysics(),
+                          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                            crossAxisCount: 2,
+                            crossAxisSpacing: 16.w,
+                            mainAxisSpacing: 22.h,
+                            childAspectRatio: 0.65,
+                          ),
+                          itemCount: selectedCard.offers.length > 2
+                              ? 2
+                              : selectedCard.offers.length,
+                          itemBuilder: (context, index) {
+                            final offer = selectedCard.offers[index];
+
+                            return GestureDetector(
+                              // onTap: () {
+                              //   Navigator.of(context).pushNamed(
+                              //     RouteConstants.offerPassDetail,
+                              //     arguments: offer.id, // ✅ pass offerId
+                              //   );
+                              // },
+                              child: Container(
+                                padding: EdgeInsets.symmetric(
+                                  horizontal: 6.w,
+                                  vertical: 6.h,
+                                ),
+                                decoration: BoxDecoration(
+                                  border: Border.all(
+                                    color: const Color(0xFFF95F62).withOpacity(.24),
+                                  ),
+                                  borderRadius: BorderRadius.circular(12.sp),
+                                ),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    /// Image
+                                    ClipRRect(
+                                      borderRadius: BorderRadius.circular(8.sp),
+                                      child: offer.mobileBannerImage != null &&
+                                          offer.mobileBannerImage!.isNotEmpty
+                                          ? Image.network(
+                                        '${ApiUrls.baseUrl}/${offer.mobileBannerImage}',
+                                        width: double.infinity,
+                                        height: 120.5.h,
+                                        fit: BoxFit.cover,
+                                        errorBuilder: (context, error, stackTrace) {
+                                          return Container(
+                                            width: double.infinity,
+                                            height: 120.5.h,
+                                            color: const Color(0xFFFEE7E7),
+                                            child: Icon(
+                                              Icons.local_offer,
+                                              size: 40.sp,
+                                              color:
+                                              const Color(0xFFF95F62).withOpacity(.6),
+                                            ),
+                                          );
+                                        },
+                                        loadingBuilder:
+                                            (context, child, loadingProgress) {
+                                          if (loadingProgress == null) return child;
+
+                                          return Container(
+                                            width: double.infinity,
+                                            height: 120.5.h,
+                                            color: const Color(0xFFFEE7E7),
+                                            child: Center(
+                                              child: CircularProgressIndicator(
+                                                strokeWidth: 2,
+                                                color: const Color(0xFFF95F62),
+                                                value: loadingProgress
+                                                    .expectedTotalBytes !=
+                                                    null
+                                                    ? loadingProgress
+                                                    .cumulativeBytesLoaded /
+                                                    loadingProgress
+                                                        .expectedTotalBytes!
+                                                    : null,
+                                              ),
+                                            ),
+                                          );
+                                        },
+                                      )
+                                          : Container(
+                                        width: double.infinity,
+                                        height: 120.5.h,
+                                        color: const Color(0xFFFEE7E7),
+                                        child: Icon(
+                                          Icons.local_offer,
+                                          size: 40.sp,
+                                          color:
+                                          const Color(0xFFF95F62).withOpacity(.6),
+                                        ),
+                                      ),
+                                    ),
+
+                                    SizedBox(height: 8.h),
+
+                                    /// Title
+                                    CustomText(
+                                      text: offer.title,
+                                      size: 18.sp,
+                                      maxLines: 2,
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+
+                                    SizedBox(height: 8.h),
+
+                                    /// Offer Code
+                                    CustomText(
+                                      text: offer.description??"N/A",
+                                      color: Colors.black.withOpacity(.6),
+                                      size: 12.sp,
+                                      maxLines: 3,
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      )
+                    else
+                      Container(
+                        height: 100.h,
+                        alignment: Alignment.center,
+                        child: CustomText(
+                          text: "No offers available",
+                          size: 14.sp,
+                          color: Colors.grey,
+                        ),
+                      ),
+
+                    SizedBox(height: 30.h),
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.w),
+                      child: Divider(color: Colors.black.withOpacity(0.1)),
+                    ),
+                    SizedBox(height: 30.h),
+
+                    // Available Attractions
+                    Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20.0.w),
+                      child: CustomText(
+                          text: "Available Attractions", size: 18.sp),
+                    ),
+                    SizedBox(height: 12.h),
+
+                    if (data.attractions.isNotEmpty)
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 20.w),
+                        child: SingleChildScrollView(
+                          scrollDirection: Axis.horizontal,
+                          child: Row(
+                            children: data.attractions.map((attraction) {
+                              return Padding(
+                                padding: EdgeInsets.only(right: 12.w),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Container(
+                                      height: 104.h,
+                                      width: 104.w,
+                                      decoration: BoxDecoration(
+                                        color: Colors.grey[200],
+                                        borderRadius: BorderRadius.circular(8.r),
+                                      ),
+                                      child: GestureDetector(
+                                        onTap: () {
+                                          Navigator.of(context).pushNamed(
+                                            RouteConstants.attractionDetails,
+                                            arguments: attraction.id,
+                                          );
+                                        },
+                                        child: ClipRRect(
+                                          borderRadius: BorderRadius.circular(8.r),
+                                          child: attraction.thumbnail != null &&
+                                              attraction.thumbnail!.isNotEmpty
+                                              ? Image.network(
+                                            attraction.thumbnail!,
+                                            fit: BoxFit.cover,
+                                            errorBuilder: (context, error, stackTrace) {
+                                              return Icon(
+                                                Icons.location_on,
+                                                size: 40.sp,
+                                                color: Colors.grey[400],
+                                              );
+                                            },
+                                            loadingBuilder: (context, child, loadingProgress) {
+                                              if (loadingProgress == null) return child;
+                                              return Center(
+                                                child: SizedBox(
+                                                  width: 20.w,
+                                                  height: 20.w,
+                                                  child: CircularProgressIndicator(color: Color(0xffF95F62),strokeWidth: 2),
+                                                ),
+                                              );
+                                            },
+                                          )
+                                              : Icon(
+                                            Icons.location_on,
+                                            size: 40.sp,
+                                            color: Colors.grey[400],
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                    SizedBox(height: 4.h),
+                                    SizedBox(
+                                      width: 104.w,
+                                      child: CustomText(
+                                        text: attraction.title,
+                                        size: 12.sp,
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              );
+                            }).toList(),
+                          ),
+                        ),
+                      )
+                    else
+                      Container(
+                        height: 100.h,
+                        alignment: Alignment.center,
+                        child: CustomText(
+                          text: "No attractions available",
+                          size: 14.sp,
+                          color: Colors.grey,
+                        ),
+                      ),
+
+                    SizedBox(height: 20.h),
+                    GestureDetector(
+                      onTap: () {
+                        Navigator.of(context).pushNamed(
+                          RouteConstants.attractionsPage,
+                          arguments: "home",
+                        );
+                      },
+                      child: Align(
+                        alignment: Alignment.center,
+                        child: CustomText(
+                          text: "View All",
+                          size: 12.sp,
+                          color: Color(0xFFF95F62),
+                        ),
+                      ),
+                    ),
+                    SizedBox(height: 41.h),
+                  ],
                 ),
-              ),
-              SizedBox(height: 20.h),
-            ],
-          ),
+              );
+            }
+
+            return const SizedBox();
+          },
         ),
       ),
     );
   }
-}
+}

lib/buy_a_pass/widget/feature_table.dart

@@ -8,7 +8,6 @@ class FeatureTable extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // Static data using a simple model
     final features = [
       FeatureModel('Access to attractions', true, true),
       FeatureModel('Entry to attractions', true, true),
@@ -16,109 +15,147 @@ class FeatureTable extends StatelessWidget {
       FeatureModel('Entry to sites', false, true),
       FeatureModel('Access to venues', true, true),
       FeatureModel('Entry to events', true, true),
-      FeatureModel('Access to experiences', true, true),
+      FeatureModel('Access to experiences', false, true),
+      FeatureModel('Access to Itinerary creation', false, true),
+      FeatureModel('Access to postcard creation', false, true),
     ];
 
     return Center(
-        child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: 20.w),
-          child: Container(
-            padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
-            decoration: BoxDecoration(
-              color: Color(0xFFF3F3F3),
-              borderRadius: BorderRadius.circular(16),
-              boxShadow: [
-                BoxShadow(
-                  color: Colors.black12,
-                  blurRadius: 1,
-                  offset: const Offset(0, 2),
-                ),
-              ],
-            ),
-            child: Table(
-              columnWidths: const {
-                0: FlexColumnWidth(2.5),
-                1: FlexColumnWidth(1.2),
-                2: FlexColumnWidth(1.2),
-              },
-
-              children: [
-                _buildHeaderRow(),
-                ...features.map((f) => _buildFeatureRow(f)).toList(),
-              ],
-            ),
+      child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 20.w),
+        child: Container(
+          padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 14.h),
+          decoration: BoxDecoration(
+            color: const Color(0xFFF3F3F3),
+            borderRadius: BorderRadius.circular(16),
+            boxShadow: const [
+              BoxShadow(
+                color: Colors.black12,
+                blurRadius: 2,
+                offset: Offset(0, 2),
+              ),
+            ],
+          ),
+          child: Table(
+            columnWidths: const {
+              0: FlexColumnWidth(2.7),
+              1: FlexColumnWidth(1.15),
+              2: FlexColumnWidth(1.15),
+            },
+            defaultVerticalAlignment: TableCellVerticalAlignment.middle,
+            children: [
+              _buildHeaderRow(),
+              ...features.map(_buildFeatureRow).toList(),
+            ],
           ),
         ),
-      );
-
+      ),
+    );
   }
 
-  // Header Row
+  // HEADER ROW
   TableRow _buildHeaderRow() {
     return TableRow(
       children: [
         Padding(
-          padding: EdgeInsets.symmetric(vertical: 6.h),
+          padding: EdgeInsets.only(bottom: 12.h),
           child: Text(
             'Features',
-            style: TextStyle(fontWeight: FontWeight.w500, fontSize: 16.sp),
-          ),
-        ),
-        Padding(
-          padding: EdgeInsets.symmetric(vertical: 6.h),
-          child: Center(
-            child: Text(
-              '${CommonAppText.selectiveCard}',
-              style: TextStyle(fontWeight: FontWeight.w500, fontSize: 16.sp),
-            ),
-          ),
-        ),
-        Padding(
-          padding: EdgeInsets.symmetric(vertical: 6.h),
-          child: Center(
-            child: Text(
-              'Unlimited',
-              style: TextStyle(fontWeight: FontWeight.w500, fontSize: 16.sp),
+            style: TextStyle(
+              fontWeight: FontWeight.w600,
+              fontSize: 15.sp,
             ),
           ),
         ),
+        _buildHeaderText(CommonAppText.selectiveCard),
+        _buildHeaderText('Unlimited'),
       ],
     );
   }
 
-  // Each Feature Row
+  Widget _buildHeaderText(String text) {
+    return Padding(
+      padding: EdgeInsets.only(bottom: 12.h),
+      child: Center(
+        child: Text(
+          text,
+          maxLines: 1,
+          softWrap: false,
+          overflow: TextOverflow.visible,
+          textAlign: TextAlign.center,
+          style: TextStyle(
+            fontWeight: FontWeight.w600,
+            fontSize: 14.sp,
+          ),
+        ),
+      ),
+    );
+  }
+
+  // FEATURE ROW
   TableRow _buildFeatureRow(FeatureModel feature) {
     return TableRow(
       children: [
-        _buildCell(feature.name),
+        _buildFeatureCell(feature.name),
         _buildIconCell(feature.flexi),
         _buildIconCell(feature.unlimited),
       ],
     );
   }
 
-  // Text cell
-  Widget _buildCell(String text) {
+  // FEATURE TEXT WITH BULLET
+  Widget _buildFeatureCell(String text) {
     return Padding(
-      padding:  EdgeInsets.symmetric(vertical: 6.h),
-      child: Text(text, style: TextStyle(fontSize: 12.sp, color: Colors.black.withOpacity(.8)),),
+      padding: EdgeInsets.symmetric(vertical: 7.h),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: EdgeInsets.only(top: 2.h, right: 6.w),
+            child: Text(
+              '•',
+              style: TextStyle(fontSize: 18.sp, height: 1),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              text,
+              style: TextStyle(
+                fontSize: 12.5.sp,
+                color: Colors.black.withOpacity(0.85),
+                height: 1.35,
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
-  // Icon cell
+  // ICON CELL
   Widget _buildIconCell(bool isAvailable) {
     return Padding(
-      padding: EdgeInsets.symmetric(vertical: 6.h),
+      padding: EdgeInsets.symmetric(vertical: 7.h),
       child: Center(
         child: isAvailable
-            ? Icon(Icons.check_circle, color: Colors.redAccent,size: 16.sp,)
-            : const Text('–', style: TextStyle(color: Colors.black54)),
+            ? Icon(
+          Icons.check_circle,
+          color: Colors.redAccent,
+          size: 16.sp,
+        )
+            : Text(
+          '–',
+          style: TextStyle(
+            fontSize: 16.sp,
+            color: Colors.black45,
+          ),
+        ),
       ),
     );
   }
 }
 
-// Model for feature row
+// MODEL
 class FeatureModel {
   final String name;
   final bool flexi;

lib/buy_a_pass/widget/pass_card_view.dart

@@ -2,22 +2,26 @@ import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-import '../../common_packages/common_app_texts.dart';
-
 class PassCardView extends StatelessWidget {
   final Color? themeColor;
   final String? city;
-  final int? adultCount;
-  final int? childCount;
+  final String? heroImage;
+  final num? adultPrice;
+  final num? childPrice;
   final String? cardType;
+  final String? description;
+  final bool isSelected;
 
   const PassCardView({
     super.key,
     this.themeColor,
     this.city,
-    this.adultCount,
-    this.childCount,
+    this.heroImage,
+    this.adultPrice,
+    this.childPrice,
     this.cardType,
+    this.description,
+    this.isSelected = false,
   });
 
   @override
@@ -25,141 +29,180 @@ class PassCardView extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
         color: Colors.white,
-        border: Border.all(color:( themeColor ?? Color(0xFFF95FAF)).withOpacity(0.24)),
+        border: Border.all(
+          color: (themeColor ?? const Color(0xFFF95FAF)).withOpacity(0.24),
+          width: 1,
+        ),
         borderRadius: BorderRadius.circular(8.r),
       ),
       child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          /// -------- LEFT: IMAGE + DETAILS --------
+          Expanded(
+            child: Row(
               children: [
+                /// HERO BANNER IMAGE
                 ClipRRect(
                   borderRadius: BorderRadius.only(
                     topLeft: Radius.circular(8.r),
-                    bottomLeft: Radius.circular(8.r)
+                    bottomLeft: Radius.circular(8.r),
                   ),
-                  child: Image.asset(
-                    "assets/images/card_banner.png",
-                    scale: 4,
+                  child: Container(
                     width: 103.w,
-                    height:140.h,
-                    fit: BoxFit.cover,
+                    height: 140.h,
+                    color: Colors.grey[200],
+                    child: heroImage != null && heroImage!.isNotEmpty
+                        ? Image.network(
+                      heroImage!,
+                      fit: BoxFit.cover,
+                      errorBuilder: (context, error, stackTrace) {
+                        return _fallbackIcon();
+                      },
+                      loadingBuilder: (context, child, loadingProgress) {
+                        if (loadingProgress == null) return child;
+                        return Center(
+                          child: SizedBox(
+                            width: 24.w,
+                            height: 24.w,
+                            child: const CircularProgressIndicator(
+                              color: Color(0xffF95F62),
+                              strokeWidth: 2,
+                            ),
+                          ),
+                        );
+                      },
+                    )
+                        : _fallbackIcon(),
                   ),
                 ),
+
                 SizedBox(width: 6.66.w),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    CustomText(
-                      text: "Melbourne",
-                      weight: FontWeight.w500,
-                      size: 16.sp,
-                    ),
 
-                    Row(
-                      children: [
-                        Text(
-                          "From ",
-                          style: TextStyle(
-                            color: Colors.black.withOpacity(0.6),
-                            fontSize: 11.sp,
-                            fontWeight: FontWeight.w400,
-                          ),
-                        ),
-                        Text(
-                          "\$80",
-                          style: TextStyle(
-                            color:themeColor,
-                            fontWeight: FontWeight.w500,
-                            fontSize: 24.sp,
-                          ),
-                        ),
-                        Text(
-                          " /Adult",
-                          style: TextStyle(
-                            color: Colors.black.withOpacity(0.8),
-                            fontSize: 11.sp,
-                            fontWeight: FontWeight.w400,
-                          ),
-                        ),
-                      ],
-                    ),
-
-                    Row(
-                      children: [
-                        Text(
-                          "and ",
-                          style: TextStyle(
-                            color: Colors.black.withOpacity(0.6),
-                            fontSize: 11.sp,
-                            fontWeight: FontWeight.w400,
-                          ),
-                        ),
-                        Text(
-                          "\$10",
-                          style: TextStyle(
-                            color: themeColor,
-                            fontWeight: FontWeight.w500,
-                            fontSize: 24.sp,
-                          ),
-                        ),
-                        Text(
-                          " /child",
-                          style: TextStyle(
-                            color: Colors.black.withOpacity(0.8),
-                            fontSize: 11.sp,
-                            fontWeight: FontWeight.w400,
-                          ),
-                        ),
-                      ],
-                    ),
-
-                    SizedBox(
-                      width: 193.w,
-                      child: CustomText(
-                        text:
-                            "Dive into an extensive selection of thrilling destinations!",
-                        color: Color(0xFF000000).withOpacity(0.6),
-                        size: 11.sp,
+                /// CARD DETAILS
+                Flexible(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      CustomText(
+                        text: city ?? "City",
+                        weight: FontWeight.w500,
+                        size: 16.sp,
                       ),
-                    ),
-                  ],
+
+                      /// Adult Price
+                      Row(
+                        children: [
+                          Text(
+                            "From ",
+                            style: TextStyle(
+                              color: Colors.black.withOpacity(0.6),
+                              fontSize: 11.sp,
+                              fontWeight: FontWeight.w400,
+                            ),
+                          ),
+                          Text(
+                            "\$${adultPrice ?? 0}",
+                            style: TextStyle(
+                              color:Color(0xFFF95F62),
+                              fontWeight: FontWeight.w800,
+                              fontSize: 24.sp,
+                            ),
+                          ),
+                          Text(
+                            " /Adult",
+                            style: TextStyle(
+                              color: Colors.black.withOpacity(0.8),
+                              fontSize: 11.sp,
+                              fontWeight: FontWeight.w400,
+                            ),
+                          ),
+                        ],
+                      ),
+
+                      /// Child Price
+                      Row(
+                        children: [
+                          Text(
+                            "and ",
+                            style: TextStyle(
+                              color: Colors.black.withOpacity(0.6),
+                              fontSize: 11.sp,
+                              fontWeight: FontWeight.w400,
+                            ),
+                          ),
+                          Text(
+                            "\$${childPrice ?? 0}",
+                            style: TextStyle(
+                              color:Color(0xFFF95F62),
+                              fontWeight: FontWeight.w800,
+                              fontSize: 24.sp,
+                            ),
+                          ),
+                          Text(
+                            " /child",
+                            style: TextStyle(
+                              color: Colors.black.withOpacity(0.8),
+                              fontSize: 11.sp,
+                              fontWeight: FontWeight.w400,
+                            ),
+                          ),
+                        ],
+                      ),
+
+                      /// Description
+                      CustomText(
+                        text: description ??
+                            "Dive into an extensive selection of thrilling destinations!",
+                        color: const Color(0xFF000000).withOpacity(0.6),
+                        size: 11.sp,
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+                  ),
                 ),
               ],
             ),
+          ),
 
-            Container(
-              width: 35.w,
-              height: 140.h,
-              decoration: BoxDecoration(
-                color: themeColor,
-                borderRadius: BorderRadius.only(
-                  bottomRight: Radius.circular(8.r),
-                  topRight: Radius.circular(8.r),
-                ),
+          /// -------- RIGHT: CARD TYPE LABEL --------
+          Container(
+            width: 35.w,
+            height: 140.h,
+            decoration: BoxDecoration(
+              color: themeColor,
+              borderRadius: BorderRadius.only(
+                bottomRight: Radius.circular(8.r),
+                topRight: Radius.circular(8.r),
               ),
-              child: RotatedBox(
-                quarterTurns: -1,
-                child: Center(
-                  child: RichText(
-                    text: TextSpan(
-                      children: [
-                        TextSpan(
-                          text: "${CommonAppText.selectiveCard} ",
-                          style: TextStyle(color: Colors.white, fontSize: 16.sp),
-                        ),
-                        TextSpan(
-                          text: "Card",
-                          style: TextStyle(color: Colors.white, fontSize: 12.sp),
-                        ),
-                      ],
-                    ),
+            ),
+            child: RotatedBox(
+              quarterTurns: -1,
+              child: Center(
+                child: Text(
+                  cardType ?? "Pass",
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 14.sp,
+                    fontWeight: FontWeight.w500,
                   ),
                 ),
               ),
             ),
-          ],
-        ),
+          ),
+        ],
+      ),
     );
-    }
   }
+
+  /// FALLBACK ICON
+  Widget _fallbackIcon() {
+    return Icon(
+      Icons.card_travel,
+      size: 40.sp,
+      color: Colors.grey[400],
+    );
+  }
+}

lib/buy_a_pass/widget/payment_card_view.dart

@@ -1,20 +1,62 @@
 import 'package:citycards_customer/common_packages/custom_filled_button.dart';
-import 'package:citycards_customer/core/route_constants.dart';
+import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../../localPreference/local_preference.dart';
+import '../bloc/buy_pass_bloc.dart';
+import '../bloc/buy_pass_event.dart';
+import '../bloc/buy_pass_state.dart';
+import '../models/checkout_model.dart';
+import '../../checkout/view/checkout_view.dart';
+import '../repository/buy_pass_repository.dart'; // ✅ Import repository
 
 class PaymentCard extends StatefulWidget {
   final String city;
-  final String tag;
-  final double oldPrice;
-  final double newPrice;
+  final String heroImage;
+  final String cardType;
+  final String cardDisplayName;
+  final Color themeColor;
+  final double adultPrice;
+  final double childPrice;
+  final int adults;
+  final int children;
+  final double totalPrice;
+  final int minNumber;
+  final int maxNumber;
+  final int selectedValue;
+  final String? description;
+  final Function(int) onAdultChanged;
+  final Function(int) onChildChanged;
+  final Function(int) onValidityChanged;
+
+  // ✅ NEW: Required parameters for API call
+  final int cityXid;
+  final int cardTypeXid;
+  final int cardXid;
 
   const PaymentCard({
     super.key,
     required this.city,
-    required this.tag,
-    required this.oldPrice,
-    required this.newPrice,
+    required this.heroImage,
+    required this.cardType,
+    required this.cardDisplayName,
+    required this.themeColor,
+    required this.adultPrice,
+    required this.childPrice,
+    required this.adults,
+    required this.children,
+    required this.totalPrice,
+    required this.minNumber,
+    required this.maxNumber,
+    required this.selectedValue,
+    this.description,
+    required this.onAdultChanged,
+    required this.onChildChanged,
+    required this.onValidityChanged,
+    required this.cityXid,        // ✅ NEW
+    required this.cardTypeXid,    // ✅ NEW
+    required this.cardXid,        // ✅ NEW
   });
 
   @override
@@ -22,137 +64,299 @@ class PaymentCard extends StatefulWidget {
 }
 
 class _PaymentCardState extends State<PaymentCard> {
-  int adults = 1;
-  int children = 1;
-
+  bool _isLoading = false;
   @override
   Widget build(BuildContext context) {
-    return Container(
-      width: 320,
-      padding: const EdgeInsets.all(20),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        border: Border.all(color: Colors.pinkAccent, width: 1.2),
-        borderRadius: BorderRadius.circular(12),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.pinkAccent.withOpacity(0.1),
-            blurRadius: 10,
-            spreadRadius: 2,
-          ),
-        ],
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          // Title
-          Text(
-            widget.city,
-            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-          ),
+    final bool isUnlimitedCard = widget.cardType == "unlimited_card";
+    final bool isSelectivePass = widget.cardType == "selective_pass";
 
-          const SizedBox(height: 6),
-
-          // Tag
-          Container(
-            padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
-            decoration: BoxDecoration(
-              color: Color(0xFFF95FAF),
-              borderRadius: BorderRadius.circular(20),
+    return Padding(
+      padding: const EdgeInsets.all(12.0),
+      child: Container(
+        width: double.infinity,
+        padding: EdgeInsets.all(20.sp),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          border: Border.all(color: Colors.pinkAccent, width: 1.2),
+          borderRadius: BorderRadius.circular(12.r),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.pinkAccent.withOpacity(0.1),
+              blurRadius: 10,
+              spreadRadius: 2,
             ),
-            child: Text(
-              widget.tag,
-              style: const TextStyle(
-                color: Colors.white,
-                fontSize: 12,
-                fontWeight: FontWeight.w500,
+          ],
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            CustomText(
+              text: widget.city,
+              size: 20.sp,
+              weight: FontWeight.bold,
+            ),
+            SizedBox(height: 6.h),
+            Container(
+              padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 6.h),
+              decoration: BoxDecoration(
+                color: widget.themeColor.withValues(alpha: 0.3),
+                borderRadius: BorderRadius.circular(20.r),
+              ),
+              child: CustomText(
+                text: widget.cardDisplayName,
+                size: 12.sp,
+                color: widget.themeColor,
+                weight: FontWeight.w500,
               ),
             ),
-          ),
-
-          const SizedBox(height: 16),
-
-          // Adult Counter
-          _buildCounterRow("No. of Adults", adults, (val) {
-            setState(() => adults = val);
-          }),
-
-          const SizedBox(height: 10),
-
-          // Children Counter
-          _buildCounterRow("No. of Children", children, (val) {
-            setState(() => children = val);
-          }),
-
-          const Divider(height: 30, thickness: 1),
-
-          // Price section
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              const Text(
-                "You Pay",
-                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
+            SizedBox(height: 16.h),
+            _buildCounterRow("No. of Adults", widget.adults, widget.onAdultChanged, context, minValue: 1),
+            SizedBox(height: 10.h),
+            _buildCounterRow("No. of Children", widget.children, widget.onChildChanged, context),
+            SizedBox(height: 10.h),
+            if (isUnlimitedCard)
+              _buildDropdownRow(
+                label: "No. of Days",
+                value: widget.selectedValue,
+                onChanged: widget.onValidityChanged,
+              )
+            else if (isSelectivePass)
+              _buildDropdownRow(
+                label: "No. of Attractions",
+                value: widget.selectedValue,
+                onChanged: widget.onValidityChanged,
               ),
-              Row(
-                children: [
-                  Text(
-                    "\$${widget.oldPrice.toStringAsFixed(0)}",
-                    style: const TextStyle(
-                      color: Colors.grey,
-                      fontSize: 14,
-                      decoration: TextDecoration.lineThrough,
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  Text(
-                    "\$${widget.newPrice.toStringAsFixed(0)}",
-                    style: const TextStyle(
-                      color: Color(0xFFF95F62),
-                      fontWeight: FontWeight.bold,
-                      fontSize: 18,
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
+            Divider(height: 30.h, thickness: 1),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                CustomText(
+                  text: "You Pay",
+                  size: 16.sp,
+                  weight: FontWeight.w500,
+                ),
+                CustomText(
+                  text: "\$${widget.totalPrice.toStringAsFixed(0)}",
+                  size: 18.sp,
+                  color: Color(0xFFF95F62),
+                  weight: FontWeight.bold,
+                ),
+              ],
+            ),
+            SizedBox(height: 20.h),
+            BlocBuilder<BuyPassBloc, BuyPassState>(
+              builder: (context, state) {
+                final isLoading = state is BuyPassLoaded && state.isAddingToCart;
 
-          const SizedBox(height: 20),
+                return CustomFilledButton(
+                  onTap: isLoading
+                      ? null
+                      : () async {
+                    final bloc = context.read<BuyPassBloc>();
+                    bloc.add(AddToCartLoading());
+                    try {
+                      // ✅ Check login status first
+                      final bool isLoggedIn = await LocalPreference.getLogin();
 
-          // Proceed Button
-          CustomFilledButton(
-            onTap: () {
-              Navigator.of(
-                context,
-              ).pushNamed(RouteConstants.checkout);
-            },
-            label: "Proceed to Pay",
-          ),
-        ],
+                      // ✅ Create checkout data (needed for both cases)
+                      final checkoutData = CheckoutData(
+                        cityName: widget.city,
+                        heroImage: widget.heroImage,
+                        cardTypeName: widget.cardType,
+                        cardDisplayName: widget.cardDisplayName,
+                        themeColor: widget.themeColor,
+                        adultCount: widget.adults,
+                        childCount: widget.children,
+                        adultPrice: widget.adultPrice,
+                        childPrice: widget.childPrice,
+                        validityDuration: widget.selectedValue,
+                        totalPrice: widget.totalPrice,
+                        description: widget.description,
+                      );
+
+                      if (isLoggedIn) {
+                        // ✅ User is logged in - hit API
+                        final repository = BuyPassRepository();
+                        final response = await repository.addToCartPasses(
+                          cityXid: widget.cityXid,
+                          cardTypeXid: widget.cardTypeXid,
+                          cardXid: widget.cardXid,
+                          cardMode: isSelectivePass ? 'flexi' : 'unlimited',
+                          totalAdult: widget.adults,
+                          totalChild: widget.children,
+                          noOfAttractions: isSelectivePass ? widget.selectedValue : 0,
+                          noOfDays: isUnlimitedCard ? widget.selectedValue : 0,
+                          baseAmount: widget.totalPrice,
+                        );
+
+                        // ✅ Extract bookingId from response
+                        final int bookingId = response['id'];
+
+                        // ✅ Navigate to checkout with bookingId
+                        if (context.mounted) {
+                          Navigator.of(context).push(
+                            MaterialPageRoute(
+                              builder: (context) => CheckoutView(bookingId: bookingId),
+                              settings: RouteSettings(
+                                arguments: checkoutData,
+                              ),
+                            ),
+                          );
+                        }
+                      } else {
+                        // ✅ User is NOT logged in - skip API, navigate directly
+                        await LocalPreference.setPassCart(
+                          cityName: widget.city,
+                          heroImage: widget.heroImage,
+                          cardTypeName: widget.cardType,
+                          cardDisplayName: widget.cardDisplayName,
+                          themeColor: widget.themeColor.value,
+                          adultCount: widget.adults,
+                          childCount: widget.children,
+                          adultPrice: widget.adultPrice,
+                          childPrice: widget.childPrice,
+                          validityDuration: widget.selectedValue,
+                          totalPrice: widget.totalPrice,
+                          description: widget.description,
+                        );
+                        if (context.mounted) {
+                          Navigator.of(context).push(
+                            MaterialPageRoute(
+                              builder: (context) => CheckoutView(bookingId: 0),
+                              settings: RouteSettings(
+                                arguments: checkoutData,
+                              ),
+                            ),
+                          );
+                        }
+                      }
+                    } catch (e) {
+                      // ✅ Show error message
+                      if (context.mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text('Failed to proceed: ${e.toString()}'),
+                            backgroundColor: Colors.red,
+                            behavior: SnackBarBehavior.floating,
+                            duration: Duration(seconds: 3),
+                          ),
+                        );
+                      }
+                    } finally {
+                      bloc.add(AddToCartDone()); // ✅ stop loading
+                    }
+                  },
+                  label: isLoading ? "Please wait..." : "Proceed to Pay",
+                );
+              },
+            ),
+          ],
+        ),
       ),
     );
   }
 
-  Widget _buildCounterRow(String label, int value, Function(int) onChanged) {
+  Widget _buildDropdownRow({
+    required String label,
+    required int value,
+    required Function(int) onChanged,
+  }) {
+    List<int> numbersList = List.generate(
+      widget.maxNumber - widget.minNumber + 1,
+          (index) => widget.minNumber + index,
+    );
+
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        Text(label, style: TextStyle(fontSize: 15.sp)),
+        CustomText(
+          text: label,
+          size: 15.sp,
+        ),
+        Container(
+          height: 36.h,
+          width: 88.w,
+          padding: EdgeInsets.symmetric(horizontal: 14.w),
+          decoration: BoxDecoration(
+            color: Color(0xFFF95F62).withValues(alpha: 0.13),
+            border: Border.all(
+              color: const Color(0xFFF95F62),
+              width: 1.4,
+            ),
+            borderRadius: BorderRadius.circular(16.r),
+          ),
+          child: DropdownButtonHideUnderline(
+            child: DropdownButton<int>(
+              value: value,
+              isExpanded: true,
+              icon: Icon(
+                Icons.keyboard_arrow_down_rounded,
+                color: const Color(0xFFF95F62),
+                size: 22.sp,
+              ),
+              items: numbersList.map((int number) {
+                return DropdownMenuItem<int>(
+                  value: number,
+                  child: Align(
+                    alignment: Alignment.centerLeft,
+                    child: CustomText(
+                      text: "$number",
+                      size: 16.sp,
+                      weight: FontWeight.bold,
+                    ),
+                  ),
+                );
+              }).toList(),
+              onChanged: (int? newValue) {
+                if (newValue != null) {
+                  onChanged(newValue);
+                }
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildCounterRow(
+      String label,
+      int value,
+      Function(int) onChanged,
+      BuildContext context, {
+        int minValue = 0,
+      }) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        CustomText(text: label, size: 15.sp),
         Row(
           children: [
             _circleButton(Icons.remove, () {
-              if (value > 0) onChanged(value - 1);
+              if (value > minValue) {
+                onChanged(value - 1);
+              } else {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      minValue == 1
+                          ? "At least 1 adult is required"
+                          : "Cannot go below 0",
+                    ),
+                    backgroundColor: const Color(0xFFF95F62),
+                    behavior: SnackBarBehavior.floating,
+                    duration: const Duration(seconds: 2),
+                  ),
+                );
+              }
             }),
             Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 10),
-              child: Text(
-                "$value",
-                style: TextStyle(
-                  fontSize: 16.sp,
-                  fontWeight: FontWeight.bold,
-                ),
+              padding: EdgeInsets.symmetric(horizontal: 10.w),
+              child: CustomText(
+                text: "$value",
+                size: 16.sp,
+                weight: FontWeight.bold,
               ),
             ),
             _circleButton(Icons.add, () {
@@ -173,9 +377,9 @@ class _PaymentCardState extends State<PaymentCard> {
           shape: BoxShape.circle,
           color: Color(0xFFF95F62),
         ),
-        padding: const EdgeInsets.all(4),
+        padding: EdgeInsets.all(4.sp),
         child: Icon(icon, color: Colors.white, size: 18.sp),
       ),
     );
   }
-}
+}

lib/cart/blocs/myPassCart/my_pass_cart_bloc.dart

@@ -0,0 +1,177 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../repository/my_pass_cart_repository.dart';
+import 'my_pass_cart_event.dart';
+import 'my_pass_cart_state.dart';
+
+class MyPassCartBloc extends Bloc<MyPassCartEvent, MyPassCartState> {
+  final MyPassCartRepository repository;
+
+  MyPassCartBloc({required this.repository}) : super(const MyPassCartInitial()) {
+    on<CheckLoginAndFetchEvent>(_onCheckLoginAndFetch);
+    on<FetchPassCartEvent>(_onFetchPassCart);
+    on<ClearPassCartEvent>(_onClearPassCart);
+  }
+
+  /// Handle checking login status and fetching cart data accordingly
+  Future<void> _onCheckLoginAndFetch(
+      CheckLoginAndFetchEvent event,
+      Emitter<MyPassCartState> emit,
+      ) async {
+    try {
+      if (kDebugMode) {
+        print('🔍 [BLOC] Checking login status and fetching cart...');
+      }
+
+      emit(const MyPassCartLoading());
+
+      // Check if user is logged in
+      final isLoggedIn = await repository.isUserLoggedIn();
+
+      if (kDebugMode) {
+        print('🔐 [BLOC] User logged in: $isLoggedIn');
+      }
+
+      if (isLoggedIn) {
+        // User is logged in - fetch from API
+        if (kDebugMode) {
+          print('🌐 [BLOC] Fetching cart data from API...');
+        }
+
+        try {
+          final apiCartData = await repository.fetchMyPassesCart();
+
+          // Check if API data is empty
+          if (apiCartData.cartItems.isEmpty) {
+            if (kDebugMode) {
+              print('⚠️ [BLOC] API returned empty cart, checking local data...');
+            }
+
+            // Try to fetch from local if API is empty
+            final localCartData = await repository.fetchPassesCartByLocal();
+
+            if (localCartData != null) {
+              if (kDebugMode) {
+                print('✅ [BLOC] Using local cart data as fallback');
+              }
+              emit(MyPassCartLoaded(cartData: localCartData));
+            } else {
+              if (kDebugMode) {
+                print('ℹ️ [BLOC] No local data available, cart is empty');
+              }
+              emit(const MyPassCartEmpty());
+            }
+          } else {
+            // API has cart items
+            if (kDebugMode) {
+              print('✅ [BLOC] API cart data loaded successfully with ${apiCartData.cartItems.length} items');
+            }
+            emit(MyPassCartApiLoaded(apiCartData: apiCartData));
+          }
+        } catch (apiError) {
+          if (kDebugMode) {
+            print('❌ [BLOC] API error: $apiError, trying local data...');
+          }
+
+          // API failed, try local data as fallback
+          final localCartData = await repository.fetchPassesCartByLocal();
+
+          if (localCartData != null) {
+            if (kDebugMode) {
+              print('✅ [BLOC] Using local cart data after API failure');
+            }
+            emit(MyPassCartLoaded(cartData: localCartData));
+          } else {
+            if (kDebugMode) {
+              print('❌ [BLOC] No local data available after API failure');
+            }
+            emit(MyPassCartError(message: 'Failed to load cart data: ${apiError.toString()}'));
+          }
+        }
+      } else {
+        // User is not logged in - fetch from local only
+        if (kDebugMode) {
+          print('📱 [BLOC] User not logged in, fetching from local storage...');
+        }
+
+        final localCartData = await repository.fetchPassesCartByLocal();
+
+        if (localCartData != null) {
+          if (kDebugMode) {
+            print('✅ [BLOC] Local cart data loaded successfully');
+          }
+          emit(MyPassCartLoaded(cartData: localCartData));
+        } else {
+          if (kDebugMode) {
+            print('ℹ️ [BLOC] No local cart data available');
+          }
+          emit(const MyPassCartEmpty());
+        }
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [BLOC] Error in CheckLoginAndFetch: $e');
+      }
+      emit(MyPassCartError(message: e.toString()));
+    }
+  }
+
+  /// Handle fetching pass cart data from local storage
+  Future<void> _onFetchPassCart(
+      FetchPassCartEvent event,
+      Emitter<MyPassCartState> emit,
+      ) async {
+    try {
+      if (kDebugMode) {
+        print('📄 [BLOC] Fetching pass cart from local...');
+      }
+
+      emit(const MyPassCartLoading());
+
+      final cartData = await repository.fetchPassesCartByLocal();
+
+      if (cartData != null) {
+        if (kDebugMode) {
+          print('✅ [BLOC] Cart data loaded successfully');
+        }
+        emit(MyPassCartLoaded(cartData: cartData));
+      } else {
+        if (kDebugMode) {
+          print('ℹ️ [BLOC] Cart is empty');
+        }
+        emit(const MyPassCartEmpty());
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [BLOC] Error fetching cart: $e');
+      }
+      emit(MyPassCartError(message: e.toString()));
+    }
+  }
+
+  /// Handle clearing pass cart
+  Future<void> _onClearPassCart(
+      ClearPassCartEvent event,
+      Emitter<MyPassCartState> emit,
+      ) async {
+    try {
+      if (kDebugMode) {
+        print('📄 [BLOC] Clearing pass cart...');
+      }
+
+      // You can add clearPassCart method to repository if needed
+      // await repository.clearPassCartFromLocal();
+
+      emit(const MyPassCartEmpty());
+
+      if (kDebugMode) {
+        print('✅ [BLOC] Cart cleared successfully');
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [BLOC] Error clearing cart: $e');
+      }
+      emit(MyPassCartError(message: e.toString()));
+    }
+  }
+}

lib/cart/blocs/myPassCart/my_pass_cart_event.dart

@@ -0,0 +1,26 @@
+import 'package:equatable/equatable.dart';
+
+abstract class MyPassCartEvent extends Equatable {
+  const MyPassCartEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+/// Event to check login status and fetch pass cart data accordingly
+/// - If logged in: fetch from API
+/// - If not logged in: fetch from local
+/// - If API returns empty and local data exists: use local data
+class CheckLoginAndFetchEvent extends MyPassCartEvent {
+  const CheckLoginAndFetchEvent();
+}
+
+/// Event to fetch pass cart data from local database
+class FetchPassCartEvent extends MyPassCartEvent {
+  const FetchPassCartEvent();
+}
+
+/// Event to clear pass cart
+class ClearPassCartEvent extends MyPassCartEvent {
+  const ClearPassCartEvent();
+}

lib/cart/blocs/myPassCart/my_pass_cart_state.dart

@@ -0,0 +1,55 @@
+import 'package:equatable/equatable.dart';
+
+import '../../model/my_passes_cart_model.dart';
+
+abstract class MyPassCartState extends Equatable {
+  const MyPassCartState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+/// Initial state
+class MyPassCartInitial extends MyPassCartState {
+  const MyPassCartInitial();
+}
+
+/// Loading state when fetching cart data
+class MyPassCartLoading extends MyPassCartState {
+  const MyPassCartLoading();
+}
+
+/// Loaded state with cart data from local storage
+class MyPassCartLoaded extends MyPassCartState {
+  final Map<String, dynamic> cartData;
+
+  const MyPassCartLoaded({required this.cartData});
+
+  @override
+  List<Object?> get props => [cartData];
+}
+
+/// Loaded state with cart data from API
+class MyPassCartApiLoaded extends MyPassCartState {
+  final MyPassesCartModel apiCartData;
+
+  const MyPassCartApiLoaded({required this.apiCartData});
+
+  @override
+  List<Object?> get props => [apiCartData];
+}
+
+/// Empty state when no cart data exists
+class MyPassCartEmpty extends MyPassCartState {
+  const MyPassCartEmpty();
+}
+
+/// Error state
+class MyPassCartError extends MyPassCartState {
+  final String message;
+
+  const MyPassCartError({required this.message});
+
+  @override
+  List<Object?> get props => [message];
+}

lib/cart/blocs/myPostcardsCart/my_postcards_cart_bloc.dart

@@ -0,0 +1,57 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter/foundation.dart';
+import '../../../localPreference/local_preference.dart';
+import '../../repository/my_postcards_cart_repository.dart';
+import 'my_postcards_cart_state.dart';
+part 'my_postcards_cart_event.dart';
+
+class MyPostCardsCartBloc
+    extends Bloc<MyPostCardsCartEvent, MyPostCardsCartState> {
+  final MyPostCardCartRepository _repository;
+
+  MyPostCardsCartBloc({MyPostCardCartRepository? repository})
+      : _repository = repository ?? MyPostCardCartRepository(),
+        super(MyPostCardsCartInitial()) {
+    on<CheckLoginAndFetchPostcardsCart>(_onCheckLoginAndFetch);
+  }
+
+  Future<void> _onCheckLoginAndFetch(
+      CheckLoginAndFetchPostcardsCart event,
+      Emitter<MyPostCardsCartState> emit,
+      ) async {
+    emit(MyPostCardsCartLoading());
+
+    try {
+      // 1. Check login status
+      final isLoggedIn = await LocalPreference.getLogin();
+
+      if (kDebugMode) {
+        print('🔐 [CART-BLOC] isLoggedIn: $isLoggedIn');
+      }
+
+      if (!isLoggedIn) {
+        // User not logged in → show not-logged-in screen
+        emit(MyPostCardsCartNotLoggedIn());
+        return;
+      }
+
+      // 2. Fetch cart from API
+      final cartData = await _repository.fetchMyPostCardsCart();
+
+      if (kDebugMode) {
+        print('🛒 [CART-BLOC] Cart items: ${cartData.totalItems}');
+      }
+
+      if (cartData.cartItems.isEmpty) {
+        emit(MyPostCardsCartEmpty());
+      } else {
+        emit(MyPostCardsCartLoaded(cartData: cartData));
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [CART-BLOC] Error: $e');
+      }
+      emit(MyPostCardsCartError(message: e.toString()));
+    }
+  }
+}

lib/cart/blocs/myPostcardsCart/my_postcards_cart_event.dart

@@ -0,0 +1,6 @@
+part of 'my_postcards_cart_bloc.dart';
+
+abstract class MyPostCardsCartEvent {}
+
+/// Checks login status then fetches cart if logged in
+class CheckLoginAndFetchPostcardsCart extends MyPostCardsCartEvent {}

lib/cart/blocs/myPostcardsCart/my_postcards_cart_state.dart

@@ -0,0 +1,27 @@
+import '../../model/my_postcards_cart_model.dart';
+
+abstract class MyPostCardsCartState {}
+
+/// Initial / idle state
+class MyPostCardsCartInitial extends MyPostCardsCartState {}
+
+/// Checking login or fetching data
+class MyPostCardsCartLoading extends MyPostCardsCartState {}
+
+/// User is NOT logged in
+class MyPostCardsCartNotLoggedIn extends MyPostCardsCartState {}
+
+/// Logged in but cart is empty
+class MyPostCardsCartEmpty extends MyPostCardsCartState {}
+
+/// Logged in and data loaded
+class MyPostCardsCartLoaded extends MyPostCardsCartState {
+  final MyPostCardsCartModel cartData;
+  MyPostCardsCartLoaded({required this.cartData});
+}
+
+/// Error state
+class MyPostCardsCartError extends MyPostCardsCartState {
+  final String message;
+  MyPostCardsCartError({required this.message});
+}

lib/cart/blocs/pass_bloc.dart

@@ -1,40 +1,40 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../model/pass_model.dart';
-
-abstract class PassEvent {}
-class LoadPasses extends PassEvent {}
-
-abstract class PassState {}
-class PassLoading extends PassState {}
-class PassLoaded extends PassState {
-  final List<PassModel> passes;
-  final double subtotal;
-  final double discountPercent;
-  final double total;
-
-  PassLoaded(this.passes, this.subtotal, this.discountPercent, this.total);
-}
-
-class PassBloc extends Bloc<PassEvent, PassState> {
-  PassBloc() : super(PassLoading()) {
-    on<LoadPasses>((event, emit) {
-      final passes = [
-        PassModel(
-          title: "Melbourne",
-          imageUrl: "assets/images/city_melbourne.png",
-          duration: "2 days",
-          adults: 3,
-          kids: 3,
-          quantity: 2,
-          price: 49.50,
-          discount: 7.2,
-        ),
-      ];
-
-      final subtotal = passes.fold(0.0, (sum, item) => sum + item.price);
-      final discountPercent = passes.first.discount;
-      final total = subtotal - (subtotal * discountPercent / 100);
-      emit(PassLoaded(passes, subtotal, discountPercent, total));
-    });
-  }
-}
+// import 'package:flutter_bloc/flutter_bloc.dart';
+// import '../model/pass_model.dart';
+//
+// abstract class PassEvent {}
+// class LoadPasses extends PassEvent {}
+//
+// abstract class PassState {}
+// class PassLoading extends PassState {}
+// class PassLoaded extends PassState {
+//   final List<PassModel> passes;
+//   final double subtotal;
+//   final double discountPercent;
+//   final double total;
+//
+//   PassLoaded(this.passes, this.subtotal, this.discountPercent, this.total);
+// }
+//
+// class PassBloc extends Bloc<PassEvent, PassState> {
+//   PassBloc() : super(PassLoading()) {
+//     on<LoadPasses>((event, emit) {
+//       final passes = [
+//         PassModel(
+//           title: "Melbourne",
+//           imageUrl: "assets/images/city_melbourne.png",
+//           duration: "2 days",
+//           adults: 3,
+//           kids: 3,
+//           quantity: 2,
+//           price: 49.50,
+//           discount: 7.2,
+//         ),
+//       ];
+//
+//       final subtotal = passes.fold(0.0, (sum, item) => sum + item.price);
+//       final discountPercent = passes.first.discount;
+//       final total = subtotal - (subtotal * discountPercent / 100);
+//       emit(PassLoaded(passes, subtotal, discountPercent, total));
+//     });
+//   }
+// }

lib/cart/model/my_passes_cart_model.dart

@@ -0,0 +1,277 @@
+import 'dart:convert';
+
+/// ---------- MAIN RESPONSE ----------
+MyPassesCartModel myPassesCartModelFromJson(String str) =>
+    MyPassesCartModel.fromJson(json.decode(str));
+
+String myPassesCartModelToJson(MyPassesCartModel data) =>
+    json.encode(data.toJson());
+
+class MyPassesCartModel {
+  CartCity city;
+  List<CartItem> cartItems;
+
+  MyPassesCartModel({
+    required this.city,
+    required this.cartItems,
+  });
+
+  factory MyPassesCartModel.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return MyPassesCartModel(
+      city: CartCity.fromJson(json['city']),
+      cartItems: json['cartItems'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['cartItems'])
+          .map((e) => CartItem.fromJson(e))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "city": city.toJson(),
+    "cartItems": cartItems.map((e) => e.toJson()).toList(),
+  };
+}
+
+/// ---------- TOP LEVEL CITY ----------
+class CartCity {
+  int id;
+  String name;
+  String bannerImage;
+
+  CartCity({
+    required this.id,
+    required this.name,
+    required this.bannerImage,
+  });
+
+  factory CartCity.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return CartCity(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      name: json['name']?.toString() ?? "",
+      bannerImage: json['bannerImage']?.toString() ?? "",
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "name": name,
+    "bannerImage": bannerImage,
+  };
+}
+
+/// ---------- CART ITEM ----------
+class CartItem {
+  int id;
+  String bookingNumber;
+  String cardMode;
+  String displayCardMode;
+  int noOfDays;
+  int noOfAttractions;
+  int totalAdult;
+  int totalChild;
+  num baseAmount;
+  num totalTaxAmount;
+  num totalAmount;
+  String bookingStatus;
+  bool isForSelf;
+
+  String recipientFirstName;
+  String recipientLastName;
+  String recipientEmail;
+  String recipientPhone;
+  String recipientCity;
+  String recipientCountry;
+  String giftMessage;
+
+  bool isPaymentRequired;
+  int couponXid;
+  num couponDiscountAmount;
+  num couponDiscountPercent;
+  String paymentStatus;
+  String createdAt;
+
+  Coupon? coupon;
+  ItemCity city;
+
+  CartItem({
+    required this.id,
+    required this.bookingNumber,
+    required this.cardMode,
+    required this.displayCardMode,
+    required this.noOfDays,
+    required this.noOfAttractions,
+    required this.totalAdult,
+    required this.totalChild,
+    required this.baseAmount,
+    required this.totalTaxAmount,
+    required this.totalAmount,
+    required this.bookingStatus,
+    required this.isForSelf,
+    required this.recipientFirstName,
+    required this.recipientLastName,
+    required this.recipientEmail,
+    required this.recipientPhone,
+    required this.recipientCity,
+    required this.recipientCountry,
+    required this.giftMessage,
+    required this.isPaymentRequired,
+    required this.couponXid,
+    required this.couponDiscountAmount,
+    required this.couponDiscountPercent,
+    required this.paymentStatus,
+    required this.createdAt,
+    required this.coupon,
+    required this.city,
+  });
+
+  factory CartItem.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return CartItem(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      bookingNumber: json['bookingNumber']?.toString() ?? "",
+      cardMode: json['cardMode']?.toString() ?? "",
+      displayCardMode: json['displayCardMode']?.toString() ?? "",
+      noOfDays: (json['noOfDays'] as num?)?.toInt() ?? 0,
+      noOfAttractions: (json['noOfAttractions'] as num?)?.toInt() ?? 0,
+      totalAdult: (json['totalAdult'] as num?)?.toInt() ?? 0,
+      totalChild: (json['totalChild'] as num?)?.toInt() ?? 0,
+      baseAmount: json['baseAmount'] ?? 0,
+      totalTaxAmount: json['totalTaxAmount'] ?? 0,
+      totalAmount: json['totalAmount'] ?? 0,
+      bookingStatus: json['bookingStatus']?.toString() ?? "",
+      isForSelf: json['isForSelf'] ?? false,
+      recipientFirstName: json['recipientFirstName']?.toString() ?? "",
+      recipientLastName: json['recipientLastName']?.toString() ?? "",
+      recipientEmail: json['recipientEmail']?.toString() ?? "",
+      recipientPhone: json['recipientPhone']?.toString() ?? "",
+      recipientCity: json['recipientCity']?.toString() ?? "",
+      recipientCountry: json['recipientCountry']?.toString() ?? "",
+      giftMessage: json['giftMessage']?.toString() ?? "",
+      isPaymentRequired: json['isPaymentRequired'] ?? false,
+      couponXid: (json['couponXid'] as num?)?.toInt() ?? 0,
+      couponDiscountAmount: json['couponDiscountAmount'] ?? 0,
+      couponDiscountPercent: json['couponDiscountPercent'] ?? 0,
+      paymentStatus: json['paymentStatus']?.toString() ?? "",
+      createdAt: json['createdAt']?.toString() ?? "",
+      coupon:
+      json['coupon'] == null ? null : Coupon.fromJson(json['coupon']),
+      city: ItemCity.fromJson(json['city']),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "bookingNumber": bookingNumber,
+    "cardMode": cardMode,
+    "displayCardMode": displayCardMode,
+    "noOfDays": noOfDays,
+    "noOfAttractions": noOfAttractions,
+    "totalAdult": totalAdult,
+    "totalChild": totalChild,
+    "baseAmount": baseAmount,
+    "totalTaxAmount": totalTaxAmount,
+    "totalAmount": totalAmount,
+    "bookingStatus": bookingStatus,
+    "isForSelf": isForSelf,
+    "recipientFirstName": recipientFirstName,
+    "recipientLastName": recipientLastName,
+    "recipientEmail": recipientEmail,
+    "recipientPhone": recipientPhone,
+    "recipientCity": recipientCity,
+    "recipientCountry": recipientCountry,
+    "giftMessage": giftMessage,
+    "isPaymentRequired": isPaymentRequired,
+    "couponXid": couponXid,
+    "couponDiscountAmount": couponDiscountAmount,
+    "couponDiscountPercent": couponDiscountPercent,
+    "paymentStatus": paymentStatus,
+    "createdAt": createdAt,
+    "coupon": coupon?.toJson(),
+    "city": city.toJson(),
+  };
+}
+
+/// ---------- COUPON ----------
+class Coupon {
+  int id;
+  String couponCode;
+  String title;
+
+  Coupon({
+    required this.id,
+    required this.couponCode,
+    required this.title,
+  });
+
+  factory Coupon.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+    return Coupon(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      couponCode: json['couponCode']?.toString() ?? "",
+      title: json['title']?.toString() ?? "",
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "couponCode": couponCode,
+    "title": title,
+  };
+}
+
+/// ---------- ITEM CITY ----------
+class ItemCity {
+  int id;
+  String cityName;
+  List<CityBanner> cityBanners;
+
+  ItemCity({
+    required this.id,
+    required this.cityName,
+    required this.cityBanners,
+  });
+
+  factory ItemCity.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+
+    return ItemCity(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      cityName: json['cityName']?.toString() ?? "",
+      cityBanners: json['cityBanners'] == null
+          ? []
+          : List<Map<String, dynamic>>.from(json['cityBanners'])
+          .map((e) => CityBanner.fromJson(e))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "id": id,
+    "cityName": cityName,
+    "cityBanners": cityBanners.map((e) => e.toJson()).toList(),
+  };
+}
+
+/// ---------- CITY BANNER ----------
+class CityBanner {
+  String imageFilePath;
+
+  CityBanner({required this.imageFilePath});
+
+  factory CityBanner.fromJson(Map<String, dynamic>? json) {
+    json ??= {};
+    return CityBanner(
+      imageFilePath: json['imageFilePath']?.toString() ?? "",
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    "imageFilePath": imageFilePath,
+  };
+}

lib/cart/model/my_postcards_cart_model.dart

@@ -0,0 +1,163 @@
+class MyPostCardsCartModel {
+  final int totalItems;
+  final List<CartItem> cartItems;
+
+  MyPostCardsCartModel({
+    required this.totalItems,
+    required this.cartItems,
+  });
+
+  factory MyPostCardsCartModel.fromJson(Map<String, dynamic> json) {
+    return MyPostCardsCartModel(
+      totalItems: json['totalItems'] ?? 0,
+      cartItems: (json['cartItems'] as List<dynamic>? ?? [])
+          .map((e) => CartItem.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'totalItems': totalItems,
+      'cartItems': cartItems.map((e) => e.toJson()).toList(),
+    };
+  }
+}
+
+class CartItem {
+  final int id;
+  final String pcTitle;
+  final String pcNumber;
+  final String cityName;
+  final DateTime? pcDatetime;
+  final String pcContent;
+  final String pcImagePath;
+  final bool isForSelf;
+
+  final String? senderFullName;
+  final String? senderCityName;
+  final String? senderCountryName;
+
+  final String fullname;
+  final String emailAddress;
+  final String isdCode;
+  final String mobileNumber;
+  final String address1;
+  final String? address2;
+  final String zipCode;
+  final String stateName;
+  final String countryName;
+
+  final num baseAmount;
+  final num totalTaxAmount;
+  final num totalAmount;
+
+  final String paymentStatus;
+  final String orderStatus;
+
+  final bool isDraft;
+  final bool isAddedToCart;
+
+  final DateTime? createdAt;
+
+  CartItem({
+    required this.id,
+    required this.pcTitle,
+    required this.pcNumber,
+    required this.cityName,
+    required this.pcDatetime,
+    required this.pcContent,
+    required this.pcImagePath,
+    required this.isForSelf,
+    required this.senderFullName,
+    required this.senderCityName,
+    required this.senderCountryName,
+    required this.fullname,
+    required this.emailAddress,
+    required this.isdCode,
+    required this.mobileNumber,
+    required this.address1,
+    required this.address2,
+    required this.zipCode,
+    required this.stateName,
+    required this.countryName,
+    required this.baseAmount,
+    required this.totalTaxAmount,
+    required this.totalAmount,
+    required this.paymentStatus,
+    required this.orderStatus,
+    required this.isDraft,
+    required this.isAddedToCart,
+    required this.createdAt,
+  });
+
+  factory CartItem.fromJson(Map<String, dynamic> json) {
+    return CartItem(
+      id: json['id'] ?? 0,
+      pcTitle: json['pcTitle'] ?? '',
+      pcNumber: json['pcNumber'] ?? '',
+      cityName: json['cityName'] ?? '',
+      pcDatetime: json['pcDatetime'] != null
+          ? DateTime.tryParse(json['pcDatetime'])
+          : null,
+      pcContent: json['pcContent'] ?? '',
+      pcImagePath: json['pcImagePath'] ?? '',
+      isForSelf: json['isForSelf'] ?? false,
+      senderFullName: json['senderFullName'],
+      senderCityName: json['senderCityName'],
+      senderCountryName: json['senderCountryName'],
+      fullname: json['fullname'] ?? '',
+      emailAddress: json['emailAddress'] ?? '',
+      isdCode: json['isdCode'] ?? '',
+      mobileNumber: json['mobileNumber'] ?? '',
+      address1: json['address1'] ?? '',
+      address2: json['address2'],
+      zipCode: json['zipCode'] ?? '',
+      stateName: json['stateName'] ?? '',
+      countryName: json['countryName'] ?? '',
+      baseAmount: json['baseAmount'] ?? 0,
+      totalTaxAmount: json['totalTaxAmount'] ?? 0,
+      totalAmount: json['totalAmount'] ?? 0,
+      paymentStatus: json['paymentStatus'] ?? '',
+      orderStatus: json['orderStatus'] ?? '',
+      isDraft: json['isDraft'] ?? false,
+      isAddedToCart: json['isAddedToCart'] ?? false,
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt'])
+          : null,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'pcTitle': pcTitle,
+      'pcNumber': pcNumber,
+      'cityName': cityName,
+      'pcDatetime': pcDatetime?.toIso8601String(),
+      'pcContent': pcContent,
+      'pcImagePath': pcImagePath,
+      'isForSelf': isForSelf,
+      'senderFullName': senderFullName,
+      'senderCityName': senderCityName,
+      'senderCountryName': senderCountryName,
+      'fullname': fullname,
+      'emailAddress': emailAddress,
+      'isdCode': isdCode,
+      'mobileNumber': mobileNumber,
+      'address1': address1,
+      'address2': address2,
+      'zipCode': zipCode,
+      'stateName': stateName,
+      'countryName': countryName,
+      'baseAmount': baseAmount,
+      'totalTaxAmount': totalTaxAmount,
+      'totalAmount': totalAmount,
+      'paymentStatus': paymentStatus,
+      'orderStatus': orderStatus,
+      'isDraft': isDraft,
+      'isAddedToCart': isAddedToCart,
+      'createdAt': createdAt?.toIso8601String(),
+    };
+  }
+}

lib/cart/model/pass_model.dart

@@ -1,21 +1,21 @@
-class PassModel {
-  final String title;
-  final String imageUrl;
-  final String duration;
-  final int adults;
-  final int kids;
-  final int quantity;
-  final double price;
-  final double discount;
-
-  PassModel({
-    required this.title,
-    required this.imageUrl,
-    required this.duration,
-    required this.adults,
-    required this.kids,
-    required this.quantity,
-    required this.price,
-    required this.discount,
-  });
-}
+// class PassModel {
+//   final String title;
+//   final String imageUrl;
+//   final String duration;
+//   final int adults;
+//   final int kids;
+//   final int quantity;
+//   final double price;
+//   final double discount;
+//
+//   PassModel({
+//     required this.title,
+//     required this.imageUrl,
+//     required this.duration,
+//     required this.adults,
+//     required this.kids,
+//     required this.quantity,
+//     required this.price,
+//     required this.discount,
+//   });
+// }

lib/cart/repository/my_pass_cart_repository.dart

@@ -0,0 +1,83 @@
+import 'package:flutter/foundation.dart';
+
+import '../../localPreference/local_preference.dart';
+import '../../networkApiServices/api_urls.dart';
+import '../../networkApiServices/network_api_services.dart';
+import '../model/my_passes_cart_model.dart';
+
+class MyPassCartRepository {
+  final NetworkApiService _apiService = NetworkApiService();
+
+  /// Check if user is logged in
+  Future<bool> isUserLoggedIn() async {
+    try {
+      final isLogin = await LocalPreference.getLogin();
+      if (kDebugMode) {
+        print('🔐 [REPO] User login status: $isLogin');
+      }
+      return isLogin;
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [REPO] Error checking login status: $e');
+      }
+      return false;
+    }
+  }
+
+  /// Fetch pass cart data from local database
+  Future<Map<String, dynamic>?> fetchPassesCartByLocal() async {
+    try {
+      if (kDebugMode) {
+        print('📄 [REPO] Fetching pass cart from local database...');
+      }
+
+      final passCartData = await LocalPreference.getPassCart();
+
+
+      if (passCartData != null) {
+        if (kDebugMode) {
+          print('✅ [REPO] Pass cart retrieved successfully');
+          print('📦 [REPO] Cart details: ${passCartData['card_display_name']} - ${passCartData['city_name']}');
+        }
+        return passCartData;
+      } else {
+        if (kDebugMode) {
+          print('ℹ️ [REPO] No pass cart data found in local database');
+        }
+        return null;
+      }
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [REPO] Error fetching pass cart: $e');
+      }
+      rethrow;
+    }
+  }
+
+  /// Fetch pass cart data from API
+  Future<MyPassesCartModel> fetchMyPassesCart() async {
+    try {
+      if (kDebugMode) {
+        print('🌐 [REPO] Fetching pass cart from API...');
+      }
+
+      final cityID = await LocalPreference.getSelectedCityId();
+
+      final response = await _apiService.getApi(
+        url: '${ApiUrls.myPassesCart}?cityXid=$cityID',
+      );
+
+      if (kDebugMode) {
+        print('✅ [REPO] API response received');
+      }
+
+      return MyPassesCartModel.fromJson(response.data);
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [REPO] Error fetching pass cart from API: $e');
+      }
+      rethrow;
+    }
+  }
+
+}

lib/cart/repository/my_postcards_cart_repository.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/foundation.dart';
+import '../../localPreference/local_preference.dart';
+import '../../networkApiServices/api_urls.dart';
+import '../../networkApiServices/network_api_services.dart';
+import '../model/my_postcards_cart_model.dart';
+
+class MyPostCardCartRepository {
+  final NetworkApiService _apiService = NetworkApiService();
+
+  /// Fetch postcards cart data from API
+  Future<MyPostCardsCartModel> fetchMyPostCardsCart() async {
+    try {
+      if (kDebugMode) {
+        print('🌐 [POSTCARD-REPO] Fetching postcards cart from API...');
+      }
+
+      final cityID = await LocalPreference.getSelectedCityId();
+
+      final response = await _apiService.getApi(
+        url: '${ApiUrls.myPostCardsCart}?cityXid=$cityID',
+      );
+
+      if (kDebugMode) {
+        print('✅ [POSTCARD-REPO] Postcards cart API response received');
+      }
+
+      return MyPostCardsCartModel.fromJson(response.data);
+    } catch (e) {
+      if (kDebugMode) {
+        print('❌ [POSTCARD-REPO] Error fetching postcards cart from API: $e');
+      }
+      rethrow;
+    }
+  }
+}

lib/cart/views/my_cart_view_page.dart

@@ -3,10 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import '../../common_packages/back_widget.dart';
-import '../blocs/pass_bloc.dart';
-import '../blocs/postcard_bloc.dart';
-import 'my_pass_page_view.dart';
-import 'my_postcard_page_view.dart';
+import '../blocs/myPassCart/my_pass_cart_bloc.dart';
+import '../blocs/myPassCart/my_pass_cart_event.dart';
+import '../blocs/myPostcardsCart/my_postcards_cart_bloc.dart';
+import 'my_pass_cart_page_view.dart';
+import 'my_postcard_cart_page_view.dart';
 
 class MyCartPage extends StatefulWidget {
   const MyCartPage({super.key});
@@ -18,56 +19,61 @@ class MyCartPage extends StatefulWidget {
 class _MyCartPageState extends State<MyCartPage> {
   int selectedTab = 0;
 
+  @override
+  void initState() {
+    super.initState();
+    context.read<MyPassCartBloc>().add(const CheckLoginAndFetchEvent());
+    context.read<MyPostCardsCartBloc>().add(CheckLoginAndFetchPostcardsCart());
+  }
+
   @override
   Widget build(BuildContext context) {
-    return MultiBlocProvider(
-      providers: [
-        BlocProvider(create: (_) => PassBloc()..add(LoadPasses())),
-        BlocProvider(create: (_) => PostCardBloc()..add(LoadPostCards())),
-      ],
-      child: Scaffold(
-        backgroundColor: Colors.white,
-        body: SafeArea(
-          child: SingleChildScrollView(
-            padding: EdgeInsets.all(16),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                CommonAppBar(
-                  isWhiteLogo: false,
-                  isProfilePage: false,
-                  showCart: false,
-                  showDivider: true,
-                ),
-                backWidget(context, "Your Cart", Colors.black),
-                SizedBox(height: 24.h),
-                Container(
-                  padding: EdgeInsets.all(4.0),
-                  margin: const EdgeInsets.all(16),
-                  decoration: BoxDecoration(
-                    color: const Color(0xffFEE7E7),
-                    borderRadius: BorderRadius.circular(30),
+    return Scaffold(
+      backgroundColor: Colors.white,
+      body: SafeArea(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: EdgeInsets.symmetric(horizontal: 16.w),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  CommonAppBar(
+                    isWhiteLogo: false,
+                    isProfilePage: false,
+                    showCart: false,
+                    showDivider: true,
                   ),
-                  child: Row(
-                    children: [
-                      _tabButton("My Passes", 0),
-                      _tabButton("My Post Cards", 1),
-                    ],
-                  ),
-                ),
-                Row(
-                  children: [
-                    Expanded(
-                      child: selectedTab == 0
-                          ? const MyPassesPage()
-                          : const MyPostCardsPage(),
+                  backWidget(context, "Your Cart", Colors.black),
+                  SizedBox(height: 24.h),
+                  Container(
+                    padding: EdgeInsets.all(4.w),
+                    decoration: BoxDecoration(
+                      color: const Color(0xffFEE7E7),
+                      borderRadius: BorderRadius.circular(30.r),
                     ),
-                  ],
-                ),
-              ],
+                    child: Row(
+                      children: [
+                        _tabButton("My Passes", 0),
+                        _tabButton("My Post Cards", 1),
+                      ],
+                    ),
+                  ),
+                  SizedBox(height: 8.h),
+                ],
+              ),
             ),
-          ),
+            Expanded(
+              child: IndexedStack(
+                index: selectedTab,
+                children: const [
+                  MyPassesCartPage(),
+                  MyPostCardsCartPage(),
+                ],
+              ),
+            ),
+          ],
         ),
       ),
     );
@@ -79,17 +85,27 @@ class _MyCartPageState extends State<MyCartPage> {
       child: GestureDetector(
         onTap: () => setState(() => selectedTab = index),
         child: Container(
-          padding: const EdgeInsets.symmetric(vertical: 12),
+          padding: EdgeInsets.symmetric(vertical: 12.h),
           decoration: BoxDecoration(
             color: isSelected ? Colors.white : Colors.transparent,
-            borderRadius: BorderRadius.circular(30),
+            borderRadius: BorderRadius.circular(30.r),
+            boxShadow: isSelected
+                ? [
+              BoxShadow(
+                color: Colors.black.withOpacity(0.06),
+                blurRadius: 6,
+                offset: const Offset(0, 2),
+              )
+            ]
+                : [],
           ),
           child: Center(
             child: Text(
               title,
               style: TextStyle(
-                fontWeight: FontWeight.w400,
-                color: Color(0xff2A2A2A),
+                fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
+                fontSize: 13.sp,
+                color: const Color(0xff2A2A2A),
               ),
             ),
           ),
@@ -97,4 +113,4 @@ class _MyCartPageState extends State<MyCartPage> {
       ),
     );
   }
-}
+}

lib/cart/views/my_pass_cart_page_view.dart

@@ -0,0 +1,434 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:citycards_customer/cart/views/view_pass_page_view.dart';
+import 'package:citycards_customer/checkout/widget/all_coupons_bottomsheet.dart';
+import 'package:citycards_customer/common_packages/custom_dashed_line.dart';
+import 'package:citycards_customer/common_packages/custom_filled_button.dart';
+import 'package:citycards_customer/common_packages/custom_text.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../../add_details/add_details_view.dart';
+import '../../buy_a_pass/models/checkout_model.dart';
+import '../../checkout/view/checkout_view.dart';
+import '../../checkout/widget/pass_purchase_details_bottomsheet.dart';
+import '../../login/view/login_email_bottomsheet.dart';
+import '../../common_packages/common_app_texts.dart';
+import '../../localPreference/local_preference.dart';
+import '../blocs/myPassCart/my_pass_cart_bloc.dart';
+import '../blocs/myPassCart/my_pass_cart_event.dart';
+import '../blocs/myPassCart/my_pass_cart_state.dart';
+
+class MyPassesCartPage extends StatefulWidget {
+  const MyPassesCartPage({super.key});
+
+  @override
+  State<MyPassesCartPage> createState() => _MyPassesCartPageState();
+}
+
+class _MyPassesCartPageState extends State<MyPassesCartPage> {
+  // For coupon/discount management
+  String? appliedCouponCode;
+  double discountPercentage = 0.0;
+  bool isPurchaseDetailsConfirmed = false;
+
+  @override
+  void initState() {
+    super.initState();
+    // Fetch cart data when page loads
+    context.read<MyPassCartBloc>().add(const CheckLoginAndFetchEvent());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<MyPassCartBloc, MyPassCartState>(
+      builder: (context, state) {
+        if (state is MyPassCartLoading) {
+          return const Center(
+            child: CircularProgressIndicator(color: Color(0xffF95F62)),
+          );
+        }
+        // ========== HANDLE API DATA (LOGGED IN USER) ==========
+        else if (state is MyPassCartApiLoaded) {
+          final apiCartData = state.apiCartData;
+
+          if (apiCartData.cartItems.isEmpty) {
+            return const Center(child: Text('Your cart is empty'));
+          }
+
+          return SingleChildScrollView(
+            physics: const BouncingScrollPhysics(),
+            padding: EdgeInsets.symmetric(horizontal: 16.w),
+            child: Column(
+              children: [
+                SizedBox(height: 22.h),
+                ...apiCartData.cartItems.map((cartItem) {
+                  // Get hero image from cityBanners imageFilePath
+                  final String heroImage = cartItem.city.cityBanners.isNotEmpty
+                      ? cartItem.city.cityBanners.first.imageFilePath
+                      : '';
+                  final bool isFlexiCard =
+                      cartItem.cardMode.toLowerCase() == 'flexi';
+
+                  final String cityName = cartItem.city.cityName;
+                  final String cardDisplayName = cartItem.displayCardMode;
+                  final String cardTypeName = cartItem.cardMode;
+                  final int themeColor = isFlexiCard ? 0xFFF95FAF : 0xFFF95F62;
+                  final int adultCount = cartItem.totalAdult;
+                  final int childCount = cartItem.totalChild;
+                  final int validityDuration = cartItem.noOfDays;
+                  final double totalPrice = cartItem.totalAmount.toDouble();
+
+                  final bool isUnlimitedCard = cardTypeName
+                      .toLowerCase()
+                      .contains("unlimited");
+                  final String validityLabel = isUnlimitedCard
+                      ? "$validityDuration Days"
+                      : "${cartItem.noOfAttractions} Attractions";
+
+                  return Padding(
+                    padding: EdgeInsets.only(bottom: 15.h),
+                    child: GestureDetector(
+                      onTap: () {
+                        final checkoutData = CheckoutData(
+                          cityName: cityName,
+                          heroImage: heroImage,
+                          cardTypeName: cardTypeName,
+                          cardDisplayName: cardDisplayName,
+                          themeColor: Color(themeColor),
+                          adultCount: adultCount,
+                          childCount: childCount,
+                          adultPrice: 0.0,
+                          childPrice: 0.0,
+                          validityDuration: validityDuration,
+                          totalPrice: cartItem.baseAmount,
+                          description: null,
+                        );
+
+                        Navigator.of(context).push(
+                          MaterialPageRoute(
+                            builder: (context) => CheckoutView(
+                              bookingId: cartItem.id,
+                              couponId: cartItem.couponXid,
+                            ),
+                            settings: RouteSettings(arguments: checkoutData),
+                          ),
+                        );
+                      },
+                      child: _CartItemCard(
+                        heroImage: heroImage,
+                        cityName: cityName,
+                        validityLabel: validityLabel,
+                        adultCount: adultCount,
+                        childCount: childCount,
+                        totalPrice: cartItem.baseAmount.toDouble(),
+                        themeColor: themeColor,
+                        cardDisplayName: cardDisplayName,
+                      ),
+                    ),
+                  );
+                }).toList(),
+                SizedBox(height: 16.h),
+              ],
+            ),
+          );
+        }
+        // ========== HANDLE LOCAL DATA (NOT LOGGED IN) ==========
+        else if (state is MyPassCartLoaded) {
+          final cartData = state.cartData;
+
+          final String cityName = cartData['city_name'] as String? ?? '';
+          final String heroImage = cartData['hero_image'] as String? ?? '';
+          final String cardTypeName =
+              cartData['card_type_name'] as String? ?? '';
+          final String cardDisplayName =
+              cartData['card_display_name'] as String? ?? '';
+          final int themeColor = cartData['theme_color'] as int? ?? 0xFFF95FAF;
+          final int adultCount = cartData['adult_count'] as int? ?? 0;
+          final int childCount = cartData['child_count'] as int? ?? 0;
+          final double adultPrice =
+              (cartData['adult_price'] as num?)?.toDouble() ?? 0.0;
+          final double childPrice =
+              (cartData['child_price'] as num?)?.toDouble() ?? 0.0;
+          final int validityDuration =
+              cartData['validity_duration'] as int? ?? 0;
+          final double totalPrice =
+              (cartData['total_price'] as num?)?.toDouble() ?? 0.0;
+          final String? description = cartData['description'] as String?;
+
+          // Calculate pricing
+          final double subtotal = totalPrice;
+          final double discountAmount = subtotal * (discountPercentage / 100);
+          final double totalBeforeTax = subtotal - discountAmount;
+          final double taxAmount = 2;
+          final double finalTotal = totalBeforeTax + taxAmount;
+
+          final bool isUnlimitedCard = cardTypeName == "unlimited_card";
+          final String validityLabel = isUnlimitedCard
+              ? "$validityDuration Days"
+              : "$validityDuration Attractions";
+
+          return SingleChildScrollView(
+            physics: const BouncingScrollPhysics(),
+            padding: EdgeInsets.symmetric(horizontal: 16.w),
+            child: Column(
+              children: [
+                SizedBox(height: 22.h),
+                _CartItemCard(
+                  heroImage: heroImage,
+                  cityName: cityName,
+                  validityLabel: validityLabel,
+                  adultCount: adultCount,
+                  childCount: childCount,
+                  totalPrice: totalPrice,
+                  themeColor: themeColor,
+                  cardDisplayName: cardDisplayName,
+                ),
+                SizedBox(height: 16.h),
+              ],
+            ),
+          );
+        }
+        // ========== EMPTY STATE ==========
+        else if (state is MyPassCartEmpty) {
+          return Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Center(
+              child: Column(
+                // mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Image.asset("assets/gif/empty_cart.gif", width: 250.w),
+                  CustomText(
+                    text: "You do not have any passes",
+                    size: 22.sp,
+                    color: const Color(0xFFF95F62),
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 4.h),
+                  Text(
+                    "Get a pass and get offers and discounts and more on your trip to your favourite city",
+                    style: TextStyle(
+                      color: const Color(0xFF656565),
+                      fontSize: 14.sp,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 40.h),
+                  CustomFilledButton(
+                    onTap: () {
+                      Navigator.pop(context);
+                    },
+                    label: "Buy a Pass",
+                  ),
+                ],
+              ),
+            ),
+          );
+        }
+        // ========== ERROR STATE ==========
+        else if (state is MyPassCartError) {
+          return Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(Icons.error_outline, size: 60.sp, color: Colors.red),
+                SizedBox(height: 16.h),
+                CustomText(
+                  text: "Error loading cart",
+                  size: 16.sp,
+                  color: Colors.red,
+                ),
+                SizedBox(height: 8.h),
+                CustomText(
+                  text: state.message,
+                  size: 12.sp,
+                  color: Colors.grey,
+                ),
+              ],
+            ),
+          );
+        }
+
+        return const SizedBox.shrink();
+      },
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────────
+// Cart Item Card Widget
+// ─────────────────────────────────────────────────────────────
+class _CartItemCard extends StatelessWidget {
+  final String heroImage;
+  final String cityName;
+  final String validityLabel;
+  final int adultCount;
+  final int childCount;
+  final double totalPrice;
+  final int themeColor;
+  final String cardDisplayName;
+
+  const _CartItemCard({
+    required this.heroImage,
+    required this.cityName,
+    required this.validityLabel,
+    required this.adultCount,
+    required this.childCount,
+    required this.totalPrice,
+    required this.themeColor,
+    required this.cardDisplayName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.white,
+        border: Border.all(color: Color(themeColor).withOpacity(0.2)),
+        borderRadius: BorderRadius.circular(8.r),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          // Left image
+          ClipRRect(
+            borderRadius: BorderRadius.only(
+              topLeft: Radius.circular(8.r),
+              bottomLeft: Radius.circular(8.r),
+            ),
+            child: heroImage.isNotEmpty
+                ? CachedNetworkImage(
+                    imageUrl: heroImage,
+                    width: 105.w,
+                    height: 130.h,
+                    fit: BoxFit.cover,
+                    errorWidget: (context, url, error) => Image.asset(
+                      "assets/images/card_banner.png",
+                      scale: 4,
+                      width: 105.w,
+                      height: 123.h,
+                      fit: BoxFit.cover,
+                    ),
+                    placeholder: (context, url) => Image.asset(
+                      "assets/images/card_banner.png",
+                      scale: 4,
+                      width: 105.w,
+                      height: 123.h,
+                      fit: BoxFit.cover,
+                    ),
+                  )
+                : Image.asset(
+                    "assets/images/card_banner.png",
+                    scale: 4,
+                    width: 105.w,
+                    height: 123.h,
+                    fit: BoxFit.cover,
+                  ),
+          ),
+          SizedBox(width: 6.66.w),
+
+          // Middle content
+          Expanded(
+            child: Padding(
+              padding: EdgeInsets.symmetric(vertical: 10.h),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  CustomText(
+                    text: cityName,
+                    weight: FontWeight.w500,
+                    size: 16.sp,
+                  ),
+                  SizedBox(height: 5.h),
+                  CustomText(
+                    text: validityLabel,
+                    color: const Color(0xFF8E8E8E),
+                    size: 12.sp,
+                  ),
+                  SizedBox(height: 5.h),
+
+                  // Adult row
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Row(
+                        children: [
+                          Image.asset('assets/icons/adult.png', scale: 4),
+                          SizedBox(width: 4.w),
+                          CustomText(
+                            text:
+                                "$adultCount ${adultCount == 1 ? 'adult' : 'adults'}",
+                            color: const Color(0xFF8E8E8E),
+                            size: 12.sp,
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+
+                  SizedBox(height: 5.h),
+
+                  // Kid + Price row
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Row(
+                        children: [
+                          Image.asset("assets/icons/kid.png", scale: 4),
+                          SizedBox(width: 4.w),
+                          CustomText(
+                            text:
+                                "$childCount ${childCount == 1 ? 'Kid' : 'Kids'}",
+                            color: const Color(0xFF8E8E8E),
+                            size: 12.sp,
+                          ),
+                        ],
+                      ),
+                      CustomText(
+                        text: "\$${totalPrice.toStringAsFixed(2)}",
+                        size: 20.sp,
+                        weight: FontWeight.w500,
+                        color: Color(themeColor),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+
+          SizedBox(width: 6.w),
+
+          // Right colored tab
+          Container(
+            width: 35.w,
+            height: 130.h,
+            decoration: BoxDecoration(
+              color: Color(themeColor),
+              borderRadius: BorderRadius.only(
+                bottomRight: Radius.circular(8.r),
+                topRight: Radius.circular(8.r),
+              ),
+            ),
+            child: RotatedBox(
+              quarterTurns: -1,
+              child: Center(
+                child: RichText(
+                  text: TextSpan(
+                    children: [
+                      TextSpan(
+                        text: "$cardDisplayName ",
+                        style: TextStyle(color: Colors.white, fontSize: 14.sp),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/cart/views/my_pass_page_view.dart

@@ -1,382 +0,0 @@
-import 'package:citycards_customer/cart/views/view_pass_page_view.dart';
-import 'package:citycards_customer/checkout/widget/all_coupons_bottomsheet.dart';
-import 'package:citycards_customer/common_packages/custom_dashed_line.dart';
-import 'package:citycards_customer/common_packages/custom_filled_button.dart';
-import 'package:citycards_customer/common_packages/custom_text.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import '../../checkout/widget/login_email_bottomsheet.dart';
-import '../../common_packages/common_app_texts.dart';
-import '../blocs/pass_bloc.dart';
-
-class MyPassesPage extends StatelessWidget {
-  const MyPassesPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<PassBloc, PassState>(
-      builder: (context, state) {
-        if (state is PassLoading) {
-          return const Center(child: CircularProgressIndicator());
-        } else if (state is PassLoaded) {
-          return
-            Column(
-            children: [
-              SizedBox(height: 22.h),
-              Container(
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    border: Border.all(
-                      color: Color(0xFFF95FAF).withOpacity(0.2),
-                    ),
-                    borderRadius: BorderRadius.circular(8.r),
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Row(
-                        children: [
-                          ClipRRect(
-                            borderRadius: BorderRadius.only(
-                              topLeft: Radius.circular(8.r),
-                              bottomLeft: Radius.circular(8.r),
-                            ),
-                            child: Image.asset(
-                              "assets/images/card_banner.png",
-                              scale: 4,
-                              width: 105.w,
-                              height: 123.h,
-                              fit: BoxFit.cover,
-                            ),
-                          ),
-                          SizedBox(width: 6.66.w),
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              CustomText(
-                                text: "Melbourne",
-                                weight: FontWeight.w500,
-                                size: 16.sp,
-                              ),
-                              SizedBox(height: 5.h),
-                              CustomText(
-                                text: "2 Days",
-                                color: Color(0xFF8E8E8E),
-                                size: 12.sp,
-                              ),
-                              SizedBox(height: 5.h),
-
-                              SizedBox(
-                                width: MediaQuery.of(context).size.width * .5,
-                                child: Row(
-                                  mainAxisAlignment:
-                                      MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    Row(
-                                      children: [
-                                        Image.asset(
-                                          'assets/icons/adult.png',
-                                          scale: 4,
-                                        ),
-                                        SizedBox(width: 4.w),
-                                        CustomText(
-                                          text: "3 adults",
-                                          color: Color(0xFF8E8E8E),
-                                          size: 12.sp,
-                                        ),
-                                      ],
-                                    ),
-
-                                    Row(
-                                      children: [
-                                        Image.asset(
-                                          'assets/icons/qty.png',
-                                          scale: 4,
-                                        ),
-                                        SizedBox(width: 4.w),
-                                        Text.rich(
-                                          TextSpan(
-                                            children: [
-                                              TextSpan(
-                                                text: "Qty:",
-                                                style: TextStyle(
-                                                  color: Color(0xFF8E8E8E),
-                                                  fontSize: 12.sp,
-                                                ),
-                                              ),
-                                              TextSpan(
-                                                text: " 2",
-                                                style: TextStyle(
-                                                  color: Color(0xFF000000),
-                                                  fontSize: 12.sp,
-                                                  fontWeight: FontWeight.w500,
-                                                ),
-                                              ),
-                                            ],
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              ),
-
-                              SizedBox(height: 5.h),
-                              Row(
-                                children: [
-                                  Image.asset(
-                                    "assets/icons/kid.png",
-                                    scale: 4,
-                                  ),
-                                  SizedBox(width: 4.w),
-                                  CustomText(
-                                    text: "3 Kids",
-                                    color: Color(0xFF8E8E8E),
-                                    size: 12.sp,
-                                  ),
-
-                                  SizedBox(width: 53.w),
-
-                                  CustomText(
-                                    text: "\$49.50",
-                                    size: 24.sp,
-                                    weight: FontWeight.w500,
-                                    color: Color(0xFFF95F62),
-                                  ),
-                                ],
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-
-                      Container(
-                        width: 35.w,
-                        height: 123.h,
-                        decoration: BoxDecoration(
-                          color: Color(0xFFF97316),
-                          borderRadius: BorderRadius.only(
-                            bottomRight: Radius.circular(8.r),
-                            topRight: Radius.circular(8.r),
-                          ),
-                        ),
-                        child: RotatedBox(
-                          quarterTurns: -1,
-                          child: Center(
-                            child: RichText(
-                              text: TextSpan(
-                                children: [
-                                  TextSpan(
-                                    text: "${CommonAppText.selectiveCard} ",
-                                    style: TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 16.sp,
-                                    ),
-                                  ),
-                                  TextSpan(
-                                    text: "Card",
-                                    style: TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 12.sp,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              SizedBox(height: 15.h),
-              Container(
-                padding: EdgeInsets.symmetric(
-                  horizontal: 12.w,
-                  vertical: 12.h,
-                ),
-                decoration: BoxDecoration(
-                  color: Color(0xFFFFF5F5),
-                  borderRadius: BorderRadius.circular(8.r),
-                  border: Border.all(
-                    color: Color(0xFFBB474A).withOpacity(0.4),
-                    width: 0.8,
-                  ),
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        CustomText(
-                          text: "Get 10% off on your first trip",
-                          color: Color(0xFF262626),
-                          size: 14.sp,
-                        ),
-                        SizedBox(height: 7.h),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          children: [
-                            GestureDetector(
-                              onTap: () {
-                                showModalBottomSheet(
-                                  context: context,
-                                  isScrollControlled: true,
-                                  backgroundColor: Colors.white,
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.vertical(
-                                      top: Radius.circular(12.r),
-                                    ),
-                                  ),
-                                  builder: (_) => AllCouponsBottomsheet(),
-                                );
-                              },
-                              child: CustomText(
-                                text: "View all coupons",
-                                color: Color(0xFFF95F62),
-                                size: 12,
-                              ),
-                            ),
-                            SizedBox(width: 3.w),
-                            Icon(Icons.arrow_right, color: Color(0xFFF95F62)),
-                          ],
-                        ),
-                      ],
-                    ),
-
-                    const Spacer(),
-                    Container(
-                      padding: EdgeInsets.symmetric(
-                        horizontal: 20.w,
-                        vertical: 10.h,
-                      ),
-                      decoration: BoxDecoration(
-                        border: Border.all(color: Color(0xFFF95F62)),
-                        borderRadius: BorderRadius.circular(8.r),
-                      ),
-                      child: CustomText(
-                        text: "Apply",
-                        color: Color(0xFFF95F62),
-                        size: 14.sp,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-
-              SizedBox(height: 15.h),
-
-              DashedDivider(
-                color: Color(0xFFACACAC),
-                thickness: 1.h,
-                dashLength: 4,
-                dashSpace: 4,
-              ),
-              SizedBox(height: 10.h),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  CustomText(text: "Subtotal", size: 14.sp),
-                  CustomText(
-                    text: "\$49.50",
-                    size: 14.sp,
-                    weight: FontWeight.w500,
-                  ),
-                ],
-              ),
-              SizedBox(height: 14.h),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  CustomText(text: "Discount", size: 14.sp),
-                  CustomText(
-                    text: "-7.20%",
-                    size: 14.sp,
-                    weight: FontWeight.w500,
-                  ),
-                ],
-              ),
-              SizedBox(height: 10.h),
-              DashedDivider(
-                color: Color(0xFFACACAC),
-                thickness: 1.h,
-                dashLength: 4,
-                dashSpace: 4,
-              ),
-              SizedBox(height: 10.h),
-
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        CustomText(text: 'Total', size: 14.sp),
-                        SizedBox(height: 4.h),
-                        CustomText(
-                          text: "Including \$2.24 in taxes",
-                          size: 12.sp,
-                          color: Colors.black.withOpacity(0.6),
-                        ),
-                      ],
-                    ),
-                  ),
-                  CustomText(
-                    text: "\$42.60",
-                    size: 24.sp,
-                    weight: FontWeight.w500,
-                  ),
-                ],
-              ),
-
-              SizedBox(height: 150.h,),
-
-              CustomFilledButton(
-                onTap: () {
-                  showModalBottomSheet(
-                    backgroundColor: Colors.white,
-                    context: context,
-                    isScrollControlled: true,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.vertical(
-                        top: Radius.circular(12.r),
-                      ),
-                    ),
-                    builder: (_) => const LoginEmailBottomsheet(),
-                  );
-                },
-                width: double.infinity,
-                label: "Proceed to Checkout",
-              ),
-              SizedBox(height: 25.h),
-            ],
-          );
-        }
-        return Center(
-          child: Column(
-            children: [
-              Image.asset("assets/gif/empty_cart.gif", width: 250.w),
-              CustomText(
-                text: "You do not have any passes",
-                size: 24.sp,
-                color: Color(0xFFF95F62),
-              ),
-              SizedBox(height: 4.h),
-              Text(
-                "Get a pass and get offers and discounts and more on your trip to your favourite city",
-                style: TextStyle(color: Color(0xFF656565), fontSize: 14.sp),
-                textAlign: TextAlign.center,
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-
-
-}

lib/cart/views/my_postcard_cart_page_view.dart

@@ -0,0 +1,501 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+import '../../common_bloc/bottom_navigation_bloc.dart';
+import '../../common_packages/custom_filled_button.dart';
+import '../../common_packages/custom_text.dart';
+import '../../login/view/login_email_bottomsheet.dart';
+import '../../postcard/blocs/edit_postcard/edit_postcard_bloc.dart';
+import '../../postcard/blocs/myPostCards/my_postcard_bloc.dart';
+import '../../postcard/blocs/myPostCards/my_postcard_event.dart';
+import '../../postcard/blocs/pick_images/pick_images_bloc.dart';
+import '../../postcard/blocs/postcardCheckout/postcard_checkout_bloc.dart';
+import '../../postcard/models/my_postcard_model.dart';
+import '../../postcard/repository/postcard_checkout_repository.dart';
+import '../../postcard/views/edit_postcard_view.dart';
+import '../../postcard/views/postcard_checkout_page_view.dart';
+import '../blocs/myPostcardsCart/my_postcards_cart_bloc.dart';
+import '../blocs/myPostcardsCart/my_postcards_cart_state.dart';
+import '../model/my_postcards_cart_model.dart';
+import '../widget/ticket_card_view.dart';
+
+class MyPostCardsCartPage extends StatelessWidget {
+  const MyPostCardsCartPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<MyPostCardsCartBloc, MyPostCardsCartState>(
+      builder: (context, state) {
+        if (state is MyPostCardsCartLoading) {
+          return const Center(
+            child: CircularProgressIndicator(color: Color(0xffF95F62)),
+          );
+        }
+        if (state is MyPostCardsCartNotLoggedIn) {
+          return _NotLoggedInScreen(onLoginTap: () {});
+        }
+        if (state is MyPostCardsCartEmpty) {
+          return _EmptyCartScreen(
+            onRefresh: () =>
+                context.read<MyPostCardsCartBloc>().add(CheckLoginAndFetchPostcardsCart()),
+          );
+        }
+        if (state is MyPostCardsCartError) {
+          return _ErrorScreen(
+            message: state.message,
+            onRetry: () =>
+                context.read<MyPostCardsCartBloc>().add(CheckLoginAndFetchPostcardsCart()),
+          );
+        }
+        if (state is MyPostCardsCartLoaded) {
+          return _CartLoadedScreen(cartData: state.cartData);
+        }
+        return const SizedBox.shrink();
+      },
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────
+// CART LOADED
+// ─────────────────────────────────────────────────────────
+class _CartLoadedScreen extends StatefulWidget {
+  final MyPostCardsCartModel cartData;
+  const _CartLoadedScreen({required this.cartData});
+
+  @override
+  State<_CartLoadedScreen> createState() => _CartLoadedScreenState();
+}
+
+class _CartLoadedScreenState extends State<_CartLoadedScreen> {
+  final ScrollController _scrollController = ScrollController();
+
+  int _selectedIndex = 0;
+
+  // Height of one card slot (card height + bottom padding).
+  // 330h card + 20h gap = 350. Adjust if your device renders differently.
+  static const double _cardItemHeight = 350.0;
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(_onScroll);
+  }
+
+  @override
+  void dispose() {
+    _scrollController.removeListener(_onScroll);
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onScroll() {
+    final offset = _scrollController.offset;
+    final newIndex = (offset / _cardItemHeight).round();
+    final clamped = newIndex.clamp(0, widget.cartData.cartItems.length - 1);
+    if (clamped != _selectedIndex) {
+      setState(() => _selectedIndex = clamped);
+    }
+  }
+
+  void _navigateToCheckout(CartItem item) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (_) => BlocProvider(
+          create: (_) =>
+              PostcardCheckoutBloc(repository: CreatePostCardRepository()),
+          child: PostcardCheckoutPageView(
+            countryName: item.countryName,
+            cityName: item.cityName,
+            stateName: item.stateName,
+            zipCode: item.zipCode,
+            address1: item.address1,
+            address2: item.address2 ?? '',
+            pcTitle: item.pcTitle,
+            pcNumber: item.pcNumber,
+            fullname: item.fullname,
+            emailAddress: item.emailAddress,
+            mobileNumber: item.mobileNumber,
+            isdCode: item.isdCode.isNotEmpty ? item.isdCode : '+91',
+            isForSelf: true,
+            baseAmount: item.baseAmount.toDouble(),
+            totalTaxAmount: item.totalTaxAmount.toDouble(),
+            totalAmount: item.totalAmount.toDouble(),
+            postcardId: item.id,
+            pcImage: item.pcImagePath,
+            pcContent: item.pcContent,
+            isEditMode: true,
+            senderName: item.senderFullName,
+            senderCity: item.senderCityName,
+            senderCountry: item.senderCountryName,
+            isCartMode: true,
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final items = widget.cartData.cartItems;
+
+    return Column(
+      children: [
+        // ── Info Banner ──────────────────────────────────────
+        Padding(
+          padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 10.h),
+          child: Container(
+            width: double.infinity,
+            padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 12.h),
+            decoration: BoxDecoration(
+              color: const Color(0xffF95F62).withValues(alpha: 0.1),
+              border: Border.all(color: const Color(0xffF95F62), width: 1),
+              borderRadius: BorderRadius.circular(15.r),
+            ),
+            child: Row(
+              children: [
+                Container(
+                  width: 28.w,
+                  height: 28.w,
+                  decoration: const BoxDecoration(
+                    color: Color(0xffF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: Icon(
+                    Icons.info_outline_rounded,
+                    color: Colors.white,
+                    size: 16.sp,
+                  ),
+                ),
+                SizedBox(width: 10.w),
+                Expanded(
+                  child: Text(
+                    'You can purchase one postcard at a time',
+                    style: GoogleFonts.poppins(
+                      fontSize: 12.sp,
+                      color: const Color(0xFF212121),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+
+        // ── Scrollable list ──────────────────────────────────
+        Expanded(
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              // Actual pixel height of the visible list area
+              final listViewHeight = constraints.maxHeight;
+
+              // KEY FIX: Add trailing bottom padding equal to
+              // (listHeight - one card slot) so the last card can scroll
+              // all the way to the top and become "selected".
+              final trailingPadding = (listViewHeight - _cardItemHeight).clamp(
+                0.0,
+                double.infinity,
+              );
+
+              return ListView.builder(
+                controller: _scrollController,
+                padding: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, trailingPadding),
+                itemCount: items.length,
+                itemBuilder: (context, index) {
+                  final isSelected = index == _selectedIndex;
+
+                  return Padding(
+                    padding: EdgeInsets.only(bottom: 20.h),
+                    child: AnimatedOpacity(
+                      opacity: isSelected ? 1.0 : 0.4,
+                      duration: const Duration(milliseconds: 300),
+                      child: AnimatedScale(
+                        scale: isSelected ? 1.0 : 0.95,
+                        duration: const Duration(milliseconds: 300),
+                        child: Stack(
+                          children: [
+                            TicketCard(
+                              cartItem: items[index],
+                              onEditDraft: () async {
+                                final result = await Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (_) => MultiBlocProvider(
+                                      providers: [
+                                        BlocProvider(
+                                          create: (context) =>
+                                              EditPostcardBloc(),
+                                        ),
+                                        BlocProvider(
+                                          create: (context) => PickImagesBloc(),
+                                        ),
+                                      ],
+
+                                      child: EditPostcardView(
+                                        myPostCard: MyPostCard(
+                                          id: items[index].id,
+                                          pcTitle: items[index].pcTitle,
+                                          pcNumber: items[index].pcNumber,
+                                          pcImagePath: items[index].pcImagePath,
+                                          pcContent: items[index].pcContent,
+                                          fullname: items[index].fullname,
+                                          emailAddress: items[index].emailAddress,
+                                          mobileNumber: items[index].mobileNumber,
+                                          isdCode: items[index].isdCode.isNotEmpty ? items[index].isdCode : '+91',
+                                          address1: items[index].address1,
+                                          address2: items[index].address2 ?? '',
+                                          cityName: items[index].cityName,
+                                          stateName: items[index].stateName,
+                                          countryName: items[index].countryName,
+                                          zipCode: items[index].zipCode,
+                                          baseAmount: items[index].baseAmount.toDouble(),
+                                          totalTaxAmount: items[index].totalTaxAmount.toDouble(),
+                                          totalAmount: items[index].totalAmount.toDouble(),
+                                          isForSelf: items[index].isForSelf,
+                                          senderCityName: items[index].senderCityName,
+                                          senderCountryName: items[index].senderCountryName,
+                                          senderFullName: items[index].senderFullName,
+                                          userXid: 0,
+                                          pcDatetime:   DateTime.now(),
+                                          orderStatus: '',
+                                          isPaid: false,
+                                          paymentMode: '',
+                                          paymentStatus: '',
+                                          isDraft: false,
+                                          isAddedToCart: true,
+                                          isActive: true,
+                                          createdAt:  DateTime.now(),
+                                          updatedAt:  DateTime.now(),
+                                        ), isCartMode: true,
+                                      ),
+                                    ),
+                                  ),
+                                );
+
+                                if (result == true) {
+                                  // ignore: use_build_context_synchronously
+                                  context.read<MyPostCardBloc>().add(
+                                    const RefreshDraftPostCards(),
+                                  );
+                                }
+                              },
+                            ),
+                            // ── Selected badge ──
+                            // if (isSelected)
+                            //   Positioned(
+                            //     top: 12.h,
+                            //     right: 20.w,
+                            //     child: Container(
+                            //       padding: EdgeInsets.symmetric(
+                            //           horizontal: 10.w, vertical: 4.h),
+                            //       decoration: BoxDecoration(
+                            //         color: const Color(0xffF95F62),
+                            //         borderRadius: BorderRadius.circular(20.r),
+                            //       ),
+                            //       child: Text(
+                            //         'Selected',
+                            //         style: GoogleFonts.poppins(
+                            //           color: Colors.white,
+                            //           fontSize: 10.sp,
+                            //           fontWeight: FontWeight.w600,
+                            //         ),
+                            //       ),
+                            //     ),
+                            //   ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              );
+            },
+          ),
+        ),
+
+        SizedBox(height: 14.h),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: CustomFilledButton(
+            width: double.infinity,
+            onTap: () {
+              // Navigator.pop(context);
+              _navigateToCheckout(items[_selectedIndex]);
+            },
+            label: "Proceed to Checkout",
+          ),
+        ),
+        SizedBox(height: 14.h),
+      ],
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────
+// NOT LOGGED IN
+// ─────────────────────────────────────────────────────────
+class _NotLoggedInScreen extends StatelessWidget {
+  final VoidCallback onLoginTap;
+  const _NotLoggedInScreen({required this.onLoginTap});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Center(
+        child: Column(
+          // mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Image.asset("assets/gif/empty_cart.gif", width: 250.w),
+            CustomText(
+              text: "You are not logged in yet!",
+              size: 22.sp,
+              color: const Color(0xFFF95F62),
+              textAlign: TextAlign.center,
+            ),
+            SizedBox(height: 4.h),
+            Text(
+              "To access my postcards cart please login",
+              style: TextStyle(
+                color: const Color(0xFF656565),
+                fontSize: 14.sp,
+              ),
+              textAlign: TextAlign.center,
+            ),
+            SizedBox(height: 40.h),
+            CustomFilledButton(
+              onTap: () {
+                showModalBottomSheet(
+                  backgroundColor: Colors.white,
+                  context: context,
+                  isScrollControlled: true,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.vertical(top: Radius.circular(12.r)),
+                  ),
+                  builder: (_) => const LoginEmailBottomsheet(),
+                );
+              },
+              label: "Login to Checkout",
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────
+// EMPTY CART
+// ─────────────────────────────────────────────────────────
+class _EmptyCartScreen extends StatelessWidget {
+  final VoidCallback onRefresh;
+  const _EmptyCartScreen({required this.onRefresh});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 16.w),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Image.asset('assets/gif/empty_post_card.gif', width: 200.w),
+            SizedBox(height: 16.h),
+            Text(
+              'You do not have any postcards',
+              style: GoogleFonts.poppins(
+                fontSize: 20.sp,
+                fontWeight: FontWeight.w600,
+                color: const Color(0xffF95F62),
+              ),
+              textAlign: TextAlign.center,
+            ),
+            SizedBox(height: 8.h),
+            Text(
+              "You do not possess any postcards yet nor have you sent to anyone",
+              textAlign: TextAlign.center,
+              style: GoogleFonts.poppins(
+                fontSize: 14.sp,
+                color: const Color(0xFF656565),
+              ),
+
+            ),
+            SizedBox(height: 40.h),
+            CustomFilledButton(
+              onTap: () {
+                Navigator.pop(context);
+              },
+              label: "Design my postcard",
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// ─────────────────────────────────────────────────────────
+// ERROR
+// ─────────────────────────────────────────────────────────
+class _ErrorScreen extends StatelessWidget {
+  final String message;
+  final VoidCallback onRetry;
+  const _ErrorScreen({required this.message, required this.onRetry});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: EdgeInsets.symmetric(horizontal: 32.w),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(
+              Icons.error_outline_rounded,
+              size: 64.sp,
+              color: const Color(0xffF95F62),
+            ),
+            SizedBox(height: 16.h),
+            Text(
+              'Something went wrong',
+              style: GoogleFonts.poppins(
+                fontSize: 18.sp,
+                fontWeight: FontWeight.w600,
+                color: const Color(0xFF212121),
+              ),
+            ),
+            SizedBox(height: 8.h),
+            Text(
+              message,
+              textAlign: TextAlign.center,
+              style: GoogleFonts.poppins(
+                fontSize: 13.sp,
+                color: const Color(0xFF656565),
+              ),
+            ),
+            SizedBox(height: 24.h),
+            OutlinedButton(
+              onPressed: onRetry,
+              style: OutlinedButton.styleFrom(
+                side: const BorderSide(color: Color(0xffF95F62)),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(30.r),
+                ),
+                padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 12.h),
+              ),
+              child: Text(
+                'Retry',
+                style: TextStyle(
+                  color: const Color(0xffF95F62),
+                  fontSize: 14.sp,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/cart/views/my_postcard_page_view.dart

@@ -1,204 +0,0 @@
-import 'package:citycards_customer/cart/widget/ticket_card_view.dart';
-import 'package:citycards_customer/checkout/widget/all_coupons_bottomsheet.dart';
-import 'package:citycards_customer/common_packages/custom_filled_button.dart';
-import 'package:citycards_customer/common_packages/custom_text.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import '../../checkout/widget/login_email_bottomsheet.dart';
-import '../blocs/postcard_bloc.dart';
-
-class MyPostCardsPage extends StatelessWidget {
-  const MyPostCardsPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<PostCardBloc, PostCardState>(
-      builder: (context, state) {
-        if (state is PostCardLoading) {
-          return const Center(child: CircularProgressIndicator());
-        } else if (state is PostCardLoaded) {
-          return SingleChildScrollView(
-            padding: const EdgeInsets.all(16),
-            child:
-            Column(
-              children: [
-                TicketCard(),
-                SizedBox(height: 40.h),
-                Container(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: 12.w,
-                    vertical: 12.h,
-                  ),
-                  decoration: BoxDecoration(
-                    color: Color(0xFFFFF5F5),
-                    borderRadius: BorderRadius.circular(8.r),
-                    border: Border.all(
-                      color: Color(0xFFBB474A).withOpacity(0.4),
-                      width: 0.8,
-                    ),
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          CustomText(
-                            text: "Get 10% off on your first trip",
-                            color: Color(0xFF262626),
-                            size: 14.sp,
-                          ),
-                          SizedBox(height: 7.h),
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            children: [
-                              GestureDetector(
-                                onTap: () {
-                                  showModalBottomSheet(
-                                    context: context,
-                                    isScrollControlled: true,
-                                    backgroundColor: Colors.white,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.vertical(
-                                        top: Radius.circular(12.r),
-                                      ),
-                                    ),
-                                    builder: (_) => AllCouponsBottomsheet(),
-                                  );
-                                },
-                                child: CustomText(
-                                  text: "View all coupons",
-                                  color: Color(0xFFF95F62),
-                                  size: 12,
-                                ),
-                              ),
-                              SizedBox(width: 3.w),
-                              Icon(Icons.arrow_right, color: Color(0xFFF95F62)),
-                            ],
-                          ),
-                        ],
-                      ),
-
-                      const Spacer(),
-                      Container(
-                        padding: EdgeInsets.symmetric(
-                          horizontal: 20.w,
-                          vertical: 10.h,
-                        ),
-                        decoration: BoxDecoration(
-                          border: Border.all(color: Color(0xFFF95F62)),
-                          borderRadius: BorderRadius.circular(8.r),
-                        ),
-                        child: CustomText(
-                          text: "Apply",
-                          color: Color(0xFFF95F62),
-                          size: 14.sp,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-                SizedBox(height: 15.h),
-
-                Divider(color: Color(0xFFACACAC), thickness: 1.h),
-                SizedBox(height: 10.h),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    CustomText(text: "Subtotal", size: 14.sp),
-                    CustomText(
-                      text: "\$49.50",
-                      size: 14.sp,
-                      weight: FontWeight.w500,
-                    ),
-                  ],
-                ),
-                SizedBox(height: 14.h),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    CustomText(text: "Discount", size: 14.sp),
-                    CustomText(
-                      text: "-7.20%",
-                      size: 14.sp,
-                      weight: FontWeight.w500,
-                    ),
-                  ],
-                ),
-                SizedBox(height: 10.h),
-                Divider(color: Color(0xFFACACAC), thickness: 1.h),
-                SizedBox(height: 10.h),
-
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          CustomText(text: 'Total', size: 14.sp),
-                          SizedBox(height: 4.h),
-                          CustomText(
-                            text: "Including \$2.24 in taxes",
-                            size: 12.sp,
-                            color: Colors.black.withOpacity(0.6),
-                          ),
-                        ],
-                      ),
-                    ),
-                    CustomText(
-                      text: "\$42.60",
-                      size: 24.sp,
-                      weight: FontWeight.w500,
-                    ),
-                  ],
-                ),
-                SizedBox(height: 60.h),
-                CustomFilledButton(
-                  onTap: () {
-                    showModalBottomSheet(
-                      backgroundColor: Colors.white,
-                      context: context,
-                      isScrollControlled: true,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(12.r),
-                        ),
-                      ),
-                      builder: (_) => const LoginEmailBottomsheet(),
-                    );
-                  },
-                  width: double.infinity,
-                  label: "Proceed to Checkout",
-                ),
-              ],
-            ),
-          );
-        }
-        return Center(
-          child: Column(
-            children: [
-              Image.asset("assets/gif/empty_post_card.gif", width: 250.w),
-              Text(
-               "You do not have any postcards",
-                style: TextStyle(
-                  fontSize: 24.sp,
-                  color: Color(0xFFF95F62)
-                ),
-               textAlign: TextAlign.center,
-              ),
-              SizedBox(height: 4.h),
-              Text(
-                "You do not possess any postcards yet nor have you sent to anyone",
-                style: TextStyle(color: Color(0xFF656565), fontSize: 14.sp),
-                textAlign: TextAlign.center,
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}

lib/cart/widget/ticket_card_view.dart

@@ -1,9 +1,18 @@
-import 'package:citycards_customer/common_packages/custom_dashed_line.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:citycards_customer/networkApiServices/api_urls.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../model/my_postcards_cart_model.dart';
 
 class TicketCard extends StatelessWidget {
-  const TicketCard({super.key});
+  final CartItem cartItem;
+  final VoidCallback onEditDraft;
+
+  const TicketCard({
+    super.key,
+    required this.cartItem,
+    required this.onEditDraft,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -13,43 +22,101 @@ class TicketCard extends StatelessWidget {
         child: ClipPath(
           clipper: TicketClipper(),
           child: Container(
-            width: 270.w,
-            height: 400.h,
-            padding: EdgeInsets.all(16.w),
+            width: 240.w,
+            height: 340.h,
+            padding: EdgeInsets.all(14.w),
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(12.r),
+              borderRadius: BorderRadius.circular(24.r), // ← was 12.r
             ),
             child: Column(
               children: [
+                // ── Postcard Image ──
                 ClipRRect(
-                  borderRadius: BorderRadius.circular(12.r),
-                  child: Image.asset(
-                    'assets/images/card_banner.png',
-                    width: 237.w,
-                    height: 198.h,
+                  borderRadius: BorderRadius.circular(16.r),
+                  child: cartItem.pcImagePath.isNotEmpty
+                      ? CachedNetworkImage(
+                    imageUrl:
+                    '${ApiUrls.baseUrl}${cartItem.pcImagePath}',
+                    width: 210.w,
+                    height: 170.h,
                     fit: BoxFit.cover,
+                    progressIndicatorBuilder:
+                        (context, url, progress) {
+                      return Container(
+                        width: 210.w,
+                        height: 170.h,
+                        decoration: BoxDecoration(
+                          color: Colors.grey.shade200,
+                          borderRadius: BorderRadius.circular(16.r),
+                        ),
+                        alignment: Alignment.center,
+                        child: CircularProgressIndicator(
+                          color: const Color(0xffF95F62),
+                          value: progress.progress,
+                        ),
+                      );
+                    },
+                    errorWidget: (_, __, ___) => _placeholderImage(),
+                  )
+                      : _placeholderImage(),
+                ),
+
+                SizedBox(height: 25.h),
+
+                // ── Dashed Divider ──
+                // Transform.translate shifts left by container padding (14.w)
+                // so dashes start/end at the notch centers.
+                Transform.translate(
+                  offset: Offset(-14.w, 0),
+                  child: SizedBox(
+                    width: 240.w,
+                    height: 14.h,
+                    child: CustomPaint(
+                      painter: _NotchDashPainter(),
+                    ),
                   ),
                 ),
-                SizedBox(height: 20.h),
-                SizedBox(
-                  width: 200.w,
-                  child: DashedDivider(
-                    color: const Color(0xFFBEBEBE),
-                    thickness: 2.h,
-                  ),
-                ),
-                SizedBox(height: 6.h),
+
+                SizedBox(height: 8.h),
+
+                // ── Title ──
                 Text(
-                  "Melbourne",
+                  cartItem.pcTitle.isNotEmpty ? cartItem.pcTitle : 'No Title',
+                  textAlign: TextAlign.center,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
                   style: TextStyle(
-                    fontSize: 18.sp,
+                    fontSize: 13.sp,
                     fontWeight: FontWeight.w500,
+                    color: const Color(0xFF212121),
+                  ),
+                ),
+
+                SizedBox(height: 22.h),
+
+                // ── Edit Draft Button ──
+                SizedBox(
+                  width: double.infinity,
+                  child: OutlinedButton(
+                    onPressed: onEditDraft,
+                    style: OutlinedButton.styleFrom(
+                      backgroundColor: Color(0xffF95F62).withValues(alpha: 0.15),
+                      side: const BorderSide(color: Color(0xffF95F62), width: 1.5),
+                      padding: EdgeInsets.symmetric(vertical: 8.h),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(30.r),
+                      ),
+                    ),
+                    child: Text(
+                      'Edit Draft',
+                      style: TextStyle(
+                        color: const Color(0xffF95F62),
+                        fontSize: 12.sp,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
                   ),
                 ),
-                SizedBox(height: 6.h),
-                _infoRow("Postcards :", "5"),
-                _infoRow("Date :", "22/04/2025"),
-                _infoRow("Time :", "12:00PM - 2:00PM"),
               ],
             ),
           ),
@@ -58,104 +125,123 @@ class TicketCard extends StatelessWidget {
     );
   }
 
-  Widget _infoRow(String title, String value) {
-    return Padding(
-      padding: EdgeInsets.symmetric(vertical: 6.h),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            title,
-            style: TextStyle(color: const Color(0xFF808080), fontSize: 12.sp),
-          ),
-          Text(
-            value,
-            style: TextStyle(fontWeight: FontWeight.w400, fontSize: 12.sp),
-          ),
-        ],
+  Widget _placeholderImage() {
+    return Container(
+      width: 210.w,
+      height: 170.h,
+      decoration: BoxDecoration(
+        color: Colors.grey.shade200,
+        borderRadius: BorderRadius.circular(16.r),
       ),
+      child: Icon(Icons.image_outlined, size: 42.sp, color: Colors.grey),
     );
   }
 }
 
-class TicketPainter extends CustomPainter {
+// ─────────────────────────────────────────────
+// Notch Dash Painter
+// Draws dashes from center of left notch to center of right notch.
+// notchRadius = 28.r, so startX = 28.w, endX = (240 - 28).w
+// ─────────────────────────────────────────────
+class _NotchDashPainter extends CustomPainter {
   @override
   void paint(Canvas canvas, Size size) {
-    final notchRadius = 23.r;
-    final dividerY = 240.h;
+    final paint = Paint()
+      ..color = const Color(0xffF95F62)
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 1.5;
 
-    final ticketPath = Path()
-      ..moveTo(12.w, 0)
-      ..lineTo(size.width - 12.w, 0)
-      ..arcToPoint(Offset(size.width, 12.h), radius: Radius.circular(12.r))
-      ..lineTo(size.width, dividerY - notchRadius)
-      ..arcToPoint(
-        Offset(size.width, dividerY + notchRadius),
-        radius: Radius.circular(notchRadius),
-        clockwise: false,
-      )
-      ..lineTo(size.width, size.height - 12.h)
-      ..arcToPoint(
-        Offset(size.width - 12.w, size.height),
-        radius: Radius.circular(12.r),
-      )
-      ..lineTo(12.w, size.height)
-      ..arcToPoint(
-        Offset(0, size.height - 12.h),
-        radius: Radius.circular(12.r),
-      )
-      ..lineTo(0, dividerY + notchRadius)
-      ..arcToPoint(
-        Offset(0, dividerY - notchRadius),
-        radius: Radius.circular(notchRadius),
-        clockwise: false,
-      )
-      ..lineTo(0, 12.h)
-      ..arcToPoint(Offset(12.w, 0), radius: Radius.circular(12.r))
-      ..close();
+    // Dashes from left notch center to right notch center.
+    // Card is 240.w wide, notchRadius = 28.w. We hardcode these because
+    // size.width here is the inner column width (240-2*14=212.w), not the card width.
+    final double startX  = 30.w; // 2.w gap from notch edge
+    final double endX    = 240.w - 30.w; // 2.w gap from notch edge
+    final double dashH   = 6.h;
+    final double dashW   = 12.w;
+    final double gap     = 5.w;
+    final double top     = (size.height - dashH) / 2;
+    final double span    = endX - startX;
 
-    final shadowPaint = Paint()
-      ..color = Colors.black.withOpacity(0.3)
-      ..maskFilter = const MaskFilter.blur(BlurStyle.outer, 8);
+    // Fit exact number of dashes: n*dashW + (n-1)*gap <= span
+    final int count = ((span + gap) / (dashW + gap)).floor();
 
-    canvas.drawPath(ticketPath, shadowPaint);
+    // Recalculate actual gap to distribute evenly
+    final double actualGap = count > 1 ? (span - count * dashW) / (count - 1) : 0;
 
-    final cardPaint = Paint()
-      ..color = const Color(0xFFFAC9CA).withOpacity(0.12)
-      ..style = PaintingStyle.fill;
-
-    canvas.drawPath(ticketPath, cardPaint);
+    double x = startX;
+    for (int i = 0; i < count; i++) {
+      canvas.drawRRect(
+        RRect.fromRectAndRadius(
+          Rect.fromLTWH(x, top, dashW, dashH),
+          Radius.circular(dashH / 2),
+        ),
+        paint,
+      );
+      x += dashW + actualGap;
+    }
   }
 
   @override
   bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
 }
 
-class TicketClipper extends CustomClipper<Path> {
+// ─────────────────────────────────────────────
+// Ticket Painter (shadow + fill)
+// ─────────────────────────────────────────────
+class TicketPainter extends CustomPainter {
   @override
-  Path getClip(Size size) {
-    final notchRadius = 23.r;
-    final dividerY = 240.h;
+  void paint(Canvas canvas, Size size) {
+    final notchRadius = 28.r;
+    final dividerY = 218.h;
 
-    final path = Path()
-      ..moveTo(12.w, 0)
-      ..lineTo(size.width - 12.w, 0)
-      ..arcToPoint(Offset(size.width, 12.h), radius: Radius.circular(12.r))
+    final ticketPath = _buildPath(size, notchRadius, dividerY);
+
+    // Shadow
+    canvas.drawPath(
+      ticketPath,
+      Paint()
+        ..color = Colors.black.withOpacity(0.15)
+        ..maskFilter = const MaskFilter.blur(BlurStyle.outer, 8),
+    );
+
+    // Fill
+    canvas.drawPath(
+      ticketPath,
+      Paint()
+        ..color = Colors.white
+        ..style = PaintingStyle.fill,
+    );
+
+    // Border stroke
+    canvas.drawPath(
+      ticketPath,
+      Paint()
+        ..color = const Color(0xffF95F62).withOpacity(0.5)
+        ..style = PaintingStyle.stroke
+        ..strokeWidth = 1.5,
+    );
+  }
+
+  Path _buildPath(Size size, double notchRadius, double dividerY) {
+    return Path()
+      ..moveTo(24.w, 0)                                                           // ← was 12.w
+      ..lineTo(size.width - 24.w, 0)                                              // ← was 12.w
+      ..arcToPoint(Offset(size.width, 24.h), radius: Radius.circular(24.r))      // ← was 12
       ..lineTo(size.width, dividerY - notchRadius)
       ..arcToPoint(
         Offset(size.width, dividerY + notchRadius),
         radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(size.width, size.height - 12.h)
+      ..lineTo(size.width, size.height - 24.h)                                    // ← was 12.h
       ..arcToPoint(
-        Offset(size.width - 12.w, size.height),
-        radius: Radius.circular(12.r),
+        Offset(size.width - 24.w, size.height),                                   // ← was 12.w
+        radius: Radius.circular(24.r),                                            // ← was 12.r
       )
-      ..lineTo(12.w, size.height)
+      ..lineTo(24.w, size.height)                                                  // ← was 12.w
       ..arcToPoint(
-        Offset(0, size.height - 12.h),
-        radius: Radius.circular(12.r),
+        Offset(0, size.height - 24.h),                                            // ← was 12.h
+        radius: Radius.circular(24.r),                                            // ← was 12.r
       )
       ..lineTo(0, dividerY + notchRadius)
       ..arcToPoint(
@@ -163,13 +249,55 @@ class TicketClipper extends CustomClipper<Path> {
         radius: Radius.circular(notchRadius),
         clockwise: false,
       )
-      ..lineTo(0, 12.h)
-      ..arcToPoint(Offset(12.w, 0), radius: Radius.circular(12.r))
+      ..lineTo(0, 24.h)                                                            // ← was 12.h
+      ..arcToPoint(Offset(24.w, 0), radius: Radius.circular(24.r))               // ← was 12
       ..close();
+  }
 
-    return path;
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
+
+// ─────────────────────────────────────────────
+// Ticket Clipper
+// ─────────────────────────────────────────────
+class TicketClipper extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    final notchRadius = 28.r;
+    final dividerY = 218.h;
+
+    return Path()
+      ..moveTo(24.w, 0)                                                           // ← was 12.w
+      ..lineTo(size.width - 24.w, 0)                                              // ← was 12.w
+      ..arcToPoint(Offset(size.width, 24.h), radius: Radius.circular(24.r))      // ← was 12
+      ..lineTo(size.width, dividerY - notchRadius)
+      ..arcToPoint(
+        Offset(size.width, dividerY + notchRadius),
+        radius: Radius.circular(notchRadius),
+        clockwise: false,
+      )
+      ..lineTo(size.width, size.height - 24.h)                                    // ← was 12.h
+      ..arcToPoint(
+        Offset(size.width - 24.w, size.height),                                   // ← was 12.w
+        radius: Radius.circular(24.r),                                            // ← was 12.r
+      )
+      ..lineTo(24.w, size.height)                                                  // ← was 12.w
+      ..arcToPoint(
+        Offset(0, size.height - 24.h),                                            // ← was 12.h
+        radius: Radius.circular(24.r),                                            // ← was 12.r
+      )
+      ..lineTo(0, dividerY + notchRadius)
+      ..arcToPoint(
+        Offset(0, dividerY - notchRadius),
+        radius: Radius.circular(notchRadius),
+        clockwise: false,
+      )
+      ..lineTo(0, 24.h)                                                            // ← was 12.h
+      ..arcToPoint(Offset(24.w, 0), radius: Radius.circular(24.r))               // ← was 12
+      ..close();
   }
 
   @override
   bool shouldReclip(covariant CustomClipper<Path> oldClipper) => false;
-}
+}