Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transactions List - indicate when a transaction is expected to be included in a future deposit #7878

Merged
merged 15 commits into from
Dec 13, 2023

Conversation

Jinksi
Copy link
Member

@Jinksi Jinksi commented Dec 12, 2023

Fixes #7876

Changes proposed in this Pull Request

In the Transactions List, for transactions that are not included in a pending/paid deposit, render "Future deposit" and an info icon in the "Deposit date" column.

Clicking this icon will present a tooltip with the message:

This transaction will be included in a future deposit. Once created, the estimated deposit date will be shown here.

This will render for all transaction types except financing_*. See list of transaction types.

image

Testing instructions

  • View the Transactions List
  • Ensure non-financing transactions that are not included in previous deposits show the tooltip icon.
  • Clicking on the tooltip icon should show the message defined above.

  • Run npm run changelog to add a changelog file, choose patch to leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.
  • Covered with tests (or have a good reason not to test in description ☝️)
  • Tested on mobile (or does not apply)

Post merge

@botwoo
Copy link
Collaborator

botwoo commented Dec 12, 2023

Test the build

Option 1. Jetpack Beta

  • Install and activate Jetpack Beta.
  • Use this build by searching for PR number 7878 or branch name add/transaction-list-future-deposit in your-test.site/wp-admin/admin.php?page=jetpack-beta&plugin=woocommerce-payments

Option 2. Jurassic Ninja - available for logged-in A12s

🚀 Launch a JN site with this branch 🚀

ℹ️ Install this Tampermonkey script to get more options.


Build info:

  • Latest commit: 6b97f48
  • Build time: 2023-12-13 05:28:39 UTC

Note: the build is updated when a new commit is pushed to this PR.

@Jinksi Jinksi changed the title Add/transaction-list-future-deposit [Transactions List] - indicate when a transaction is expected to be included in a future deposit Dec 12, 2023
Copy link
Contributor

github-actions bot commented Dec 12, 2023

Size Change: +97 B (0%)

Total Size: 1.44 MB

Filename Size Change
release/woocommerce-payments/dist/index-rtl.css 36.8 kB +8 B (0%)
release/woocommerce-payments/dist/index.css 36.8 kB +8 B (0%)
release/woocommerce-payments/dist/index.js 287 kB +81 B (0%)
ℹ️ View Unchanged
Filename Size
release/woocommerce-payments/assets/css/admin.css 1.06 kB
release/woocommerce-payments/assets/css/success.css 158 B
release/woocommerce-payments/dist/blocks-checkout-rtl.css 1.8 kB
release/woocommerce-payments/dist/blocks-checkout.css 1.8 kB
release/woocommerce-payments/dist/blocks-checkout.js 75.8 kB
release/woocommerce-payments/dist/checkout-rtl.css 441 B
release/woocommerce-payments/dist/checkout.css 442 B
release/woocommerce-payments/dist/checkout.js 28.9 kB
release/woocommerce-payments/dist/multi-currency-analytics.js 1.05 kB
release/woocommerce-payments/dist/multi-currency-rtl.css 3.4 kB
release/woocommerce-payments/dist/multi-currency-switcher-block.js 60.3 kB
release/woocommerce-payments/dist/multi-currency.css 3.4 kB
release/woocommerce-payments/dist/multi-currency.js 55.5 kB
release/woocommerce-payments/dist/order-rtl.css 676 B
release/woocommerce-payments/dist/order.css 679 B
release/woocommerce-payments/dist/order.js 41.5 kB
release/woocommerce-payments/dist/payment-gateways-rtl.css 1.31 kB
release/woocommerce-payments/dist/payment-gateways.css 1.31 kB
release/woocommerce-payments/dist/payment-gateways.js 39.1 kB
release/woocommerce-payments/dist/payment-request-rtl.css 153 B
release/woocommerce-payments/dist/payment-request.css 153 B
release/woocommerce-payments/dist/payment-request.js 13.2 kB
release/woocommerce-payments/dist/product-details.js 898 B
release/woocommerce-payments/dist/settings-rtl.css 10.5 kB
release/woocommerce-payments/dist/settings.css 10.5 kB
release/woocommerce-payments/dist/settings.js 234 kB
release/woocommerce-payments/dist/subscription-edit-page.js 669 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal-rtl.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.js 20.4 kB
release/woocommerce-payments/dist/subscription-product-onboarding-toast.js 693 B
release/woocommerce-payments/dist/subscriptions-empty-state-rtl.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.js 19.5 kB
release/woocommerce-payments/dist/tos-rtl.css 230 B
release/woocommerce-payments/dist/tos.css 231 B
release/woocommerce-payments/dist/tos.js 21.9 kB
release/woocommerce-payments/dist/upe_checkout-rtl.css 441 B
release/woocommerce-payments/dist/upe_checkout.css 442 B
release/woocommerce-payments/dist/upe_checkout.js 34.1 kB
release/woocommerce-payments/dist/upe_split_checkout-rtl.css 441 B
release/woocommerce-payments/dist/upe_split_checkout.css 442 B
release/woocommerce-payments/dist/upe_split_checkout.js 34.7 kB
release/woocommerce-payments/dist/upe_with_deferred_intent_creation_checkout.js 37.1 kB
release/woocommerce-payments/dist/upe-blocks-checkout-rtl.css 1.8 kB
release/woocommerce-payments/dist/upe-blocks-checkout.css 1.8 kB
release/woocommerce-payments/dist/upe-blocks-checkout.js 41 kB
release/woocommerce-payments/dist/upe-split-blocks-checkout-rtl.css 1.8 kB
release/woocommerce-payments/dist/upe-split-blocks-checkout.css 1.8 kB
release/woocommerce-payments/dist/upe-split-blocks-checkout.js 42.6 kB
release/woocommerce-payments/dist/woopay-express-button-rtl.css 153 B
release/woocommerce-payments/dist/woopay-express-button.css 153 B
release/woocommerce-payments/dist/woopay-express-button.js 52.6 kB
release/woocommerce-payments/dist/woopay-rtl.css 4.18 kB
release/woocommerce-payments/dist/woopay.css 4.19 kB
release/woocommerce-payments/dist/woopay.js 71.7 kB
release/woocommerce-payments/includes/subscriptions/assets/css/plugin-page.css 622 B
release/woocommerce-payments/includes/subscriptions/assets/js/plugin-page.js 812 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/i18n-loader.js 2.43 kB
release/woocommerce-payments/vendor/automattic/jetpack-assets/src/js/i18n-loader.js 1.01 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-ajax.js 522 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-callables.js 581 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/babel.config.js 160 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.css 2.32 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.js 13.8 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.rtl.css 2.32 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/about.css 1.03 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-empty-state.css 291 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-order-statuses.css 403 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin.css 3.6 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/checkout.css 299 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/modal.css 742 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/view-subscription.css 572 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/wcs-upgrade.css 411 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin-pointers.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin.js 9.4 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.js 6.8 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.min.js 3.83 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-coupon.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-subscription.js 2.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.js 22.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.min.js 11.6 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/payment-method-restrictions.js 1.29 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/wcs-meta-boxes-order.js 502 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/payment-methods.js 355 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/single-product.js 429 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/view-subscription.js 1.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/wcs-cart.js 781 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/modal.js 1.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/wcs-upgrade.js 1.27 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.css 392 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.js 3.05 kB

compressed-size-action

@Jinksi Jinksi marked this pull request as ready for review December 12, 2023 01:03
@Jinksi Jinksi requested a review from a team December 12, 2023 01:03
@Jinksi Jinksi changed the title [Transactions List] - indicate when a transaction is expected to be included in a future deposit Transactions List - indicate when a transaction is expected to be included in a future deposit Dec 12, 2023
@shendy-a8c shendy-a8c self-requested a review December 12, 2023 03:48
@shendy-a8c
Copy link
Contributor

This will render for all transaction types except financing_*.

Why is this? I'm not too familiar with loan feature. When merchant gets a loan, isn't the money paid out in the form of a deposit?

Copy link
Contributor

@shendy-a8c shendy-a8c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and tested well. I just have a question above, about loan transaction.

@csmcneill
Copy link
Contributor

In case merchants want more details, should we include a Learn more. link in the tooltip that directs users to https://woo.com/document/woopayments/deposits/deposit-schedule/#pending-funds ?

@Jinksi
Copy link
Member Author

Jinksi commented Dec 12, 2023

In case merchants want more details, should we include a Learn more. link in the tooltip that directs users to woo.com/document/woopayments/deposits/deposit-schedule/#pending-funds ?

Great idea, I'll add this!

@Jinksi Jinksi changed the base branch from develop to release/6.9.2 December 13, 2023 01:31
@Jinksi
Copy link
Member Author

Jinksi commented Dec 13, 2023

When merchant gets a loan, isn't the money paid out in the form of a deposit? - @shendy-a8c

At the moment, we show loan financing transactions as individual transactions separate from (rather than within) a deposit.

@souravdebnath1986 has mentioned that we want to rectify this in the future, at which point financing types will have a deposit date and will show up within the deposit details transaction list.

Example: below is the same deposit, including a financing repayment.

Stripe shows the financing repayment within the transactions list.

image 2

WooPayments Deposit details transaction list doesn’t include this and therefore the totals don’t add up.
image 3

In 6.8.0, it is especially confusing, since these show an estimated deposit that never arrives.
image

I'll check to see if there is an open issue for this and create one if not.

@Jinksi Jinksi changed the base branch from release/6.9.2 to develop December 13, 2023 02:51
@Jinksi Jinksi changed the base branch from develop to release/6.9.2 December 13, 2023 03:09
@Jinksi Jinksi force-pushed the add/transaction-list-future-deposit branch from 7a1d9ba to c7fa489 Compare December 13, 2023 03:20
@Jinksi
Copy link
Member Author

Jinksi commented Dec 13, 2023

Rebased to release/6.9.2 and removed all commits carried over from develop.

@Jinksi
Copy link
Member Author

Jinksi commented Dec 13, 2023

I've updated this PR by adding a Learn More link that directs to https://woo.com/document/woopayments/deposits/deposit-schedule/#pending-funds.

I've also added the text "Future deposit" to the row's value, alongside the tooltip icon.

@shendy-a8c
Copy link
Contributor

Retested and looks good.

@Jinksi Jinksi merged commit a81f368 into release/6.9.2 Dec 13, 2023
18 of 22 checks passed
@Jinksi Jinksi deleted the add/transaction-list-future-deposit branch December 13, 2023 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deposits / Transaction list: Deposit date is missing.
4 participants