Add custom amounts business logic #10035

AnirudhBhat · 2023-10-27T04:06:13Z

NOTE: Please follow the below PR orders for reviewing

Description

This PR introduces the core business logic and UI components required for the "Custom Amounts" feature.

Key Changes:

Business Logic for Custom Amounts: Implemented the essential logic to handle the addition of custom amounts.

Custom Amounts Adapter: Introduced a new adapter to handle the display of added custom amounts within a RecyclerView.

Custom Amount Item UI: Designed a user-friendly and intuitive UI for each custom amount item.

Testing instructions

Navigate to the orders tab
Click on "+" button to navigate the the order creation screen
Click on the "Add custom amount" button
Add a custom amount
Ensure the custom amount gets added
Ensure you see the "custom amount" subsection instead of fees
Ensure the order total is correct
Add any product and ensure the custom amount, and order total are correct.

Images/gif

add_custom_amount.mp4

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

… least 1 custom amount added.

…rst pass

wpmobilebot · 2023-10-27T04:27:03Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`982a0bb`
	Direct Download	`woocommerce-prototype-build-pr10035-982a0bb.apk`

…dated with proper name

… fee line gets updated with default name

…iggered

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditProductsAdapter.kt # WooCommerce/src/main/res/layout/order_creation_product_item.xml

peril-woocommerce · 2023-10-31T06:24:42Z

	Warnings
⚠️	This PR is assigned to a milestone which is closing in less than 2 days Please, make sure to get it merged by then or assign it to a later expiring milestone
⚠️	PR has more than 300 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

AnirudhBhat · 2023-10-31T06:47:32Z

@samiuelson Please note that I've added the unit-tests-exemption label because the CI was asking for it. Specifically for customAmountsAdapter class. I don't think we should unit test the adapter class since it has a direct dependency on the Android framework classes.

samiuelson

LGTM

wpmobilebot · 2023-11-02T13:53:18Z

	4 Warnings
⚠️	View files have been modified, but no screenshot is included in the pull request. Consider adding some for clarity.
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	Class `OrderCreateEditCustomAmountAdapter` is missing tests, but `unit-tests-exemption` label was set to ignore this.
⚠️	This PR is assigned to the milestone 16.1. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

codecov-commenter · 2023-11-02T14:20:16Z

Codecov Report

Attention: 17 lines in your changes are missing coverage. Please review.

Comparison is base (8966787) 42.29% compared to head (982a0bb) 42.32%.
Report is 70 commits behind head on trunk.

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #10035      +/-   ##
============================================
+ Coverage     42.29%   42.32%   +0.02%     
- Complexity     4631     4636       +5     
============================================
  Files           953      954       +1     
  Lines         52065    52120      +55     
  Branches       6741     6749       +8     
============================================
+ Hits          22022    22060      +38     
- Misses        28167    28183      +16     
- Partials       1876     1877       +1

Files	Coverage Δ
...orders/creation/MapFeeLineToCustomAmountUiModel.kt	`80.00% <80.00%> (ø)`
...oid/ui/orders/creation/OrderCreateEditViewModel.kt	`81.88% <68.00%> (-0.95%)`	⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

AnirudhBhat · 2023-11-21T12:11:05Z

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/OrdersUITest.kt

@@ -47,6 +48,7 @@ class OrdersUITest : TestBase() {
        TabNavComponent().gotoOrdersScreen()
    }

+    @Ignore


Please note that the current test failures are a direct result of the modifications introduced in this PR, which affect the order creation screen. Sergiy Fedosov has taken on the task of implementing a fix. In the interim, we have agreed to bypass the affected test, as well as any other UI tests impacted by this PR, until a resolution is in place

AnirudhBhat added 25 commits October 25, 2023 09:09

Add necessary dependencies for the view model.

330f337

Add string resources

38a87cb

Add inputType as text for custom name edit text.

844e32c

Add mapper class to map from fee line to CustomAmountUIModel

579ceab

Add logic in OrderCreateEditViewModel.kt to handle custom amount

2d4f7f5

Handle custom amount button click

fbd3a51

Remove unnecessary code

9a0d880

Add a layout for custom amounts in order creation screen

6eb2a90

Add public helper method to show "add" icon

fa6be92

Add custom amount icon

f6d96d2

Add custom amount layout

5468c5b

Add custom amount single item layout

f9be493

Add custom amount adapter

2aaf38a

Integrate custom amount adapter into the OrderCreateEditFormFragment.kt

