Skip to content

Commit

Permalink
update orders delivered
Browse files Browse the repository at this point in the history
  • Loading branch information
Student authored and Student committed May 7, 2024
1 parent 9d2caf6 commit 9a08e7a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
9 changes: 6 additions & 3 deletions lib/feature/data/datasources/order_remote_data_source.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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);
}
Expand Down
5 changes: 5 additions & 0 deletions lib/feature/data/models/order_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand All @@ -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,
);
Expand All @@ -36,6 +40,7 @@ class OrderModel extends OrderEntity {
'clientPhone': clientPhone,
'clientName': clientName,
'orderDate': orderDate.toIso8601String(),
'deliverdDate': deliverdDate!.toIso8601String(),
'neadToCall': neadToCall,
'paymentMethod': paymentMethod,
};
Expand Down
3 changes: 3 additions & 0 deletions lib/feature/domain/entities/order_entity.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
});
Expand All @@ -32,6 +34,7 @@ class OrderEntity extends Equatable {
clientPhone,
clientName,
orderDate,
deliverdDate,
neadToCall,
paymentMethod,
];
Expand Down
2 changes: 0 additions & 2 deletions lib/feature/presentation/pages/order_detail_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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(
Expand Down

0 comments on commit 9a08e7a

Please sign in to comment.