Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/images/Online Delivery Service.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/Packaging For Delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/myOrders.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/recievedOrders.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions lib/app/config/auth_storage/sign_out.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:wassalha/features/address/presentation/manger/address_cubit.dart
import 'package:wassalha/features/createOrder/presentation/manger/create_order_cubit.dart';
import 'package:wassalha/features/notifications/presentation/manager/notifications_cubit.dart';
import 'package:wassalha/features/orders/presentation/manger/orders_cubit.dart';
import 'package:wassalha/features/orders/presentation/manger/receiver_orders_cubit.dart';
import 'package:wassalha/features/profile/presentation/manger/profile_cubit.dart';
import 'package:wassalha/features/wallet/data/datascources/wallet_local_datasource.dart';
import 'package:wassalha/features/wallet/presentation/manger/wallet_cubit.dart';
Expand All @@ -23,6 +24,7 @@ Future<void> signOut() async {
await _resetUserCubit<ProfileCubit>();
await _resetUserCubit<WalletCubit>();
await _resetUserCubit<OrdersCubit>();
await _resetUserCubit<ReceiverOrdersCubit>();
await _resetUserCubit<CreateOrderCubit>();
await _resetUserCubit<NotificationsCubit>();
await _resetUserCubit<AddressCubit>();
Expand Down
57 changes: 50 additions & 7 deletions lib/app/config/di/di.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions lib/app/core/api_manger/api_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,51 @@ abstract class ApiClient {
@Path("orderId") int orderId,
);

@GET(AppEndpointString.myReceiverOrders)
Future<HttpResponse<OrdersListResponse>> getMyReceiverOrders({
@Query("term") String? term,
@Query("page") int? page,
@Query("size") int? size,
@Query("sort") String? sort,
});

@GET('${AppEndpointString.receiverOrdersByUser}/{userId}/receiver/all')
Future<HttpResponse<OrdersListResponse>> getReceiverOrdersByUser(
@Path("userId") int userId, {
@Query("page") int? page,
@Query("size") int? size,
@Query("sort") String? sort,
});

@GET('${AppEndpointString.receiverOrderById}/{id}')
Future<HttpResponse<OrderDetailResponse>> getReceiverOrderById(
@Path("id") int id,
);

@POST('${AppEndpointString.receiverConfirmOrder}/{orderId}/confirm')
Future<HttpResponse<OrderDetailResponse>> confirmReceiverOrder(
@Path("orderId") int orderId,
@Query("accept") bool accept,
);

@GET('${AppEndpointString.senderOrdersByUser}/{userId}/sender/status/{status}')
Future<HttpResponse<OrdersListResponse>> getSenderOrdersByStatus(
@Path("userId") int userId,
@Path("status") String status, {
@Query("page") int? page,
@Query("size") int? size,
@Query("sort") String? sort,
});

@GET('${AppEndpointString.receiverOrdersByUser}/{userId}/receiver/status/{status}')
Future<HttpResponse<OrdersListResponse>> getReceiverOrdersByStatus(
@Path("userId") int userId,
@Path("status") String status, {
@Query("page") int? page,
@Query("size") int? size,
@Query("sort") String? sort,
});

@POST(AppEndpointString.updateNotificationToken)
Future<HttpResponse<void>> updateNotificationToken(
@Body() Map<String, dynamic> request,
Expand Down
214 changes: 214 additions & 0 deletions lib/app/core/api_manger/api_client.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading