raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,164 Commits 21 Branches 450 Tags
32d8ce78eff642a17c60362104d2eb796d9554bf
Commit Graph

22164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nihal Mohammed
32d8ce78ef Re-add :country validation to spree_address model 2021-10-06 15:06:56 +05:30
Nihal Mohammed
f5743b3b36 Update invoice templates to use business address when form filled in 2021-10-06 15:06:56 +05:30
Nihal M. Kelanthodika
ed8edf0ab9 Update business_address form 
Removes `{ "ng-controller" => "countryCtrl" }` from column element as its now on the parent div.

Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2021-10-06 15:06:56 +05:30
Matt-Yorkley
8393414bf5 Adapt admin enterprise form handling for both address and business_address 2021-10-06 15:06:56 +05:30
Nihal Mohammed
83524f2285 Update en.yml to include translations for business_address form 2021-10-06 15:06:56 +05:30
Nihal Mohammed
7096667c6f Add business_address form to business details section 2021-10-06 15:06:56 +05:30
Nihal Mohammed
26c7cb2bd3 Fix business_address attribute permissions 2021-10-06 15:06:56 +05:30
Nihal Mohammed
9007418455 Set belongs_to association for business_address and accept nested attributes on enterprise model 2021-10-06 15:06:56 +05:30
Nihal Mohammed
e3307fd341 Migration to add business_address_id to enterpries 2021-10-06 15:06:50 +05:30
Nihal Mohammed
56c02a2e99 Add business_address to build_resource method in enterprise_controller 2021-10-06 15:06:20 +05:30
Nihal Mohammed
783b055d55 Add business address permitted attributes 2021-10-06 15:06:20 +05:30
Matt-Yorkley
b53047e0e3 Merge pull request #8287 from mkllnk/fix-variant-filter 
Catch JS error on OC page
 2021-10-06 10:35:02 +02:00
Maikel Linke
129c4c92fa Catch JS error on OC page 
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.

Fixing this then revealed a missing require statement in a controller.
 2021-10-06 15:29:41 +11:00
Andy Brett
7a49b304d1 Merge pull request #8279 from Matt-Yorkley/orphaned-adjustments 
Orphaned adjustments handing
 2021-10-05 17:19:58 -07:00
Andy Brett
c8419940bf Merge pull request #8264 from filipefurtad0/orders_spec_update_2 
Orders spec update
 2021-10-05 15:50:03 -07:00
Andy Brett
4169faccf9 Merge pull request #8283 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.4 
Bump mrujs from 0.5.3 to 0.5.4
 2021-10-05 15:35:34 -07:00
Maikel
ddd0034fff Merge pull request #8267 from filipefurtad0/fix_negative_assertion 
Switches assertion order
 2021-10-06 09:33:30 +11:00
filipefurtad0
18ff3f52b7 Moves spec from feature into system folder 2021-10-06 09:15:02 +11:00
filipefurtad0
076907d56b Changes spec config from feature into system 2021-10-06 09:15:02 +11:00
filipefurtad0
5c881431d3 Switches assertions order 2021-10-06 09:15:02 +11:00
Andy Brett
f3ef3bb052 Merge pull request #8270 from achauve/8161-fix-sorting-admin-orders-by-total 
Fix sorting admin orders by total
 2021-10-05 14:44:59 -07:00
Andy Brett
9b9db3202e Merge pull request #8277 from sinansonmez/8223-remove-ask-checkbox 
Ask checkboxes are removed from two pages
 2021-10-05 14:44:27 -07:00
Andy Brett
ce63d02a3d Merge pull request #8262 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.4 
Bump jest from 27.2.3 to 27.2.4
 2021-10-05 14:42:14 -07:00
Matt-Yorkley
19daf1d2fb Update adjustment unit tests 2021-10-05 22:40:37 +01:00
dependabot[bot]
765b6831a9 Bump mrujs from 0.5.3 to 0.5.4 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.5.3...v0.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-05 21:39:40 +00:00
Andy Brett
c2c9684e66 Merge pull request #8240 from mkllnk/fix-serializer-spec 
Load referenced lib class for independent spec run
 2021-10-05 14:34:40 -07:00
