From b0b68d688ecb8df3d1aec4e9109bc4c1ae068075 Mon Sep 17 00:00:00 2001 From: "manish.zure" Date: Sat, 1 Nov 2025 10:58:30 +0000 Subject: [PATCH] revert 4aaf8a6bf1db345351c44b5136e4ca9f67da1834 revert Merge branch 'feature/payment' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into feature/payment --- lib/helpers/services/api_endpoints.dart | 10 --------- lib/view/auth/login_option_screen.dart | 11 ---------- lib/view/layouts/user_profile_right_bar.dart | 22 -------------------- 3 files changed, 43 deletions(-) diff --git a/lib/helpers/services/api_endpoints.dart b/lib/helpers/services/api_endpoints.dart index 15f24d7..c0c360b 100644 --- a/lib/helpers/services/api_endpoints.dart +++ b/lib/helpers/services/api_endpoints.dart @@ -110,14 +110,4 @@ class ApiEndpoints { static const String tenantSubscribe = '/Tenant/self/subscription'; static const String tenantRenewSubscription = '/Tenant/renew/subscription'; static const String getIndustries = '/market/industries'; - - // Payment Module API Endpoints - static const String createOrder = "/payment/create-order"; - static const String verifyPayment = "/payment/verify-payment"; - - // Tenant endpoints - static const String createTenantSelf = '/Tenant/self/create'; - static const String tenantSubscribe = '/Tenant/self/subscription'; - static const String tenantRenewSubscription = '/Tenant/renew/subscription'; - static const String getIndustries = '/market/industries'; } diff --git a/lib/view/auth/login_option_screen.dart b/lib/view/auth/login_option_screen.dart index 154ab6f..ea6d5b9 100644 --- a/lib/view/auth/login_option_screen.dart +++ b/lib/view/auth/login_option_screen.dart @@ -142,13 +142,6 @@ class _WelcomeScreenState extends State option: null, ), const SizedBox(height: 16), - _buildActionButton( - context, - label: "Subscribe", - icon: LucideIcons.bell, - option: null, - ), - const SizedBox(height: 16), _buildActionButton( context, label: "Request a Demo", @@ -257,10 +250,6 @@ class _WelcomeScreenState extends State shadowColor: Colors.black26, ), onPressed: () { - if (label == "Subscribe") { - Get.toNamed('/subscription'); // Navigate to Subscription screen - return; - } if (label == "Subscribe") { Get.toNamed('/subscription'); // Navigate to Subscription screen return; diff --git a/lib/view/layouts/user_profile_right_bar.dart b/lib/view/layouts/user_profile_right_bar.dart index 2002e93..7b19564 100644 --- a/lib/view/layouts/user_profile_right_bar.dart +++ b/lib/view/layouts/user_profile_right_bar.dart @@ -132,12 +132,6 @@ class _UserProfileBarState extends State final TenantSwitchController tenantSwitchController = Get.put(TenantSwitchController()); - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), - child: Obx(() { - if (tenantSwitchController.isLoading.value) { - return _loadingTenantContainer(); - } return Padding( padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), child: Obx(() { @@ -145,12 +139,9 @@ class _UserProfileBarState extends State return _loadingTenantContainer(); } - final tenants = tenantSwitchController.tenants; - if (tenants.isEmpty) return _noTenantContainer(); final tenants = tenantSwitchController.tenants; if (tenants.isEmpty) return _noTenantContainer(); - final selectedTenant = TenantService.currentTenant; final selectedTenant = TenantService.currentTenant; final sortedTenants = List.of(tenants); @@ -333,14 +324,6 @@ class _UserProfileBarState extends State textColor: Colors.redAccent, ), SizedBox(height: spacingHeight), - _menuItemRow( - icon: LucideIcons.bell, - label: 'Subscribe', - onTap: _onSubscribeTap, - iconColor: Colors.redAccent, - textColor: Colors.redAccent, - ), - SizedBox(height: spacingHeight), _menuItemRow( icon: LucideIcons.settings, label: 'Settings', @@ -415,11 +398,6 @@ class _UserProfileBarState extends State } - void _onSubscribeTap() { - Get.toNamed("/subscription"); - } - - void _onMpinTap() { final controller = Get.put(MPINController()); if (hasMpin) controller.setChangeMpinMode();