Commit graph

6853 commits

Author SHA1 Message Date
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