raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,398 Commits 15 Branches 453 Tags
35c2297d55700541bbd3fa7b33244bf8db7f6226
Commit Graph

31398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
35c2297d55 Detect changes in price 
Price is actually an association with lots of custom methods to make it look like a field, and so changes were ignored.
Now this issue is fixed, perhaps it should be moved to a concern..

Note, there are other delegated fields: product name and description may be assigned from the variant. But there's no hooks to save the prroduct, so I didn't include it when checking for changes.
 2024-05-28 12:00:04 +10:00
David Cook
c71eb2d6b5 Remove duplicate assign 2024-05-27 10:34:35 +10:00
isidzukuri
7565825b61 Do not commit to db unchanged products is bulk save 2024-05-27 10:22:58 +10:00
Gaetan Craig-Riou
a64bf68d54 Merge pull request #12517 from openfoodfoundation/dependabot/bundler/knapsack_pro-7.4.0 
chore(deps-dev): bump knapsack_pro from 7.2.0 to 7.4.0
 2024-05-27 10:11:25 +10:00
dependabot[bot]
9cd5f5aaa0 chore(deps-dev): bump knapsack_pro from 7.2.0 to 7.4.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 7.2.0 to 7.4.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v7.2.0...v7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-24 09:13:06 +00:00
filipefurtad0
0bfa9fe997 Update all locales with the latest Transifex translations v4.4.47 2024-05-24 09:49:20 +01:00
Maikel
5b9e83745d Merge pull request #12508 from mkllnk/schema 
Fixup db schema.rb
 2024-05-24 08:19:31 +10:00
Filipe
88baf5e1de Merge pull request #12496 from isidzukuri/12355-remove-unused-discourse 
[12355] Remove discourse
 2024-05-23 19:28:02 +01:00
Filipe
5455e68620 Merge pull request #12504 from dacook/buu/edit-image-turbo-12399 
[BUU] Remove StimulusReflex from Image Edit
 2024-05-23 17:32:59 +01:00
Rachel Arnould
163e9b6c9c Merge pull request #12505 from filipefurtad0/remove_deprecation 
Removes deprecation strikethrough from tax report (by producer)
 2024-05-23 17:14:28 +02:00
Maikel Linke
b9c7be769a Fixup db schema.rb 
It looks like I forgot to commit the latest change in 46cd60aa3c.
 2024-05-23 15:51:43 +10:00
David Cook
e30dc1b05c Merge pull request #12493 from cyrillefr/RedundantPresenceValidationOnBelongs_part_IV 
Fix RedundantPresenceValidationOnBelongs on two files
 2024-05-23 13:09:17 +10:00
David Cook
55ac816a87 Show success message 
Phew, that was really easy.
And now the existing feature spec still Just Works.
 2024-05-23 11:55:56 +10:00
David Cook
05f0b93548 Use requestSubmit to allow JS events 
Yay, now it works. Not sure the best way to show loading yet.
- currently the Turbo loading indicator shows which is better than nothing (blue bar at top)
- ideally we could show a small spinner over the image thumbnail. need to write some stimulus to hook into turbo lifecycle I guess.
- or we could activate the frame-level loading overlay. refactor loading_controller a bit so that it's applied on the container, then hopefully  we can just call  change->loading#showLoading. the turbo_stream response could dectivate it.
 2024-05-23 11:55:33 +10:00
David Cook
665273ce2f [wip] Attempt to update edited image in-place with Turbo Stream 
but it doesn't quite work.

