Skip to content

Multiple shipping lines support#11580

Merged
atorresveiga merged 47 commits intotrunkfrom
issue/multiple-shipping-lines-support
May 27, 2024
Merged

Multiple shipping lines support#11580
atorresveiga merged 47 commits intotrunkfrom
issue/multiple-shipping-lines-support

Conversation

@atorresveiga
Copy link
Copy Markdown
Contributor

@atorresveiga atorresveiga commented May 24, 2024 •
edited
Loading

Description

This PR releases multiple shipping lines support. It does that by displaying multiple shipping lines in the Order Details screen and the Order Create/Edit screen. Additionally, we updated some analytic events to contain a new property to track the number of shipping lines in an order.

Testing instructions

TC1

  1. Open an order with shipping lines
  2. Check that all sipping lines are displayed in the shipping section

TC2

  1. Open the app
  2. Tap on Add a new order
  3. Add a product to enable the shipping section
  4. Tap on add shipping and add a new shipping line
  5. Check that the new shipping section is displayed
  6. Optionally, you can remove the shipping line just added to check that when there is no shipping line, the shipping section is hidden.
  7. Tap on the plus button in the shipping section
  8. Add a shipping line line
  9. Check that the new shipping line is added to the order
  10. Edit one of the shipping lines
  11. Check that the changes are persisted
  12. Delete one of the shipping lines
  13. Check that the shipping line is removed from the order
  14. Create the order

TC3

  1. Using the order form TC2
  2. Tap on Edit to enter the edit flow
  3. Tap on the plus button in the shipping section
  4. Add a shipping line line
  5. Check that the new shipping line is added to the order
  6. Edit one of the shipping lines
  7. Check that the changes are persisted
  8. Delete one of the shipping lines
  9. Check that the shipping line is removed from the order

Images/gif

Screen_recording_20240524_151118.mp4
  • I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Alejo added 30 commits May 17, 2024 10:37
add title
e3a65ea
add shipping lines section
432874b
get shipping details
c9f15b1
format currency
11a8179
fix warnings
6d97d9a
remove shipping lines warning
5690e76
adjust list padding
a56a385
fix unit tests
5c2cbd4
fix detekt warnings
02d6b80
at least one missing for refresh
21292c0
add unit tests
fec09ee
fix detekt warnings
d40442e
Merge remote-tracking branch 'origin/trunk' into issue/11394-shipping…
a52fe2b 
…-lines-in-order-details
add animation
0eb3b00
fix spacing
84d4f66
clear warning multiple lines
f20934a
shipping lines section
caa8c85
display shipping lines section
b039868
update h6 spacing
65cb3cb
detekt warnings
f4613cc
fix unit tests
45f2612
add and edit UI
2f106a5
read only shipping in totals
06dd1a7
logic for add and edit shipping methods
3200ba2
display items with id != null
b45c58f
shipping read only
4ea961e
id in shipping details
e1eca45
connect ui with viewmodel shipping support
282d268
fix detekt warnings
85b63f2
remove add shipping button interaction
8bd1a7b
Alejo and others added 14 commits May 23, 2024 09:33
use string resources
2587273
add unit tests
36ef361
refactor move ShippingLineDetails
753dfdb
@atorresveiga
Merge pull request #11556 from woocommerce/issue/11394-shipping-lines…
888e482 
…-in-order-details

Shipping lines in order details
@atorresveiga
Merge pull request #11571 from woocommerce/issue/11393-order-create-e…
c834ca1 
…dit-shipping-lines-support

Order create edit shipping lines support
add new event
2165c5f
add new property
9396eae
add new property to ORDER_SHIPPING_METHOD_ADD
bfbdce8
add new property to ORDER_CREATION_SUCCESS
ce9511e
track new event ORDER_DETAILS_SHIPPING_METHODS_SHOWN
e590e6d
fix imports
67f90fc
add unit tests
fa78ec2
@atorresveiga
Merge pull request #11574 from woocommerce/issue/11397-shipping-lines…
0ad68a4 
…-m2-analytics

Shipping lines m2 analytics
Merge remote-tracking branch 'origin/trunk' into issue/multiple-shipp…
d9283d4 
…ing-lines-support
@dangermattic
Copy link
Copy Markdown
Collaborator

dangermattic commented May 24, 2024 •
edited
Loading

1 Warning
⚠️ This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
1 Message
📖

This PR contains changes to Tracks-related logic. Please ensure (author and reviewer) the following are completed:

  • The tracks events must be validated in the Tracks system.
  • Verify the internal Tracks spreadsheet has also been updated.
  • Please consider registering any new events.
  • The PR must be assigned the category: tracks label.

Generated by 🚫 Danger

@atorresveiga atorresveiga added this to the 18.9 milestone May 24, 2024
@atorresveiga atorresveiga added feature: order details Related to order details. category: tracks Related to analytics, including Tracks Events. feature: order editing Related to unified order editing. type: task An internally driven task. labels May 24, 2024
@wpmobilebot
Copy link
Copy Markdown
Collaborator

wpmobilebot commented May 24, 2024 •
edited
Loading

📲 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
FlavorJalapeno
Build TypeDebug
Commit7cfcd60
Direct Downloadwoocommerce-prototype-build-pr11580-7cfcd60.apk

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 24, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 22.42647% with 211 lines in your changes are missing coverage. Please review.

Project coverage is 40.24%. Comparing base (d5d0a51) to head (7cfcd60).

Files Patch % Lines
...rders/creation/shipping/ShippingLineFormSection.kt 0.00% 111 Missing ⚠️
...erce/android/ui/orders/details/ShippingLineCard.kt 0.00% 69 Missing ⚠️
...oid/ui/orders/creation/OrderCreateEditViewModel.kt 60.46% 11 Missing and 6 partials ⚠️
.../woocommerce/android/ui/orders/CustomAmountCard.kt 0.00% 6 Missing ⚠️
.../android/ui/orders/details/OrderDetailViewModel.kt 83.33% 0 Missing and 5 partials ⚠️
...woocommerce/android/ui/compose/theme/Typography.kt 0.00% 2 Missing ⚠️
...ers/creation/totals/OrderCreateEditTotalsHelper.kt 80.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##              trunk   #11580      +/-   ##
============================================
- Coverage     40.34%   40.24%   -0.11%     
- Complexity     5200     5202       +2     
============================================
  Files          1087     1089       +2     
  Lines         63247    63462     +215     
  Branches       8668     8711      +43     
============================================
+ Hits          25520    25539      +19     
- Misses        35432    35619     +187     
- Partials       2295     2304       +9

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

@atorresveiga atorresveiga merged commit 11da5dd into trunk May 27, 2024
@atorresveiga atorresveiga deleted the issue/multiple-shipping-lines-support branch May 27, 2024 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

category: tracks Related to analytics, including Tracks Events. feature: order details Related to order details. feature: order editing Related to unified order editing. type: task An internally driven task.

Projects

None yet

Milestone

18.9

Development

Successfully merging this pull request may close these issues.

4 participants

@atorresveiga @dangermattic @wpmobilebot @codecov-commenter