raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,460 Commits 18 Branches 453 Tags
9d340af68069e35c334258006dccb73bb970c8ea
Commit Graph

15866 Commits

Author SHA1 Message Date
Rachel Arnould
d4d5449fba Merge pull request #12107 from dacook/buu/fixes 
[BUU] Style and behaviour updates
 2024-02-05 11:33:06 +01:00
Rachel Arnould
11bdba3c4e Merge pull request #12073 from rioug/12045-add-invisible-captcha 
Add invisible captcha to registration screen
 2024-02-05 10:44:41 +01:00
Gaetan Craig-Riou
6d3af4801e Merge pull request #12100 from mkllnk/remove-background-reports-toggle 
Remove background_reports feature toggle
 2024-02-05 11:47:43 +11:00
David Cook
d0724bab85 Fix column header alignmnt 2024-02-01 12:09:49 +11:00
David Cook
36722bfa20 Add more room for the On Hand column 2024-02-01 12:02:42 +11:00
David Cook
262823bddd Ensure On Demand field doesn't overflow following cell 2024-02-01 11:56:40 +11:00
David Cook
079925bc9a Fix for styling with a blank value 
It's not usually valid, but can still be entered. I wasn't able to fix the positioning of the :after psuedo element without having a child text node. Maybe it's possible to add an empty child text node, but I didn't think it worth getting down to that level..
 2024-02-01 11:31:14 +11:00
David Cook
133a9e6c7f Show popout when press printable character 2024-02-01 11:18:15 +11:00
David Cook
da82b12ca7 Prevent negative values for stock on hand 
Using browser validation. I didn't use model validation because the on_hand pseudo-attribute doesn't support it.

But.. it turned out to  not be so simple. Browser validation can't work if the field is hidden, and breaks the javascript. So now I made the javascript smarter, and the end result is more helpful I think.
 2024-02-01 11:18:15 +11:00
David Cook
3d941dcc1f Adjust popout position 
Now it's lined up perfectly with the number input.
 2024-02-01 11:18:15 +11:00
David Cook
ae1fabae38 Tweak padding according to design 2024-02-01 11:18:15 +11:00
Konrad
a30da1f656 Merge pull request #12093 from cillian/generate-invoice-button-warning 
Display a warning when clicking the generate invoice button if an ABN is required but not present
 2024-01-31 21:52:15 +01:00
Konrad
60c18ffa85 Merge pull request #12084 from cyrillefr/Replace-toggle_controller-with-generic-toggle_control_controller 
Replace toggle_controller with method inside generic controller
 2024-01-31 21:17:47 +01:00
Konrad
d24924b8f4 Merge pull request #12075 from cyrillefr/Actions-dropdown-should-not-open-automatically-after-shipping-the-order 
Actions dropdown should stay closed after shipping order
 2024-01-31 20:49:49 +01:00
Konrad
9e6b8e0624 Merge pull request #12047 from rioug/12021-enterprise-fee-tax-on-invoice 
Include Tax on enterprise fees on the invoice
 2024-01-31 15:32:54 +01:00
Maikel Linke
a7571b152d Simplify report rendering 
* DRY rendering_options calls.
* Remove unneeded parameter from method.
* Choose better name for background rendering method.
 2024-01-30 12:46:32 +11:00
Maikel Linke
d2736002dc Remove dead code from ReportsController 
That code was rendering the report in the request but we only do it in
the background now.
 2024-01-30 12:34:57 +11:00
Maikel Linke
29bcbc58de Simplify reports form options 2024-01-30 12:18:59 +11:00
Maikel Linke
bcfaed852b Remove background_reports feature toggle 2024-01-30 12:11:04 +11:00
Gaetan Craig-Riou
e129ef38c2 Refactor total method to use sum instead of reduce 
Plus some extra specs to cover missing scenarios
 2024-01-29 14:12:28 +11:00
Gaetan Craig-Riou
04db8dbd37 Remove unused method 2024-01-29 13:21:13 +11:00
Gaetan Craig-Riou
d5499245d0 Merge pull request #11698 from openfoodfoundation/dependabot/bundler/redis-5.0.8 
chore(deps): bump redis from 4.8.1 to 5.0.8
 2024-01-29 10:55:58 +11:00
Cillian O'Ruanaidh
f960dec0eb Display a warning when clicking the generate invoice button if an ABN is required but not present 2024-01-26 14:28:42 +00:00
cyrillefr
e6c0afa477 Replace toggle_controller with method inside generic ctrller 
- move toggle method from toggle_controller inside toggle_control
    ctrller
  - change corresponding html attributes in view
  - mode corresponding spec in toggle_controller ctrller spec
  - delete now unused toggle controller + spec
 2024-01-25 10:16:02 +01:00
