raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-14 04:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,234 Commits 16 Branches 456 Tags
2462d71ab578a14adba0179caa67f40822778fc8
Commit Graph

22234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cillian O'Ruanaidh
2462d71ab5 When creating backoffice orders hide variants with no stock by default 
But let people include out of stock variants by checking a checkbox if they want.

Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.

Co-authored-by: Maikel Linke <maikel@email.org.au>
 2021-10-08 13:13:32 +01:00
Matt-Yorkley
86404045f2 Update all locales with the latest Transifex translations 2021-10-07 19:04:55 +01:00
Matt-Yorkley
10fe61b71f Merge pull request #8285 from openfoodfoundation/transifex 
Transifex
 2021-10-07 20:01:07 +02:00
Transifex-Openfoodnetwork
1adcd61c88 Updating translations for config/locales/fr.yml 2021-10-08 03:18:25 +11:00
Transifex-Openfoodnetwork
452f4ec0b8 Updating translations for config/locales/en_FR.yml 2021-10-08 03:16:20 +11:00
Transifex-Openfoodnetwork
09b9c8e10d Updating translations for config/locales/fr.yml 2021-10-08 03:15:23 +11:00
Andy Brett
e4be521632 Merge pull request #8203 from YasuhiroYoshida/adjust-visibility-of-enterprises-on-hub 
Change visibilities of hubs on group page
 2021-10-07 08:00:37 -07:00
Andy Brett
40e701abcc Merge pull request #8280 from sinansonmez/50-make-home-page-labels-clickable 
Make home page labels clickable
 2021-10-07 07:59:52 -07:00
Nihal M. Kelanthodika
d85a109a21 Merge pull request #7973 from apricot12/HQ_address_in_business_details 2021-10-07 18:32:24 +05:30
Matt-Yorkley
bb43d82306 Merge pull request #8300 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.10 
Bump @storybook/addon-controls from 6.3.9 to 6.3.10
 2021-10-07 12:56:42 +02:00
Matt-Yorkley
f1b7e1b994 Merge pull request #8304 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.10 
Bump @storybook/server from 6.3.9 to 6.3.10
 2021-10-07 12:55:55 +02:00
dependabot[bot]
0ae87b2252 Bump @storybook/server from 6.3.9 to 6.3.10 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 10:53:50 +00:00
dependabot[bot]
0f081422ee Bump @storybook/addon-controls from 6.3.9 to 6.3.10 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 10:53:12 +00:00
Matt-Yorkley
ecac39b71f Merge pull request #8299 from openfoodfoundation/dependabot/bundler/bugsnag-6.24.0 
Bump bugsnag from 6.23.0 to 6.24.0
 2021-10-07 12:51:38 +02:00
Matt-Yorkley
aea07af23f Merge pull request #8298 from openfoodfoundation/dependabot/bundler/ddtrace-0.53.0 
Bump ddtrace from 0.52.0 to 0.53.0
 2021-10-07 12:51:25 +02:00
Matt-Yorkley
d44d6293d4 Merge pull request #8297 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.12.3 
Bump rubocop-rails from 2.12.2 to 2.12.3
 2021-10-07 12:50:59 +02:00
Matt-Yorkley
a0bea5baa9 Merge pull request #8302 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.10 
Bump @storybook/addon-docs from 6.3.9 to 6.3.10
 2021-10-07 12:49:37 +02:00
Matt-Yorkley
58f7955c16 Merge pull request #8306 from openfoodfoundation/revert-8301-dependabot/npm_and_yarn/stimulus-3.0.1 
Revert "Bump stimulus from 2.0.0 to 3.0.1"
 2021-10-07 12:42:04 +02:00
Matt-Yorkley
200bf36604 Revert "Bump stimulus from 2.0.0 to 3.0.1" 2021-10-07 12:41:51 +02:00
Matt-Yorkley
4ecb646965 Merge pull request #8305 from openfoodfoundation/revert-8303-dependabot/npm_and_yarn/webpack-cli-4.9.0 
Revert "Bump webpack-cli from 3.3.12 to 4.9.0"
 2021-10-07 12:41:30 +02:00
Matt-Yorkley
9282d8e1e0 Revert "Bump webpack-cli from 3.3.12 to 4.9.0" 2021-10-07 12:41:14 +02:00
Matt-Yorkley
ba99824def Merge pull request #8301 from openfoodfoundation/dependabot/npm_and_yarn/stimulus-3.0.1 
Bump stimulus from 2.0.0 to 3.0.1
 2021-10-07 12:40:54 +02:00
