Commit graph

206 commits

Author SHA1 Message Date
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
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
3873c23716 Removing toast 2023-11-13 19:42:15 +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
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
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
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
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
CarlNation
14d5f879ac Merge branch 'develop' into feature/CSR-1392 2023-10-26 06:18:56 -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
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
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
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