David Cook
4634917597 Treat image integrity error as an input error 
And thus give the user a useful message to try again.

Hmm, if this is a good idea, we should do it everywhere we upload an image. Can we build that in somehow, or at least make a shared helper that accepts a block and catches the error?

I replicated this in dev a couple of times, I think with a text file labelled as an image file. Unfortunately, I can no longer replicate in dev or with a spec.
 2024-01-25 14:14:58 +11:00
David Cook
c462ac919f Use image url helper 
Without it, I think the correct S3 url isn't generated.
 2024-01-25 14:14:58 +11:00
David Cook
f72154e40c Add image create form 
Re-using the edit image form, because they're basically the same.
 2024-01-25 14:14:58 +11:00
Maikel Linke
687176cf49 Remove trouble-some hiredis 
The hiredis client was praised as being faster parsing bulk responses
but it seems to have multiple issues now:

- The redis release 5.0 moved hiredis support to another gem.
- I tried the hiredis-client gem and it raised errors.
- There are claims of worse performance of hiredis [1].
- Maintenance responsiveness has been questioned [2].

Using the default redis driver seems to work fine though.

[1]: https://discuss.rubyonrails.org/t/hiredis-does-not-support-ssl-action-cable/75945
[2]: https://github.com/redis/hiredis/issues/655
 2024-01-25 13:28:44 +11:00
Konrad
773131741b Merge pull request #11817 from rioug/10809-match-taxons-to-DFC-product-types 
[DFC] match taxons to dfc product types
 2024-01-25 00:05:31 +01:00
Konrad
d15395a252 Merge pull request #12052 from dacook/hotkeys 
Hotkey fix
 2024-01-24 23:34:50 +01:00
Konrad
ca12eab4bb Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report 
Include vouchers in report: Enterprise Fees With Tax Report By Order
 2024-01-24 22:57:48 +01:00
Konrad
5377304190 Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller 
Replace toggle_button_disable controller with generic toggle_control controller
 2024-01-24 16:39:26 +01:00
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category 
Spec requiring tax category when creating products
 2024-01-24 16:26:57 +01:00
cyrillefr
b8743d853f Actions dropdown should stay closed after shipping order 
- added hidden css class for it to stay closed.
 2024-01-24 08:35:55 +01:00
Gaetan Craig-Riou
d8876c40b8 Add invisible_captcha on the user registration page 
The default action when a user submit the form too quickly is to
redirect to :back with flash error message. As we are using CableReady
it's not working for us, so I render_alert_timestamp_error_message
to show the error message to the user.
 2024-01-23 16:30:12 +11:00
Gaetan Craig-Riou
fab6a79dae Fix various method to remove or add enterprise fee tax 2024-01-23 10:36:58 +11:00
Gaetan Craig-Riou
8181f3b09a Add enterprise_fee_additional_tax and enterprise_fee_included_tax 2024-01-23 10:36:43 +11:00
Gaetan Craig-Riou
b28e63174d Update display_line_items_taxes 
Make sure we add the correct enterprise fee tax amount based on tax
being included in the price or not.
 2024-01-23 10:36:43 +11:00
Gaetan Craig-Riou
bfe8f08910 Refator, add total_additional_tax and total_included_tax 
They are used to add/remove enterprise fee tax as needed
 2024-01-23 10:35:09 +11:00
Gaetan Craig-Riou
3cfa7e29d1 Add the enterprise fee tax to amount with taxes 2024-01-22 13:08:58 +11:00
Gaetan Craig-Riou
ba841d9fbc Add enterprise_fee_tax to Invoice::LineItemSerializer 2024-01-22 13:08:58 +11:00
Gaetan Craig-Riou
a77ba5b0b1 Include enterprise fee tax in the line item tax 2024-01-22 13:08:39 +11:00
Gaetan Craig-Riou
913da34228 Add EnterpriseFeeAdjustments 
It represent a collection of enterprise fee adjustments. Currently
it only allows you to calculate the tax amount relating to enterprise
fees when tax is not included in price
 2024-01-22 13:08:39 +11:00
Gaetan Craig-Riou
96a010033d Fix admin view to use dfc_id 
This was missed in a previous refactor
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
652c7a563c Add dfc_name field on Spree::Taxons 
This will let us map OFN product taxons to DFC product types
 2024-01-22 10:02:10 +11:00
Gaetan Craig-Riou
83beafc564 Add missing translation on taxon admin form 2024-01-22 10:02:10 +11:00
Ahmed Ejaz
cb9c2963af 11768: add roundoff 
- Fix lint issues
 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
38b7616b1a 11768: apply voucher 2024-01-19 01:52:18 +05:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
cyrillefr
ca4aa645f7 Delete now ununsed stimulus controller toggle_button_disabled 
- also delete one comment about replacing this controller with another
 2024-01-18 10:10:49 +01:00