raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,645 Commits 18 Branches 453 Tags
dd59ae7f69ace7cab9ca57b9d8a334a35cf5f06d
Commit Graph

21645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
dd59ae7f69 Merge pull request #7997 from openfoodfoundation/dependabot/bundler/redis-4.4.0 
Bump redis from 4.3.1 to 4.4.0
 2021-07-29 19:34:25 +02:00
Matt-Yorkley
f18d075220 Merge pull request #7994 from jibees/5472-add-OC-coordinator-to-list-of-enterprises-fees 
Add order cycle coordinator to the list of enterprises with fees for order cycle incoming products form
 2021-07-29 19:29:00 +02:00
Matt-Yorkley
b22bcd46ff Merge pull request #7993 from openfoodfoundation/dependabot/bundler/haml-5.2.2 
Bump haml from 5.2.1 to 5.2.2
 2021-07-29 13:28:27 +02:00
dependabot[bot]
9b11671d34 Bump redis from 4.3.1 to 4.4.0 
Bumps [redis](https://github.com/redis/redis-rb) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.3.1...v4.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-29 09:03:11 +00:00
Jean-Baptiste Bellet
2116779527 Add order cycle coordinator to the list of enterprises with fees 
- Thus, coordinator can choose to add its own fee for a specific supplier
 2021-07-28 11:40:57 +02:00
dependabot[bot]
5024d3b707 Bump haml from 5.2.1 to 5.2.2 
Bumps [haml](https://github.com/haml/haml) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/5.2.1...v5.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-28 09:02:50 +00:00
Matt-Yorkley
b113162582 Merge pull request #7984 from openfoodfoundation/dependabot/bundler/bootsnap-1.7.6 
Bump bootsnap from 1.7.5 to 1.7.6
 2021-07-28 10:37:20 +02:00
Matt-Yorkley
edb0960a51 Merge pull request #7950 from openfoodfoundation/dependabot/bundler/activerecord-import-1.2.0 
Bump activerecord-import from 1.1.0 to 1.2.0
 2021-07-28 10:35:08 +02:00
Maikel
5e1f1ca81c Merge pull request #7985 from openfoodfoundation/dependabot/bundler/i18n-js-3.8.4 
Bump i18n-js from 3.8.3 to 3.8.4
 2021-07-28 10:17:31 +10:00
Maikel
eeaac6fdb0 Merge pull request #7991 from openfoodfoundation/transifex 
Transifex
 2021-07-28 10:02:43 +10:00
Transifex-Openfoodnetwork
832f08d13a Updating translations for config/locales/de_DE.yml 2021-07-28 09:12:46 +10:00
Matt-Yorkley
440eb2a996 Merge pull request #7987 from openfoodfoundation/transifex 
Transifex
 2021-07-27 14:53:23 +02:00
Transifex-Openfoodnetwork
db0063314b Updating translations for config/locales/en_FR.yml 2021-07-27 22:33:38 +10:00
Transifex-Openfoodnetwork
4e6bc33b05 Updating translations for config/locales/fr.yml 2021-07-27 22:33:04 +10:00
Matt-Yorkley
28fe72c1ec Merge pull request #7976 from openfoodfoundation/transifex 
Transifex
 2021-07-27 14:26:22 +02:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin 
[Adjustments] Admin adjustments
 2021-07-27 12:23:29 +02:00
Matt-Yorkley
9d4b34b35b Merge pull request #7977 from Matt-Yorkley/tidy-up 
Spree tidy-up
 2021-07-27 11:52:22 +02:00
Matt-Yorkley
9311070f26 Merge pull request #7979 from Matt-Yorkley/cuprite-update 
Test suite update
 2021-07-27 11:51:17 +02:00
dependabot[bot]
94e0748234 Bump i18n-js from 3.8.3 to 3.8.4 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.8.3 to 3.8.4.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.8.3...v3.8.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:03:51 +00:00
dependabot[bot]
23e336c7ac Bump bootsnap from 1.7.5 to 1.7.6 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.5...v1.7.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-27 09:03:26 +00:00
Matt-Yorkley
a26a78c9fe Merge pull request #7286 from luisramos0/am 
Replace setup_intents class from active merchant v1.98 with a decorator that will change the current v1.119
 2021-07-26 21:29:01 +02:00
Matt-Yorkley
c00ca35f09 Merge pull request #7972 from jibees/#7928-transform-locale-for-flatpickr 
Flatpickr only use language and not locale
 2021-07-26 18:31:14 +02:00
Matt-Yorkley
4dccd55490 Merge pull request #7981 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.6 
Bump @storybook/addon-docs from 6.3.5 to 6.3.6
 2021-07-26 14:40:30 +02:00
dependabot[bot]
5c350acb1c Bump @storybook/addon-docs from 6.3.5 to 6.3.6 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.5 to 6.3.6.
- [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.6/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-07-26 11:57:32 +00:00
Matt-Yorkley
110a5ed398 Merge pull request #7982 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.6 
Bump @storybook/server from 6.3.5 to 6.3.6
 2021-07-26 13:53:24 +02:00
Matt-Yorkley
0d4534eff4 Merge pull request #7980 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.6 
Bump @storybook/addon-controls from 6.3.5 to 6.3.6
 2021-07-26 13:53:10 +02:00
dependabot[bot]
b01888f092 Bump @storybook/server from 6.3.5 to 6.3.6 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.5 to 6.3.6.
- [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.6/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-07-26 09:11:05 +00:00
dependabot[bot]
8744441c8a Bump @storybook/addon-controls from 6.3.5 to 6.3.6 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.5 to 6.3.6.
- [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.6/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-07-26 09:08:26 +00:00
Matt-Yorkley
6daa37a5c0 Ensure TaxRateFinder returns an array if the given adjustment has no tax 2021-07-25 22:47:40 +01:00
Matt-Yorkley
cb114283ea Update spec/migrations/migrate_admin_tax_amounts_spec.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-07-25 22:47:40 +01:00
Matt-Yorkley
cab36f375b Update app/services/order_tax_adjustments_fetcher.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-07-25 22:47:40 +01:00
Matt-Yorkley
091bfc710f Add test for applying multiple tax rates per tax zone 2021-07-25 22:47:40 +01:00
Matt-Yorkley
69e4670a17 Tidy up building default address objects 2021-07-25 22:47:40 +01:00
Matt-Yorkley
41757254d6 Recalculate taxes when an order's customer details are changed 2021-07-25 22:47:40 +01:00
Matt-Yorkley
d55079f474 Extract comment-method 2021-07-25 22:47:40 +01:00
Matt-Yorkley
ca6979e394 Extract call to Spree::TaxRate.match to a separate method and update tests 2021-07-25 22:47:40 +01:00
Matt-Yorkley
8f62ccb9b7 Match tax rates using rates applicable to the order 2021-07-25 22:47:40 +01:00
Matt-Yorkley
5da545c751 Improve adjustment listing in UI 2021-07-25 22:47:40 +01:00
Luis Ramos
d1f1f62f9a Add needed constant to class eval 2021-07-25 16:08:30 +01:00
Luis Ramos
02b4693068 Fix class name 2021-07-25 16:08:30 +01:00
Luis Ramos
901c1589ee Remove decorator, it's not needed now in v1.119 of active merchant 2021-07-25 16:08:30 +01:00
Luis Ramos
4057445562 Replace setup_intents class from active merchat v1.i98 with a decorator that will adapt the version in v1.119 2021-07-25 16:06:49 +01:00
Matt-Yorkley
21f26669b4 Split spec configurations into smaller parts 
base_spec_helper now defines configs that are universal, whereas spec_helper is for configs that are using DatabaseCleaner and Selenium. This means we can include the base_spec_helper in both the system test setup and the regular setup but separate the other configurations for each type.
 2021-07-25 12:32:36 +01:00
Matt-Yorkley
afce55dab5 Add Devise System spec helpers 
This is recommended when using Devise.
 2021-07-25 11:25:44 +01:00
Matt-Yorkley
38aac70705 Remove class_eval on Spree::Gateway 2021-07-24 21:28:13 +01:00
Matt-Yorkley
0764484f41 Remove class_eval in PaymentMethodDistributors 2021-07-24 21:28:13 +01:00
Matt-Yorkley
87c7fceae9 Remove dead code for Ruby 1.8... 2021-07-24 21:28:13 +01:00
Matt-Yorkley
cc1410fbb5 Remove now unused decorator loading 2021-07-24 21:28:13 +01:00
Matt-Yorkley
58f95bd34c Remove ActionController::Metal class_eval hack 2021-07-24 21:28:13 +01:00
Matt-Yorkley
7493697955 Tidy up CalculatedAdjustments in Spree::PaymentMethod 2021-07-24 21:28:13 +01:00