raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,691 Commits 17 Branches 453 Tags
05dcf75ff9690f86259511649fb9833e188ea2f2
Commit Graph

21691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
05dcf75ff9 Merge pull request #7990 from Matt-Yorkley/void-transactions 
Cancel payments on stock shortages
 2021-08-05 00:38:33 +02:00
Matt-Yorkley
a92847d80d Merge pull request #7947 from andrewpbrett/zeitwerk 
Use zeitwerk for autoloading
 2021-08-05 00:36:32 +02:00
Matt-Yorkley
c18409a6f7 Merge pull request #8003 from openfoodfoundation/dependabot/bundler/bootsnap-1.7.7 
Bump bootsnap from 1.7.6 to 1.7.7
 2021-08-03 22:07:17 +02:00
Matt-Yorkley
d625e0b643 Merge pull request #8006 from openfoodfoundation/transifex 
Transifex
 2021-08-03 22:06:10 +02:00
Transifex-Openfoodnetwork
8d16c4c97f Updating translations for config/locales/en_FR.yml 2021-08-04 05:43:13 +10:00
Transifex-Openfoodnetwork
2a1b547b74 Updating translations for config/locales/fr.yml 2021-08-04 05:42:46 +10:00
Transifex-Openfoodnetwork
80a6527a5a Updating translations for config/locales/fr.yml 2021-08-04 05:39:37 +10:00
Matt-Yorkley
b15ae89944 Merge pull request #7840 from jibees/new-checkout-first-step 
New checkout first + second step
 2021-08-03 12:00:26 +02:00
Matt-Yorkley
623c0eada5 Reinstate removed naming on checkout routes and tidy up 2021-08-03 11:24:22 +02:00
Matt-Yorkley
937ba3ca0a Ensure previously selected shipping method is selected in form 2021-08-03 11:24:17 +02:00
Matt-Yorkley
6f2035febe Update (provisional) checkout actions boilerplate 2021-08-03 11:24:13 +02:00
Matt-Yorkley
2207aae679 Add strong params for checkout 
We'll need to add more as we go
 2021-08-03 11:24:08 +02:00
Matt-Yorkley
a32ca23ca5 Simplify routes and partials 2021-08-03 11:24:03 +02:00
Matt-Yorkley
aba3cf99a3 Fix address2 field 2021-08-03 11:23:58 +02:00
Matt-Yorkley
d10899d9ea Simplify use of nested field helpers 2021-08-03 11:23:53 +02:00
Matt-Yorkley
cea2433c3e Fix indentation 2021-08-03 11:23:30 +02:00
Matt-Yorkley
6b430f9440 Drop AMS injection for shipping methods 
We don't need this now
 2021-08-03 11:23:10 +02:00
dependabot[bot]
984a549dc3 Bump bootsnap from 1.7.6 to 1.7.7 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.6 to 1.7.7.
- [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.6...v1.7.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-03 09:03:27 +00:00
Matt-Yorkley
3acd9ed35c Merge pull request #8000 from openfoodfoundation/dependabot/bundler/i18n-js-3.9.0 
Bump i18n-js from 3.8.4 to 3.9.0
 2021-08-02 09:37:53 +02:00
Matt-Yorkley
af7355a780 Merge pull request #7988 from jibees/7919-add-enterprise-fees-validation 
Enterprise fee must be linked with an enterprise: add validations
 2021-07-30 19:16:04 +02:00
Matt-Yorkley
27be399727 Merge pull request #7995 from jibees/5168-filter-by-shipping-method-in-OCM-report 
Reports/Order Cycle Management: filter by shipping method
 2021-07-30 18:29:58 +02:00
Matt-Yorkley
7e3b9be506 Allow StripeSCA Gateway to actually void payments 2021-07-30 11:48:57 +01:00
dependabot[bot]
d1facd3656 Bump i18n-js from 3.8.4 to 3.9.0 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.8.4 to 3.9.0.
- [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.4...v3.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-30 09:02:32 +00:00
jibees
e6d600cf57 Merge pull request #7998 from openfoodfoundation/dependabot/bundler/view_component-2.36.0 
Bump view_component from 2.35.0 to 2.36.0
 2021-07-30 09:18:31 +02:00
Matt-Yorkley
60aec2eff0 Update all locales with the latest Transifex translations v3.8.8 2021-07-29 18:42:50 +01:00
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]
948bab47b8 Bump view_component from 2.35.0 to 2.36.0 
Bumps [view_component](https://github.com/github/view_component) from 2.35.0 to 2.36.0.
- [Release notes](https://github.com/github/view_component/releases)
- [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/github/view_component/compare/v2.35.0...v2.36.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-29 09:03:35 +00: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
09491cfc6d Only return order with the selected shipping rates is true 
Same concept as

https://github.com/openfoodfoundation/openfoodnetwork/blob/master/app/services/search_orders.rb#L31
 2021-07-28 17:05:50 +02: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
e1393c96ca Correctly void transactions when payments are cancelled due to stock issues 2021-07-27 23:24:00 +01:00
Jean-Baptiste Bellet
434f9600b7 Enterprise fee must be linked with an enterprise 
Add 2 validation / errorproof options:
 - Add rails validation on `enterprise_id`  on enterprise_fee model
 - Do not add a blank option on the select: ie. user can select a blank enterprise in the form

Update tests as well
 2021-07-27 15:39:40 +02: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