Commit graph

378 commits

Author SHA1 Message Date
Sneha
33d2db26d7 Update promo-modal-question.vue 2023-11-13 19:44:38 +05:30
Sneha
3873c23716 Removing toast 2023-11-13 19:42:15 +05:30
Sneha
fa16142627 Formatting 2023-11-13 16:16:06 +05:30
hiteshkumar87
ab507a9280 taxable promo
taxable promo and lineitems
2023-11-13 16:08:38 +05:30
AMSNEHA
bbdcbe65af
Merge branch 'develop' into feature/CSR-1393.1 2023-11-13 13:23:37 +05:30
Sneha
d041721858 CSR-1393 2023-11-13 13:17:18 +05:30
Scott Kiener
d83ec8a4bc Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1452 2023-11-10 10:51:16 -05:00
Scott Kiener
f8f9749d3a CSR-1452 | Rewrite save promo functions
Combined inactive and active into one method
 -new save method prevents the same promos ending up in inactive AND active at the same time
 -query string promos save to inactive automatically
2023-11-10 10:51:01 -05:00
Scott Kiener
f72ce16936 CSR-1452 | Refactor and reformat 2023-11-09 15:17:47 -05:00
Scott Kiener
7eea3baa13 CSR-1452 | Alerts for promos and alert.vue refactoring 2023-11-09 14:52:18 -05:00
Adam Caouette
00ca94d5dd CSR-1384: fix if lineItems.vaps is null 2023-11-09 13:51:49 -05:00
Scott Kiener
2600e70755 Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1452 2023-11-09 09:11:32 -05:00
Scott Kiener
2cbae603bd CSR-1452 | Toast messages built and displayed
For payment-method and quote, only for initial page load promo logic
2023-11-09 09:11:19 -05:00
hiteshkumar87
84c7e8c617 add vaps to lineitems
add vaps to lineitems
2023-11-09 18:03:45 +05:30
Leah Schumann
fd4c287b2d Merge branch 'develop' into feature/CSR-1382-last-styling 2023-11-09 06:36:28 -05:00
Sneha
b7f46e877f CSR-1393 2023-11-09 16:46:05 +05:30
Adam Caouette
929cf3e314 CSR-1384: another tech-review refactor - make wipersOffered a computed 2023-11-08 19:47:16 -05:00
Adam Caouette
84948b5cc1 CSR-1484: formatting :-/ 2023-11-08 18:02:48 -05:00
Adam Caouette
a475c87bc8 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-11-08 16:44:42 -05:00
Adam Caouette
afb2cbae73 CSR-1384: refactor updates from tech review 2023-11-08 16:31:25 -05:00
Chloe Herd
cae80fa813 Also check for "PIA Required" 2023-11-08 15:04:26 -05:00
Sneha
189350f1e9 new 2023-11-08 18:56:11 +05:30
Leah Schumann
adbbd4f15d Merge branch 'develop' into feature/CSR-1382-last-styling 2023-11-08 07:21:19 -05:00
hiteshkumar87
ccbb9b18ef Appointment EndTime
Appointment end time for Inshop and Dropoff Schedules
2023-11-08 16:38:18 +05:30
Sneha
8455ec926b CSR-1393 2023-11-08 16:28:27 +05:30
scottkiener
b25b2abde1
Merge pull request #1497 from Safelite/feature/skiener/CSR-1452
CSR-1452 | More promo logic
2023-11-07 15:42:45 -05:00
Scott Kiener
fa2bccb518 CSR-1452 | More promo logic
Watch lineItems to automatically run revalidate when the cart changes
Add in auto add of addable vaps in beforeRouteEnter
Create adding of addableVaps to order in promo helper
2023-11-07 15:34:31 -05:00
Bryan Mauger
4dec7a3df7 Format code. 2023-11-07 14:27:01 -05:00
Bryan Mauger
f51817033d CSR-1722 fix font weight and spacing issues. 2023-11-07 14:17:48 -05:00
Leah Schumann
794150b33d Revamp of non-packaged cart-items to display all of them in the loop instead of making separate cart item markup for fees etc 2023-11-07 11:22:51 -05:00
Leah Schumann
1078b46450 Merged from develop 2023-11-07 06:43:03 -05:00
Leah Schumann
45c9279333 Added allowItemRemoval prop to cart 2023-11-07 06:35:09 -05:00
bmauger
9be8662ed5
Merge pull request #1493 from Safelite/CSR-1396-recycling-fee-modal
CSR-1396 add recycle modal to cart page.
2023-11-06 17:02:24 -05:00
Bryan Mauger
03a07c9c62 CSR-1396 add recycle modal to cart page. 2023-11-06 15:43:06 -05:00
Adam Caouette
ab81351bd5 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-11-06 13:47:20 -05:00
Adam Caouette
20cda7ef69 CSR-1384: work to add a auto-dismissing alert / 'toast' message for adding vap to cart 2023-11-06 13:42:50 -05:00
Adam Caouette
39c33aabc1 CSR-1384: add a ref to funnelHeader on any pages where it's missing 2023-11-06 13:39:08 -05:00
Leah Schumann
dbcb8c15c0 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-11-06 08:22:13 -05:00
Leah Schumann
ec431ecd59 Prettified 2023-11-03 14:01:08 -04:00
Scott Kiener
5b6a8da335 Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1452 2023-11-03 11:42:40 -04:00
Scott Kiener
da1feeab07 CSR-1452 | Set up wireframe for payment-method and promos 2023-11-03 11:42:11 -04:00
Leah Schumann
4d7f01d87e WIP - Cart Styling 2023-11-03 09:38:40 -04:00
Chloe Herd
f07740a688 Fire footer text update on page load 2023-11-02 15:43:57 -04:00
Leah Schumann
32d7ce105f Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-11-01 08:01:49 -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
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
cbef188b01 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-31 10:09:56 -04:00
Leah Schumann
0ae599c35e Removed LineItemUtilities as it is no longer needed 2023-10-31 06:37:55 -04:00
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
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
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
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
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
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
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
CarlNation
7840e90dc5 CSR-1392
prettier
2023-10-25 17:00:29 -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
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
62ef3faefd CSR-1391 moved signature api call to beforeRouteEnter and other fixes 2023-10-25 13:42:33 -04:00
Leah Schumann
d8dd23e2c9 Merged from develop, prettified 2023-10-25 11:39:32 -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
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
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
b243f41fa7 CSR-1392
make displayPiaAlert a computed instead of data field
2023-10-24 11:08:51 -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
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
Adam Caouette
2be4b378c1 CSR-1384: remove outdated code 2023-10-20 10:38:13 -04:00
Adam Caouette
820a4387ac CSR-1384: adding modals with add to cart buttons 2023-10-20 09:56:38 -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
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
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
7164dc57f3 CSR-1390
Routing to correct payment method type
2023-10-19 06:46:12 -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
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
b8d5ecd08e CSR-1390
V3 submit, provisional booking, credit card payments
2023-10-17 22:51:44 -04:00
Bryan Mauger
fcef594b90 CSR-1647 fix spacing. 2023-10-17 14:29:02 -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
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
Adam Caouette
f263bcbf52 CSR-1384: remove accidental inclusion of test button 2023-10-16 11:11:02 -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
Chloe Herd
5e5a1ff58a Make field required 2023-10-13 16:55:18 -04:00
Chloe Herd
19dd003f8b Don't autofill payment-method field if not defined in store 2023-10-13 16:25:25 -04:00
Chloe Herd
bf167c17be Patch to new store value 2023-10-13 16:00:07 -04:00
Chloe Herd
655360b0c8 Merge branch 'develop' into feature/csr-1465 2023-10-13 15:38:10 -04:00
CarlNation
837ad2912f CSR-1392
wire up payment method to forward button click.
2023-10-13 13:35:46 -04:00
Leah Schumann
ffd829cee9 WIP 2023-10-13 13:16:51 -04:00
Chloe Herd
6dec3371c2 Add pia to store 2023-10-11 14:06:21 -04:00
Adam Caouette
d6653354e7 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-10-11 14:04:54 -04:00
Adam Caouette
a47dfbc27e CSR-1384: more cleanup, remove deep cloning 2023-10-11 14:01:50 -04:00
Chloe Herd
ad2a1001e6 Fix unit tests 2023-10-11 13:22:49 -04:00
Chloe Herd
acd658eb14 Formatting 2023-10-11 10:48:22 -04:00
Chloe Herd
8134cc9a05 Replace placeholder buttons with real buttons 2023-10-11 10:47:37 -04:00
Chloe Herd
4e7c7fe032 Merge branch 'develop' into feature/CSR-1389 2023-10-11 10:34:56 -04:00
Adam Caouette
575978ae65 CSR-1384: refactoring re: deepClone, naming 2023-10-11 10:17:14 -04:00
Adam Caouette
5903115a22 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-10-11 10:15:51 -04:00
Bryan Mauger
15dbe4c592 CSR-1591 radio button width adjustments, misc css tweaks. 2023-10-11 09:42:36 -04:00
Chloe Herd
41a63aa4be Merge branch 'develop' into feature/CSR-1389 2023-10-11 09:22:05 -04:00
Chloe Herd
18b6ed27a4 Update schedule prereq check 2023-10-10 16:57:31 -04:00
Chloe Herd
6d0256d9dc Merge branch 'develop' into feature/CSR-1463 2023-10-10 15:56:09 -04:00
Chloe Herd
0a9df36a8d Update prereq expectations 2023-10-10 15:54:52 -04:00
Adam Caouette
ab1f47d038 CSR-1384: use deepClone on resultMap and glassParts 2023-10-10 15:37:21 -04:00
Adam Caouette
5a3d9c3b80 CSR-1384: formatting 2023-10-10 14:32:29 -04:00
Adam Caouette
348dba428a CSR-1384: updates for cart work, using lineItems instead of cartItems 2023-10-10 14:30:43 -04:00
Chloe Herd
469818c022 Add prerequisite method 2023-10-10 12:29:04 -04:00
Chloe Herd
fcc3c5ab95 Initial changes for PIA experiments 2023-10-10 09:50:50 -04:00
Chloe Herd
26f20b8d5a Formatting 2023-10-10 09:50:33 -04:00
CarlNation
0d8ce72a3e Merge branch 'develop' into feature/CSR-1392 2023-10-10 06:49:39 -04:00
CarlNation
a242946770 CSR-1392
Create work order in delete sub status for pia.  add amount due
2023-10-10 06:49:16 -04:00
Adam Caouette
2519b71732 CSR-1383: fix for repair orders 2023-10-09 10:48:09 -04:00
Adam Caouette
c479143385 CSR-1383: update cart to enable remove from cart functionality 2023-10-06 10:13:37 -04:00
bmauger
4ee0908ad4
Merge pull request #1376 from Safelite/CSR-1591-radio-button-width
Csr 1591 radio button width
2023-10-05 15:58:05 -04:00
Matt Caimi
d6d0540d7f CSR-1391 afterpay button and pop up 2023-10-05 14:22:49 -04:00
Bryan Mauger
2d1815dece WIP Desktop updates. 2023-10-05 09:39:21 -04:00
CarlNation
1dba4521c5 CSR-1392
added paypal errorhandling and modals
2023-10-05 08:51:16 -04:00
CarlNation
c6bc872b05 CSR-1392
fix merge conflict
2023-10-02 10:33:39 -04:00
CarlNation
fc8f7970ce Merge branch 'develop' into feature/CSR-1392 2023-10-02 10:29:33 -04:00
CarlNation
bd994e8b74 CSR-1392
begin paypal integration work
2023-10-02 10:26:54 -04:00
Adam Caouette
a520b6cf31 CSR-1383: more changes due to develop updates 2023-09-29 10:33:02 -04:00
CarlNation
1653a6b4e3 CSR-1413
test coverage
2023-09-29 08:11:16 -04:00
Adam Caouette
86add1e358 CSR-1383: add product tiles; some cart updates for CSR-1382 2023-09-28 16:52:07 -04:00
Chloe Herd
61a83f4815 Tests 2023-09-28 15:26:43 -04:00
Adam Caouette
166978bc3a Merge develop 2023-09-28 14:03:41 -04:00
CarlNation
f9f69f827d CSR-1413
prettier
2023-09-28 13:44:52 -04:00
CarlNation
b662ee4a99 CSR-1413
add routing from review to payment-method.
also move the submit work order from review to payment-method and await it.
2023-09-28 13:41:04 -04:00
Chloe Herd
32d26c728d Many changes 2023-09-28 12:35:49 -04:00
Chloe Herd
f4c22fbf7a Merge branch 'develop' into feature/CSR-1389 2023-09-27 10:10:32 -04:00
hiteshkumar87
f1a5d0f0b4 confirmation page
basic confirmation page
2023-09-20 20:02:08 +05:30
Bryan Mauger
ce6916658a First pass at desktop max width and breakpoints per page.
Rename funnel-footer to nav-bar.
2023-09-18 16:20:45 -04:00
Bryan Mauger
64c1d65328 WIP 2023-09-14 12:31:59 -04:00
Bryan Mauger
2b98b9ab2c WIP 2023-09-11 17:08:14 -04:00
Chloe Herd
2aec329c5c Update CTA when new method is selected 2023-09-07 17:29:33 -04:00
Chloe Herd
57e520d2c4 Move hard-coded values to constants file 2023-09-07 17:24:26 -04:00
Chloe Herd
604dda8526 Bind & compute CTA text 2023-09-05 10:07:46 -04:00
Chloe Herd
f14c424d23 Fetch text from cms 2023-08-31 15:38:12 -04:00
Chloe Herd
0777a1ec57 Shift conditional rendering order 2023-08-31 13:14:59 -04:00
Chloe Herd
91379ef271 Initial blockout 2023-08-30 17:20:26 -04:00
Bryan Mauger
9ab3cb7f00 WIP Order Cart. 2023-08-17 14:05:42 -04:00
Bryan Mauger
f2f791baef Add cart to payment-method. 2023-08-09 14:08:29 -04:00
Bryan Mauger
0fbb6d67ca Commit Leah's changes to avoid later conflicts. 2023-08-09 08:32:03 -04:00
Leah Schumann
fe215b33c3 CSR-1381- Tech review changes
A couple of things Mark found I forgot to fix
2023-08-09 06:26:44 -04:00
Leah Schumann
dc3aab18a7 CSR-1381 - Prettified 2023-08-04 08:05:06 -04:00
Leah Schumann
503e6ab619 CSR-1381 - Created page for payment method
Initial stub for payment method page. Note: Styling around header may still be necessary. I got it to where I thought it was right
2023-08-04 07:58:00 -04:00