Andy Brett
a06326d15f Merge pull request #8239 from mkllnk/fix-reports-spec 
Fix order dependent reports spec
 2021-10-05 14:34:05 -07:00
Andy Brett
ec0bb63b42 Merge pull request #8179 from filipefurtad0/feature_into_system 
Feature into system specs
 2021-10-05 14:27:29 -07:00
Andy Brett
6aa24e4db3 Merge pull request #8248 from Matt-Yorkley/npm-pins 
Pin webpack packages to respective major versions
 2021-10-05 14:25:40 -07:00
Matt-Yorkley
9bd89ec1ce Merge pull request #8261 from Matt-Yorkley/bump-aws-sdk 
Bump aws-sdk to 2.2.0
 2021-10-05 19:43:49 +02:00
Matt-Yorkley
05ba7df54f Merge pull request #8263 from Matt-Yorkley/inventory-only-setting 
Fix display of "inventory only" radio buttons
 2021-10-05 19:21:55 +02:00
Matt-Yorkley
17c31a22bc Merge pull request #8260 from Matt-Yorkley/paperclip-uri-deprecation 
Fix deprecation in Paperclip
 2021-10-05 19:20:26 +02:00
Nihal M. Kelanthodika
4052aba00e Merge pull request #8245 from apricot12/Migrate-Migs-Payment-Method 2021-10-05 18:07:46 +05:30
dependabot[bot]
7c0b0bebf7 Bump jest from 27.2.3 to 27.2.4 
Bumps [jest](https://github.com/facebook/jest) from 27.2.3 to 27.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.3...v27.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 20:09:36 +00:00
Andy Brett
5499d777aa Merge pull request #8276 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.9 
Bump @storybook/addon-docs from 6.3.8 to 6.3.9
 2021-10-04 13:03:45 -07:00
dependabot[bot]
af133930c8 Bump @storybook/addon-docs from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.8 to 6.3.9.
- [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.9/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-04 19:22:41 +00:00
Andy Brett
407c4de406 Merge pull request #8272 from openfoodfoundation/dependabot/bundler/jwt-2.3.0 
Bump jwt from 2.2.3 to 2.3.0
 2021-10-04 11:37:43 -07:00
Andy Brett
ebb52510b5 Merge pull request #8275 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.9 
Bump @storybook/addon-controls from 6.3.8 to 6.3.9
 2021-10-04 11:22:05 -07:00
Andy Brett
291e2ca968 Merge pull request #8274 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.9 
Bump @storybook/server from 6.3.8 to 6.3.9
 2021-10-04 11:21:35 -07:00
Andy Brett
3b930fe6f7 Merge pull request #8273 from openfoodfoundation/dependabot/bundler/rubocop-1.22.1 
Bump rubocop from 1.22.0 to 1.22.1
 2021-10-04 11:21:01 -07:00
Matt-Yorkley
65f08ee8f4 Deal with edge cases where an adjustment is left referencing a deleted item 2021-10-04 17:55:27 +01:00
Sinan Chaush
7dc8500aa9 ask checkbox is removed from two pages 2021-10-04 17:08:32 +02:00
dependabot[bot]
3b55486172 Bump @storybook/addon-controls from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.8 to 6.3.9.
- [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.9/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-04 09:07:53 +00:00
dependabot[bot]
d88bceebef Bump @storybook/server from 6.3.8 to 6.3.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.8 to 6.3.9.
- [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.9/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-04 09:07:17 +00:00
dependabot[bot]
12f367f47f Bump rubocop from 1.22.0 to 1.22.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.22.0...v1.22.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:48 +00:00
dependabot[bot]
fc1efe4d05 Bump jwt from 2.2.3 to 2.3.0 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.2.3...v2.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:11 +00:00
Adrien Chauve
45eefb627d Fix sorting orders by total in admin/ via api/v0/orders 2021-10-01 18:32:59 +02:00
Adrien Chauve
f256bb7d28 Add new failing test on sorting orders by total (api/v0/orders) 2021-10-01 18:32:59 +02:00
Matt-Yorkley
43f28d94b9 Update all locales with the latest Transifex translations 2021-09-30 18:22:16 +01:00
Matt-Yorkley
61fa251f6a Merge pull request #8252 from openfoodfoundation/transifex 
Transifex
 2021-09-30 19:00:49 +02:00