Commit graph

4362 commits

Author SHA1 Message Date
CarlNation
3ad9cfd659 CSR-1392
prettier
2023-10-26 06:21:32 -04:00
CarlNation
14d5f879ac Merge branch 'develop' into feature/CSR-1392 2023-10-26 06:18:56 -04:00
CarlNation
6749be0df4 CSR-1392
fix tests
2023-10-26 06:18:17 -04:00
sheena
40b765c197 CSR-1718 2023-10-26 15:06:50 +05:30
sheena
417babdbc8 CSR-1718
Updated the space
2023-10-26 15:02:22 +05:30
Adam Caouette
77455fa673 CSR-1384: updates to add vaps modals 2023-10-25 21:48:34 -04:00
Adam Caouette
c75c406c50 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-10-25 21:45:43 -04:00
Chloe Herd
721314f808 Merge branch 'develop' into feature/CSR-1387 2023-10-25 17:09:21 -04:00
Chloe Herd
1cf6b80f19 Only count experiment settings from active experiments 2023-10-25 17:08:58 -04:00
CarlNation
7840e90dc5 CSR-1392
prettier
2023-10-25 17:00:29 -04:00
CarlNation
ec6eabb24a Merge branch 'develop' into feature/CSR-1392 2023-10-25 16:56:01 -04:00
CarlNation
67fe2e0177 CSR-1392
move promise reset to after we await all save sessions (submitWOrkOrder)
2023-10-25 16:55:31 -04:00
Bryan Mauger
3eb75f3a58 Format code. 2023-10-25 16:47:52 -04:00
Bryan Mauger
f687e1a803 Payment page style updates. 2023-10-25 16:44:16 -04:00
CarlNation
f6bdd4a272 CSR-1392
unused parm passed to setupPia.
2023-10-25 15:19:19 -04:00
CarlNation
b77b284148 Merge branch 'develop' into feature/CSR-1392 2023-10-25 15:10:27 -04:00
CarlNation
fb783ee7dd CSR-1392
use router params instead of store to save pia error
2023-10-25 15:09:18 -04:00
Leah Schumann
f64b6ad31c A couple, not all, code review changes 2023-10-25 14:57:19 -04:00
Leah Schumann
18cc04b2ef Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-25 14:52:11 -04:00
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
Matt Caimi
520193e18d
Merge pull request #1455 from Safelite/feature/CSR-1391.1
CSR-1391 bug fix
2023-10-25 14:28:16 -04:00
bmauger
240c71fa0c
Merge pull request #1454 from Safelite/CSR-1390-style-payment-page
Initial styling for payment page.
2023-10-25 14:27:36 -04:00
Matt Caimi
3fa60a1746 CSR-1391 bug fix 2023-10-25 14:22:27 -04:00
Bryan Mauger
ded7ea101c Initial styling for payment page. 2023-10-25 14:10:11 -04:00
Matt Caimi
62ef3faefd CSR-1391 moved signature api call to beforeRouteEnter and other fixes 2023-10-25 13:42:33 -04:00
CarlNation
30e147c160 CSR-1392
prettier
2023-10-25 13:19:18 -04:00
CarlNation
3845838db4 Merge branch 'develop' into feature/CSR-1392 2023-10-25 13:16:33 -04:00
CarlNation
b34e49ab17 CSR-1392
increase amount to test paypal settlement
2023-10-25 13:16:17 -04:00
CarlNation
992f2e9215 CSR-1392
return a higher to test Paypal settlement error
also changed how to build the display line items sent to paypal so it's just pats, supportingitems and vaps.
2023-10-25 13:15:20 -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
Chloe Herd
75b47e2ebd Actually key into experiment setting 2023-10-25 11:29:47 -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
Adam Caouette
e104a36886 CSR-1384: set up modals 2023-10-24 14:43:18 -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
9213908105 CSR-1656 | Modify validate promos request 2023-10-24 10:46:01 -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
scottkiener
995d1b42e9
Merge pull request #1445 from Safelite/feature/skiener/CSR-1656
CSR-1656 | Store promo information from load-session
2023-10-24 09:26:26 -04:00
CarlNation
fd72735a8c CSR-1390 prettier 2023-10-24 08:29:41 -04:00
CarlNation
b9750982a4 CSR-1390
use payment method constants
2023-10-24 08:25:58 -04:00
Scott Kiener
e93a5e049d CSR-1656 | Store promo information from load-session 2023-10-23 15:15:33 -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
2c3589f235 Update column setting. 2023-10-20 15:36:02 -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
7c60a4c069 Fixed the NaN issue that was introduced with Tax stuff 2023-10-20 11:20: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
hiteshkumar87
047ed98550 remove calendar url from vue config
remove calendar url from vue config
2023-10-20 19:51:09 +05:30
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
Leah Schumann
93335d238d Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-19 09:37:01 -04:00
CarlNation
cb09d401d2 Merge branch 'develop' into feature/CSR-1390-style 2023-10-19 08:54:52 -04:00
CarlNation
fa1472ad7e CSR-1390
add second hop style sheet
2023-10-19 08:54:18 -04:00
hiteshkumar87
37ebeaf5a1
Merge pull request #1430 from Safelite/feature/Digital/CSR-1417
Calendar content
2023-10-19 17:43:14 +05:30
hiteshkumar87
6defb7ea9c Calendar content
Calendar content from CMS
2023-10-19 17:28:09 +05:30
Leah Schumann
6c7b8b98fe Prettifed, Fixed and Updated some unit tests for consistency 2023-10-19 07:32:40 -04:00
Leah Schumann
ebad5c6fae Fixed the "seling" price thing again 2023-10-19 07:11:02 -04:00
Leah Schumann
fdc85fb808 Merge branch 'develop' into feature/CSR-1709 2023-10-19 07:09:37 -04:00
Leah Schumann
9b529572f6 Fix for defect where the shop list wasn't updating correctly on zip change 2023-10-19 07:09:00 -04:00
CarlNation
3f3e4e3fc6
Merge pull request #1428 from Safelite/feature/CSR-1390-style
Feature/csr 1390 style
2023-10-19 06:57:54 -04:00
CarlNation
7164dc57f3 CSR-1390
Routing to correct payment method type
2023-10-19 06:46:12 -04:00
Bryan Mauger
af2feb8d1b Re-set desktop modal footer to sticky rather than fixed at bottom of content. 2023-10-18 17:08:26 -04:00
Bryan Mauger
5e74ea4160 Set button width. 2023-10-18 16:44:47 -04:00
Bryan Mauger
f4582c221c Format code. 2023-10-18 16:32:32 -04:00
Bryan Mauger
b5dbb1aebf CSR-1711 fix spacing issues. 2023-10-18 16:20:11 -04:00
Leah Schumann
35f30e339e
Merge pull request #1425 from Safelite/feature/fix-spelling-and-rename-early-bird
Fixed Seling Price misspelling and renamed EarlyBirdIndex to PremiumF…
2023-10-18 13:50:58 -04:00
Leah Schumann
2ad20c39f7 Fixed Seling Price misspelling and renamed EarlyBirdIndex to PremiumFeeIndex 2023-10-18 13:42:18 -04:00
CarlNation
1713742364 CSR-1390
prettier
2023-10-18 13:25:48 -04:00
CarlNation
581f13a12c CSR-1390
Verify sending an actual amount in dev will trigger settlement on the backend
2023-10-18 13:10:36 -04:00
Leah Schumann
71b30976ce Added semicolon to make variable text for remove link 2023-10-18 09:52:44 -04:00
Leah Schumann
4414d39c50 Prettified 2023-10-18 09:15:35 -04:00
Leah Schumann
df554cfae5 Line spacing 2023-10-18 09:12:46 -04:00
Leah Schumann
e297bfdc1a Merge branch 'develop' into feature/CSR-1395-sales-tax-store-methods 2023-10-18 09:12:21 -04:00
Leah Schumann
cb01a42341 Cart now calculating tax, there may be other issues in the cart that may effect calculation 2023-10-18 09:10:53 -04:00
CarlNation
f8cb54e9c6 CSR-1390
Broken test
2023-10-18 08:24:19 -04:00
CarlNation
52111388dd Merge branch 'develop' into feature/CSR-1390-style 2023-10-17 22:52:25 -04:00
CarlNation
b8d5ecd08e CSR-1390
V3 submit, provisional booking, credit card payments
2023-10-17 22:51:44 -04:00
Chloe Herd
b3f6df7612 Update pattern for resetting payment method 2023-10-17 15:06:06 -04:00
Bryan Mauger
fcef594b90 CSR-1647 fix spacing. 2023-10-17 14:29:02 -04:00
bmauger
824cc0977c
Merge pull request #1419 from Safelite/CSR-1708-fix-error-copy-alignment
CSR-1708 center error text when <= 2 buttons.
2023-10-17 14:05:01 -04:00
Bryan Mauger
633afad3dd Format code. 2023-10-17 13:59:09 -04:00
Bryan Mauger
fa9683fbae CSR-1708 center error text when <= 2 buttons. 2023-10-17 13:57:42 -04:00
Adam Caouette
d8a9596aca CSR-1384: quick fixes for dev on add vaps modal feature, in progress 2023-10-17 13:43:40 -04:00
Matt Caimi
94399470c4 CSR-1391 formatting 2023-10-17 13:10:19 -04:00
Matt Caimi
028272c08f CSR-1391 iframe styling 2023-10-17 13:07:12 -04:00
Chloe Herd
db846e974c Undo local fix 2023-10-17 11:43:57 -04:00
Chloe Herd
1e9d3f7a4d Add payment-method resetting 2023-10-17 10:57:19 -04:00
Chloe Herd
616cb187ed Merge branch 'develop' into feature/csr-1465 2023-10-17 10:09:02 -04:00
Chloe Herd
5e2a07df2f Add subheader when pia disabled 2023-10-17 10:08:34 -04:00
Leah Schumann
059195b31d Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-17 08:59:32 -04:00
Leah Schumann
b387c15058 Prettified *again* 2023-10-17 08:41:33 -04:00
Leah Schumann
4d2fe040a0 Added TODO for one more important test and Prettified 2023-10-17 08:39:47 -04:00
Leah Schumann
a2b39cc918 Merge branch 'develop' into feature/CSR-1395-tech-review-changes 2023-10-17 08:31:35 -04:00
Leah Schumann
29b7a4fb45 Minor treak and unit tests 2023-10-17 08:30:56 -04:00
Bryan Mauger
3fef2f9324 Format code. 2023-10-16 15:34:24 -04:00
Bryan Mauger
4530abcbf6 CSR-1704 spacing fixes for:
CSR-1704, 1705, 1706
2023-10-16 15:33:12 -04:00
bmauger
a6661071a0
Merge pull request #1413 from Safelite/CSR-1707-fix-input-border-cutoff-at-top-of-modal
CSR-1707 fix border outline cut off at top of modal body.
2023-10-16 14:24:34 -04:00
CarlNation
aa9dc9649c
Merge pull request #1407 from Safelite/rlsmerge/2023.09.21-to-develop
Rlsmerge/2023.09.21 to develop
2023-10-16 14:17:07 -04:00
Bryan Mauger
4b0ce48dc1 CSR-1707 fix border outline cut off at top of modal body. 2023-10-16 14:15:20 -04:00
Adam Caouette
f263bcbf52 CSR-1384: remove accidental inclusion of test button 2023-10-16 11:11:02 -04:00
Bryan Mauger
0f2dbe3aef Format code. 2023-10-16 09:54:59 -04:00
Bryan Mauger
02067b51d2 CSR-1703 set width of alert on vehicle parts page. 2023-10-16 09:53:32 -04:00
hiteshkumar87
b247a03ed3
Merge pull request #1408 from Safelite/feature/Digital/CSR-1417
CSR-1417
2023-10-16 19:03:16 +05:30
hiteshkumar87
fcbbf298d5 getDateFormat
getDateFormat unit test cases
2023-10-16 18:48:47 +05:30
Bryan Mauger
c4d88da016 Remove commented code. 2023-10-16 08:39:47 -04:00
Bryan Mauger
3d23bdbabc CSR-1593 set column width to control overly-wide components on larger screens.
Change scroll to auto for modals to avoid ghost scrollbars when not needed.

Center content on all screen sizes.
2023-10-16 08:38:23 -04:00
Leah Schumann
b4531bed88 Merge branch 'develop' into feature/CSR-1395-tech-review-changes 2023-10-16 08:32:40 -04:00
Leah Schumann
f0d7926b10 Additional refactoring per tech review 2023-10-16 08:31:16 -04:00
hiteshkumar87
1c48dc856a service-type constant file
service-type constant file added
2023-10-16 17:54:54 +05:30
hiteshkumar87
aefac08554
Merge branch 'develop' into feature/Digital/CSR-1417 2023-10-16 17:06:03 +05:30
hiteshkumar87
bd7be85511 CSR-1417
remove getFullDayName and getFullMonthName from date-helper and use from schedule helper
2023-10-16 17:03:57 +05:30
CarlNation
32ce8283c5 Merge branch 'release/2023.09.21' into rlsmerge/2023.09.21-to-develop 2023-10-14 11:06:11 -04:00
Chloe Herd
47473ffb6a Formatting 2023-10-13 16:55:26 -04:00