Skip to content

Commit 35e27f7

Browse files
authored
Merge pull request #1169 from Puli-shilpa/Dev-2.0
added ulbtype and designation for receipt
2 parents 90ec90d + 7a8303b commit 35e27f7

File tree

2 files changed

+48
-1
lines changed
  • frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments

2 files changed

+48
-1
lines changed

frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ export const convertEpochToDate = (dateEpoch) => {
4444
refetchOnWindowFocus: false,
4545
});
4646
console.log("datatatataty",data)
47+
const cities = Digit.Hooks.useTenants();
48+
let ulbType=""
49+
const loginCity=JSON.parse(sessionStorage.getItem("Digit.User"))?.value?.info?.permanentCity
50+
if(cities.data!==undefined){
51+
const selectedTenantData = cities.data.find(item => item.city.districtTenantCode=== loginCity);
52+
ulbType=selectedTenantData.city.ulbGrade
53+
}
4754

4855
const { label } = Digit.Hooks.useApplicationsForBusinessServiceSearch({ businessService: business_service }, { enabled: false });
4956

@@ -226,6 +233,19 @@ export const convertEpochToDate = (dateEpoch) => {
226233
if(business_service=="WS" || business_service=="SW"){
227234
response = await Digit.PaymentService.generatePdf(state, { Payments: [{...paymentData}] }, generatePdfKeyForWs);
228235
}
236+
else if(paymentData.paymentDetails[0].businessService.includes("BPA")){
237+
const designation=(ulbType==="Municipal Corporation") ? "Municipal Commissioner" : "Executive Officer"
238+
const updatedpayments={
239+
...paymentData,
240+
additionalDetails:{
241+
...paymentData.additionalDetails,
242+
designation:designation,
243+
ulbType:ulbType
244+
}
245+
}
246+
247+
response = await Digit.PaymentService.generatePdf(state, { Payments: [{...updatedpayments}] }, generatePdfKey);
248+
}
229249
else{
230250
response = await Digit.PaymentService.generatePdf(state, { Payments: [{...paymentData}] }, generatePdfKey);
231251
}

frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@ export const SuccessfulPayment = (props) => {
4343
{},
4444
{ enabled: businessService?.includes("BPA") ? true : false }
4545
);
46-
46+
const cities = Digit.Hooks.useTenants();
47+
let ulbType=""
48+
const loginCity=JSON.parse(sessionStorage.getItem("Digit.User"))?.value?.info?.tenantId
49+
if(cities.data!==undefined){
50+
const selectedTenantData = cities.data.find(item => item.city.districtTenantCode=== loginCity);
51+
ulbType=selectedTenantData.city.ulbGrade
52+
}
53+
4754
const FSM_EDITOR = Digit.UserService.hasAccess("FSM_EDITOR_EMP") || false;
4855

4956
function onActionSelect(action) {
@@ -270,6 +277,26 @@ export const SuccessfulPayment = (props) => {
270277
payments.Payments[0].paymentDetails[0].additionalDetails=details;
271278
printRecieptNew(payments)
272279
}
280+
else if(payments.Payments[0].paymentDetails[0].businessService.includes("BPA")){
281+
const designation=(ulbType==="Municipal Corporation") ? "Municipal Commissioner" : "Executive Officer"
282+
const updatedpayments={
283+
...payments,
284+
payments:payments.Payments.map((payment, index)=>{
285+
if(index===0){
286+
return{
287+
...payment,
288+
additionalDetails:{
289+
...payment.additionalDetails,
290+
designation:designation,
291+
ulbType:ulbType
292+
}
293+
}
294+
}
295+
return payment;
296+
})
297+
}
298+
response = await Digit.PaymentService.generatePdf(state, { Payments: updatedpayments.payments }, generatePdfKey);
299+
}
273300
else {
274301
response = await Digit.PaymentService.generatePdf(state, { Payments: payments.Payments }, generatePdfKey);
275302
}

0 commit comments

Comments
 (0)