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.

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

Palamgarg patch 3 #1580

Open
wants to merge 901 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
901 commits
Select commit Hold shift + click to select a range
b8cbbff
update meter number
abhirana04 Jul 29, 2024
89b205b
update
abhirana04 Jul 29, 2024
08173c0
rolled back for PG
palamgarg Jul 29, 2024
e85aef5
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Jul 29, 2024
49dadc6
Update application.properties
palamgarg Jul 29, 2024
2cb6512
update meter number
abhirana04 Jul 29, 2024
f106b97
Update WorKflowRepository.java
palamgarg Jul 29, 2024
29618ba
SW connection approval issue
deepgumber9996 Jul 29, 2024
c600177
Resubmit issue
anujkit Jul 29, 2024
37a6469
pt cal applucation file change
abhirana04 Jul 30, 2024
1444359
Unhandled Expection in Issue in FireNOC
anujkit Jul 30, 2024
f2dbdd5
changes
abhirana04 Jul 30, 2024
f78f3b5
fixed penalty issue in Trade license
palamgarg Jul 30, 2024
c8faf63
update for cancel demand
erlove000 Jul 31, 2024
f7c46d4
update for cancel demand
erlove000 Aug 1, 2024
f10501f
Revert "update for cancel demand"
erlove000 Aug 1, 2024
c5c89c2
changes for cancel demand
erlove000 Aug 1, 2024
2fd2a34
update taxheadcode issue fix for sewerage equal to water
deepgumber9996 Aug 1, 2024
fb6d1b0
issue fixed demand not settled in amritsar for sw commerical connection.
deepgumber9996 Aug 1, 2024
2772885
For metere reading / number entery
abhirana04 Aug 2, 2024
24a08c4
Fixed address length for TL
palamgarg Aug 2, 2024
ea77679
collection search correction
abhirana04 Aug 2, 2024
45e9ebd
null pointer handling
abhirana04 Aug 2, 2024
57f1809
update null pointer
abhirana04 Aug 2, 2024
cbb6f4e
update
abhirana04 Aug 2, 2024
2bca2fb
add ed
palamgarg Aug 2, 2024
63be47c
null
abhirana04 Aug 2, 2024
399157d
Inactive/Active Button
abhirana04 Aug 4, 2024
3b2dc17
null pointer handling
abhirana04 Aug 5, 2024
13cf730
Update DemandValidatorV1.java
deepgumber9996 Aug 5, 2024
6312804
Merge pull request #1 from pmidc-digit/deepgumber9996-patch-1
palamgarg Aug 5, 2024
70dc9e6
Fixed demand not settled in amritsar for sw commerical connection
deepgumber9996 Aug 5, 2024
c3f75ce
Merge pull request #2 from pmidc-digit/deepgumber9996-patch-2
palamgarg Aug 5, 2024
2e44d61
added
palamgarg Aug 6, 2024
102fbeb
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Aug 6, 2024
91e2e28
added back penality
palamgarg Aug 6, 2024
5d82691
added
palamgarg Aug 7, 2024
597c2bc
FIxed CXF Data Issue
palamgarg Aug 7, 2024
2e46f3b
core
palamgarg Aug 7, 2024
5d717c7
converted response
palamgarg Aug 7, 2024
331fbbf
Adding log
palamgarg Aug 8, 2024
5d94460
testing EGov Searcher and Billing No Deamd found expacton
palamgarg Aug 8, 2024
88ea7c1
data
palamgarg Aug 8, 2024
9fa3383
fixing XMl dat Issue
palamgarg Aug 8, 2024
418e185
fixing XML reposne
palamgarg Aug 8, 2024
e0be6dd
reponse Warpper
palamgarg Aug 8, 2024
bbf26a0
updated
palamgarg Aug 8, 2024
d82ea18
khanna yearly
abhirana04 Aug 8, 2024
a774d58
adding
palamgarg Aug 8, 2024
c4ac41f
soap changes
abhirana04 Aug 9, 2024
aa181d5
Update SearchRepository.java
abhirana04 Aug 9, 2024
12c9dbf
Merge branch 'PMIDC-Upgrade-Dev3' into ws_cal_khanna_yearly
abhirana04 Aug 9, 2024
45bd361
Merge pull request #3 from pmidc-digit/abhirana04-patch-1
palamgarg Aug 9, 2024
6d8bdaa
Merge pull request #4 from pmidc-digit/searcherchanges
palamgarg Aug 9, 2024
6729f05
Merge pull request #5 from pmidc-digit/ws_cal_khanna_yearly
palamgarg Aug 9, 2024
0020675
updated
palamgarg Aug 12, 2024
986f564
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Aug 12, 2024
e00fe21
fetch bill null (No demand found)
abhirana04 Aug 12, 2024
c5a685e
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
abhirana04 Aug 12, 2024
164d58a
null pointer handling no demand found
abhirana04 Aug 12, 2024
5a5418d
Merge pull request #6 from pmidc-digit/ws_cal_khanna_yearly
palamgarg Aug 12, 2024
b6a2a45
FireNOc Change for Resubmit
anujkit Aug 13, 2024
b6b3b32
fixing issue throws exception
palamgarg Aug 13, 2024
ba2908c
Revert "fetch bill null (No demand found)"
abhirana04 Aug 13, 2024
4e117bd
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
abhirana04 Aug 13, 2024
b1c3760
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
anujkit Aug 13, 2024
0335e2c
null pointer
palamgarg Aug 13, 2024
7f9f453
Update V20210206112800__owner_category_alter.sql
anujkit Aug 13, 2024
9c10cc0
colection service mix
abhirana04 Aug 13, 2024
ceb5271
collection service
abhirana04 Aug 13, 2024
7e0fe49
bill handling for property active inactive
abhirana04 Aug 13, 2024
498f4d5
Merge pull request #7 from pmidc-digit/ws_cal_khanna_yearly
palamgarg Aug 14, 2024
05eae7f
Update bank request , change order of tid
deepgumber9996 Aug 14, 2024
dca0836
Update razorpay prod secret id and key
deepgumber9996 Aug 14, 2024
0673cca
Merge pull request #8 from pmidc-digit/deepgumber9996-patch-3
simar1977 Aug 14, 2024
c7dab8c
Merge pull request #9 from pmidc-digit/deepgumber9996-patch-4
simar1977 Aug 14, 2024
cb62dc3
property active inactive button
abhirana04 Aug 20, 2024
5197c02
active
abhirana04 Aug 20, 2024
5bc883b
update
abhirana04 Aug 20, 2024
6937542
update
abhirana04 Aug 20, 2024
80cb787
Update tid parameter value in paymentgateway ccavanue
deepgumber9996 Aug 20, 2024
aeac57e
Merge pull request #11 from pmidc-digit/deepgumber9996-patch-6
palamgarg Aug 20, 2024
5366eca
update
abhirana04 Aug 20, 2024
ed31c8e
Update ccAvanueGateway.java
deepgumber9996 Aug 20, 2024
ed4c3fd
Merge pull request #12 from pmidc-digit/deepgumber9996-patch-7
gurpreetsinghkhanna Aug 21, 2024
2352b2a
update
abhirana04 Aug 21, 2024
0ca2803
Update PropertyService.java
palamgarg Aug 21, 2024
40dc72e
Update PropertyService.java
palamgarg Aug 21, 2024
45c9dbf
Added Property Schduler
palamgarg Aug 21, 2024
f394836
changes to fix
palamgarg Aug 21, 2024
4f2c2ae
log for create and update
anujkit Aug 21, 2024
5072b77
COMPLE EROR
palamgarg Aug 22, 2024
5613edd
added
palamgarg Aug 22, 2024
dd071fc
change in SQL
palamgarg Aug 22, 2024
783d282
Merge branch 'PMIDC-Upgrade-Dev3' into ws_cal_khanna_yearly
abhirana04 Aug 22, 2024
71b0137
fraction fixing PI-16460
abhirana04 Aug 22, 2024
1130a84
update
abhirana04 Aug 23, 2024
67c00c6
update number
abhirana04 Aug 23, 2024
c883b35
update
abhirana04 Aug 23, 2024
52fc6c5
updated CER
palamgarg Aug 23, 2024
47526de
Merge branch 'PMIDC-Upgrade-Dev3' into ws_cal_khanna_yearly
abhirana04 Aug 27, 2024
36a77a4
Update last connection inactive on modify connection request
deepgumber9996 Aug 28, 2024
e0cd2ea
Update road cutting condition by pass in case of modify water connect…
deepgumber9996 Aug 28, 2024
2aef12e
Merge pull request #14 from pmidc-digit/deepgumber9996-patch-8
simar1977 Aug 28, 2024
432a06f
Merge pull request #15 from pmidc-digit/deepgumber9996-patch-9
simar1977 Aug 28, 2024
b71ccd6
added
palamgarg Sep 3, 2024
b8252a3
Update Service.java
palamgarg Sep 3, 2024
28404cf
update the Primary Owner
anujkit Sep 5, 2024
b952579
update the default user
anujkit Sep 5, 2024
d8535b4
fixed length issues
palamgarg Sep 9, 2024
7ea9a8c
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Sep 9, 2024
fe01ad5
lenthg city
palamgarg Sep 9, 2024
18a95ea
Update Address.java
palamgarg Sep 9, 2024
b008095
Merge pull request #16 from pmidc-digit/palamgarg-patch-1
palamgarg Sep 9, 2024
f919506
round off
palamgarg Sep 9, 2024
59f7a8b
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Sep 9, 2024
c4bfa00
Merge branch 'PMIDC-Upgrade-Dev3' into ws_cal_khanna_yearly
abhirana04 Sep 10, 2024
0187cc6
removing generate demand ulb method of NIUA and setting up batch wise…
abhirana04 Sep 11, 2024
64ea2b9
upgrade
abhirana04 Sep 11, 2024
7ab3cef
update
abhirana04 Sep 11, 2024
67a3caa
update job
abhirana04 Sep 11, 2024
1198a52
update 100 limit
abhirana04 Sep 11, 2024
507f2c8
update
abhirana04 Sep 11, 2024
aaef321
60000 batch size
abhirana04 Sep 12, 2024
852c1d0
update modify
abhirana04 Sep 13, 2024
3554f4c
update
abhirana04 Sep 13, 2024
01c10b9
Merge pull request #18 from pmidc-digit/ws_cal_khanna_yearly
gurpreetsinghkhanna Sep 17, 2024
c9c2940
update for itpatiala issue
abhirana04 Sep 17, 2024
314b2b1
Merge pull request #19 from pmidc-digit/ws_cal_khanna_yearly
gurpreetsinghkhanna Sep 17, 2024
b8acfcb
Update reconcile API for CCAVANUE
deepgumber9996 Sep 17, 2024
b52b983
Update reconcile API for CCAVANUE
deepgumber9996 Sep 17, 2024
155a065
Update reconcile API for CCAVANUE
deepgumber9996 Sep 17, 2024
cacc029
Update reconcile API for CCAVANUE
deepgumber9996 Sep 17, 2024
fb74ce0
Merge pull request #20 from pmidc-digit/deepgumber9996-patch-10
gurpreetsinghkhanna Sep 17, 2024
0308c31
Merge pull request #21 from pmidc-digit/deepgumber9996-patch-11
gurpreetsinghkhanna Sep 17, 2024
4194bec
Merge pull request #22 from pmidc-digit/deepgumber9996-patch-11-1
gurpreetsinghkhanna Sep 17, 2024
9fe647b
Merge pull request #23 from pmidc-digit/deepgumber9996-patch-10-1
gurpreetsinghkhanna Sep 17, 2024
0278793
Update reconcile API for CCAVANUE
deepgumber9996 Sep 17, 2024
593deed
Merge pull request #24 from pmidc-digit/deepgumber9996-patch-12
gurpreetsinghkhanna Sep 17, 2024
0f4b99f
micro-ui change talendID =pb
anujkit Sep 19, 2024
3fd6f1f
Merge branch 'anuj_firenoc_fix' of https://github.com/pmidc-digit/mSe…
anujkit Sep 19, 2024
224778c
Fixed issue for reconcile RAZORPAY
deepgumber9996 Sep 22, 2024
fbb74f2
Merge pull request #25 from pmidc-digit/deepgumber9996-patch-13
gurpreetsinghkhanna Sep 22, 2024
1fb5664
Update demand not generated for commerical connection amritsar
deepgumber9996 Sep 23, 2024
9d66e40
Merge pull request #26 from pmidc-digit/deepgumber9996-patch-14
gurpreetsinghkhanna Sep 23, 2024
10c949b
update
abhirana04 Sep 24, 2024
44b9c90
Merge branch 'PMIDC-Upgrade-Dev3' into ws_cal_khanna_yearly
abhirana04 Sep 24, 2024
08d7243
Merge pull request #27 from pmidc-digit/ws_cal_khanna_yearly
simar1977 Sep 24, 2024
c9f9f13
update
abhirana04 Sep 24, 2024
12f1a3c
Merge pull request #28 from pmidc-digit/ws_cal_khanna_yearly
simar1977 Sep 24, 2024
7f96a29
UPDATE FOR IS paymentcompleted false for pt error
abhirana04 Oct 1, 2024
0fd605b
Merge pull request #31 from pmidc-digit/abhirana04-patch-4
palamgarg Oct 1, 2024
954149f
Update DemandQueryBuilder.java
abhirana04 Oct 8, 2024
9578b4d
Merge pull request #33 from pmidc-digit/abhirana04-patch-5
gurpreetsinghkhanna Oct 8, 2024
1c42a6b
update for serach demand in fetch bill
abhirana04 Oct 8, 2024
07c322e
Update CalculatorUtils.java
abhirana04 Oct 8, 2024
ee164d4
Merge pull request #34 from pmidc-digit/abhirana04-patch-6
simar1977 Oct 9, 2024
8ba5df3
Merge pull request #35 from pmidc-digit/abhirana04-patch-7
simar1977 Oct 9, 2024
c276939
Update DemandService.java
abhirana04 Oct 9, 2024
915bcae
Merge pull request #36 from pmidc-digit/abhirana04-patch-8
simar1977 Oct 9, 2024
8410fda
Merge pull request #38 from pmidc-digit/anuj_firenoc_fix
palamgarg Oct 11, 2024
17b64eb
Open search ws search error fixing
abhirana04 Oct 14, 2024
412cb54
Merge pull request #39 from pmidc-digit/abhirana04-patch-9
palamgarg Oct 14, 2024
a49c793
fixing penalty issuer
palamgarg Oct 18, 2024
2346732
fixed pom
palamgarg Oct 18, 2024
7416a0e
Penalty calculation fix
skninja Oct 21, 2024
c4cb9ee
jackson databind dependency version
skninja Oct 21, 2024
2d68f41
sewerage changes
skninja Oct 29, 2024
aca219d
null check added for dischargeConnection in additonal details
skninja Nov 5, 2024
a99ad31
Merge pull request #47 from pmidc-digit/sewerage-issue=demand-generat…
palamgarg Nov 6, 2024
a911a27
Fixed SMS
palamgarg Nov 6, 2024
91e0a71
add
palamgarg Nov 6, 2024
796fe21
Update NotificationConsumer.java
abhirana04 Nov 6, 2024
2937a89
Merge pull request #49 from pmidc-digit/abhirana04-patch-10
simar1977 Nov 6, 2024
7ca7499
Update Payment.java
abhirana04 Nov 7, 2024
b84abd6
Update PaymentSearchCriteria.java
abhirana04 Nov 7, 2024
15c4fab
Update PaymentRepository.java
abhirana04 Nov 7, 2024
9e3fefc
Update PaymentService.java
abhirana04 Nov 7, 2024
790ebbe
Create RoadCuttingInfo.java
abhirana04 Nov 7, 2024
9853abf
Create UsageCategoryInfo.java
abhirana04 Nov 7, 2024
167c6ec
Update WorkflowService.java
abhirana04 Nov 7, 2024
41355ff
Merge pull request #56 from pmidc-digit/abhirana04-patch-20
palamgarg Nov 7, 2024
50caaa6
Merge pull request #55 from pmidc-digit/abhirana04-patch-16
palamgarg Nov 7, 2024
aae1b57
Merge pull request #54 from pmidc-digit/abhirana04-patch-15
palamgarg Nov 7, 2024
4d8223c
Merge pull request #53 from pmidc-digit/abhirana04-patch-14
palamgarg Nov 7, 2024
45a45a0
Merge pull request #52 from pmidc-digit/abhirana04-patch-13
palamgarg Nov 7, 2024
127bf18
Merge pull request #51 from pmidc-digit/abhirana04-patch-12
palamgarg Nov 7, 2024
672fbf0
Merge pull request #50 from pmidc-digit/abhirana04-patch-11
palamgarg Nov 7, 2024
cb762a9
added groups
palamgarg Nov 7, 2024
ecb759d
Added Group by biling in patiala
palamgarg Nov 7, 2024
170e922
patiala group billing
abhirana04 Nov 8, 2024
0a61f45
alter table for group billing
abhirana04 Nov 8, 2024
8a91a8e
TL renewal NPE fix
skninja Nov 11, 2024
7ff54f9
TL renewal fix - removing logs
skninja Nov 11, 2024
9b32f76
Merge pull request #57 from pmidc-digit/skshatri-tl-NPE-fix
palamgarg Nov 11, 2024
dff7b11
TL demand detail null check for taxAmount
skninja Nov 11, 2024
176c51f
TL demand detail null check
skninja Nov 12, 2024
f79259d
Merge pull request #58 from pmidc-digit/skshatri-tl-NPE-fix
palamgarg Nov 12, 2024
66d82a8
changes for group / batch search
abhirana04 Nov 12, 2024
1c0ba67
added
palamgarg Nov 14, 2024
c03bf0a
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Nov 14, 2024
5c77324
UPDATE for change mobilenumber
abhirana04 Nov 18, 2024
f64bb82
Update PropertyService.java
abhirana04 Nov 18, 2024
7853d75
changes for mobile number
abhirana04 Nov 18, 2024
1afa66f
Merge pull request #61 from pmidc-digit/abhirana04-patch-23
simar1977 Nov 18, 2024
3e31bf5
Merge pull request #59 from pmidc-digit/abhirana04-patch-21
simar1977 Nov 18, 2024
a097976
Merge pull request #60 from pmidc-digit/abhirana04-patch-22
simar1977 Nov 18, 2024
7af4824
Update PropertyRepository.java
abhirana04 Nov 18, 2024
7223924
Merge pull request #63 from pmidc-digit/abhirana04-patch-24
simar1977 Nov 18, 2024
2efca36
Add files via upload
palamgarg Nov 19, 2024
3ee7086
Updated
palamgarg Nov 19, 2024
3ae98fa
removed old cert
palamgarg Nov 19, 2024
2a6df7c
TL tax head estimate amount null check
skninja Nov 19, 2024
19febe5
Merge pull request #64 from pmidc-digit/skshatri-tl-NPE-fix
palamgarg Nov 20, 2024
d411f61
Update application.properties
palamgarg Nov 20, 2024
6e96da6
Merge pull request #65 from pmidc-digit/palamgarg-patch-2
palamgarg Nov 20, 2024
6221c46
fix error of address enc/dsc
abhirana04 Nov 20, 2024
e79eb48
update mobile number for connectionHolder skip workflow
skninja Nov 21, 2024
65c77e9
added null check
skninja Nov 22, 2024
f38bba1
code formatted
skninja Nov 22, 2024
e4a9515
Merge pull request #66 from pmidc-digit/skshatri-ws-connHolder-mobile…
suhanikshatriya Nov 22, 2024
e5ca498
Changes done for SW security Deposit based on Plot size and usage type
palamgarg Nov 25, 2024
915f3dd
Update EstimationService.java
palamgarg Nov 25, 2024
d80ed97
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
palamgarg Nov 25, 2024
f66431c
fixed Security fee
palamgarg Nov 25, 2024
60e0feb
SecFee
palamgarg Nov 25, 2024
de3b002
response added to sw calculator
abhirana04 Nov 26, 2024
cff228b
Update application.properties
palamgarg Nov 26, 2024
7871029
Merge pull request #67 from pmidc-digit/patiala_billing
palamgarg Nov 26, 2024
68f478e
status check added in sewerage conn repo
suhanikshatriya Nov 26, 2024
ca40fde
Merge branch 'PMIDC-Upgrade-Dev3' of https://github.com/pmidc-digit/m…
suhanikshatriya Nov 26, 2024
f79be96
Merge pull request #68 from pmidc-digit/skshatri-fetchbill-multiple-r…
palamgarg Nov 26, 2024
2d1c4f7
bug fix for null pointer exception in wscal
abhirana04 Nov 27, 2024
bb36c22
total tax estimate amount fix
suhanikshatriya Nov 27, 2024
fdb43fb
Merge pull request #69 from pmidc-digit/skshatr-tl-tax-fix
palamgarg Nov 27, 2024
f90e1f6
Change of TimeZone in application properties file of User service
abhirana04 Nov 28, 2024
7012557
Update application.properties
abhirana04 Nov 28, 2024
0ee9633
Merge pull request #71 from pmidc-digit/abhirana04-patch-26
palamgarg Nov 28, 2024
dece17b
Update routes.properties
palamgarg Nov 28, 2024
61eed41
Merge pull request #72 from pmidc-digit/query-optimization
palamgarg Nov 28, 2024
5adfac6
Update for estimation service null pointer error fix
abhirana04 Nov 29, 2024
1d779d4
sewerage previous conn inactive update for modify connection
suhanikshatriya Nov 29, 2024
1014568
SW Group billing
abhirana04 Dec 2, 2024
60c1f1c
Merge pull request #74 from pmidc-digit/skshatr-sw-status-fix-active-…
palamgarg Dec 2, 2024
50f82dd
Merge pull request #70 from pmidc-digit/abhirana04-patch-25
palamgarg Dec 2, 2024
c1a5af9
Null Pointer handling for URL shortner (TAG)
abhirana04 Dec 2, 2024
0aaac1b
API Error Issue
anujkit Dec 3, 2024
95cd5e2
Merge pull request #75 from pmidc-digit/anuj_firenoc_fix
palamgarg Dec 3, 2024
661875b
Mseva Sso development
hemendiranb Dec 4, 2024
236df83
Update routes.properties
palamgarg Dec 9, 2024
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
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ else if (validityYears == 2)
else if (validityYears == 3)
estimate.setEstimateAmount(totalTax.multiply(BigDecimal.valueOf(3)));
}
//estimate.setEstimateAmount(totalTax);
estimate.setEstimateAmount(totalTax);
estimate.setCategory(Category.TAX);
if(license.getApplicationType() != null && license.getApplicationType().toString().equals(TLCalculatorConstants.APPLICATION_TYPE_RENEWAL)){
estimate.setTaxHeadCode(config.getRenewTaxHead());