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

118 option wegboeken #122

Merged
merged 5 commits into from
Oct 11, 2024
Merged

118 option wegboeken #122

merged 5 commits into from
Oct 11, 2024

Conversation

SimplyPancake
Copy link
Contributor

Please describe what your PR is fixing
Adds a write off option, where it can be enabled in the django admin per organisation.
When it is enabled, writeoff categories can be added in the admin panel of the organisation.
Then, bartenders are able to select 'write off' in the juliana POS, where they can put their orders on a category.
Then, in the sales overview, a tab has been added for the writeoff categories, where it shows how much (and which items) have been written off per category. A JSON export is also available.

Concretely, which issues does your PR solve?
#118

Does your PR include any django migrations?
yes!

PR does not include CSS changes

@SimplyPancake SimplyPancake linked an issue Oct 8, 2024 that may be closed by this pull request
- Django admin: Add inline display of purchases in a writeoff order
- Add toString for writeoff categories, to improve display in Django admin
- Add a writeoff order detail page to view individual writeoff order details.
- Add a list of writeoff orders to the drink orders page.
- Increase max description length of a writeoff category
- Actually display the writeoff category description on the writeoff button, in the order overview, and on the writeoff detail page
- Move  util to a model class method, as it makes more sense there.
- Add a cancel button to the writeoff screen, to go back to the regular sales view.
- Add a timer to write-off orders, just like regular orders, so they can be cancelled if a mistake is made
- CSS tweaks to improve layout of the writeoff juliana frontend
Copy link
Member

@Kurocon Kurocon left a comment

Choose a reason for hiding this comment

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

Overall the feature looks really good, good work!

I've added one commit with some of my own improvements, see the commit message as to what I've changed. If you agree with the changes, then I am OK with merging this for further testing on staging.

@SimplyPancake
Copy link
Contributor Author

I checked it out and I agree with the changes! Thanks for the 'small' changes ;) The changes make it more coherent, looks good!

@Kurocon Kurocon merged commit 2d420e9 into main Oct 11, 2024
2 checks passed
@Kurocon Kurocon deleted the 118-option-wegboeken branch October 11, 2024 10:41
@Kurocon Kurocon mentioned this pull request Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Option "wegboeken"
2 participants