raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,163 Commits 18 Branches 452 Tags
a463a39abc16ffa4c0e9beef4e9abed670e75976
Commit Graph

26163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
a463a39abc Update all locales with the latest Transifex translations v4.2.33 2023-02-02 16:11:57 +01:00
Filipe
99a0056d7f Merge pull request #10257 from rioug/9720-fix-imperial-weight-display-when-using-float-value 
Fix decimal display for imperial weight on Cart, Order Confirmation page and Confirmation emails
 2023-02-02 15:03:39 +00:00
Rachel Arnould
0973e79a91 Merge pull request #10274 from jibees/8905-convert-popup-to-flash-messages- 
On `/cart` page, if consumer adds more quantity than available, use in-app flash message instead of native alert
 2023-02-02 15:50:17 +01:00
Filipe
d0897ec677 Merge pull request #10248 from jibees/10117-reports-in-order-cycle-customer-totals-incorrect-sorting-when-lastname-first-letter-isnt-capitalized 
Reports, Orders and fulfillment: Sort by customer lastname + firstname case insensitive
 2023-02-02 14:39:10 +00:00
Jean-Baptiste Bellet
915174b513 Do not stack same flash messages 
Very ugly in UI.
 2023-02-02 15:28:35 +01:00
Jean-Baptiste Bellet
f5aae5f8b9 Remplace ouf of stock alert by Flash message 2023-02-02 15:28:35 +01:00
Filipe
1e3f754f96 Merge pull request #10318 from dacook/10272-remove-currency-from-calculators 
Remove unused currency from calculators
 2023-02-01 13:49:51 +00:00
Filipe
095e520777 Merge pull request #10339 from mkllnk/ssl 
Remove unnecessary SSL code
 2023-02-01 13:06:26 +00:00
jibees
452b38fa36 Merge pull request #10355 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-5.0.1 
Bump sidekiq-scheduler from 5.0.0 to 5.0.1
 2023-02-01 10:58:15 +01:00
jibees
496bc9120a Merge pull request #10354 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.5 
Bump @hotwired/turbo from 7.2.4 to 7.2.5
 2023-02-01 10:51:37 +01:00
dependabot[bot]
762e27b015 Bump sidekiq-scheduler from 5.0.0 to 5.0.1 
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v5.0.0...v5.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:03:29 +00:00
dependabot[bot]
29915cdbbd Bump @hotwired/turbo from 7.2.4 to 7.2.5 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.2.4 to 7.2.5.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.2.4...v7.2.5)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:01:50 +00:00
David Cook
d5ae5c9af4 Revert "Bump rspec-rails from 5.1.2 to 6.0.1" 
This reverts commit 1313b55531.

Because it also updates activemerchant. Dunno why, but it shouldn't have been merged (oops).
 2023-02-01 12:16:32 +11:00
David Cook
01c6a8b9ec Merge pull request #9850 from openfoodfoundation/dependabot/bundler/rspec-rails-6.0.1 
Bump rspec-rails from 5.1.2 to 6.0.1
 2023-02-01 11:43:57 +11:00
Maikel
dda85666e6 Merge pull request #10347 from openfoodfoundation/dependabot/bundler/ddtrace-1.9.0 
Bump ddtrace from 1.8.0 to 1.9.0
 2023-02-01 11:23:53 +11:00
dependabot[bot]
bf9cfd4990 Bump ddtrace from 1.8.0 to 1.9.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 1.8.0 to 1.9.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/v1.8.0...v1.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-31 09:03:18 +00:00
Maikel Linke
d3b80b7fc9 Clarify expecting a hash, not keyword arguments 
The syntax was ambiguous and nwer version of rspec-rails catch that.
 2023-01-31 15:40:33 +11:00
David Cook
d9aa125903 Merge pull request #10305 from heroinedor/feature/docker-dev 
Docker dev environment improvement
 2023-01-31 10:52:37 +11:00
Filipe
678c60c9b6 Merge pull request #10175 from abdellani/tax_totals_with_rates_by_producer_report 
Tax Totals with Rates by Producer Report
 2023-01-30 13:56:48 +00:00
jibees
83335cfab4 Merge pull request #10342 from openfoodfoundation/dependabot/bundler/redcarpet-3.6.0 
Bump redcarpet from 3.5.1 to 3.6.0
 2023-01-30 10:20:33 +01:00
jibees
a762aa6ff9 Merge pull request #10341 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.1.1 
Bump @floating-ui/dom from 1.1.0 to 1.1.1
 2023-01-30 10:14:38 +01:00
dependabot[bot]
6b1d6e33c0 Bump redcarpet from 3.5.1 to 3.6.0 
Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vmg/redcarpet/compare/v3.5.1...v3.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-30 09:06:42 +00:00
dependabot[bot]
24d29c6949 Bump @floating-ui/dom from 1.1.0 to 1.1.1 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.1.1/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-30 09:01:33 +00:00
Maikel Linke
8c458c2d48 Remove outdated SSL setting from database 2023-01-30 14:32:31 +11:00
Maikel Linke
0fc108a8e6 Remove useless option to allow SSL 
It's an outdated Spree setting. We always enforce SSL in production and
staging while development and test environments are running without SSL.
This setting didn't have any effect.
 2023-01-30 14:19:37 +11:00
Maikel Linke
f888a0eb21 Remove unnecessary rack-ssl gem 
Rails comes with ActionDispatch::SSL which is enabled in staging and
production. We don't need this ancient gem last updated in 2014.
 2023-01-30 14:08:55 +11:00
jibees
a97fb0f46b Merge pull request #10336 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.119.0 
Bump aws-sdk-s3 from 1.118.0 to 1.119.0
 2023-01-27 10:29:38 +01:00
