Commit Graph

146 Commits

Author SHA1 Message Date
a2e0eb5e14 Merge pull request 'main' (#20) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #20
2026-04-23 14:44:18 +00:00
aryabenade
191aa3fd54 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-23 20:12:44 +05:30
1575690684 Merge pull request 'change card service again' (#19) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 21s
Reviewed-on: #19
2026-04-23 14:26:01 +00:00
Hemant Vishwakarma
6a23429131 change card service again 2026-04-23 19:55:21 +05:30
132ceccbdd Merge pull request 'change card service file' (#18) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #18
2026-04-23 14:21:57 +00:00
aryabenade
2c9bf7da83 show toast error when not able to create itinerary with the error msg from backend 2026-04-23 19:50:48 +05:30
Hemant Vishwakarma
8279715f2c change card service file 2026-04-23 19:50:43 +05:30
aryabenade
37601dd51d round off the basePrice and strikedPrice 2026-04-23 19:31:26 +05:30
aryabenade
16fe56913d debug the cityId issue in getting user itineraries 2026-04-23 19:29:18 +05:30
46f5533028 Merge pull request 'change payment success page and endpoint' (#17) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #17
2026-04-23 13:59:11 +00:00
Hemant Vishwakarma
a1a5c839dd change payment success page and endpoint 2026-04-23 19:28:13 +05:30
87a8749f10 Merge pull request 'Again rechange in payment success' (#16) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #16
2026-04-23 13:35:28 +00:00
Hemant Vishwakarma
d3bedeb56d Again rechange in payment success 2026-04-23 19:02:42 +05:30
c1b50de2b6 Merge pull request 'change payment success file and cards endpoints' (#15) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #15
2026-04-23 13:04:26 +00:00
Hemant Vishwakarma
cd7c6ffbaf change payment success file and cards endpoints 2026-04-23 18:33:33 +05:30
aryabenade
cdfcc70e45 integrate api to show itineraries in profile acc to the city selected 2026-04-23 18:24:34 +05:30
aryabenade
977eecd4d8 add indentation in register page 2026-04-23 17:51:12 +05:30
aryabenade
420d2038f2 add validations in register page 2026-04-23 17:48:48 +05:30
aryabenade
27382c45e3 round off the tax amount before adding to cart 2026-04-23 17:00:41 +05:30
aryabenade
0e8045d9a2 add navigation to the footer links 2026-04-23 16:50:09 +05:30
5efc22d150 Merge pull request 'main' (#14) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 25s
Reviewed-on: #14
2026-04-23 10:01:47 +00:00
b3bb9f08cd Merge pull request 'arya-branch' (#13) from arya-branch into main
Reviewed-on: #13
2026-04-23 10:01:05 +00:00
aryabenade
b1fb01a2a6 refactor the api call by passing cityId when getting user city cards 2026-04-23 15:25:52 +05:30
aryabenade
ef1408fe2a change the label of passes route to Buy Cards 2026-04-23 14:43:07 +05:30
aryabenade
23d1eaa43a add favicon to the app 2026-04-23 14:02:57 +05:30
aryabenade
cee671cf32 replace passes with cards in profile page 2026-04-23 13:56:30 +05:30
aryabenade
517a7c0446 remove the register button from logout modal 2026-04-23 13:34:58 +05:30
aryabenade
0d83118938 remove from local and session storage when signing out 2026-04-23 13:31:46 +05:30
aryabenade
0cb3d6c326 replace the registration modal with the registration page 2026-04-23 12:38:39 +05:30
aryabenade
0c7667bf26 remove console logs from checkout page 2026-04-23 00:13:37 +05:30
aryabenade
4c15fa597d remove the unused secure checkout file 2026-04-22 23:52:06 +05:30
aryabenade
617b494249 rename and replace the design files with actual page names 2026-04-22 23:49:59 +05:30
aryabenade
351c767104 replace the citySelected condition from local to session storage 2026-04-22 23:20:26 +05:30
2fa8f86d62 Merge pull request 'main' (#12) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 25s
Reviewed-on: #12
2026-04-22 14:26:44 +00:00
aryabenade
61f8202fe1 Merge branch 'main' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 19:55:31 +05:30
aryabenade
ef15941484 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-22 19:54:37 +05:30
aryabenade
8f3698b41f show purchased card details using api in the profile page 2026-04-22 19:44:21 +05:30
aryabenade
beae316bc0 integrate api in viewIternary page 2026-04-22 18:33:09 +05:30
3ee552dccc Merge pull request 'main' (#11) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #11
2026-04-22 12:31:47 +00:00
Hemant Vishwakarma
16c6161520 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 18:01:03 +05:30
Hemant Vishwakarma
03dabde979 New changes in paymentsuccesspage 2026-04-22 18:00:33 +05:30
11714bc1e4 Merge pull request 'main' (#10) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #10
2026-04-22 12:21:36 +00:00
Hemant Vishwakarma
d8d3ac1bfb Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:50:55 +05:30
Hemant Vishwakarma
b7767053e7 Stripe again changes 2026-04-22 17:50:30 +05:30
c9ed8f5628 Merge pull request 'main' (#9) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 21s
Reviewed-on: #9
2026-04-22 12:15:33 +00:00
Hemant Vishwakarma
690a59d8a9 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:44:57 +05:30
Hemant Vishwakarma
043b575a7b change cancel page of stripe and navbar profile changes 2026-04-22 17:44:34 +05:30
Hemant Vishwakarma
65e7b53a84 Again changes in success page 2026-04-22 17:37:24 +05:30
473902a2ae Merge pull request 'main' (#8) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #8
2026-04-22 11:47:22 +00:00
Hemant Vishwakarma
1691396eea Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:16:32 +05:30