Add columns to "pay your supplier" report #13037
Conversation
chahmedejaz
added
the
user facing changes
| supplier(line_items).charges_sales_tax ? I18n.t(:yes) : I18n.t(:no) | ||
| supplier(line_items).charges_sales_tax |
There was a problem hiding this comment.
Given the specs are passing, I assume the boolean are auto-magically translated to Yes/No ?
There was a problem hiding this comment.
I was curious too, so I found out the answer here: https://github.com/openfoodfoundation/openfoodnetwork/blob/master/lib/reporting/report_row_builder.rb#L120-L122
I've been interested to try this gem for this sort of thing: https://github.com/RST-J/human_attribute_values
It would allow translators to choose a more specific description, which might be better in some circumstances.
But I think handling it this way is quite sufficient and much simpler, until someone says we need a better solution.
| @@ -38,8 +38,11 @@ def suppliers_adjustments(line_item, adjustment_type = 'EnterpriseFee') | |||
| end | |||
|
|
|||
| def adjustments_by_type(line_item, type, included: false) | |||
| is_tax = type == :tax | |||
| return 0.0 if is_tax && !supplier(line_item).charges_sales_tax | |||
There was a problem hiding this comment.
It seems strange that the report needs to check if charges_sales_tax. I thought that the application logic should be able to work this out. I see that Spree::TaxRate checks for this in match, but I don't think that helps here.
Oh well, it turns out it's quite common to refer to this directly in other reports, all good 👍
| tax = total_tax.call(line_item) | ||
|
|
||
| total_price + total_fees + total_fees_tax + tax | ||
| total_excl_vat.call(line_item) + total_tax.call(line_item) |
There was a problem hiding this comment.
Nice to see some of the logic ends up simpler! 😎
| supplier(line_items).charges_sales_tax ? I18n.t(:yes) : I18n.t(:no) | ||
| supplier(line_items).charges_sales_tax |
There was a problem hiding this comment.
I was curious too, so I found out the answer here: https://github.com/openfoodfoundation/openfoodnetwork/blob/master/lib/reporting/report_row_builder.rb#L120-L122
I've been interested to try this gem for this sort of thing: https://github.com/RST-J/human_attribute_values
It would allow translators to choose a more specific description, which might be better in some circumstances.
But I think handling it this way is quite sufficient and much simpler, until someone says we need a better solution.
Sure, @rioug will take care of it from now onwards. Thanks 🙂 |
Thanks for introducing this gem, David. Yes, it seems more flexible indeed. Maybe in future we may find a usecase to add this 😬 |
What? Why?
What should we test?
Release notes
Changelog Category (reviewers may add a label for the release notes):