fixing jira bugs

faiz_dev
Faiz Hashmi 12 hours ago
parent 9b956574ae
commit d9a2dd4fcb

@ -8,13 +8,13 @@ import 'package:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/base_view_model.dart';
List<PickerItem> initDaysList = [
PickerItem(id: 1, title: "Monday", isSelected: false),
PickerItem(id: 2, title: "Tuesday", isSelected: false),
PickerItem(id: 3, title: "Wednesday", isSelected: false),
PickerItem(id: 4, title: "Thursday", isSelected: false),
PickerItem(id: 5, title: "Friday", isSelected: false),
PickerItem(id: 6, title: "Saturday", isSelected: false),
PickerItem(id: 7, title: "Sunday", isSelected: false),
PickerItem(id: 1, title: "Sunday", isSelected: false),
PickerItem(id: 2, title: "Monday", isSelected: false),
PickerItem(id: 3, title: "Tuesday", isSelected: false),
PickerItem(id: 4, title: "Wednesday", isSelected: false),
PickerItem(id: 5, title: "Thursday", isSelected: false),
PickerItem(id: 6, title: "Friday", isSelected: false),
PickerItem(id: 7, title: "Saturday", isSelected: false),
];
class ScheduleVM extends BaseVM {

@ -49,6 +49,14 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
List<PickerItem>? pickedItems;
ServiceVM? serviceVM;
// Currency dropdown
DropValue? selectedCurrency;
List<DropValue> currencies = [
DropValue(1, 'SAR', 'SAR'),
DropValue(2, 'AED', 'AED'),
DropValue(3, 'USD', 'USD'),
];
@override
void initState() {
// TODO: implement initState
@ -142,19 +150,34 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
onChanged: (v) => serviceVm.updateCustomServiceTitle(v),
),
8.height,
TxtField(
postfixWidget: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
LocaleKeys.sar.tr().toText(fontWeight: MyFonts.Medium, fontSize: 15, color: borderColor, textAlign: TextAlign.center),
],
),
value: serviceVm.customServicePrice,
errorValue: serviceVm.customServicePriceError,
keyboardType: TextInputType.number,
numbersOnly: true,
hint: LocaleKeys.price.tr(),
onChanged: (v) => serviceVm.updateCustomServicePrice(v),
Row(
children: [
Expanded(
flex: 2,
child: TxtField(
value: serviceVm.customServicePrice,
errorValue: serviceVm.customServicePriceError,
keyboardType: TextInputType.number,
numbersOnly: true,
hint: LocaleKeys.price.tr(),
onChanged: (v) => serviceVm.updateCustomServicePrice(v),
),
),
8.width,
Expanded(
flex: 1,
child: DropdownField(
(DropValue value) {
setState(() {
selectedCurrency = value;
});
},
dropdownValue: selectedCurrency,
list: currencies,
hint: 'Currency',
),
),
],
),
8.height,
TxtField(
@ -166,7 +189,7 @@ class _AddNewServiceAppointmentPageState extends State<AddNewServiceAppointmentP
),
isNeedClickAll: true,
isBackgroundEnabled: true,
hint: '',
hint: LocaleKeys.tax.tr(),
onTap: () {},
value: serviceVm.customerServiceTax,
errorValue: '',

@ -14,7 +14,7 @@ import 'package:easy_localization/easy_localization.dart';
class SelectDaysSheet extends StatefulWidget {
final Function(List<PickerItem>) onSelected;
const SelectDaysSheet({Key? key, required this.onSelected}) : super(key: key);
const SelectDaysSheet({super.key, required this.onSelected});
@override
State<SelectDaysSheet> createState() => _SelectDaysSheetState();

Loading…
Cancel
Save