Commit graph

232 commits

Author SHA1 Message Date
Leah Schumann
a15cdcea59 Merge branch 'develop' into feature/CSR-1388-tech-review-changes 2023-11-16 09:12:10 -05:00
Leah Schumann
aa44f1798b Fixed calculation issue related to excluding fees from other supporting items cart item 2023-11-16 09:11:12 -05:00
Adam Caouette
2591ab9935 CSR-1689: restore removed recycle label on cart 2023-11-14 11:47:33 -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
e30ad754b0 Merge branch 'develop' into feature/CSR-1689-ajc 2023-11-14 09:09:30 -05:00
Leah Schumann
dd01528864 Merge branch 'develop' into feature/CSR-1388 2023-11-14 08:44:49 -05:00
Leah Schumann
784a4467f1 Added promo cart item bundling and ensured removal was working correctly 2023-11-14 08:42:21 -05:00
Adam Caouette
86c8f62e8b CSR-1689: add cart to confirmation page 2023-11-14 07:32:24 -05:00
Scott Kiener
09d21df072 CSR-1452 | Remove unused data member 2023-11-13 16:16:21 -05:00
Scott Kiener
13be6d4559 CSR-1452 | Tech review changes 2023-11-13 15:48:42 -05:00
Scott Kiener
f06d9e9e5e CSR-1452 | Loading modal spinner for revalidate (payment-method) 2023-11-13 14:23:40 -05:00
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
Sneha
5fda20d9ab Update cart.vue 2023-11-13 13:36:45 +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
7eea3baa13 CSR-1452 | Alerts for promos and alert.vue refactoring 2023-11-09 14:52:18 -05:00
Leah Schumann
e3887f931e Prettified 2023-11-09 09:43:58 -05:00
Leah Schumann
80adf99f63 Made available line items return empty glass part, supporting items and available vaps arrays to prevent errors 2023-11-09 09:41:35 -05:00
Leah Schumann
1568303e8a Removed another css comment missed 2023-11-09 08:43:54 -05:00
Leah Schumann
70ae9d02b6 Removed commented CSS 2023-11-09 08:40:30 -05:00
Leah Schumann
f0e0c4a3e8 Fixed package price calculation that was including early bird fee, prettified 2023-11-09 07:37:01 -05:00
Leah Schumann
fd4c287b2d Merge branch 'develop' into feature/CSR-1382-last-styling 2023-11-09 06:36:28 -05:00
Leah Schumann
57bffe1334 Tech review changes 2023-11-09 06:35:34 -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
Leah Schumann
adbbd4f15d Merge branch 'develop' into feature/CSR-1382-last-styling 2023-11-08 07:21:19 -05:00
Leah Schumann
f345973d77 Tech review changes 2023-11-08 07:20:01 -05:00
Sneha
8455ec926b CSR-1393 2023-11-08 16:28:27 +05:30
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
23b03a8118 Prettified 2023-11-07 07:10:16 -05:00
Leah Schumann
1078b46450 Merged from develop 2023-11-07 06:43:03 -05:00
Leah Schumann
4cc415af6d Added allowItemRemoval prop to cart 2 2023-11-07 06:36:04 -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
fc190cebae Format code. 2023-11-06 15:45:11 -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
Adam Caouette
a6a4a302b2 CSR-1384: add some space under cart component 2023-11-06 13:37:41 -05:00
Leah Schumann
d3d334f666 Fixed unit test and Prettified 2023-11-06 08:39:46 -05:00
Leah Schumann
3471b6e514 Fixed some calculation issues 2 2023-11-06 08:21:35 -05:00
Leah Schumann
738ffbe843 Fixed some calculation issues 2023-11-06 08:21:28 -05:00
Leah Schumann
ec431ecd59 Prettified 2023-11-03 14:01:08 -04:00
Bryan Mauger
8cb06c096f WIP Update Nonpackaged Cart Items for Leah 2023-11-03 10:21:21 -04:00
Leah Schumann
4d7f01d87e WIP - Cart Styling 2023-11-03 09:38:40 -04:00
Leah Schumann
346e59b0de Prettified and unit test commented out for now 2023-11-02 11:27:07 -04:00
Leah Schumann
1e998ee748 Refactor for clarity and consistency 2023-11-02 11:19:40 -04:00
Leah Schumann
5b9c47111b Fix for multiple glass parts 2023-11-02 11:18:05 -04:00
Leah Schumann
32d7ce105f Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-11-01 08:01:49 -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
Adam Caouette
4302dc0f43 CSR-1384: remove old copy of add-vaps-modal-buttons again... DIE! DIE 2023-10-31 11:06:53 -04:00
Leah Schumann
5d926de12f Started working on unit tests 2023-10-31 10:06:47 -04:00
Leah Schumann
0ae599c35e Removed LineItemUtilities as it is no longer needed 2023-10-31 06:37:55 -04:00
Leah Schumann
5472b8b3f8 Prettified 2023-10-30 15:48:32 -04:00
Leah Schumann
5583070c2c Fixed calculation issue, added promo cart items 2023-10-30 15:46:48 -04:00
Leah Schumann
acc533e42c Fixing the commits to the wrong branch 2023-10-30 07:15:56 -04:00
Bill Richardson
e25425e2a0 This should have the new behavior and keep the old behavior 2023-10-27 14:16:12 -04:00
Leah Schumann
f64b6ad31c A couple, not all, code review changes 2023-10-25 14:57:19 -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
Leah Schumann
3d1a9d6299 WIP - Taxes added 2023-10-25 11:32:01 -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
Leah Schumann
f2ff088663 WIP 2023-10-24 13:57:27 -04:00
Leah Schumann
8439dd3938 WIP 2023-10-23 14:27:37 -04:00
Bryan Mauger
2c3589f235 Update column setting. 2023-10-20 15:36:02 -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
Adam Caouette
86a8acd194 CSR-1384: fixes to keep dev working 2023-10-19 16:40:48 -04:00
Leah Schumann
93335d238d Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-19 09:37:01 -04:00
Bryan Mauger
b5dbb1aebf CSR-1711 fix spacing issues. 2023-10-18 16:20:11 -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
b8d5ecd08e CSR-1390
V3 submit, provisional booking, credit card payments
2023-10-17 22:51:44 -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
Leah Schumann
059195b31d Merge branch 'develop' into feature/CSR-1382-loose-ends 2023-10-17 08:59:32 -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
Bryan Mauger
0293664c53 Format code. 2023-10-13 14:31:02 -04:00
Bryan Mauger
16c359ac18 Fix alert width for questions component. 2023-10-13 14:30:00 -04:00
Leah Schumann
ffd829cee9 WIP 2023-10-13 13:16:51 -04:00
Bryan Mauger
54fc103a3b Set menu modal menu open height. 2023-10-12 10:24:09 -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
Adam Caouette
5903115a22 Merge branch 'develop' into feature/CSR-1384-modals-for-add-vaps 2023-10-11 10:15:51 -04:00
CarlNation
fe9119e975 Merge branch 'develop' into feature/CSR-1392 2023-10-11 10:03:17 -04:00
CarlNation
e6fc6635c4 CSR-1392
do not pass null items to getTotalPrice logic
2023-10-11 10:02:54 -04:00
Bryan Mauger
15dbe4c592 CSR-1591 radio button width adjustments, misc css tweaks. 2023-10-11 09:42:36 -04:00
Adam Caouette
5a3d9c3b80 CSR-1384: formatting 2023-10-10 14:32:29 -04:00