Commit graph

2654 commits

Author SHA1 Message Date
Leah Schumann
cfedf248b7 Revert "Revert "Merge branch 'develop' into feature/CSR-1382-loose-ends""
This reverts commit 936bc95957.
2023-10-25 14:34:08 -04:00
Leah Schumann
d8dd23e2c9 Merged from develop, prettified 2023-10-25 11:39:32 -04:00
Leah Schumann
0b63dfca88 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-25 11:37:44 -04:00
Leah Schumann
3d1a9d6299 WIP - Taxes added 2023-10-25 11:32:01 -04:00
Scott Kiener
3d9c1b97fb CSR-1520 | Formatting 2023-10-25 10:36:25 -04:00
Scott Kiener
abd09c48a8 Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1520 2023-10-25 10:33:27 -04:00
Scott Kiener
2516adc2fc CSR-1520 | Package selection promo logic 2023-10-25 10:33:14 -04:00
Leah Schumann
936bc95957 Revert "Merge branch 'develop' into feature/CSR-1382-loose-ends"
This reverts commit 8b742bbc44, reversing
changes made to c94e3e3740.
2023-10-25 07:35:06 -04:00
Leah Schumann
8b742bbc44 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-24 15:48:00 -04:00
Leah Schumann
c94e3e3740 WIP again 2023-10-24 15:47:21 -04:00
CarlNation
0da018e83c CSR-1392
prettier
2023-10-24 15:21:20 -04:00
CarlNation
45add3866b CSR-1392
testing lower paypal dollar amounts
2023-10-24 15:13:56 -04:00
Leah Schumann
4bfeebcec3 WIP 2023-10-24 14:46:08 -04:00
Leah Schumann
f2ff088663 WIP 2023-10-24 13:57:27 -04:00
CarlNation
f471bac01c CSR-1392
prettier
2023-10-24 11:13:19 -04:00
CarlNation
0e08c99ad8 Merge branch 'develop' into feature/CSR-1392 2023-10-24 11:09:42 -04:00
CarlNation
b243f41fa7 CSR-1392
make displayPiaAlert a computed instead of data field
2023-10-24 11:08:51 -04:00
scottkiener
38557f7477
Merge pull request #1447 from Safelite/feature/skiener/CSR-1656
CSR-1656 | Store promo information from load-session
2023-10-24 10:51:52 -04:00
Scott Kiener
f7715b35e5 CSR-1656 | Front end promo bug fixes
Don't save empty serverData to store
Save all promos on quote page nav
2023-10-24 10:12:57 -04:00
CarlNation
b9750982a4 CSR-1390
use payment method constants
2023-10-24 08:25:58 -04:00
Chloe Herd
85417ce9f2 Merge branch 'develop' into feature/csr-1465 2023-10-23 14:35:42 -04:00
Leah Schumann
8439dd3938 WIP 2023-10-23 14:27:37 -04:00
Bryan Mauger
94cae9329b Set column width for xl breakpoint. 2023-10-23 11:26:31 -04:00
CarlNation
93cf47df5a CSR-1390
prettier
2023-10-23 10:06:59 -04:00
CarlNation
9b0089a3b0 Merge branch 'develop' into feature/CSR-1390-style 2023-10-23 09:57:21 -04:00
CarlNation
3be7e71481 CSR-1390
credit card and paypal settlement changes for NextGen
2023-10-23 09:56:35 -04:00
Bryan Mauger
3ac40696ca Change col-lg-4 to col-xl-4 to correct mistake. 2023-10-23 09:38:53 -04:00
Bryan Mauger
b06e5b435d Set column for vehicle-parts page. 2023-10-20 16:19:01 -04:00
Bryan Mauger
dee4e36ba7 CSR-1715 fix spacing. 2023-10-20 13:18:54 -04:00
Leah Schumann
0d1e87b9d8 Post merge adjustments 2023-10-20 11:53:19 -04:00
Leah Schumann
aa492f31e6 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-20 11:53:03 -04:00
Leah Schumann
86fde0c034 WIP 2023-10-20 11:11:57 -04:00
AdamCaouetteSafelite
5998f13e9c
Merge pull request #1436 from Safelite/feature/CSR-1384-modals-for-add-vaps
CSR-1384: adding modals with add to cart buttons
2023-10-20 11:04:42 -04:00
hiteshkumar87
8403a3d170
Merge pull request #1435 from Safelite/feature/Digital/CSR-1417
move add-to-calendar within confirmation
2023-10-20 20:30:24 +05:30
Adam Caouette
2be4b378c1 CSR-1384: remove outdated code 2023-10-20 10:38:13 -04:00
bmauger
43bfda937b
Merge pull request #1433 from Safelite/CSR-1712-add-copy-to-vehicle-page
CSR-1712 add copy to vehicle page.
2023-10-20 10:23:25 -04:00
Bryan Mauger
b16c36d2cf format code. 2023-10-20 10:17:25 -04:00
Bryan Mauger
8c7e1953a9 Update unit test. 2023-10-20 10:11:15 -04:00
Adam Caouette
820a4387ac CSR-1384: adding modals with add to cart buttons 2023-10-20 09:56:38 -04:00
hiteshkumar87
2404c5f9f2 move external links to Vue config
move external links to Vue config
2023-10-20 19:10:19 +05:30
hiteshkumar87
10b1d941ef move add-to-calendar within confirmation
move add-to-calendar within confirmation and pass cms widget as props
2023-10-20 18:01:55 +05:30
Bryan Mauger
61c2c039cc Change P to div. 2023-10-19 17:49:10 -04:00
Chloe Herd
dd4f98c405 Merge branch 'develop' into feature/csr-1465 2023-10-19 17:07:03 -04:00
Adam Caouette
86a8acd194 CSR-1384: fixes to keep dev working 2023-10-19 16:40:48 -04:00
Bryan Mauger
3d0bdb734c CSR-1712 add copy to vehicle page. 2023-10-19 15:00:26 -04:00
Chloe Herd
f90dd07480 Patch for carl's code 2023-10-19 14:47:22 -04:00
Chloe Herd
eefd2be36e Merge branch 'feature/CSR-1384-modals-for-add-vaps' into feature/csr-1465 2023-10-19 14:38:12 -04:00
Adam Caouette
f8819c3690 CSR-1384: possible temporary fix for lineItems while cart.vue is in development 2023-10-19 11:27:17 -04:00
Chloe Herd
15241f9316 Merge branch 'develop' into feature/csr-1465 2023-10-19 10:22:21 -04:00
Chloe Herd
6e658992cd Save & reorganize 2023-10-19 10:21:09 -04:00