Commit graph

100 commits

Author SHA1 Message Date
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
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
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