Commit graph

8089 commits

Author SHA1 Message Date
Johnny shultz
63de7f959f CASH-185
CASH-185 fixed import conflict
2025-02-24 10:58:17 -05:00
Johnny Shultz
ea03889bb1
Merge branch 'develop' into feature/CASH-185 2025-02-24 09:58:23 -05:00
CarlNation
1ecd0b4a83
Merge pull request #2326 from Safelite/rlsmerge/2025.02.27-to-develop
Rlsmerge/2025.02.27 to develop
2025-02-24 09:43:14 -05:00
CarlNation
112ba413de Merge branch 'release/2025.02.27' into rlsmerge/2025.02.27-to-develop 2025-02-24 09:37:20 -05:00
CarlNation
0df37c65be
Merge pull request #2325 from Safelite/feature/CASH-291
CASH-291
2025-02-24 09:36:40 -05:00
CarlNation
9ebfcd4fb3 Merge branch 'develop' into rlsmerge/2025.02.27-to-develop 2025-02-24 09:35:49 -05:00
CarlNation
e6778d3403 Merge branch 'release/2025.02.27' into rlsmerge/2025.02.27-to-develop 2025-02-24 09:35:42 -05:00
Chris
8df041b7dc
Merge pull request #2323 from Safelite/feature/CASH-273
Feature/cash 273
2025-02-24 08:14:07 -05:00
Chris
554bc756bd
Merge branch 'develop' into feature/CASH-273 2025-02-24 08:07:39 -05:00
bmauger
5987e78e2a
Merge pull request #2321 from Safelite/CASH-132-add-experiment-settings
CASH-132 add experiment.
2025-02-23 15:53:24 -05:00
bmauger
f1b3234398
Merge branch 'develop' into CASH-132-add-experiment-settings 2025-02-23 15:46:06 -05:00
Bryan Mauger
8fbe2173aa Fix unit test. 2025-02-23 15:39:12 -05:00
CarlNation
d72f7864f3 Jest failure in azure
trying to resolve error:
TypeError: _istanbulReports(...).default.create(...).execute is not a function
2025-02-23 06:25:28 -05:00
CarlNation
47c1771ffa Merge remote-tracking branch 'origin/feature/CASH-291' into feature/CASH-291 2025-02-23 05:51:04 -05:00
CarlNation
8e53442d93 CASH-291
CASH-291 fix tests
2025-02-23 05:50:56 -05:00
bmauger
7649c2e5ed
Merge pull request #2324 from Safelite/feature/CASH-151
Feature/cash 151
2025-02-22 15:09:32 -05:00
Bryan Mauger
45be0757b2 Merge branch 'feature/CASH-151' of https://github.com/Safelite/DigitalConsumer.FixMyGlass into feature/CASH-151 2025-02-22 14:13:59 -05:00
Bryan Mauger
a8a0724b84 CSS update. 2025-02-22 14:13:56 -05:00
CarlNation
d2454c5733
Merge branch 'release/2025.02.27' into feature/CASH-291 2025-02-22 06:20:40 -05:00
CarlNation
eedcf4dfdd CASH-291
CASH-291 The issue here is that when computing the tier one price for determining which tab to select. we are including the service package discount of $50 bringing the tier one price to $287(337-50), which is less than $300 and causing the cash tab to be selected.  This is not the tier one price we show but only used in the computation for determining which tab to default.
2025-02-22 06:09:45 -05:00
bmauger
7674eb0e33
Merge branch 'develop' into feature/CASH-151 2025-02-21 16:29:05 -05:00
Bryan Mauger
202e53aa88 CASH-151 style updates. 2025-02-21 16:24:51 -05:00
CarlNation
ba430211c9
Merge pull request #2322 from Safelite/feature/CASH-291 2025-02-21 14:47:49 -05:00
Chris Redelinghuys
90f8f6f3cd CASH-273 2025-02-21 14:44:08 -05:00
CarlNation
75345b9f9d CASH-291
CASH-291 cannot recreate locally.  adding some debug info to try and determine in dev/sys or qa
2025-02-21 14:28:16 -05:00
hiteshkumar87
06d7edadab CASH-273
unit test cases
2025-02-21 23:30:43 +05:30
Bryan Mauger
2683e837a6 CASH-132 add experiment. 2025-02-21 12:44:25 -05:00
Johnny shultz
748970b715 CASH-185
CASH-185 fixed unit test in schedule.spec.js
2025-02-21 10:11:53 -05:00
Chris Redelinghuys
a2be43e190 CASH-273: Update service location when mobile service zip doesn't offer mobile service 2025-02-21 10:11:34 -05:00
hiteshkumar87
6f9f49992e
Merge pull request #2320 from Safelite/feature/CASH-151
CASH-151
2025-02-21 18:25:12 +05:30
hiteshkumar87
e9c6c0e6f4
Merge branch 'release/2025.02.27' into feature/CASH-151 2025-02-21 18:17:57 +05:30
hiteshkumar87
4b728b12e3 CASH-151
remove extra spacing from service packages tiles
2025-02-21 18:15:56 +05:30
bmauger
29815f7022
Merge pull request #2319 from Safelite/CASH-191-button-fix-2
CASH-191 button fix.
2025-02-20 13:34:39 -05:00
Bryan Mauger
b0fe6cfd97 Minor change to force build. 2025-02-20 10:56:11 -05:00
AdamCaouetteSafelite
9f576e07da
Merge pull request #2313 from Safelite/feature/CASH-153
CASH-153: updates after tech review
2025-02-20 10:55:38 -05:00
Adam Caouette
ca65ba6659 Merge branch 'release/2025.02.27' into feature/CASH-153 2025-02-20 10:46:05 -05:00
CarlNation
04160cef0c
Merge branch 'develop' into CASH-191-button-fix-2 2025-02-20 10:08:54 -05:00
CarlNation
5ef96c993e
Merge pull request #2318 from Safelite/rlsmerge/2025.02.27-to-develop
Rlsmerge/2025.02.27 to develop
2025-02-20 10:03:46 -05:00
bmauger
e3c3d08fbe
Merge branch 'develop' into CASH-191-button-fix-2 2025-02-20 10:01:09 -05:00
Bryan Mauger
c4045efee3 CASH-191 button fix. 2025-02-20 09:59:50 -05:00
CarlNation
6297246301
Merge branch 'develop' into rlsmerge/2025.02.27-to-develop 2025-02-20 09:31:03 -05:00
bmauger
1ce8381d72
Merge pull request #2316 from Safelite/CASH-132-dontation-widget-foster-love
Cash 132 donation widget foster love
2025-02-20 09:24:25 -05:00
Bryan Mauger
0eaa1c2fd7 Move component out of subfolder. 2025-02-20 09:18:10 -05:00
Bryan Mauger
3455c50fe7 CASH-132 move donation block to experiment-component folder. 2025-02-20 09:05:30 -05:00
Bryan Mauger
31ba135ef4 Merge branch 'develop' into CASH-132-dontation-widget-foster-love 2025-02-20 08:57:07 -05:00
CarlNation
352e2932f5 Merge branch 'develop' into rlsmerge/2025.02.27-to-develop 2025-02-20 08:50:02 -05:00
CarlNation
1900da762b Merge branch 'release/2025.02.27' into rlsmerge/2025.02.27-to-develop 2025-02-20 08:49:56 -05:00
CarlNation
178d9ff116
Merge pull request #2317 from Safelite/rlsmerge/2025.02.20-to-2025.02.27
Rlsmerge/2025.02.20 to 2025.02.27
2025-02-20 08:49:05 -05:00
CarlNation
1a9edd28c9 Merge branch 'release/2025.02.20' into rlsmerge/2025.02.20-to-2025.02.27 2025-02-20 08:42:06 -05:00
Bryan Mauger
91da7f8c45 CASH-132 donation block updates. 2025-02-19 18:35:00 -05:00