Matt-Yorkley
87c679b7cc Merge pull request #8303 from openfoodfoundation/dependabot/npm_and_yarn/webpack-cli-4.9.0 
Bump webpack-cli from 3.3.12 to 4.9.0
 2021-10-07 12:39:08 +02:00
dependabot[bot]
832347a253 Bump webpack-cli from 3.3.12 to 4.9.0 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.9.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.9.0)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:54 +00:00
dependabot[bot]
9f1e1ee270 Bump @storybook/addon-docs from 6.3.9 to 6.3.10 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:21 +00:00
dependabot[bot]
a619d7b61d Bump stimulus from 2.0.0 to 3.0.1 
Bumps [stimulus](https://github.com/stimulusjs/stimulus) from 2.0.0 to 3.0.1.
- [Release notes](https://github.com/stimulusjs/stimulus/releases)
- [Changelog](https://github.com/hotwired/stimulus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusjs/stimulus/compare/v2.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: stimulus
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:05:58 +00:00
dependabot[bot]
a384af6d0e Bump bugsnag from 6.23.0 to 6.24.0 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.23.0 to 6.24.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.23.0...v6.24.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:04:48 +00:00
dependabot[bot]
820b7df63c Bump ddtrace from 0.52.0 to 0.53.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.52.0 to 0.53.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.52.0...v0.53.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:04:07 +00:00
dependabot[bot]
55ac7ffe5b Bump rubocop-rails from 2.12.2 to 2.12.3 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.12.2 to 2.12.3.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.2...v2.12.3)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:03:21 +00:00
Andy Brett
fc7a25e287 Merge pull request #8290 from openfoodfoundation/dependabot/bundler/ffaker-2.20.0 
Bump ffaker from 2.19.0 to 2.20.0
 2021-10-06 10:55:23 -07:00
Andy Brett
5db1228aa6 Merge pull request #8278 from filipefurtad0/checkout_spec_into_system 
Updates checkout_spec into system
 2021-10-06 08:12:56 -07:00
Andy Brett
5da1c2f7bd Merge pull request #8288 from mkllnk/pending-changes 
Translate "Save Changes"
 2021-10-06 08:06:48 -07:00
Matt-Yorkley
805e12cffe Merge pull request #8291 from openfoodfoundation/dependabot/bundler/json-2.5.1 
Bump json from 1.8.6 to 2.5.1
 2021-10-06 11:48:44 +02:00
Nihal M. Kelanthodika
82d9b041c9 Remove unnecessary spaces and newlines 2021-10-06 15:06:57 +05:30
Nihal M. Kelanthodika
f7124ee327 Add business address form feature spec 2021-10-06 15:06:57 +05:30
Nihal M. Kelanthodika
c632442466 Update unused company field to 'unused' 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
b0dcf47481 Add translation for "Reset Form" button 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
06344ed7c4 Remove comments 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
aa58318723 Create a Reset form button that destroy the form itself 
- Thanks to the input hidden field. Its value is false, but when clicking on Reset form, this value changes to 'true' (and then the form is cleared)
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
9b6cc187b6 Remove clear form checkbox (used via _destroy) 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
802c5c8c94 Create a secondary form button 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
786b198f4d Create an updateinput controller 
- that update the targets input value to the value stored in data attribute
 - Add tests
 2021-10-06 15:06:56 +05:30
Jean-Baptiste Bellet
49e93a6125 Add StimulusJS controllers via webpacker for the admin 2021-10-06 15:06:56 +05:30
Nihal
f6e66de52b Update phone validation to simple validation 2021-10-06 15:06:56 +05:30
Nihal
7eb0c6c33c Add module to set unused ship, bill address fields 2021-10-06 15:06:56 +05:30
Nihal
f72f182363 Redo business_address_empty? method 2021-10-06 15:06:56 +05:30
Nihal
912b869407 Re-order country/state selector 2021-10-06 15:06:56 +05:30
Nihal
5f1a326a05 Add before_validation callback to set unused addressed fields in customer, order, user, subscription, enterprise_group 2021-10-06 15:06:56 +05:30
Nihal
372326debc Updated validation to include phone and edit address_spec to requires phone 2021-10-06 15:06:56 +05:30
Nihal
c120965a8d Fix translations 2021-10-06 15:06:56 +05:30