dependabot[bot]
73c81e626c Bump aws-sdk-s3 from 1.118.0 to 1.119.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.118.0 to 1.119.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-27 09:08:25 +00:00
Maikel Linke
b35f9551eb Update translations v4.2.32 2023-01-27 17:12:37 +11:00
Maikel
4193cdb9f1 Merge pull request #10320 from dacook/remove-ie-warning 
Remove unnecessary IE warning
 2023-01-27 17:02:53 +11:00
David Cook
57678b7566 Remove IE warning 
It brings me great pleasure to remove this. I've been waiting my whole career: IE is finally gone!!
 2023-01-27 12:45:46 +11:00
Maikel
ee5f255fc9 Merge pull request #10326 from openfoodfoundation/dependabot/bundler/bootsnap-1.16.0 
Bump bootsnap from 1.15.0 to 1.16.0
 2023-01-27 12:10:52 +11:00
Maikel
408c2f7a04 Merge pull request #10325 from openfoodfoundation/dependabot/bundler/rubocop-1.44.1 
Bump rubocop from 1.44.0 to 1.44.1
 2023-01-27 11:59:21 +11:00
Filipe
1cfc13e66f Merge pull request #10208 from jibees/9424-calculator-provide-a-calculator-none 
Admin: Include a "None" option for calculator type user in shipping method and payment method forms
 2023-01-26 14:48:41 +00:00
dependabot[bot]
110c594353 Bump rubocop from 1.44.0 to 1.44.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.44.0 to 1.44.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.44.0...v1.44.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-26 14:31:42 +00:00
dependabot[bot]
1748274e72 Bump bootsnap from 1.15.0 to 1.16.0 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.15.0...v1.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-26 14:31:00 +00:00
Filipe
e6863f83fc Merge pull request #10328 from jibees/10327-flaky-specsystemconsumersplit_checkout_specrb486 
SplitCheckout, Specs: fix errors count when submitting form with errors
 2023-01-26 14:27:03 +00:00
jibees
e48ba1b5fa Specify assertions by grouping them into page section 
Co-Authored-By: Filipe <49817236+filipefurtad0@users.noreply.github.com>
 2023-01-26 15:06:00 +01:00
Jean-Baptiste Bellet
999440da0a Fix errors count when user submit the form 
Since https://github.com/openfoodfoundation/openfoodnetwork/pull/10317 we are displaying the error message also in the flash message. For unknown reason, build didn't fail for that PR, but, as the PR adds some error message, we need to change the spec to reflect that change.

This PR separates error in checkout page itself, and errors in flash message banner.
 2023-01-26 11:05:55 +01:00
Filipe
1ea7304549 Merge pull request #10276 from jibees/10250-split-checkout-responsiveness-is-broken-on-iphone 
Split Checkout, increase input to 16px for small devices and iOS devices
 2023-01-25 17:32:10 +00:00
Filipe
ad4670705e Merge pull request #10245 from jibees/10222-in-bom-dont-show-group-buy-info-if-equal-to-0 
Admin, BOM: Don't display "group by size" if group by product value is actually null
 2023-01-25 15:29:05 +00:00
Filipe
5e4afb765b Merge pull request #10307 from rioug/10271-add-mandatory-asterisk-in-business-detail 
Add required asterisk in business details panel
 2023-01-25 13:23:39 +00:00
Filipe
d2d9e318fc Merge pull request #10310 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-5.0.0 
Bump sidekiq-scheduler from 4.0.3 to 5.0.0
 2023-01-25 12:42:16 +00:00
Filipe
a2a1d8b7e2 Merge pull request #10264 from dacook/readonly-mail-settings 
Update mail settings notice
 2023-01-25 12:25:05 +00:00
Filipe
65d8337d3d Merge pull request #10319 from mkllnk/show-flash-until-closed-by-user 
Show new flash messages until discarded by user
 2023-01-25 12:19:45 +00:00
Filipe
7f3cf743f7 Merge pull request #10317 from mkllnk/9056-stuck-in-split-checkout 
Display checkout error messages to user for convencience
 2023-01-25 12:15:36 +00:00
Rachel Arnould
27e8d89325 Merge pull request #10313 from jibees/split-checkout-do-not-display-payment-method-instruction-if-empty 
SplitCheckout: On step3, do not display payment method description if not present
 2023-01-25 11:43:19 +01:00
Maikel Linke
882d7a1215 Simplify method according to style rules 2023-01-25 15:49:44 +11:00
Maikel Linke
cec9d2987e Name order attributes similar to other text 
Rails' auto-generated names used in error messages were a bit cryptic
for users.
 2023-01-25 15:49:44 +11:00
Maikel Linke
2bba38134e Show new flash messages until discarded by user 
We currently have two mechanisms to display flash messages. The old one
through AngularJS and the new one with StimulusReflex.

The AngularJS directive showed flashes for 10 seconds. The
StimulusReflex controller showed them only for 3 seconds. But any time
based disappearance of error messages is problematic. There's important
information in there and some error messages can be long. It's also
possible that a request takes a while, the user leaves the computer and
comes back later. If we hide the flash automatically then the user may
have no idea what went wrong. They may even think that everything is
fine and their order went through.

I removed the time-based removal of flash messages from the new
StimulusReflex controller to address this problem. But I didn't touch
the AngularJS directive because it will be removed anyway. There may
also be many more messages that could be annoying if they didn't
disappear, for example a simple "login successful".

I personally think that flash messages that are not important to keep,
don't need to be shown in the first place. The best UX makes the success
obvious on the page. And success should be assumed.
 2023-01-25 15:33:17 +11:00