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
23,651 Commits 16 Branches 456 Tags
adcdca812d37e9f4b341fe79d210d90f4e0fa7fd
Commit Graph

23651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
dc7dfcacba Wait for product import to finish in spec 
The expectation returned to early.
 2021-12-06 18:01:17 +11:00
Matt-Yorkley
87fe341b5b Remove dead code: Order#backordered? 2021-12-05 15:17:27 +00:00
Matt-Yorkley
dcad00d047 Merge pull request #8484 from Matt-Yorkley/stripe-session-checks 
Stripe checkout alerting
 2021-12-05 12:04:00 +00:00
filipefurtad0
1393b52d98 Corrects several Rubocop offenses 2021-12-05 11:04:01 +00:00
Transifex-Openfoodnetwork
59380ef547 Updating translations for config/locales/it.yml 2021-12-04 04:00:36 +11:00
Liam McMenemie
b18e38a7ef Fix out-of-date links in CONTRIBUTING.md 2021-12-03 16:54:54 +00:00
filipefurtad0
b246cbad06 Deletes trailing space 2021-12-03 11:07:01 +00:00
filipefurtad0
8d20174a0f Deletes doubled unused pick_date method 2021-12-03 11:06:04 +00:00
filipefurtad0
e0006a6dc4 Removes build line related to feature specs 2021-12-03 10:54:28 +00:00
filipefurtad0
7487e7256a Implements pick_date and pick_datetime helpers 2021-12-03 10:54:28 +00:00
filipefurtad0
05de253ad7 Adds pick_date and pick_datetime helpers 2021-12-03 10:54:28 +00:00
filipefurtad0
61aa357a39 Makes timedate selection independent of current date 2021-12-03 10:54:28 +00:00
filipefurtad0
2096b3474e Fixes date selection on xero-flapickr 2021-12-03 10:54:28 +00:00
filipefurtad0
87365a939a Fixes case on xero_invoice_header class 2021-12-03 10:54:28 +00:00
filipefurtad0
d2dddb674e Fixes date selection on flapickr 2021-12-03 10:54:28 +00:00
filipefurtad0
5245d5574f Fixes string case in assertions 2021-12-03 10:54:28 +00:00
filipefurtad0
a7a1673e2e Moves/updates reports_spec.rb into system 2021-12-03 10:54:28 +00:00
jibees
9590b15f50 Merge pull request #8550 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.3 
Bump jest from 27.3.1 to 27.4.3
 2021-12-03 09:32:13 +01:00
Matt-Yorkley
6e905bd2fc Merge pull request #8561 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.2 
Bump mrujs from 0.7.1 to 0.7.2
 2021-12-03 01:11:59 +00:00
Filipe
89864395ca Merge pull request #8520 from seballot/multiple-flash-messages 
Fix rendering problem with multiple flash messages in the admin section
 2021-12-03 01:05:36 +00:00
Filipe
b2e5a89395 Merge pull request #8487 from jibees/7278-multipe-stripe-form-in-admin-section 
Allow mutiple stripe form in the admin section
 2021-12-03 00:21:03 +00:00
