Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.3 fsm urc develop #89

Merged
merged 10 commits into from
Apr 4, 2023
Merged

1.3 fsm urc develop #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
498e4c8
Added URC for citizrn and employee in create flow
rakesh-wt-egov Mar 31, 2023
2a68929
Citizen and employee create issues fixed for URC
rakesh-wt-egov Apr 3, 2023
c66b442
Merge branch 'v1.3-fsm-urc' into 1.3-fsm-urc-develop
rakesh-wt-egov Apr 3, 2023
023f049
Add new vehicle changes for URC
rakesh-wt-egov Apr 3, 2023
68d20b4
changed css version to 1.5.9
rakesh-wt-egov Apr 3, 2023
80d841a
Total amount issue fixed
rakesh-wt-egov Apr 4, 2023
e711310
Added boundaryType in create payload
rakesh-wt-egov Apr 4, 2023
f8b59a1
Added boundaryType for village and GP as well
rakesh-wt-egov Apr 4, 2023
a0efc8c
Merge branch 'v1.3-fsm-urc' into 1.3-fsm-urc-develop
rakesh-wt-egov Apr 4, 2023
3591c45
Changed boundayType to GP in url
rakesh-wt-egov Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Urls = {
location: {
localities: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality`,
revenue_localities: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=Locality`,
gramPanchayats: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=GramPanchayat`,
gramPanchayats: `/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=REVENUE&boundaryType=GP`,
},

pgr_search: `/pgr-services/v2/request/_search`,
Expand Down
2 changes: 2 additions & 0 deletions web/micro-ui-internals/packages/modules/fsm/src/pages/employee/NewApplication/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export const NewApplication = ({ parentUrl, heading }) => {
const advanceAmount = amount === 0 ? null : data?.advancepaymentPreference?.advanceAmount;
const gramPanchayat = data?.address.gramPanchayat;
const village = data?.address.village;
const propertyLocation = data?.address?.propertyLocation?.code;

const formData = {
fsm: {
Expand Down Expand Up @@ -143,6 +144,7 @@ export const NewApplication = ({ parentUrl, heading }) => {
longitude: data?.address?.longitude,
},
additionalDetails: {
boundaryType: propertyLocation === "FROM_GRAM_PANCHAYAT" ? (village?.code ? "Village" : "GP") : "Locality",
gramPanchayat: {
code: gramPanchayat?.code,
name: gramPanchayat?.name,
Expand Down
7 changes: 7 additions & 0 deletions web/src/Customisations/fsm/pages/citizen/NewApplication/Response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const Response = ({ data, onSuccess }) => {
slum,
gramPanchayat,
village,
propertyLocation,
} = address;
setPaymentPreference(selectPaymentPreference?.code);
const advanceAmount =
Expand All @@ -112,6 +113,12 @@ const Response = ({ data, onSuccess }) => {
address: {
tenantId: city.code,
additionalDetails: {
boundaryType:
propertyLocation?.code === "FROM_GRAM_PANCHAYAT"
? village?.code
? "Village"
: "GP"
: "Locality",
gramPanchayat: {
code: gramPanchayat?.code,
name: gramPanchayat?.name,
Expand Down