raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
f9fc1657a8 Grey out disabled button 
It looks like the disabled-bg colour was being used for pagination, but I can't see where. This way we should be able to apply the styles more consistently in the future.
 2023-11-03 17:28:20 +11:00
David Cook
38296eb967 Merge pull request #11755 from mkllnk/cleaning 
Remove orphaned JSON data in admin pages
 2023-11-03 16:02:10 +11:00
Maikel
eef7df8ce3 Merge pull request #11750 from dacook/buu-editing-part5c-show-summary-11059 
[BUU] Showing error summary at top of form
 2023-11-03 15:45:24 +11:00
Maikel Linke
f6903518c3 Remove orphaned JSON data in admin pages 
This was left over data from commit:

- 79ba223e12
 2023-11-03 15:16:22 +11:00
David Cook
7fe6f3fe89 Disable form elements in a disabled-section 
I chose to use the 'elements' collection rather than choosing which elements to include (ie this supports inputs, textareas, buttons and anything else I didn't think of). It could be a bit simpler if we assume the element is a form. Even simpler if it's a fieldset (that has a disabled property). But I didn't want to limit it too much.

Unfortunately JS is quite ugly compared to Ruby. And 'prettier' made it uglier in my opinion.
 2023-11-03 14:32:58 +11:00
David Cook
f63f37fd3b Wrap form element in a form 
This makes it easier to control in the next commit.
 2023-11-03 14:32:58 +11:00
David Cook
d0abbc5d2c Ensure error summary always shows when error 
Best viewed with whitespace ignored.
 2023-11-03 14:32:58 +11:00
David Cook
41cf0bedfc Fix: Handle missing attributes 2023-11-03 14:32:58 +11:00
David Cook
f05d27b58b Show error message summary at top of form 2023-11-03 14:32:58 +11:00
David Cook
a94c50f0c1 Count updated products 
Ignoring variants for now.
 2023-11-03 14:32:58 +11:00
David Cook
de915e8bd7 Capture variant errors when updating 2023-11-03 14:32:55 +11:00
Maikel Linke
d64b311230 Update all locales with the latest Transifex translations v4.4.18 2023-11-03 12:56:16 +11:00
Filipe
771bd93f5f Merge pull request #11677 from rioug/11359-vouchers-fix-tax-moving-back-in-checkout 
[vouchers] fix tax calculation when moving back in the checkout process
 2023-11-02 17:02:08 +00:00
David Cook
1d5ec6b8d2 Spec for updating products with variants 
Trying to cover it more comprehensively, and revealing we have a lot of behaviour to update.
Products and their variants should always get saved (or not saved) together. This is considered the most intuitive behaviour.

There's still duplication with the "variant has error" context, but I try to avoid nesting shared_examples, it starts to get ugly. Happy to discuss though.
 2023-11-02 15:42:40 +11:00
Maikel
eea08ac0a1 Merge pull request #11745 from openfoodfoundation/dependabot/bundler/sidekiq-7.2.0 
chore(deps): bump sidekiq from 7.1.6 to 7.2.0
 2023-11-02 15:33:53 +11:00
Maikel Linke
c4c5c97270 Clarify cuprite driver configuration 
Rails is registering a driver called `cuprite`. And when we did that as
well the driver got registered three times somehow. It looked like our
driver options were used in the end but just to clarify I gave it a
unique name.

This was inspired by:

* https://github.com/ViewComponent/view_component/pull/1877

It suggests that it may avoid dead browser errors on CI. We'll see.
 2023-11-02 14:07:33 +11:00
David Cook
e651e3cd5e Tiny spec refactor 
I found this in my stashes
 2023-11-02 11:05:45 +11:00
David Cook
39eeb0e917 Add spec for truthiness 
It's generally expected that a #save method will return true on succes, and false on failure.
 2023-11-02 11:05:45 +11:00
Ryan Murphy
7e5ad8c8a4 9048: Fix Stripe payment flash rendering issue 2023-11-01 07:33:06 -04:00
dependabot[bot]
744b0799a6 chore(deps): bump sidekiq from 7.1.6 to 7.2.0 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.6 to 7.2.0.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.6...v7.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-01 09:26:51 +00:00
David Cook
d8cc45c5c3 Merge pull request #11742 from filipefurtad0/vcr_payment_intent_validator_spec 
Replaces mocks with VCR calls
 2023-11-01 17:04:00 +11:00
David Cook
031abd6546 Merge pull request #11743 from openfoodfoundation/revert-11708-test-redis-5 
Revert "replace hiredis gem with hiredis-client"
 2023-11-01 16:08:49 +11:00
Maikel
6a236a8678 Revert "replace hiredis gem with hiredis-client" 2023-11-01 15:16:57 +11:00
Maikel
8e88ef021f Merge pull request #11738 from openfoodfoundation/dependabot/bundler/bootsnap-1.17.0 
chore(deps): bump bootsnap from 1.16.0 to 1.17.0
 2023-11-01 14:40:29 +11:00
Maikel
a1c6a43954 Merge pull request #11740 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.6.0 
chore(deps): bump newrelic_rpm from 9.5.0 to 9.6.0
 2023-11-01 14:00:16 +11:00
Maikel
512fee2a9b Merge pull request #11739 from openfoodfoundation/dependabot/bundler/view_component-3.7.0 
chore(deps): bump view_component from 3.6.0 to 3.7.0
 2023-11-01 13:59:02 +11:00
Maikel
e6e2f27ed4 Merge pull request #11736 from dacook/registration-noindex 
Print robots tag for registration layout
 2023-11-01 13:53:07 +11:00
Maikel
fb732e55bc Merge pull request #11734 from openfoodfoundation/dependabot/bundler/angular-rails-templates-1.2.1 
chore(deps): bump angular-rails-templates from 1.2.0 to 1.2.1
 2023-11-01 13:46:32 +11:00
Maikel
8f4f691cb2 Merge pull request #11735 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.22.1 
chore(deps-dev): bump rubocop-rails from 2.21.2 to 2.22.1
 2023-11-01 13:40:52 +11:00
Maikel
25a3149f48 Merge pull request #11702 from dacook/buu-editing-part5b-11059 
[BUU] Mark changed fields, when error
 2023-11-01 13:01:08 +11:00
Maikel
ddd410ceb5 Merge pull request #11729 from openfoodfoundation/dependabot/npm_and_yarn/browserify-sign-4.2.2 
chore(deps): bump browserify-sign from 4.2.1 to 4.2.2
 2023-11-01 12:50:20 +11:00
Maikel
e85a1cef7e Merge pull request #11708 from abdellani/test-redis-5 
replace hiredis gem with hiredis-client
 2023-11-01 10:02:25 +11:00
filipefurtad0
a88919299f Replaces mocks with VCR calls 2023-10-31 19:06:40 +00:00
dependabot[bot]
1134c9c07a chore(deps): bump newrelic_rpm from 9.5.0 to 9.6.0 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.5.0 to 9.6.0.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.5.0...9.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-31 09:44:29 +00:00
dependabot[bot]
d3883c7302 chore(deps): bump view_component from 3.6.0 to 3.7.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.6.0...v3.7.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>
 2023-10-31 09:44:08 +00:00
dependabot[bot]
a8de70c79e chore(deps): bump bootsnap from 1.16.0 to 1.17.0 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.16.0 to 1.17.0.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.16.0...v1.17.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-10-31 09:42:54 +00:00
David Cook
18b79668a5 Merge pull request #11727 from openfoodfoundation/dependabot/bundler/valid_email2-5.1.1 
chore(deps): bump valid_email2 from 5.1.0 to 5.1.1
 2023-10-31 14:32:44 +11:00
David Cook
d79c5c39cf Merge pull request #11723 from openfoodfoundation/dependabot/bundler/rubocop-1.57.2 
chore(deps-dev): bump rubocop from 1.57.1 to 1.57.2
 2023-10-31 14:31:01 +11:00
David Cook
1d96747570 Merge pull request #11716 from openfoodfoundation/dependabot/bundler/active_storage_validations-1.1.1 
chore(deps): bump active_storage_validations from 1.0.4 to 1.1.1
 2023-10-31 14:29:42 +11:00
David Cook
435bf6e6b0 Print robots tag for registration layout 
This is copied from the darkswarm layout.
 2023-10-31 14:03:32 +11:00
Mohamed ABDELLANI
6d0f7d7c81 render null shipment when shipment adjustment doesn't exist 2023-10-30 22:53:19 +01:00
Mohamed ABDELLANI
23a56d35a0 add tax_adjustment total to the invoice 2023-10-30 22:09:22 +01:00
Mohamed ABDELLANI
e16df2777a optimize DataPresenter#checkout_adjustments 
reduce the complexity of the method
 2023-10-30 21:58:37 +01:00
Mohamed ABDELLANI
c8f69c8778 always render shipment on the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c513eb5d9d fix existing test 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
15aeb2f8e5 remove legacy template (used when invoice feature enable) 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
da89860f35 fix price per unit 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c1ed8ed67c update the adjustments rows 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
716cf3e522 reorder the totals section 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b7f601d140 show tax rate column regardless of the tax amount on the order 2023-10-30 19:43:57 +01:00