Commit graph

2860 commits

Author SHA1 Message Date
Matt Caimi
e9eccce1fe removed comment 2023-11-15 11:35:45 -05:00
Matt Caimi
12459ecc97 CSR-1391 combine like line items for pia 2023-11-15 11:34:01 -05:00
Scott Kiener
e2c86d0516 CSR-1452 | Formatting 2023-11-15 11:13:51 -05:00
Scott Kiener
8d9fbdf985 Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1452 2023-11-15 11:12:21 -05:00
Scott Kiener
f9332b1028 CSR-1452 | Working on integrating promo-modal 2023-11-15 11:12:08 -05:00
Adam Caouette
2b44e2274a CSR-1778: swap button positions 2023-11-15 09:50:02 -05:00
AMSNEHA
2e159ef37f
Merge pull request #1529 from Safelite/feature/CSR-1393.1
validate alphanumeric values
2023-11-15 18:20:12 +05:30
Sneha
bc3468f8d6 Format 2023-11-15 18:14:52 +05:30
Sneha
61aeb06e0a validate alphanumeric values 2023-11-15 16:02:21 +05:30
Matt Caimi
28c42a0572 CSR-1391 click x on afterpay modal sends user back to payment-method 2023-11-14 15:02:25 -05:00
Adam Caouette
17bc2cf8ce CSR-1689: swap to using submitted order 2023-11-14 11:18:54 -05:00
Leah Schumann
eda0eb7d06 Merge branch 'develop' into feature/CSR-1388-tech-review-changes 2023-11-14 10:40:11 -05:00
Leah Schumann
d297dafcc8 Tech review changes 2023-11-14 10:29:18 -05:00
Leah Schumann
a34e45b179 Moved promo link into cart and did some restyling to ensure matching to figma 2023-11-14 10:08:00 -05:00
Adam Caouette
86c8f62e8b CSR-1689: add cart to confirmation page 2023-11-14 07:32:24 -05:00
AMSNEHA
c1e4f0a3d7
Merge pull request #1520 from Safelite/feature/CSR-1393.1
adding unittest
2023-11-14 17:24:36 +05:30
Sneha
67b905dc4c Update promo-modal-question.vue 2023-11-14 16:35:56 +05:30
Sneha
46e95c1c14 adding unittest 2023-11-14 16:23:52 +05:30
Scott Kiener
f06d9e9e5e CSR-1452 | Loading modal spinner for revalidate (payment-method) 2023-11-13 14:23:40 -05:00
bmauger
282b7719c8
Merge pull request #1516 from Safelite/CSR-1775-fix-header-alignment
CSR-1775 fix misalignment of hamburger button.
2023-11-13 10:18:22 -05:00
Bryan Mauger
ba9ac2b4db CSR-1775 fix misalignment of hamburger button. 2023-11-13 10:03:03 -05:00
Sneha
ae505070c2 CSR-1393 2023-11-13 20:11:00 +05:30
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
CarlNation
a667d3ef47 CSR prettier 2023-11-10 14:19:13 -05:00
CarlNation
0735f949f1 CSR-1462
leave create submitted order in confirmation.vue
2023-11-10 13:37:29 -05:00
Matt Caimi
702d03f974 CSR-1462 break confirmation page out of iframe 2023-11-10 11:44:37 -05:00
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
044ce50de9 CSR-1452 | Unit test fixes 2023-11-09 15:26:20 -05:00
Scott Kiener
f72ce16936 CSR-1452 | Refactor and reformat 2023-11-09 15:17:47 -05:00
Chloe Herd
1715194c5b Update add-to-calendar to pull from submitted order 2023-11-09 15:16:38 -05:00
Scott Kiener
7eea3baa13 CSR-1452 | Alerts for promos and alert.vue refactoring 2023-11-09 14:52:18 -05:00
Scott Kiener
a0439e551e Merge remote-tracking branch 'origin/develop' into feature/skiener/CSR-1452 2023-11-09 14:34:00 -05:00
Adam Caouette
00ca94d5dd CSR-1384: fix if lineItems.vaps is null 2023-11-09 13:51:49 -05:00
Matt Caimi
effe8b4d89 formatting 2023-11-09 10:51:33 -05:00
Matt Caimi
d781b7fdad CSR-1462 line items refactor fix for payment page 2023-11-09 10:49:24 -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
e2ad359408 CSR-1384: update naming on payment page too 2023-11-08 19:45:34 -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
a56abad962 Unit test changes 2023-11-08 15:55:19 -05:00
Chloe Herd
d5a748cacd Update ctu when updating zip on service-location 2023-11-08 15:55:08 -05:00
Chloe Herd
cae80fa813 Also check for "PIA Required" 2023-11-08 15:04:26 -05:00
Matt Caimi
8dfd6c4023 Merge remote-tracking branch 'origin/develop' into feature/CSR-1391.1 2023-11-08 14:53:18 -05:00
Matt Caimi
68c89b97d8 CSR-1391 add cart to payment page 2023-11-08 14:52:36 -05:00
Chloe Herd
854885b6d9 Tie vehicle banner to submitted order on confirmation 2023-11-08 14:03:48 -05:00
Bryan Mauger
1f60207983 CSR-1391 update window height and styles for Afterpay. 2023-11-08 10:20:11 -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
Bryan Mauger
d61825dc20 CSR-1728 set width to prevent copy going past Edit button on review page. 2023-11-07 13:45:30 -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
b2b5e4ff6a
Merge pull request #1487 from Safelite/feature/CSR-1382-loose-ends
Front end changes for recent backend changed related to repair chips
2023-11-02 15:08:30 -04:00
Leah Schumann
50cd865af4 Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-11-02 14:55:42 -04:00
Leah Schumann
1456a65cca Front end changes for recent backend changed related to repair chips 2023-11-02 14:54:50 -04:00
Matt Caimi
4d9c1a88de CSR-1391 better looking payment buttons 2023-11-02 14:19:57 -04:00
Matt Caimi
da764e57cf Merge remote-tracking branch 'origin/develop' into feature/CSR-1391.1 2023-11-02 14:12:46 -04:00
Leah Schumann
4d9ae22071
Merge pull request #1484 from Safelite/feature/CSR-1382-loose-ends
Feature/csr 1382 loose ends
2023-11-02 13:08:33 -04:00
Chloe Herd
676cda96f7 Formatting 2023-11-02 12:00:55 -04:00
Chloe Herd
5d48014a83 Update unit tests 2023-11-02 11:41:49 -04:00
Leah Schumann
ce5bb4f13d Merging from develop 2023-11-02 11:22:17 -04:00
Chloe Herd
d07b57f718 Clear submitted orders on vehicle FBA 2023-11-01 15:39:48 -04:00
Chloe Herd
e63f8bdcc4 Formatting 2023-11-01 15:31:33 -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
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
Scott Kiener
c1d7585056 CSR-1452 | Unit test fix 2023-10-31 16:02:15 -04:00