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.

Sign up for GitHub

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

Jump to bottom

Add deposit return voucher UI (Apps-1643) #231

Merged
merged 60 commits into from
Jan 6, 2025
Merged

Add deposit return voucher UI (Apps-1643) #231

merged 60 commits into from
Jan 6, 2025

Conversation

Fabtron
Copy link
Collaborator

@Fabtron Fabtron commented Dec 23, 2024 •
edited
Loading

The UI for the deposit return voucher has been added. E.g. for each voucher one cart item is added containing all referenced line items since a voucher can refer to multiple line items.

APPS-1643

How to test?

Add vouchers, Delete them and do a checkout.

Definition of Done

  • Issue is linked
  • All requirements of the issue are fulfilled
  • Changelog is updated
  • Documentation is updated
  • Self-Review
  • Review with the Product Owner (Release-Variante o. Minified Build)

App Tests

  • Minified build has been tested (aka. Release Build)
  • Environments have been taken care of (Production/Staging)
  • Supported languages have been tested
  • Light-/Dark-Mode has been tested
  • Edge-Cases have been tested
  • Android API Levels have been taken care of (minSdk?)

Testing

  • Tests have been written (aka Unit-Tests, Integration-Tests, ...)

Fabtron added 30 commits December 3, 2024 12:05
@Fabtron
WIP: integrate new code templates and except them as matches for scan…
2b0a278 
…ned codes
@Fabtron
WIP: remove logging
232b9fe
@Fabtron
WIP: add support for new drv items
6e444ba
@Fabtron
WIP: upgrade gradle for synch
f0281a4
@Fabtron
refactor it to insert a new item from a deposit return voucher
f5f18ac
@Fabtron
add required properties to the BackendCartItem
29cf6a2
@Fabtron
fix type
6746977
@Fabtron
replace with localised message
fc292c5
@Fabtron
move it to be part of the templates
9e1be5e
@Fabtron
clean up code
6935404
@Fabtron
make setter private
53c0d85
@Fabtron
remove obsolete itemId
93b1d8e
@Fabtron
add additional new type
4261861
@Fabtron
ensure that new line item from type deposit return is added
51cd087
@Fabtron
add type for BackendCartItem for new deposit return items
2f40d8d
@Fabtron
make it more readable
8c57083
@Fabtron
formatting
7949215
@Fabtron
use existing match method to stick to the existing logic
0c84196
@Fabtron
switch order since it matters for the item type
cd5f312
@Fabtron
update doc
d35ed3a
@Fabtron
WIP: add violations messages
e7b3591
@Fabtron
WIP: resolve violations messages
d50e1b3
@Fabtron
WIP: handle deposit return voucher violations
9996612
@Fabtron
WIP: logs for debug
9498a41
@Fabtron
make item nullable and add new DepositReturnItem
489ae45
@Fabtron
add ui for new item
e510f1d
@Fabtron
integrate new ui and add required logic
bbf161d
@Fabtron
refactor to add an item for each deposit voucher and remove logs
1e5c1b2
@Fabtron
refactor to make resolve method more generic and handle both new viol…
dc76234 
…ations
@Fabtron
remove logs
62f76d4
Fabtron added 23 commits December 17, 2024 21:01
@Fabtron
refactor handling the invalid cart item since it is broken
9702581
@Fabtron
revert obsolete changes
c3ca180
@Fabtron
remove obsolete log
cfb25e1
@Fabtron
update string
b9709c0
@Fabtron
remove obsolete forEach
ad526c3
@Fabtron
give it a better name
607be85
@Fabtron
simplify check
c2e9ab9
@Fabtron
simplify violation check
720ee35
@Fabtron
simplify violation resolve
b578525
@Fabtron
simplify mapping
ec7b428
@Fabtron
simplify enum ViolationType
8f468db
@Fabtron
rename it
4f90667
@Fabtron
simplify it
0eb4ad8
@Fabtron
Merge branch 'apps-1642-add-scanner-support-for-deposit-voucher' into a…
92970b7 
…pps-1643-add-deposit-return-voucher-ui

# Conflicts:
#	core/src/main/java/io/snabble/sdk/shoppingcart/ShoppingCart.kt
#	core/src/main/java/io/snabble/sdk/shoppingcart/ShoppingCartUpdater.kt
@Fabtron
add horizontal divider to each item
2222483
@Fabtron
Merge remote-tracking branch 'origin/feature-deposit-return-voucher' …
a71a6c6 
…into apps-1643-add-deposit-return-voucher-ui
@Fabtron
center content vertically
52e9898
@Fabtron
delete obsolete remove function
3909b94
@Fabtron
change it to add lineitems to the referred voucher
7772f64
@Fabtron
remove obsolete delete logic
4b65adb
@Fabtron
formatting
fd780bf
@Fabtron
update CHANGELOG.md
cd00a4d
@Fabtron
renaming for better readability
ea89caa
@Fabtron Fabtron marked this pull request as ready for review December 30, 2024 08:51
@Fabtron Fabtron requested a review from cmaier December 30, 2024 09:41
@Fabtron Fabtron merged commit 8a193d1 into feature-deposit-return-voucher Jan 6, 2025
1 check passed
@Fabtron Fabtron deleted the apps-1643-add-deposit-return-voucher-ui branch January 6, 2025 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmaier cmaier cmaier approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Fabtron @cmaier