raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konrad
02873d7596 Merge pull request #10817 from Matt-Yorkley/permissions-scoping 
Scope orders before bulk actions
 2023-05-17 12:44:07 +02:00
Matt-Yorkley
e1b0a03819 Scope orders before bulk actions 2023-05-17 12:03:40 +02:00
Jean-Baptiste Bellet
2336981ca0 Do not display OFN banner on order confirmation email if white label 2023-05-17 11:35:18 +02:00
Jean-Baptiste Bellet
dfafbfe996 Create an order confirmation email preview of the last completed order 
Available on `/rails/mailers/order_mailer/confirm_email_for_customer`
 2023-05-17 11:35:06 +02:00
Jean-Baptiste Bellet
f7d06fe0e8 Do not display OFN banner on subscription confirmation email if white label 
+ add specs that test for the presence of the footer logo which is in the header (I know it's a bit contradictory)
 2023-05-17 11:34:35 +02:00
Jean-Baptiste Bellet
3ed89fc2db Create a subscription confirmation email preview of the last completed order 
Available on: `/rails/mailers/subscription_mailer/confirmation_email`
 2023-05-17 11:34:16 +02:00
Maikel Linke
eaf3bd0bae Update spec after new import file validation 2023-05-17 15:18:29 +10:00
Mohamed ABDELLANI
fcb8550cb1 extract file path sanitizer to an independent class 2023-05-17 15:09:48 +10:00
Mohamed ABDELLANI
4d5ba6a7e6 add file path validation 2023-05-17 15:09:48 +10:00
Maikel Linke
a0d05b26d1 Spec current product import vulnerabilities 
I didn't use pending specs but deliberately passing specs on wrong
behaviour. This is not how it should be but how it is at the moment.
 2023-05-17 15:09:01 +10:00
Konrad
4a66b62fa7 Merge pull request #10825 from jibees/10824-remove-feature-toggle-on-white-label-feature 
Activate white label feature
 2023-05-16 13:50:58 +02:00
Maikel
16329e953f Merge pull request #10844 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.0.0 
Bump jasmine-core from 4.6.0 to 5.0.0
 2023-05-16 17:50:39 +10:00
Gaetan Craig-Riou
abf2105df7 Admin::VoucherController check enterprise permission 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
355af9e818 Per review comment, build enterprise instead of create 
Speed up testing by removing unnecessarily created record
 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b585f77be4 Make enterprise mandatory for a voucher 
It should have already been the case...
 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
2d8fa24862 Add a voucher factory 
As vouchers are getting more complicated, it makes sense to use a
factory to simplify writing test.
 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b427e420ce Update admin pages to allow entering an amount 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
15eee8175e Add amount to voucher 
Change value to amount to be more consistent
 2023-05-16 16:19:59 +10:00
Maikel
10c918be75 Merge pull request #10732 from mkllnk/report-email 
[Hidden] Notify about completed report with download link via email
 2023-05-16 10:25:23 +10:00
Maikel
a979f7c8df Merge pull request #10587 from rioug/10432-vouchers-bare-minimum-checkout 
10432 vouchers bare minimum checkout
 2023-05-16 09:19:06 +10:00
Maikel Linke
08aff56e20 Expire report files after 1 week, maximum for S3 
We didn't see this in tests which use disk storage. But AWS S3 has a
maximum of one week for URL expiry.
 2023-05-15 19:41:45 +02:00
Maikel Linke
5ae04a5a3e Hide report link which only works at unknown time 
It was bad UX to show a link that doesn't work straight away. At the
time, it was the only way to download the report but now we send an
email which is a much better way to go.

I leave the rest of the code because we want to implement a reflex which
shows the download link once it's ready.
 2023-05-15 19:41:45 +02:00
Maikel Linke
299bc253a4 Expire report download links in a month, not 5mins 2023-05-15 19:41:45 +02:00
Maikel Linke
8a8c53ceee Add ReportMailer preview for devs 2023-05-15 19:41:45 +02:00
Maikel Linke
860fe85af9 Add report download link to email notification 
I added a system spec to verify that the download link can be generated
within the mailer in a background job. ActiveStorage is a bit particular
when it comes to genererating URLs and depending on the situation it may
generate a redirect URL, a proxy URL or link directly to the storage.
But we want a redirect URL here.
 2023-05-15 19:41:45 +02:00
Maikel Linke
cf5a8a26ce Notify only about slow reports 
It would be annoying to get an email for reports which display on the
screen immediately.
 2023-05-15 19:41:45 +02:00
Maikel Linke
1f4af7f990 Send (dummy) email when background report is done 
I'll fill it out in future commits.
 2023-05-15 19:41:45 +02:00
Jean-Baptiste Bellet
aaa9bac4dd Remove white_label feature toggle 
White label is now activated for everyone.

+ add mock for `spec/controllers/spree/orders_controller_spec.rb`
 2023-05-15 17:10:50 +02:00
jibees
d43678c68b Merge pull request #10827 from filipefurtad0/logging_out_spec 
Adds test case for logging out
 2023-05-15 15:33:56 +02:00
Jean-Baptiste Bellet
ec0cbc5bf9 Avoid warning by being more precise about *.erb files 2023-05-15 15:29:28 +02:00
jibees
a1e4c45daa Merge pull request #10843 from openfoodfoundation/dependabot/bundler/rubocop-1.51.0 
Bump rubocop from 1.50.2 to 1.51.0
 2023-05-15 15:03:24 +02:00
jibees
edeedc0704 Merge pull request #10841 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.2.8 
Bump @floating-ui/dom from 1.2.7 to 1.2.8
 2023-05-15 15:02:22 +02:00
jibees
d2539b34e0 Merge pull request #10840 from openfoodfoundation/dependabot/bundler/rails-i18n-7.0.7 
Bump rails-i18n from 7.0.6 to 7.0.7
 2023-05-15 15:01:12 +02:00
jibees
fea3957481 Merge pull request #10845 from openfoodfoundation/dependabot/bundler/test-unit-3.5.8 
Bump test-unit from 3.5.7 to 3.5.8
 2023-05-15 15:00:03 +02:00
jibees
b183832fbb Merge pull request #10842 from openfoodfoundation/dependabot/bundler/capybara-3.39.1 
Bump capybara from 3.39.0 to 3.39.1
 2023-05-15 12:22:59 +02:00
dependabot[bot]
8a352132a0 Bump test-unit from 3.5.7 to 3.5.8 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.7 to 3.5.8.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.5.7...3.5.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 10:00:55 +00:00
dependabot[bot]
0e59a5db91 Bump jasmine-core from 4.6.0 to 5.0.0 
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 4.6.0 to 5.0.0.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v4.6.0...v5.0.0)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 10:00:22 +00:00
dependabot[bot]
340fe91e07 Bump rubocop from 1.50.2 to 1.51.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.50.2 to 1.51.0.
- [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.50.2...v1.51.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 10:00:15 +00:00
dependabot[bot]
6c126cfc33 Bump capybara from 3.39.0 to 3.39.1 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.39.0 to 3.39.1.
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.39.0...3.39.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 09:59:19 +00:00
dependabot[bot]
82c6eaab4e Bump @floating-ui/dom from 1.2.7 to 1.2.8 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.2.7 to 1.2.8.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.2.8/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-05-15 09:57:51 +00:00
dependabot[bot]
d4918893a7 Bump rails-i18n from 7.0.6 to 7.0.7 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.6 to 7.0.7.
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/compare/v7.0.6...v7.0.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 09:57:24 +00:00
jibees
1e05bc5b5c Merge pull request #10789 from jibees/10770-bom-cancelling-an-order-always-restocks-the-line-item 
BOM: when deleting the last item of order that leads to order cancellation, take into account the restock items checkbox
 2023-05-15 09:50:13 +02:00
Mohamed ABDELLANI
7f52684488 add check_calculators_compatibility_with_taxes before running enterprise bulk update 2023-05-15 07:35:52 +01:00
Gaetan Craig-Riou
5eb6097101 Fix error handling when creating a voucher adjustment 
I wrongly assumed that `voucher.create_adjustment` would return nil
if failing to create an adjustment. I will in fact return an
adjustment object with errors.
 2023-05-15 13:42:40 +10:00
David Cook
ccff3379ea Update schema.rb 
On a freshly mirrored prod db, I found these changes.

I don't know why.. but hopefully this is correct.
 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
d29119f5c5 Remove non need belongs_to associations from Adjustments 
It turns out the "tax_rate" association isn't used and wasn't working.
Same for the "voucher" one, which I added to be consistent with existing
code.
Both of these weren't caught by the specs because you can't test associations
with a custome relation with 'shouda-matchers' see: https://github.com/thoughtbot/shoulda-matchers/issues/981
 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
b67f5ae154 Fixing Rubocop issue 
My editor automatically remove blank character on empty line, that's
why rubocop got grumpy here.
 2023-05-15 13:42:40 +10:00
Matt-Yorkley
9b1725d39f Fix model name in adjustment association 2023-05-15 13:42:40 +10:00
Gaetan Craig-Riou
b80274f49d Per review comment, Use named value on voucher submit button to distinguish between submission types 
The voucher apply button is inside form that has another a submit button,
it leads to a weird situation where either one will submit the whole
payments page form. Adding a named parameter on the voucher apply button
means we can distinguish between the two by checking for the presence
of params[:apply_voucher].
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
92bcd937dc Per review comment, remove form object from the partial 
This partial is rendered inside another <form> element, nested form
don't work.
 2023-05-15 13:42:39 +10:00