From 9a08e7aba3fb5dd029a83a52848a1ca6412e2b0f Mon Sep 17 00:00:00 2001
From: Student <Student@DESKTOP-FDAEEF2>
Date: Tue, 7 May 2024 20:39:25 +0600
Subject: [PATCH] update orders delivered

---
 .../data/datasources/order_remote_data_source.dart       | 9 ++++++---
 lib/feature/data/models/order_model.dart                 | 5 +++++
 lib/feature/domain/entities/order_entity.dart            | 3 +++
 lib/feature/presentation/pages/order_detail_screen.dart  | 2 --
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/feature/data/datasources/order_remote_data_source.dart b/lib/feature/data/datasources/order_remote_data_source.dart
index d1e8e57..88545c5 100644
--- a/lib/feature/data/datasources/order_remote_data_source.dart
+++ b/lib/feature/data/datasources/order_remote_data_source.dart
@@ -55,7 +55,10 @@ class OrderRemoteDataSourceImpl implements OrderRemoteDataSource {
   Future<void> setOrderIsDelivered(int id, bool isDelivered) async {
     final List<Map<String, dynamic>> data = await supabaseClient
         .from("Orders")
-        .update({'is_delivered': isDelivered})
+        .update({
+          'is_delivered': isDelivered,
+          'date_delivered': DateTime.now().toIso8601String()
+        })
         .eq('order_number', id)
         .select();
     print('data --> $data');
@@ -79,8 +82,8 @@ class OrderRemoteDataSourceImpl implements OrderRemoteDataSource {
       data = await supabaseClient
           .from('Orders')
           .select()
-          .gte('order_date', start)
-          .lt('order_date', end)
+          .gte('date_delivered', start)
+          .lt('date_delivered', end)
           .eq('is_delivered', isDelivered)
           .order('order_date', ascending: true);
     }
diff --git a/lib/feature/data/models/order_model.dart b/lib/feature/data/models/order_model.dart
index 3d6628d..cd18a97 100644
--- a/lib/feature/data/models/order_model.dart
+++ b/lib/feature/data/models/order_model.dart
@@ -9,6 +9,7 @@ class OrderModel extends OrderEntity {
     required super.clientPhone,
     required super.clientName,
     required super.orderDate,
+    super.deliverdDate,
     required super.neadToCall,
     required super.paymentMethod,
   });
@@ -22,6 +23,9 @@ class OrderModel extends OrderEntity {
       clientPhone: map['client_phone'] as String,
       clientName: map['client_name'] as String,
       orderDate: DateTime.parse(map['order_date'] as String),
+      deliverdDate: map['date_delivered'] == null
+          ? null
+          : DateTime.parse(map['date_delivered'] as String),
       neadToCall: map['nead_to_call'] as bool,
       paymentMethod: map['payment_method'] as String,
     );
@@ -36,6 +40,7 @@ class OrderModel extends OrderEntity {
       'clientPhone': clientPhone,
       'clientName': clientName,
       'orderDate': orderDate.toIso8601String(),
+      'deliverdDate': deliverdDate!.toIso8601String(),
       'neadToCall': neadToCall,
       'paymentMethod': paymentMethod,
     };
diff --git a/lib/feature/domain/entities/order_entity.dart b/lib/feature/domain/entities/order_entity.dart
index 1bd7532..9254452 100644
--- a/lib/feature/domain/entities/order_entity.dart
+++ b/lib/feature/domain/entities/order_entity.dart
@@ -8,6 +8,7 @@ class OrderEntity extends Equatable {
   final String clientPhone;
   final String clientName;
   final DateTime orderDate;
+  final DateTime? deliverdDate;
   final bool neadToCall;
   final String paymentMethod;
 
@@ -19,6 +20,7 @@ class OrderEntity extends Equatable {
     required this.clientPhone,
     required this.clientName,
     required this.orderDate,
+    this.deliverdDate,
     required this.neadToCall,
     required this.paymentMethod,
   });
@@ -32,6 +34,7 @@ class OrderEntity extends Equatable {
         clientPhone,
         clientName,
         orderDate,
+        deliverdDate,
         neadToCall,
         paymentMethod,
       ];
diff --git a/lib/feature/presentation/pages/order_detail_screen.dart b/lib/feature/presentation/pages/order_detail_screen.dart
index cd1d672..5ada743 100644
--- a/lib/feature/presentation/pages/order_detail_screen.dart
+++ b/lib/feature/presentation/pages/order_detail_screen.dart
@@ -13,7 +13,6 @@ import 'package:beFit_Del/feature/presentation/bloc/orders_cost_cubit/orders_cos
 import 'package:beFit_Del/feature/presentation/bloc/set_delivered_cubit/set_delivered_cubit.dart';
 import 'package:beFit_Del/feature/presentation/bloc/set_delivered_cubit/set_delivered_state.dart';
 import 'package:beFit_Del/feature/presentation/widgets/item_list_widget.dart';
-import 'package:swipeable_button_view/swipeable_button_view.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:geolocator/geolocator.dart';
 
@@ -34,7 +33,6 @@ class _OrderDetailPageState extends State<OrderDetailPage> {
     context.read<ItemCubit>().getOrderItems(order.id);
     context.read<LocationCubit>().getPhoneLocation(order.address);
     context.read<OrdersCostCubit>().getOrdersCost(isDelivered);
-    var key = '1';
     BitmapDescriptor address = BitmapDescriptor.defaultMarker;
     BitmapDescriptor home = BitmapDescriptor.defaultMarker;
     BitmapDescriptor.fromAssetImage(