BASE: Update Icons & Name Of The App.
This commit is contained in:
@@ -4,7 +4,7 @@ import 'package:customer/models/coupon_model.dart';
|
||||
import 'package:customer/models/user_model.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:intl/intl.dart';
|
||||
import '../models/onprovider_order_model.dart';
|
||||
import '../models/provider_serivce_model.dart';
|
||||
@@ -55,8 +55,12 @@ class OnDemandBookingController extends GetxController {
|
||||
|
||||
void fetchCoupons() {
|
||||
if (provider.value?.author != null && provider.value!.author!.isNotEmpty) {
|
||||
FireStoreUtils.getProviderCoupon(provider.value!.author!).then((activeCoupons) => couponList.assignAll(activeCoupons));
|
||||
FireStoreUtils.getProviderCouponAfterExpire(provider.value!.author!).then((expiredCoupons) => couponList.addAll(expiredCoupons));
|
||||
FireStoreUtils.getProviderCoupon(
|
||||
provider.value!.author!,
|
||||
).then((activeCoupons) => couponList.assignAll(activeCoupons));
|
||||
FireStoreUtils.getProviderCouponAfterExpire(
|
||||
provider.value!.author!,
|
||||
).then((expiredCoupons) => couponList.addAll(expiredCoupons));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,8 +84,12 @@ class OnDemandBookingController extends GetxController {
|
||||
|
||||
void applyCoupon(CouponModel coupon) {
|
||||
double discount = 0.0;
|
||||
if (coupon.discountType == "Percentage" || coupon.discountType == "Percent") {
|
||||
discount = price.value * (double.tryParse(coupon.discount.toString()) ?? 0) / 100;
|
||||
if (coupon.discountType == "Percentage" ||
|
||||
coupon.discountType == "Percent") {
|
||||
discount =
|
||||
price.value *
|
||||
(double.tryParse(coupon.discount.toString()) ?? 0) /
|
||||
100;
|
||||
} else {
|
||||
discount = double.tryParse(coupon.discount.toString()) ?? 0;
|
||||
}
|
||||
@@ -115,9 +123,14 @@ class OnDemandBookingController extends GetxController {
|
||||
|
||||
// discount
|
||||
if (discountType.value == "Percentage" || discountType.value == "Percent") {
|
||||
discountAmount.value = price.value * (double.tryParse(discountLabel.value) ?? 0) / 100;
|
||||
discountAmount.value =
|
||||
price.value * (double.tryParse(discountLabel.value) ?? 0) / 100;
|
||||
} else {
|
||||
discountAmount.value = double.tryParse(discountLabel.value.isEmpty ? '0' : discountLabel.value) ?? 0;
|
||||
discountAmount.value =
|
||||
double.tryParse(
|
||||
discountLabel.value.isEmpty ? '0' : discountLabel.value,
|
||||
) ??
|
||||
0;
|
||||
}
|
||||
|
||||
subTotal.value = price.value - discountAmount.value;
|
||||
@@ -125,7 +138,10 @@ class OnDemandBookingController extends GetxController {
|
||||
// tax calculation
|
||||
double total = subTotal.value;
|
||||
for (var element in Constant.taxList) {
|
||||
total += Constant.getTaxValue(amount: subTotal.value.toString(), taxModel: element);
|
||||
total += Constant.getTaxValue(
|
||||
amount: subTotal.value.toString(),
|
||||
taxModel: element,
|
||||
);
|
||||
}
|
||||
|
||||
totalAmount.value = total;
|
||||
@@ -137,7 +153,9 @@ class OnDemandBookingController extends GetxController {
|
||||
} else if (dateTimeController.value.text.isEmpty) {
|
||||
ShowToastDialog.showToast("Please select time slot.".tr());
|
||||
} else {
|
||||
UserModel? providerUser = await FireStoreUtils.getUserProfile(provider.value!.author!);
|
||||
UserModel? providerUser = await FireStoreUtils.getUserProfile(
|
||||
provider.value!.author!,
|
||||
);
|
||||
|
||||
if (provider.value?.priceUnit == "Fixed") {
|
||||
OnProviderOrderModel onDemandOrderModel = OnProviderOrderModel(
|
||||
@@ -161,14 +179,27 @@ class OnDemandBookingController extends GetxController {
|
||||
adminCommissionType:
|
||||
Constant.sectionConstantModel?.adminCommision?.isEnabled == false
|
||||
? 'fixed'
|
||||
: providerUser?.adminCommissionModel?.commissionType ?? Constant.sectionConstantModel?.adminCommision?.commissionType,
|
||||
: providerUser?.adminCommissionModel?.commissionType ??
|
||||
Constant
|
||||
.sectionConstantModel
|
||||
?.adminCommision
|
||||
?.commissionType,
|
||||
otp: Constant.getReferralCode(),
|
||||
couponCode: offerCode.toString(),
|
||||
);
|
||||
print('totalAmount ::::::: ${double.tryParse(Constant.amountShow(amount: totalAmount.value.toString())) ?? 0.0}');
|
||||
print(
|
||||
'totalAmount ::::::: ${double.tryParse(Constant.amountShow(amount: totalAmount.value.toString())) ?? 0.0}',
|
||||
);
|
||||
print('totalAmount value ::::::: ${totalAmount.value}');
|
||||
|
||||
Get.to(() => OnDemandPaymentScreen(), arguments: {'onDemandOrderModel': Rxn<OnProviderOrderModel>(onDemandOrderModel), 'totalAmount': totalAmount.value, 'isExtra': false});
|
||||
Get.to(
|
||||
() => OnDemandPaymentScreen(),
|
||||
arguments: {
|
||||
'onDemandOrderModel': Rxn<OnProviderOrderModel>(onDemandOrderModel),
|
||||
'totalAmount': totalAmount.value,
|
||||
'isExtra': false,
|
||||
},
|
||||
);
|
||||
} else {
|
||||
ShowToastDialog.showLoader("Please wait...".tr());
|
||||
OnProviderOrderModel onDemandOrder = OnProviderOrderModel(
|
||||
@@ -192,21 +223,36 @@ class OnDemandBookingController extends GetxController {
|
||||
adminCommissionType:
|
||||
Constant.sectionConstantModel?.adminCommision?.isEnabled == false
|
||||
? 'fixed'
|
||||
: providerUser?.adminCommissionModel?.commissionType ?? Constant.sectionConstantModel?.adminCommision?.commissionType,
|
||||
: providerUser?.adminCommissionModel?.commissionType ??
|
||||
Constant
|
||||
.sectionConstantModel
|
||||
?.adminCommision
|
||||
?.commissionType,
|
||||
paymentStatus: true,
|
||||
);
|
||||
|
||||
await FireStoreUtils.onDemandOrderPlace(onDemandOrder, 0.0);
|
||||
await FireStoreUtils.sendOrderOnDemandServiceEmail(orderModel: onDemandOrder);
|
||||
await FireStoreUtils.sendOrderOnDemandServiceEmail(
|
||||
orderModel: onDemandOrder,
|
||||
);
|
||||
|
||||
if (providerUser != null) {
|
||||
Map<String, dynamic> payLoad = {"type": 'provider_order', "orderId": onDemandOrder.id};
|
||||
await SendNotification.sendFcmMessage(Constant.bookingPlaced, providerUser.fcmToken.toString(), payLoad);
|
||||
Map<String, dynamic> payLoad = {
|
||||
"type": 'provider_order',
|
||||
"orderId": onDemandOrder.id,
|
||||
};
|
||||
await SendNotification.sendFcmMessage(
|
||||
Constant.bookingPlaced,
|
||||
providerUser.fcmToken.toString(),
|
||||
payLoad,
|
||||
);
|
||||
}
|
||||
|
||||
ShowToastDialog.closeLoader();
|
||||
Get.offAll(const OnDemandDashboardScreen());
|
||||
OnDemandDashboardController controller = Get.put(OnDemandDashboardController());
|
||||
OnDemandDashboardController controller = Get.put(
|
||||
OnDemandDashboardController(),
|
||||
);
|
||||
controller.selectedIndex.value = 2;
|
||||
ShowToastDialog.showToast("OnDemand Service successfully booked".tr());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user