dependabot[bot]
6aa0a9864d Bump mrujs from 0.7.1 to 0.7.2 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.1 to 0.7.2.
- [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.7.1...v0.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 21:22:09 +00:00
Matt-Yorkley
d2f542032e Update all locales with the latest Transifex translations 2021-12-02 21:20:26 +00:00
Matt-Yorkley
639ff6730f Merge pull request #8558 from openfoodfoundation/transifex 
Transifex
 2021-12-02 21:15:16 +00:00
Matt-Yorkley
e533973ecd Merge pull request #8513 from jibees/run-rubocop-with-reviewdog 
Run rubocop with reviewdog
 2021-12-02 21:14:04 +00:00
Matt-Yorkley
5f4c24f44d Merge pull request #8522 from seballot/vscode 
gitignore vscode editor folder
 2021-12-02 21:13:45 +00:00
Matt-Yorkley
684143cd46 Merge pull request #8515 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.1.0 
Bump @hotwired/turbo from 7.0.1 to 7.1.0
 2021-12-02 21:13:31 +00:00
Transifex-Openfoodnetwork
2a9a92dd6c Updating translations for config/locales/en_IE.yml 2021-12-03 04:30:38 +11:00
Matt-Yorkley
4cdb892c75 Refactor formatting of credit card brand names and reformat automatically when saving 
This little bit of "translation" between what we might receive as input and what ActiveMerchant requires is important, but currently the responsibility for this job is spread all over the code base. It can now just live in the CreditCard model (in one place) and doesn't need to be duplicated anywhere else (like several different places in frontend Javascript!)
 2021-12-02 16:22:52 +00:00
Filipe
f56dc2e284 Merge pull request #8517 from openfoodfoundation/chore-remove-deprecated-application.yml 
Remove references to deprecated application.yml config file.
 2021-12-02 10:54:08 +00:00
Sinan Chaush
68908fdff5 Navigation is included only for super admin users 2021-12-02 11:53:46 +01:00
Filipe
ff485314a4 Merge pull request #8526 from jibees/3584-fix-adjustment-on-voiding-payment 
Revoke transaction fee if payment is cancelled
 2021-12-02 10:44:08 +00:00
dependabot[bot]
b28942b2eb Bump jest from 27.3.1 to 27.4.3 
Bumps [jest](https://github.com/facebook/jest) from 27.3.1 to 27.4.3.
- [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.3.1...v27.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 04:52:17 +00:00
Maikel
d0625e99c7 Merge pull request #8545 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.3 
Bump @storybook/addon-docs from 6.4.1 to 6.4.3
 2021-12-02 15:47:40 +11:00
Adrien Chauve
8585c68691 Remove occurences of application.yml.example 2021-12-01 18:39:26 +01:00
Adrien Chauve
2095024f48 Don't git-ignore application.yml any more 2021-12-01 18:37:26 +01:00
Adrien Chauve
abf1b54364 Fix environment variables loading when running whenever 2021-12-01 18:34:39 +01:00
dependabot[bot]
26c711f095 Bump @storybook/addon-docs from 6.4.1 to 6.4.3 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.1 to 6.4.3.
- [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.4.3/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-12-01 09:09:59 +00:00
Maikel
97751763a7 Merge pull request #8536 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.1 
Bump @storybook/addon-docs from 6.3.12 to 6.4.1
 2021-12-01 15:06:27 +11:00
dependabot[bot]
a58fd7a388 Bump @storybook/addon-docs from 6.3.12 to 6.4.1 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.12 to 6.4.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.1/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.1/addons/docs)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-01 03:36:53 +00:00
Maikel
74b81febe0 Merge pull request #8535 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.1 
Bump @storybook/addon-controls from 6.3.12 to 6.4.1
 2021-12-01 14:33:03 +11:00
Jean-Baptiste Bellet
57dc10888c Improve shipped email design 
- Use default class for header, content
 - Use monospace font for the list of the items
 - Add line breaks for the list of the items
 2021-11-30 17:02:42 +01:00
Jean-Baptiste Bellet
9bc7343420 Create a mailer preview for the shipped email 
Available on http://localhost:3000/rails/mailers/spree/shipment/shipped
 2021-11-30 16:55:07 +01:00
dependabot[bot]
108aed21bc Bump @storybook/addon-controls from 6.3.12 to 6.4.1 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.12 to 6.4.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.1/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.1/addons/controls)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-30 09:06:18 +00:00
Jean-Baptiste Bellet
58ea420626 Voiding a payment should revoke any payment fees 
... and create a new one if a new payment is then linked to the order.
 2021-11-30 09:42:10 +01:00
Matt-Yorkley
64fd8da742 Merge pull request #8531 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.1 
Bump mrujs from 0.6.0 to 0.7.1
 2021-11-29 15:53:56 +00:00
Jean-Baptiste Bellet
59eb91c7c8 Remove id "card-element" as well 2021-11-29 10:18:06 +01:00
dependabot[bot]
87da55abb7 Bump mrujs from 0.6.0 to 0.7.1 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.6.0 to 0.7.1.
- [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.6.0...v0.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-29 09:08:30 +00:00
Jean-Baptiste Bellet
57a94d64f2 Revoke adjustment if payment is cancelled 2021-11-26 16:31:25 +01:00
Sebastian Castro
c9952eb372 gitignore vscode editor folder 2021-11-26 11:40:50 +01:00