Commit graph

4424 commits

Author SHA1 Message Date
Chloe Herd
d07b57f718 Clear submitted orders on vehicle FBA 2023-11-01 15:39:48 -04:00
Chloe Herd
36ab8e04eb Redirect to confirmation if submitted order is present 2023-11-01 15:32:00 -04:00
Chloe Herd
e63f8bdcc4 Formatting 2023-11-01 15:31:33 -04:00
Matt Caimi
39e42b8c7c Merge remote-tracking branch 'origin/develop' into feature/CSR-1391.1 2023-11-01 14:23:25 -04:00
Chloe Herd
560ad28597 Shortcut prerequisites if a submitted order is already present. 2023-11-01 14:19:24 -04:00
Chloe Herd
11ec8df5da Stage order info to submittedOrder on page load 2023-11-01 14:17:20 -04:00
Matt Caimi
c9610e2aa2 CSR-1391 switch payment functionality 2023-11-01 13:09:46 -04:00
CarlNation
2a81d3fbe1 CSR-1932
only add sales tax from amountDue
2023-11-01 12:37:30 -04:00
bmauger
28288df804
Merge pull request #1482 from Safelite/CSR-1390-dynamic-iframe-height
CSR-1390 dynamic resize of iFrame
2023-11-01 10:10:38 -04:00
Bryan Mauger
2006fbbe9b Format code. 2023-11-01 10:03:23 -04:00
Bryan Mauger
595e97ea9f CSR-1390 dynamic resize of iFrame
Implement iFrameResizer node package.
2023-11-01 09:56:27 -04:00
Leah Schumann
32d7ce105f Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-11-01 08:01:49 -04:00
brich1212safe
b1b2b456e9
Merge pull request #1481 from Safelite/feature/richardson/CSR-1696.merge-to-dev
Merge pre-cash modal to develop
2023-10-31 16:59:59 -04:00
Bill Richardson
a5f541ee77 remove hitch-hiker class from merge 2023-10-31 16:54:54 -04:00
Bill Richardson
79b88319e0 prettierd 2023-10-31 16:47:35 -04:00
Bill Richardson
92778c8bcb Merge branch 'release/pre-cash-enhancements' into feature/richardson/CSR-1696.merge-to-dev 2023-10-31 16:40:52 -04:00
Scott Kiener
c1d7585056 CSR-1452 | Unit test fix 2023-10-31 16:02:15 -04:00
Scott Kiener
551c6b9a60 CSR-1452 | Formatting 2023-10-31 15:45:05 -04:00
Scott Kiener
c21d50c3ba CSR-1452 | Multiple bug fixes
additionalButtonData was used incorrectly
404's from validatePromo were handled incorrectly
2023-10-31 15:42:40 -04:00
Adam Caouette
4302dc0f43 CSR-1384: remove old copy of add-vaps-modal-buttons again... DIE! DIE 2023-10-31 11:06:53 -04:00
Adam Caouette
83099186e0 CSR-1384: remove old method 2023-10-31 10:57:35 -04:00
Adam Caouette
e7d2d47048 CSR-1384: remove old prop var 2023-10-31 10:56:11 -04:00
Adam Caouette
bbf4b083e8 CSR-1384: add validation on modal when multiple wiper options 2023-10-31 10:53:33 -04:00
Leah Schumann
b21e9dc8d2 Added conditional to only send service location city, state, and zipcode to the backend if the appointment type is Mobile 2023-10-31 10:26:08 -04:00
Leah Schumann
cbef188b01 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-31 10:09:56 -04:00
Leah Schumann
5d926de12f Started working on unit tests 2023-10-31 10:06:47 -04:00
CarlNation
c644bd4ef5 CSR-1392
correct vaps amount check
2023-10-31 08:17:00 -04:00
CarlNation
c97c30a968 Merge branch 'develop' into feature/CSR-1392 2023-10-31 06:42:41 -04:00
Leah Schumann
0ae599c35e Removed LineItemUtilities as it is no longer needed 2023-10-31 06:37:55 -04:00
hiteshkumar87
785a51fdca customerPortalLoginToken
customerPortalLoginToken
2023-10-31 13:43:45 +05:30
CarlNation
deed0dfb5f CSR-1392
set amount due for PIA
2023-10-30 16:03:03 -04:00
CarlNation
fc0a21aa95 Merge branch 'develop' into feature/CSR-1392 2023-10-30 15:56:54 -04:00
Leah Schumann
5472b8b3f8 Prettified 2023-10-30 15:48:32 -04:00
Leah Schumann
c73d2e2334 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-30 15:47:32 -04:00
Leah Schumann
5583070c2c Fixed calculation issue, added promo cart items 2023-10-30 15:46:48 -04:00
CarlNation
f2fc50cd3e CSR-1392
set amount due for PIA
2023-10-30 11:20:43 -04:00
shnsuku
cc1d0abd06
Merge pull request #1468 from Safelite/feature/Digital/CSR-1725
CSR-1725
2023-10-30 19:02:23 +05:30
Leah Schumann
2fa866953d Removed debugger statements 2023-10-30 08:42:50 -04:00
Leah Schumann
72987d84c2 afe9ff98 Merge pull request #1469 from Safelite/feature/CSR-1727-front-end-updates-tax-service 2023-10-30 08:27:15 -04:00
Leah Schumann
448ca01354 Added serviceLocationCity field to call to tax endpoint 2023-10-30 07:58:05 -04:00
Leah Schumann
46473c5ba0
Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-30 07:27:07 -04:00
Leah Schumann
acc533e42c Fixing the commits to the wrong branch 2023-10-30 07:15:56 -04:00
Leah Schumann
d39870f2ca Merging changes committed to wrong branch 2023-10-30 07:08:26 -04:00
sheena
90ce654e47 Update modal.vue 2023-10-30 16:19:57 +05:30
sheena
4dc0a437a1 CSR-1725
spacing fixed
2023-10-30 16:17:34 +05:30
CarlNation
4723eb8098 CSR-1392
associated tests
2023-10-29 10:25:05 -04:00
CarlNation
0d9373cae7 CSR-1392
prettier
2023-10-29 08:33:17 -04:00
CarlNation
166940db04 CSR-1392
removed work order flags for submitting a pia in delete substatus and the final submit flag from the store and pass it as a parameter to save session instead.
2023-10-29 08:28:32 -04:00
AdamCaouetteSafelite
2bd808a8c0
Merge pull request #1461 from Safelite/feature/CSR-1384-modals-for-add-vaps
CSR-1384: fixes for constant strings refactoring
2023-10-27 16:58:25 -04:00
Adam Caouette
4bbc508aad CSR-1384: minor alts to insure against console errors 2023-10-27 16:40:24 -04:00
Bryan Mauger
4344f82a60 CSR-1390 style PayPal modal. 2023-10-27 15:57:38 -04:00
Bill Richardson
f8a475b13d prettier'd since less than 3 attr/prop 2023-10-27 14:33:25 -04:00
Bill Richardson
2d4a1f59b5 attribute in a future update 2023-10-27 14:28:52 -04:00
Bill Richardson
ab31d642bb prettier'd 2023-10-27 14:21:49 -04:00
Bill Richardson
e25425e2a0 This should have the new behavior and keep the old behavior 2023-10-27 14:16:12 -04:00
Matt Caimi
248d666d9e CSR-1391 moved switch payment label to cms
still need to refine the styling for this switch payment section, but i think it makes sense to commit this functionality for now
2023-10-27 13:43:43 -04:00
Matt Caimi
1061ba8c34 CSR-1391 switch payment functionality 2023-10-27 10:45:21 -04:00
Chloe Herd
4adb021e86 Add page pre-requisites for payment 2023-10-26 17:15:00 -04:00
Adam Caouette
4009be32fe CSR-1384: fixes for constant strings refactoring 2023-10-26 15:43:27 -04:00
AdamCaouetteSafelite
6d5a23d8fa
Merge pull request #1459 from Safelite/feature/CSR-1384-modals-for-add-vaps
Feature/CSR-1384 modals for add vaps
2023-10-26 11:25:20 -04:00
Adam Caouette
dd0273b8f6 CSR-1384: update to use constant strings 2023-10-26 10:48:16 -04:00
shnsuku
a03d168e19
Merge pull request #1460 from Safelite/feature/Digital/CSR-1718
CSR-1718
2023-10-26 16:20:13 +05:30
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