revert 4aaf8a6bf1db345351c44b5136e4ca9f67da1834
revert Merge branch 'feature/payment' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into feature/payment
This commit is contained in:
parent
4aaf8a6bf1
commit
b0b68d688e
@ -110,14 +110,4 @@ class ApiEndpoints {
|
|||||||
static const String tenantSubscribe = '/Tenant/self/subscription';
|
static const String tenantSubscribe = '/Tenant/self/subscription';
|
||||||
static const String tenantRenewSubscription = '/Tenant/renew/subscription';
|
static const String tenantRenewSubscription = '/Tenant/renew/subscription';
|
||||||
static const String getIndustries = '/market/industries';
|
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';
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -142,13 +142,6 @@ class _WelcomeScreenState extends State<WelcomeScreen>
|
|||||||
option: null,
|
option: null,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
_buildActionButton(
|
|
||||||
context,
|
|
||||||
label: "Subscribe",
|
|
||||||
icon: LucideIcons.bell,
|
|
||||||
option: null,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
_buildActionButton(
|
_buildActionButton(
|
||||||
context,
|
context,
|
||||||
label: "Request a Demo",
|
label: "Request a Demo",
|
||||||
@ -257,10 +250,6 @@ class _WelcomeScreenState extends State<WelcomeScreen>
|
|||||||
shadowColor: Colors.black26,
|
shadowColor: Colors.black26,
|
||||||
),
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (label == "Subscribe") {
|
|
||||||
Get.toNamed('/subscription'); // Navigate to Subscription screen
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (label == "Subscribe") {
|
if (label == "Subscribe") {
|
||||||
Get.toNamed('/subscription'); // Navigate to Subscription screen
|
Get.toNamed('/subscription'); // Navigate to Subscription screen
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -132,12 +132,6 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
final TenantSwitchController tenantSwitchController =
|
final TenantSwitchController tenantSwitchController =
|
||||||
Get.put(TenantSwitchController());
|
Get.put(TenantSwitchController());
|
||||||
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
|
||||||
child: Obx(() {
|
|
||||||
if (tenantSwitchController.isLoading.value) {
|
|
||||||
return _loadingTenantContainer();
|
|
||||||
}
|
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||||
child: Obx(() {
|
child: Obx(() {
|
||||||
@ -145,12 +139,9 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
return _loadingTenantContainer();
|
return _loadingTenantContainer();
|
||||||
}
|
}
|
||||||
|
|
||||||
final tenants = tenantSwitchController.tenants;
|
|
||||||
if (tenants.isEmpty) return _noTenantContainer();
|
|
||||||
final tenants = tenantSwitchController.tenants;
|
final tenants = tenantSwitchController.tenants;
|
||||||
if (tenants.isEmpty) return _noTenantContainer();
|
if (tenants.isEmpty) return _noTenantContainer();
|
||||||
|
|
||||||
final selectedTenant = TenantService.currentTenant;
|
|
||||||
final selectedTenant = TenantService.currentTenant;
|
final selectedTenant = TenantService.currentTenant;
|
||||||
|
|
||||||
final sortedTenants = List.of(tenants);
|
final sortedTenants = List.of(tenants);
|
||||||
@ -333,14 +324,6 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
textColor: Colors.redAccent,
|
textColor: Colors.redAccent,
|
||||||
),
|
),
|
||||||
SizedBox(height: spacingHeight),
|
SizedBox(height: spacingHeight),
|
||||||
_menuItemRow(
|
|
||||||
icon: LucideIcons.bell,
|
|
||||||
label: 'Subscribe',
|
|
||||||
onTap: _onSubscribeTap,
|
|
||||||
iconColor: Colors.redAccent,
|
|
||||||
textColor: Colors.redAccent,
|
|
||||||
),
|
|
||||||
SizedBox(height: spacingHeight),
|
|
||||||
_menuItemRow(
|
_menuItemRow(
|
||||||
icon: LucideIcons.settings,
|
icon: LucideIcons.settings,
|
||||||
label: 'Settings',
|
label: 'Settings',
|
||||||
@ -415,11 +398,6 @@ class _UserProfileBarState extends State<UserProfileBar>
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void _onSubscribeTap() {
|
|
||||||
Get.toNamed("/subscription");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void _onMpinTap() {
|
void _onMpinTap() {
|
||||||
final controller = Get.put(MPINController());
|
final controller = Get.put(MPINController());
|
||||||
if (hasMpin) controller.setChangeMpinMode();
|
if (hasMpin) controller.setChangeMpinMode();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user