BASE: Update Icons & Name Of The App.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:intl/intl.dart';
|
||||
import '../constant/constant.dart';
|
||||
import '../models/parcel_order_model.dart';
|
||||
@@ -15,7 +15,8 @@ class ParcelMyBookingController extends GetxController {
|
||||
RxList<ParcelOrderModel> parcelOrder = <ParcelOrderModel>[].obs;
|
||||
|
||||
RxString selectedTab = "New".obs;
|
||||
RxList<String> tabTitles = ["New", "In Transit", "Delivered", "Cancelled"].obs;
|
||||
RxList<String> tabTitles =
|
||||
["New", "In Transit", "Delivered", "Cancelled"].obs;
|
||||
|
||||
StreamSubscription<List<ParcelOrderModel>>? _parcelSubscription;
|
||||
|
||||
@@ -53,16 +54,38 @@ class ParcelMyBookingController extends GetxController {
|
||||
List<ParcelOrderModel> getOrdersForTab(String tab) {
|
||||
switch (tab) {
|
||||
case "New":
|
||||
return parcelOrder.where((order) => ["Order Placed"].contains(order.status)).toList();
|
||||
return parcelOrder
|
||||
.where((order) => ["Order Placed"].contains(order.status))
|
||||
.toList();
|
||||
|
||||
case "In Transit":
|
||||
return parcelOrder.where((order) => ["Order Accepted", "Driver Accepted", "Driver Pending", "Order Shipped", "In Transit"].contains(order.status)).toList();
|
||||
return parcelOrder
|
||||
.where(
|
||||
(order) => [
|
||||
"Order Accepted",
|
||||
"Driver Accepted",
|
||||
"Driver Pending",
|
||||
"Order Shipped",
|
||||
"In Transit",
|
||||
].contains(order.status),
|
||||
)
|
||||
.toList();
|
||||
|
||||
case "Delivered":
|
||||
return parcelOrder.where((order) => ["Order Completed"].contains(order.status)).toList();
|
||||
return parcelOrder
|
||||
.where((order) => ["Order Completed"].contains(order.status))
|
||||
.toList();
|
||||
|
||||
case "Cancelled":
|
||||
return parcelOrder.where((order) => ["Order Rejected", "Order Cancelled", "Driver Rejected"].contains(order.status)).toList();
|
||||
return parcelOrder
|
||||
.where(
|
||||
(order) => [
|
||||
"Order Rejected",
|
||||
"Order Cancelled",
|
||||
"Driver Rejected",
|
||||
].contains(order.status),
|
||||
)
|
||||
.toList();
|
||||
|
||||
default:
|
||||
return [];
|
||||
@@ -70,7 +93,8 @@ class ParcelMyBookingController extends GetxController {
|
||||
}
|
||||
|
||||
/// Old helper (optional)
|
||||
List<ParcelOrderModel> get filteredParcelOrders => getOrdersForTab(selectedTab.value);
|
||||
List<ParcelOrderModel> get filteredParcelOrders =>
|
||||
getOrdersForTab(selectedTab.value);
|
||||
|
||||
String formatDate(Timestamp timestamp) {
|
||||
final dateTime = timestamp.toDate();
|
||||
@@ -97,10 +121,18 @@ class ParcelMyBookingController extends GetxController {
|
||||
final taxSettings = order.taxSetting ?? [];
|
||||
|
||||
for (var element in taxSettings) {
|
||||
totalTax += Constant.calculateTax(amount: (double.parse(order.subTotal.toString()) - double.parse(order.discount.toString())).toString(), taxModel: element);
|
||||
totalTax += Constant.calculateTax(
|
||||
amount:
|
||||
(double.parse(order.subTotal.toString()) -
|
||||
double.parse(order.discount.toString()))
|
||||
.toString(),
|
||||
taxModel: element,
|
||||
);
|
||||
}
|
||||
|
||||
double subTotal = double.parse(order.subTotal.toString()) - double.parse(order.discount.toString());
|
||||
double subTotal =
|
||||
double.parse(order.subTotal.toString()) -
|
||||
double.parse(order.discount.toString());
|
||||
double refundAmount = subTotal + totalTax;
|
||||
|
||||
WalletTransactionModel walletTransaction = WalletTransactionModel(
|
||||
@@ -122,7 +154,10 @@ class ParcelMyBookingController extends GetxController {
|
||||
await FireStoreUtils.setWalletTransaction(walletTransaction);
|
||||
|
||||
// Update wallet balance
|
||||
await FireStoreUtils.updateUserWallet(amount: refundAmount.toString(), userId: FireStoreUtils.getCurrentUid());
|
||||
await FireStoreUtils.updateUserWallet(
|
||||
amount: refundAmount.toString(),
|
||||
userId: FireStoreUtils.getCurrentUid(),
|
||||
);
|
||||
}
|
||||
|
||||
ShowToastDialog.showToast("Order cancelled successfully".tr());
|
||||
|
||||
Reference in New Issue
Block a user