Commit graph

6908 commits

Author SHA1 Message Date
Bryan Mauger
e8ca2fb3ee BRM fix undocumented border radius issue. 2025-08-05 08:57:51 -04:00
bmauger
018149c804
Merge branch 'release/2025.08.21' into CASH-1327-quote-page-bug-fixes 2025-08-05 08:13:47 -04:00
Bryan Mauger
b9dfa47d9e CASH-1327 adjust modal height on screen. 2025-08-05 08:12:11 -04:00
Bryan Mauger
6219b847d9 CASH-1327 quote page bug fixes. 2025-08-05 08:08:45 -04:00
Johnny shultz
8a26261c94 CASH-1182
formatting
2025-08-04 14:47:08 -04:00
Johnny shultz
d5d3bb5cca Merge remote-tracking branch 'origin/release/2025.08.21' into feature/CASH-1182 2025-08-04 14:27:39 -04:00
Johnny shultz
0e8711e8ed CASH-1182
CASH-1182 changed appointmentType button styling, and some semiBold font-weight adjustments
2025-08-04 14:26:38 -04:00
Bryan Mauger
fe0c71c331 Merge branch 'CASH-1326-header-updates' of https://github.com/Safelite/DigitalConsumer.FixMyGlass into CASH-1326-header-updates 2025-08-04 12:21:06 -04:00
Bryan Mauger
9e4e0436fb CASH-1326 format code. 2025-08-04 12:20:29 -04:00
bmauger
a3881607b8
Merge branch 'release/2025.08.21' into CASH-1326-header-updates 2025-08-04 12:18:08 -04:00
Bryan Mauger
af9a07b6e2 CASH-1326 UI bug fixes. 2025-08-04 12:16:36 -04:00
Chris Redelinghuys
900704150b CASH-1183: Shop location and timeslot parity updates 2025-08-01 16:14:06 -04:00
Johnny shultz
1c733b723c Merge remote-tracking branch 'origin/feature/CASH-1182' into feature/CASH-1182 2025-08-01 13:15:05 -04:00
Johnny shultz
0e2b29d803 CASH-1182
CASH-1182 formatting and removed unused css
2025-08-01 13:14:43 -04:00
Johnny Shultz
237e1539d5
Merge branch 'release/2025.08.21' into feature/CASH-1182 2025-08-01 13:06:50 -04:00
Johnny shultz
7a9f677a4a Merge Conflict 2025-08-01 13:05:31 -04:00
Bryan Mauger
4029d9c089 CASH-1048 format code. 2025-08-01 10:45:51 -04:00
Bryan Mauger
7fce2e5b5e CASH-1048 add comment. 2025-08-01 10:32:50 -04:00
Bryan Mauger
385b7e747f CASH-1048 center modal on quote page. 2025-08-01 10:31:04 -04:00
Johnny shultz
215cd0003d CASH-1182
CASH-1182 updated cms, font stylings
2025-08-01 09:36:51 -04:00
Bryan Mauger
81daa44e57 CASH-1043 schedule page updates. 2025-07-31 11:30:32 -04:00
Bryan Mauger
85c4734163 CASH-1043 schedule page formatting and style updates. 2025-07-31 10:43:21 -04:00
Johnny shultz
76e667f7cc CASH-1182
CASH-1182 moved serviceZipModal under appointmentType question, left alignedheaders and stuff on the page
2025-07-31 09:42:32 -04:00
bmauger
a6878675f6
Merge branch 'develop' into CASH-1048-quote-page-updates 2025-07-30 16:42:24 -04:00
Bryan Mauger
ac37e4e3a9 CASH-1048 fix unit test. 2025-07-30 16:05:21 -04:00
Bryan Mauger
033ecf3ce5 CASH-1048 formate code. 2025-07-30 15:13:02 -04:00
Bryan Mauger
3e4f14b410 CASH-1048 quote page updates. 2025-07-30 15:06:15 -04:00
Chris Redelinghuys
957b66ac1a CASH-1235: Auto select if only one timeslot available 2025-07-30 15:05:21 -04:00
Chris Redelinghuys
4d7229c9c8 Merge branch 'release/2025.07.31' into rlsmerge/2025.07.31-to-develop 2025-07-30 11:15:20 -04:00
Scott Kiener
b7cad29c3d CASH-1303 | Fix 2025-07-29 16:24:36 -04:00
Bryan Mauger
8ae5783b4b CASH-1042 format code. 2025-07-29 15:48:21 -04:00
Bryan Mauger
5f9a4017d0 CASH-1042 fix unit test; replace widget. 2025-07-29 15:33:49 -04:00
Scott Kiener
92d111877c Revert some of 1291 2025-07-29 15:16:31 -04:00
Bryan Mauger
b7c098b900 Merge branch 'develop' into CASH-1042-header-and-progress-bar-style-updates 2025-07-29 14:26:46 -04:00
Bryan Mauger
1d422e3d90 CASH-1042 Format code. 2025-07-29 10:51:00 -04:00
bmauger
3d9ca2f44d
Merge branch 'develop' into CASH-1042-header-and-progress-bar-style-updates 2025-07-29 10:45:51 -04:00
CarlNation
4ec1e3d9b6 Revert "Merge pull request #2654 from Safelite/CASH-1042-header-and-progress-bar-style-updates"
this is a revert of the revert:
Revert "Merge pull request #2654 from Safelite/CASH-1042-header-and-progress-bar-style-updates"
2025-07-29 10:33:58 -04:00
Chris Redelinghuys
d9360bc04f CASH-1291: Calendar not reloading when switching inshop/mobile 2025-07-29 10:18:13 -04:00
CarlNation
596732e1b4 Merge branch 'release/2025.07.31' into rlsmerge/2025.07.31-to-develop 2025-07-29 09:12:30 -04:00
Chris Redelinghuys
7e58b4cd15 CASH-1291: Redundant clearing of timeslot 2025-07-29 08:34:16 -04:00
Chris Redelinghuys
3e001244fa Revert "CASH-1235: Set auto selected timeslot"
This reverts commit c61e153fc3.
2025-07-28 11:24:02 -04:00
Chris Redelinghuys
462ebd6519 Revert "CASH-1209: Auto select pre-selected timeslot"
This reverts commit f5d4da065c.
2025-07-28 11:15:51 -04:00
scottkiener-at-safelite
21a58d4403
Merge branch 'release/2025.07.31' into feature/CASH-1159-skiener 2025-07-28 10:56:45 -04:00
Scott Kiener
09843ae2cb CASH-1159
Remember last in-shop selection if simply toggling between mobile and in-shop
2025-07-28 10:43:54 -04:00
Chris Redelinghuys
c61e153fc3 CASH-1235: Set auto selected timeslot 2025-07-28 10:34:43 -04:00
Johnny shultz
9af579ca23 CASH-1249
CASH-1249 reset schedule page selected info if they change their zip from top modal
2025-07-28 09:01:16 -04:00
Chris Redelinghuys
f5d4da065c CASH-1209: Auto select pre-selected timeslot 2025-07-28 08:33:56 -04:00
bmauger
d7da7a6205
Merge branch 'release/2025.07.31' into CASH-1163-afterpay-update 2025-07-25 14:31:49 -04:00
Bryan Mauger
2fcefc104e CASH-1163 format code. 2025-07-25 14:24:58 -04:00
Bryan Mauger
55238e0c31 CASH-1163 update Afterpay and code cleanup. 2025-07-25 14:16:23 -04:00
Chris Redelinghuys
a8ac522200 CASH-1247: Preselect In-Shop if Drop-off was selected 2025-07-25 14:14:33 -04:00
Chloe Herd
0f18cca165 Set serviceability details for ZIP when zip is changed 2025-07-25 13:37:32 -04:00
CarlNation
c867a5d214 Merge branch 'release/2025.07.31' into nation/CASH-1245 2025-07-25 12:54:36 -04:00
CarlNation
dca8a41b58 CASH-1245
CASH-1245 added loading modal to hide the scroll to top and also to work like the other page transitions
2025-07-25 12:53:54 -04:00
Johnny shultz
0cff68f49a CASH-1159
formatting
2025-07-25 12:27:03 -04:00
Johnny shultz
91ed93839c Merge remote-tracking branch 'origin/feature/CASH-1159' into feature/CASH-1159 2025-07-25 12:22:30 -04:00
Johnny shultz
fb1eb0487a CASH-1159
CASH-1159 reverting changes for now
2025-07-25 12:22:03 -04:00
Johnny Shultz
638eb39820
Merge branch 'release/2025.07.31' into feature/CASH-1159 2025-07-25 09:35:28 -04:00
Scott Kiener
095c8aad7b CASH-1237 | Fix CTA text for overnight dropoff 2025-07-25 09:23:21 -04:00
Johnny shultz
4ed29efa3b CASH-1159
CASH-1159 fixed selected shop from not persisting when switching from mobile back to inshop
2025-07-25 09:10:35 -04:00
Bryan Mauger
c83b30edf8 CASH-1208 fix persistent waitlist success message. 2025-07-24 15:46:13 -04:00
CarlNation
b7dc72ad77 CASH-1228
CASH-1228 force reset the selected timeslot when the date changes.
2025-07-24 15:15:50 -04:00
Chris Redelinghuys
e32a1cd9c4 CASH-1214: Clear selectedRouteCode if no time slot is selected 2025-07-24 14:36:19 -04:00
CarlNation
33241a8ecb
Merge branch 'release/2025.07.31' into nation/CASH-1225 2025-07-24 13:33:40 -04:00
CarlNation
30a12ca7ca Merge branch 'release/2025.07.31' into nation/CASH-1225 2025-07-24 13:30:33 -04:00
CarlNation
6d0e9ff4a1 CASH-1225
CASH-1225 seemed like meta was false when default timeslot selected.  Could not determine why so removed meta and changed the check to enable the continue button to be based on having an appointment type and a routecode.
Will need to retest CASH-1145.  Should also cover CASH-1218 and CASH-1228
2025-07-24 13:29:52 -04:00
mvalaiyapathi
f301527e3c
Merge branch 'release/2025.07.31' into feature/CASH-1227 2025-07-24 13:10:26 -04:00
Minojhini Valaiyapathi
3a1a1060d8 CASH-1227 - Fixed resetting the date from navigating back from mobile/customer details to schedule page 2025-07-24 13:08:35 -04:00
Chloe Herd
9bb93af149 Don't change serviceability details when new shop is chosen 2025-07-24 12:53:03 -04:00
Johnny Shultz
407eae0556
Merge branch 'release/2025.07.31' into feature/CASH-1230 2025-07-24 12:42:45 -04:00
Johnny shultz
905eeb9e31 CASH-1230
CASH-1230 simplifed code back to the way it was in setDisplayWaitlist, only need to call this method on an appointment type change
2025-07-24 12:41:19 -04:00
Chris Redelinghuys
b909b90f34 CASH-1222: Add validation rules to inshop/dropoff options 2025-07-24 12:22:50 -04:00
Johnny shultz
1b7eb2962e CASH-1230
formatting
2025-07-24 10:07:09 -04:00
Johnny shultz
0d826f478e CASH-1230
CASH-1230 modified waitlist to display for mobile and for inshop when it should/shouldnt
2025-07-24 09:53:06 -04:00
Bryan Mauger
e2c256fe21 CASH-1028 make waitlist show only if date is selected. 2025-07-24 08:44:57 -04:00
Minojhini Valaiyapathi
42c479177e CASH-1226 - Passed mobile provider number when appointment type is mobile 2025-07-24 08:24:24 -04:00
Chloe Herd
6d3af6d1af Dont reset fields unnecessarily 2025-07-23 14:27:30 -04:00
Chris Redelinghuys
84f7911c1a CASH-1214: Reset selected timeslot on date change 2025-07-23 14:04:30 -04:00
scottkiener-at-safelite
92620b1dcd
Merge branch 'release/2025.07.31' into feature/CASH-1224 2025-07-22 16:02:19 -04:00
Johnny shultz
1c58528633 CASH-1224
CASH-1224 resetting preSelectedDate in onShopSelected, because if user is searching for a new shop then no need for the preSelectedDate variable other than preserving the value after advancing
2025-07-22 15:54:22 -04:00
Chloe Herd
64e91ca4f3 Refactor promises to awaits 2025-07-22 15:51:05 -04:00
Chris Redelinghuys
52b5cf42f0 CASH-1212: Update selected date if it's null after getting dates for another month 2025-07-22 14:29:04 -04:00
Johnny shultz
8636751b7d CASH-1221
formatting
2025-07-22 13:01:59 -04:00
Johnny shultz
fd9265a269 CASH-1221
CASH-1221 fixed waitList success message from popping up when it is not supposed to, reset waitList selection on change from both modals and new date
2025-07-22 12:54:33 -04:00
chloeherdsafelite
ca9880efe2
Merge branch 'release/2025.07.31' into feature/CASH-1207 2025-07-22 12:15:46 -04:00
Chloe Herd
ead9fc10af Don't over-update fields with wrong information. 2025-07-22 12:09:07 -04:00
Minojhini Valaiyapathi
381d661c09 CASH-1216 - Checked if selectedProvider is null for mobile 2025-07-22 11:50:45 -04:00
Bryan Mauger
eafe144519 CASH-1042 WIP 2025-07-22 08:08:07 -04:00
Johnny shultz
1470d3e52f Merge remote-tracking branch 'origin/feature/CASH-1145' into feature/CASH-1145 2025-07-21 16:12:00 -04:00
Johnny shultz
94a3fbcc72 CASH-1145
formatting
2025-07-21 16:11:27 -04:00
Johnny Shultz
042bcd43b9
Merge branch 'release/2025.07.31' into feature/CASH-1145 2025-07-21 16:07:38 -04:00
Johnny shultz
d1fff5162f CASH-1145
CASH-1145 prevented continue button from being selected before a timeslot has been picked for happy path and for when they navigate forward and back
2025-07-21 16:05:17 -04:00
Chloe Herd
1df3a739ad Don't set appointment type when no appointment/routecode is present. 2025-07-21 15:28:49 -04:00
Scott Kiener
25fbe8933d CASH-1204 | Schedules not loading on initial page load
Moved initialization logic out of mounted into next() of beforeRouteEnter
2025-07-21 11:36:11 -04:00
Bryan Mauger
89f8b15d1e CASH-1042 WIP 2025-07-21 10:17:09 -04:00
AdamCaouetteSafelite
4775a7d077 CASH-1153: remove line that was conflicting and causing error 2025-07-18 16:15:36 -04:00
AdamCaouetteSafelite
4b5de2fe6d CASH-845 add duration text back to Mobile 2025-07-18 15:58:58 -04:00
AdamCaouetteSafelite
b7bf5c9690 CASH-845: add another nextTick and await to ensure date picker is ready for an auto select of first date 2025-07-18 15:39:52 -04:00
AdamCaouetteSafelite
913de733ca CASH-845: fix for seeing duration as undefined 2025-07-18 15:24:19 -04:00
AdamCaouetteSafelite
e552d37031 Merge branch 'release/2025.07.31' into feature/CASH-845-stage-6 2025-07-18 13:53:20 -04:00