raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-30 06:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,349 Commits 15 Branches 460 Tags
e71a2603bd035c8bf1c6cdb6b3eb0fca9baca5ce
Commit Graph

34349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaetan Craig-Riou
e6fba74a87 Make update_pending_payment private 
It's not used anywhere in the code, there is no reason for it to be
public
 2024-02-07 14:44:59 +11:00
Gaetan Craig-Riou
a2ce718091 Merge pull request #12131 from mkllnk/openid_connect 
Fix gem dependency declaration
 2024-02-07 14:15:58 +11:00
Maikel Linke
d92263456d Fix gem dependency declaration 
Dependabot updated openid_connect despite this being restricted in our
Gemfile. Now, all future updates downgrade openid_connect again to
satisfy our requested version.

I couldn't find any good reason not to upgrade openid_connect though and
since that's the version we already have, let's keep it and just remove
the restriction. Then bundler doesn't downgrade any more and updates are
performed well.
 2024-02-07 13:50:19 +11:00
David Cook
5e4dd3864f Update image and modal size 
Using a new 'fit' modal size.

On smaller screens, we need to allow the image to shrink. That's a good general rule, but I was hesitant to make it a global rule..
 2024-02-07 12:48:44 +11:00
David Cook
98cfc68c3a Add option for modal class 2024-02-07 12:28:43 +11:00
David Cook
d24348d0f2 Increase button size 
And fix alignment for smaller screens.
 2024-02-07 10:13:17 +11:00
Maikel Linke
b524e0f1cc Remove update script, use bin/setup instead 2024-02-07 08:24:10 +11:00
cyrillefr
f8cb98f43e Replace remote_toggle with method inside generic controller 
- put former remote toggle ctrller toggle method
   in new toggleAdvancedSettings in more generic toggle ctrller
 - modified acordingly the 2 associated views
 - put former test code in more generic ctrller test file
 - deleted now useless ctrller + test files
 2024-02-06 17:02:23 +01:00
dependabot[bot]
7c8a149d49 chore(deps): bump trix from 2.0.9 to 2.0.10 
Bumps [trix](https://github.com/basecamp/trix) from 2.0.9 to 2.0.10.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.9...v2.0.10)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-06 09:10:24 +00:00
Gaetan Craig-Riou
75355b0359 Add test to cover updating pending payments 2024-02-06 16:47:18 +11:00
David Cook
b3692d7468 Remove min-height for ModalComponent 2024-02-06 15:00:29 +11:00
David Cook
6189feadaa Prevent modal covered by scrollbar 
Using units relative to the document, rather than the screen.

I don't think that remaining min-height should be there at all, but reveal-modal is used a lot so I don't know for sure.
 2024-02-06 14:56:39 +11:00
David Cook
784f74f466 Align buttons to the right 2024-02-06 14:51:13 +11:00
dependabot[bot]
e77bad2dfa chore(deps): bump nokogiri from 1.16.0 to 1.16.2 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.0 to 1.16.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.0...v1.16.2)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-06 14:40:42 +11:00
Maikel
d772c590da Merge pull request #12118 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-3.13.6 
chore(deps): bump hotkeys-js from 3.13.5 to 3.13.6
 2024-02-06 14:37:26 +11:00
David Cook
8c6d3a27ec Move modal action styles to parent component 
They were already being shared with a HelpModalComponent in fact.
 2024-02-06 14:34:36 +11:00
Maikel
4dda4e2385 Merge pull request #12101 from openfoodfoundation/dependabot/bundler/datafoodconsortium-connector-1.0.0.pre.alpha.10 
chore(deps): bump datafoodconsortium-connector from 1.0.0.pre.alpha.9 to 1.0.0.pre.alpha.10
 2024-02-06 11:20:41 +11:00