Maybe we can force it with JS (https://www.writesoftwarewell.com/process-turbo-stream-javascript/)
 2024-05-23 11:55:29 +10:00
David Cook
0e03ff6925 Merge branch 'master' into RedundantPresenceValidationOnBelongs_part_IV 2024-05-23 09:22:36 +10:00
Maikel
74cfa42461 Merge pull request #12465 from MrBowmanXD/mirror 
Allow return or line break in shipping / payment method description
 2024-05-23 09:10:13 +10:00
Maikel Linke
be79016753 Remove now obsolete check in rake task 2024-05-23 09:08:05 +10:00
Maikel
32eb9c5504 Merge pull request #12481 from mkllnk/connect-app-once 
Avoid submitting duplicate Connected Apps
 2024-05-23 08:50:34 +10:00
Manuel Gonçalves
2bc481d8f7 Merge branch 'master' into mirror 2024-05-22 23:35:45 +01:00
Filipe
b4d4faafc0 Merge pull request #12472 from dacook/bump-stimulus_reflex-cable_ready 
Bump stimulus_reflex to 3.5.1 and cable_ready to 5.0.5
 2024-05-22 21:37:42 +01:00
Filipe
1130bf8cbe Merge pull request #12460 from mkllnk/enterprise-data-purge 
Clean up unused enterprise fields
 2024-05-22 21:29:54 +01:00
filipefurtad0
5ccecdd9ff Removes deprecation strikethrough from enterprise fees with tax report by producer 2024-05-22 20:38:11 +01:00
cyrillefr
46cd60aa3c Fix RedundantPresenceValidationOnBelongs on two files 
- presence: true is redundant since Rails 5.0 BUT applies
       with new default config of
       belongs_to_required_by_default to true.
       Lots of files with belongs_to_required_by_default = false
       (backward compatibility).
       So: deleting this setting implies to adding optional: true
     - added 'NOT NULL' constraints so model constraints match
       with contraints on DB tables.
     - corresponding migration files to match AR Models &
       DB tables
     - rake tasks to check corrupt data (ie: NULL/nil in id fields)
     - updated the todo
 2024-05-22 09:44:02 +02:00
David Cook
536b5608ab Show edit form for new images 2024-05-22 17:08:58 +10:00
David Cook
3fcc9ac1fa Move product image edit modal to Turbo Stream 
Didn't even need to touch the controller, because data-turbo-stream tells it to render the turbo_stream format ✨

But you might notice that it doesn't redirect to the right return_url yet. Let's see if we can use more Turbo to avoid the page refresh..

TODO: also handle empty images
 2024-05-22 17:08:58 +10:00
David Cook
b935a0e8d9 [add gem] turbo-rails 
This gives us a nice 'turbo_stream' format helper.
 2024-05-22 15:07:16 +10:00
Maikel
5fdea3e8ce Merge pull request #12502 from dacook/specs 
Break up large spec files
 2024-05-22 13:39:02 +10:00
Maikel
9d453a82ed Merge pull request #12494 from filipefurtad0/update_paypal_checkout_system_spec 
Updates Paypal system spec to consider new checkout flow
 2024-05-22 10:17:06 +10:00
David Cook
b2078c2906 Merge pull request #12486 from dacook/tax-category-12480 
Show any tax category errors when saving variants
 2024-05-22 09:30:19 +10:00
David Cook
5ff89a279c Use Spring to save on subsequent boot times 
Each time we run a rails command, it can take some time to load up (I think it was 20s). We run two commands (db setup, then rspec), so the second one should be faster now.
 2024-05-22 09:21:51 +10:00
David Cook
85165369a2 Move run runner over for system specs. 2024-05-22 09:21:51 +10:00
David Cook
1d11f8c85b Move bulk order actions to separate spec file 
This was another large file, potentially causing a bottleneck.
All the order setup is duplicated from the other file which is a bit of shame, but I think it makes sense.
 2024-05-22 09:20:12 +10:00
filipefurtad0
818c0306c6 Updates paypal feature spec to consider new checkout flow 2024-05-21 17:37:22 +01:00
David Cook
39f1eac300 Move invoices specs to the invoices spec file 
The orders file is too big and causes a bottleneck for parallelising specs.

Maybe they should be merged with the above specs, but I'm not familiar enough to know for sure.
 2024-05-21 16:43:17 +10:00
David Cook
f0f2754d7f Remove now-unused translation 2024-05-21 16:33:49 +10:00
isidzukuri
b9a0c1cc87 revert feature-template.md 2024-05-21 09:02:45 +03:00
isidzukuri
621a95e913 Remove discourse 2024-05-21 09:02:45 +03:00
David Cook
b729ec3428 Merge pull request #12490 from mkllnk/mail-spec 
Move mail spec precompile assets for it
 2024-05-21 09:51:46 +10:00
David Cook
c960e55437 Bump cable_ready and stimulus_reflex again 
Sigh.
 2024-05-20 15:51:55 +10:00
Manuel Gonçalves
1c0a6d1229 Reintroduced changes made in commit #12443 2024-05-20 03:55:49 +01:00
Gaetan Craig-Riou
943c21be34 Merge pull request #12487 from openfoodfoundation/dependabot/bundler/rexml-3.2.8 
chore(deps): bump rexml from 3.2.6 to 3.2.8
 2024-05-20 10:38:28 +10:00
David Cook
a9bf25244e Merge pull request #12457 from abdellani/12452-log-who-deleted-products 2024-05-20 10:37:32 +10:00
Mohamed ABDELLANI
8ccb59a9ab included LogDestroyPerformer on product model 2024-05-17 15:42:39 +01:00
Maikel Linke
ac24725d6c Move mail spec precompile assets for it 
Specs in `spec/lib` don't trigger asset compilation but this particular
spec uses a mailer and needs assets.
 2024-05-17 14:35:08 +10:00
Maikel
100cba874d Merge pull request #12488 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.151.0 
chore(deps): bump aws-sdk-s3 from 1.147.0 to 1.151.0
 2024-05-17 11:44:36 +10:00
Maikel Linke
58e1dc7b9a Declare rexml as indirect dependency, not direct 
Reverting 41d56ce98b:

> This was previously included in Ruby, and has now been extracted.
> It's used by activemerchant and selenium and possibly others,
> but those gems don't currently declare it as a dependency.

This has changed. It's now a dependency of:

* activemerchant
* rubocop [dev dep only]
 2024-05-17 11:37:49 +10:00
dependabot[bot]
726c52e725 chore(deps): bump aws-sdk-s3 from 1.147.0 to 1.151.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.147.0 to 1.151.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>
 2024-05-16 09:02:01 +00:00
dependabot[bot]
79741eac58 chore(deps): bump rexml from 3.2.6 to 3.2.8 
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.2.8.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.6...v3.2.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-16 09:01:30 +00:00
David Cook
3a3dc9eea5 Update all locales with the latest Transifex translations v4.4.45 2024-05-16 16:17:30 +10:00