6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 5d50690b
Changed files
comwell_key_app/lib/services/api.dart | 2 +- .../lib/up_sales/components/catalog/room_upgrade_catalog.dart | 9 +++------ .../lib/up_sales/components/up_sales_services_widget.dart | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-)
Diff
diff --git a/comwell_key_app/lib/services/api.dart b/comwell_key_app/lib/services/api.dart
index ac41a71c..83179a46 100644
--- a/comwell_key_app/lib/services/api.dart
+++ b/comwell_key_app/lib/services/api.dart
@@ -167,7 +167,7 @@ class Api {
return response;
}
- Future<dynamic> getHotelInfo(String hotelCode, Locale culture) async {
+ Future<dynamic> getHotelInfo(String hotelCode) async {
final cultureString = _currentLocale.toString().replaceAll('_', '-');
final response = await dio.get<Json>(
'${ApiEndpoints.getHotelInfo}x?hotelCode=$hotelCode&culture=$cultureString');
diff --git a/comwell_key_app/lib/up_sales/components/catalog/room_upgrade_catalog.dart b/comwell_key_app/lib/up_sales/components/catalog/room_upgrade_catalog.dart
index 9079873a..57d44237 100644
--- a/comwell_key_app/lib/up_sales/components/catalog/room_upgrade_catalog.dart
+++ b/comwell_key_app/lib/up_sales/components/catalog/room_upgrade_catalog.dart
@@ -14,8 +14,8 @@ class RoomUpgradeCatalog extends StatelessWidget {
final List<RoomUpgrade> availableRoomUpgrades;
final String selectedRoomUpgrade;
final List<Upgrade> selectedUpSales;
- final Function(RoomUpgrade, bool)? onRoomUpgradeSelected;
- final Function(Upgrade)? onTap;
+ final void Function(RoomUpgrade, bool)? onRoomUpgradeSelected;
+ final void Function(Upgrade)? onTap;
const RoomUpgradeCatalog({
super.key,
required this.availableRoomUpgrades,
@@ -28,11 +28,8 @@ class RoomUpgradeCatalog extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
- final roomUpSales = upSales
- .where((roomUpgrade) => roomUpgrade.type == UpgradeType.room)
- .toList();
- if (roomUpSales.isEmpty) {
+ if (availableRoomUpgrades.isEmpty) {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text('no_room_upgrades_available'.tr(),
diff --git a/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart b/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
index 1cdb5340..dfba384e 100644
--- a/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
+++ b/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
@@ -1,6 +1,7 @@
import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/up_sales/components/comwell_radio_button.dart';
import 'package:comwell_key_app/up_sales/components/tags.dart';
+import 'package:comwell_key_app/up_sales/models/room_upgrade.dart';
import 'package:comwell_key_app/up_sales/models/upgrade.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -11,7 +12,7 @@ class UpSalesServicesWidget extends StatelessWidget {
final Upgrade upgrade;
final bool? isSelected;
final bool? isPopular;
- final void Function(RoomUpgrade)? onTap;
+ final void Function(Upgrade)? onTap;
final bool showRadioButton;
final List<Upgrade>? selectedUpSales;
const UpSalesServicesWidget(