1638ad5

Remove unused import

bf72acb

Exit the custom amount dialog when done button is clicked

08ee2a9

Make use of currency formatter for displaying the currency code

b1c5135

Pass currency formatter to the adapter.

b7e01f1

rename addProductIcon to addIcon

5fd106d

Hide custom amounts button from the product section when there are at…

6136358

… least 1 custom amount added.

Move the divider to the top of the view

014e957

Add id field to CustomAmountUIModel

c1881c7

Add logic to hide the divider for the first and last items.

a36a431

Add some helper methods to remove buttons in custom amount section

bd44b5e

UI changes and modifying fees to show as custom amounts on the UI. Fi…

b52c484

…rst pass

AnirudhBhat added 4 commits October 27, 2023 15:37

UI changes to the divider

de79f57

Hide the divider in the xml

d3350ab

Hide the divider for the first custom amount item.

d503571

Hide the divider in the xml.

76b7b29

AnirudhBhat added 5 commits October 30, 2023 10:03

Add test to verify that when custom amount is added, fee line gets up…

d102c7c

…dated with proper name

Add test to verify that when custom amount is added without any name,…

28df0f0

… fee line gets updated with default name

Add test to verify that when custom amount is added, exit event is tr…

9e645a5

…iggered

remove redundant new line

9bdf1b2

Add test for fee line to custom amount UI model mapper

0bc4273

AnirudhBhat added feature: mobile payments Related to mobile payments / card present payments / Woo Payments. type: task An internally driven task. labels Oct 30, 2023

AnirudhBhat added this to the 16.1 milestone Oct 30, 2023

Base automatically changed from issue/9938-custom-amounts-flow-ui to trunk October 31, 2023 05:08

AnirudhBhat added 5 commits October 31, 2023 10:50

Fix merge conflicts

4095b95

Delete unused file

676d268

Remove unnecessary code

96ad41a

Add custom amount label programmatically

9f2640f

Add color resource instead of hardcoding for ic_custom_amount.xml

fc7d9a6

AnirudhBhat added the unit-tests-exemption label Oct 31, 2023

AnirudhBhat requested a review from samiuelson October 31, 2023 06:45

AnirudhBhat marked this pull request as ready for review October 31, 2023 06:45

samiuelson self-assigned this Nov 1, 2023

samiuelson approved these changes Nov 2, 2023

View reviewed changes

Ignoring the failing e2e tests for now. This will be fixed shortly.

982a0bb

AnirudhBhat requested a review from a team as a code owner November 2, 2023 13:47

AnirudhBhat merged commit 7357fea into trunk Nov 3, 2023

AnirudhBhat deleted the issue/10016-add-custom-amounts-business-logic branch November 3, 2023 04:04

AnirudhBhat commented Nov 21, 2023

View reviewed changes

jostnes mentioned this pull request Feb 1, 2024

[UI Test] - Re-enable Create Order test #10660

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add custom amounts business logic #10035

Add custom amounts business logic #10035

AnirudhBhat commented Oct 27, 2023 •

edited

Loading

wpmobilebot commented Oct 27, 2023 •

edited

Loading

peril-woocommerce bot commented Oct 31, 2023 •

edited

Loading

AnirudhBhat commented Oct 31, 2023

samiuelson left a comment

wpmobilebot commented Nov 2, 2023

codecov-commenter commented Nov 2, 2023 •

edited

Loading

AnirudhBhat Nov 21, 2023

Add custom amounts business logic #10035

Add custom amounts business logic #10035

Conversation

AnirudhBhat commented Oct 27, 2023 • edited Loading

NOTE: Please follow the below PR orders for reviewing

Description

Testing instructions

Images/gif

wpmobilebot commented Oct 27, 2023 • edited Loading

peril-woocommerce bot commented Oct 31, 2023 • edited Loading

AnirudhBhat commented Oct 31, 2023

samiuelson left a comment

Choose a reason for hiding this comment

wpmobilebot commented Nov 2, 2023

codecov-commenter commented Nov 2, 2023 • edited Loading

Codecov Report

AnirudhBhat Nov 21, 2023

Choose a reason for hiding this comment

AnirudhBhat commented Oct 27, 2023 •

edited

Loading

wpmobilebot commented Oct 27, 2023 •

edited

Loading

peril-woocommerce bot commented Oct 31, 2023 •

edited

Loading

codecov-commenter commented Nov 2, 2023 •

edited

Loading