loan/expert-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Amin Ghasempoor
2023-07-16 16:59:10 +03:30
parent 9caf417101 a683c4029f
commit 0a5bb44770
12 changed files with 353 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/data/apiRoutes.js
View File

@@ -23,6 +23,7 @@ export const REJECT_PASSENGER_OFFICE =
BASE_URL + "/dashboard/passenger_office_chief/reject";
//passenger office
<<<<<<< HEAD
//transportation assistance
export const GET_TRANSPORTATION_ASSISTANCE =
BASE_URL + "/dashboard/transportation_asisstants/show";
@@ -33,3 +34,15 @@ export const CONFIRM_TRANSPORTATION_ASSISTANCE =
export const REJECT_TRANSPORTATION_ASSISTANCE =
BASE_URL + "/dashboard/transportation_asisstants/reject";
//transportation assistance
=======
//machinary office
export const GET_MACHINARY_OFFICE =
BASE_URL + "/dashboard/machinery_expert/show";
export const CONFIRM_MACHINARY_OFFICE =
BASE_URL + "/dashboard/machinery_expert/confirm";
export const REJECT_MACHINARY_OFFICE =
BASE_URL + "/dashboard/machinery_expert/reject";
//passenger office
>>>>>>> a683c4029fdd3b3cae26a4cc7823835ad7e687b1