filipefurtad0
6c2f958b3f Update all locales with the latest Transifex translations v4.4.28 2024-02-05 11:11:29 +00:00
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
dependabot[bot]
5b719fcb9b chore(deps): bump hotkeys-js from 3.13.5 to 3.13.6 
Bumps [hotkeys-js](https://github.com/jaywcjlove/hotkeys-js) from 3.13.5 to 3.13.6.
- [Release notes](https://github.com/jaywcjlove/hotkeys-js/releases)
- [Commits](https://github.com/jaywcjlove/hotkeys-js/compare/v3.13.5...v3.13.6)

---
updated-dependencies:
- dependency-name: hotkeys-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 09:25:21 +00:00
Maikel Linke
939687a592 Bump DFC taxonomies from v1.0.2 to v1.2.0 2024-02-05 14:19:29 +11:00
Maikel Linke
e3c6629f62 Remove DFC importer monkey patches 
The Connector gem contains our code now.
 2024-02-05 14:19:29 +11:00
dependabot[bot]
a65c7fc65a chore(deps): bump datafoodconsortium-connector 
Bumps datafoodconsortium-connector from 1.0.0.pre.alpha.9 to 1.0.0.pre.alpha.10.

---
updated-dependencies:
- dependency-name: datafoodconsortium-connector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 14:19:29 +11:00
Gaetan Craig-Riou
67aead6981 Merge pull request #12114 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.0.9 
chore(deps): bump trix from 2.0.8 to 2.0.9
 2024-02-05 11:58:08 +11: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
Cillian O'Ruanaidh
da71f711c0 Make sure fees are applied when adding the first item to a back office order 2024-02-02 13:11:15 +00:00
dependabot[bot]
4a0a6c6827 chore(deps): bump trix from 2.0.8 to 2.0.9 
Bumps [trix](https://github.com/basecamp/trix) from 2.0.8 to 2.0.9.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.8...v2.0.9)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-02 09:53:24 +00:00
Maikel
df769192af Merge pull request #12109 from openfoodfoundation/dependabot/bundler/omniauth_openid_connect-and-openid_connect-0.7.1 
chore(deps): bump omniauth_openid_connect and openid_connect
 2024-02-02 15:11:40 +11:00
Maikel
ed62e5f371 Merge pull request #12110 from openfoodfoundation/dependabot/bundler/bootsnap-1.18.3 
chore(deps): bump bootsnap from 1.18.2 to 1.18.3
 2024-02-02 15:10:02 +11:00
Ahmed Ejaz
a6431bdec6 12085: fix customer search autofill issue 2024-02-02 01:58:35 +05:00
dependabot[bot]
2c497195b4 chore(deps): bump bootsnap from 1.18.2 to 1.18.3 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.18.2 to 1.18.3.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.18.2...v1.18.3)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-01 09:50:57 +00:00
dependabot[bot]
4d6500fe39 chore(deps): bump omniauth_openid_connect and openid_connect 
Bumps [omniauth_openid_connect](https://github.com/m0n9oose/omniauth_openid_connect) and [openid_connect](https://github.com/nov/openid_connect). These dependencies needed to be updated together.

Updates `omniauth_openid_connect` from 0.6.1 to 0.7.1
- [Changelog](https://github.com/omniauth/omniauth_openid_connect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/m0n9oose/omniauth_openid_connect/compare/v0.6.1...v0.7.1)

Updates `openid_connect` from 1.4.2 to 2.3.0
- [Release notes](https://github.com/nov/openid_connect/releases)
- [Changelog](https://github.com/nov/openid_connect/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nov/openid_connect/compare/v1.4.2...v2.3.0)

---
updated-dependencies:
- dependency-name: omniauth_openid_connect
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: openid_connect
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-01 09:50:18 +00: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
Maikel
1550f1356d Merge pull request #12105 from openfoodfoundation/dependabot/bundler/bootsnap-1.18.2 
chore(deps): bump bootsnap from 1.17.1 to 1.18.2
 2024-02-01 11:31:34 +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
dependabot[bot]
3773946d0d chore(deps): bump bootsnap from 1.17.1 to 1.18.2 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.17.1 to 1.18.2.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.17.1...v1.18.2)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-31 10:00:46 +00:00
David Cook
52e2e37c4e Merge pull request #12078 from mkllnk/yarn 
Prompt for nodenv when missing
 2024-01-31 14:01:10 +11:00
David Cook
97ab41b47e Merge pull request #12068 from mkllnk/dfc-enterprise-promo-image 
Add promo image to DFC Enterprise API
 2024-01-31 13:35:47 +11:00
Maikel
46a5f13cd8 Merge pull request #12102 from openfoodfoundation/dependabot/bundler/monetize-1.13.0 
chore(deps): bump monetize from 1.12.0 to 1.13.0
 2024-01-31 11:36:34 +11:00