raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,046 Commits 18 Branches 453 Tags
dafe4b599fdc7d925e2cc1dee366278919bc3368
Commit Graph

26046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jibees
dafe4b599f Merge pull request #10303 from mkllnk/webpacker-ignores-tmp-files 
Ignore vi .swp files when webpack dev reloads page
 2023-01-23 17:12:29 +01:00
Filipe
d7c99a9d8b Merge pull request #10275 from filipefurtad0/update_orders_spec 
Updates system spec for orders page
 2023-01-23 16:00:38 +00:00
Rachel Arnould
53fb906861 Merge pull request #10254 from jibees/10246-split-checkout-order-summary-page-design-changes 
Split checkout: order summary page design changes
 2023-01-23 15:52:06 +01:00
filipefurtad0
fa96f7339d Replaces URL with routing syntax 2023-01-23 11:35:53 +00:00
Sigmund Petersen
78bbb08666 Merge pull request #10301 from openfoodfoundation/update-getting-started 
Docs: Suggest using SSH instead of HTTPS for cloning
 2023-01-23 08:36:17 +01:00
Sigmund Petersen
e260112eb8 Merge pull request #10296 from filipefurtad0/add_no_sandbox_to_cuprite_settings 
Sets no-sandbox option, for CI env.; increases timeout values
 2023-01-23 08:34:09 +01:00
Maikel Linke
b91b85febc Ignore vi .swp files when webpack dev reloads page 
The webpack dev server watches assets and reloads the page when files
change on disk. I'm adding vi's temporary files to the ignore list.
 2023-01-23 14:42:08 +11:00
filipefurtad0
7dc14cc35a Adds coverage for bulk pdf generation 
and order cancelling
 2023-01-20 18:31:33 +00:00
Jean-Baptiste Bellet
370e476fc5 has:() relational pseudo class is not available for firefox 
cf. https://caniuse.com/css-has

So be more generic, as the only `checkout-input` is for that checkbox for T&Cs
 2023-01-20 15:37:52 +01:00
filipefurtad0
8bfb17144c Filters by order state 2023-01-20 13:56:40 +00:00
filipefurtad0
f984cd89c2 Filters by invoice number 2023-01-20 13:14:23 +00:00
filipefurtad0
336210b898 Tests shipping methods filtering 2023-01-20 13:10:18 +00:00
filipefurtad0
9323394eb7 Adds CI condition browser_options; sets timeouts to 60 2023-01-20 11:13:31 +00:00
jibees
895fc94a75 Merge pull request #10295 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.118.0 
Bump aws-sdk-s3 from 1.117.2 to 1.118.0
 2023-01-20 11:43:14 +01:00
jibees
aa725ec8a4 Merge pull request #10299 from openfoodfoundation/dependabot/bundler/globalid-1.0.1 
Bump globalid from 1.0.0 to 1.0.1
 2023-01-20 11:37:20 +01:00
Sigmund Petersen
f921bbfe45 Merge pull request #10288 from openfoodfoundation/dependabot/bundler/rack-2.2.6.2 
Bump rack from 2.2.4 to 2.2.6.2
 2023-01-20 11:31:49 +01:00
Jean-Baptiste Bellet
f8b8e79725 Specify a bit when T&Cs label is longer that summary width 
and therefore on two lines
 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
b559171d0e Put order summary footer into its own file _totals_footer.html.haml 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
3e7e0e4d81 Instead of adding inline style, create a CSS rule 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
c5d94d372f Remove unnecessary within block 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
c99ec38c85 By default, we reject all adjustements with amount equal to 0 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
37f359542e Remove bold on firstname+lastname 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
21b74386f9 Introduce mobile view for summary step 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
53c701e04c In fact, it seems likely to be strictly less. 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
ef572668d5 Let's keep fees next to the payment or shipping method 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
fa8e36fbeb As this is used in a odd/even table, background needs to be transparent 
Otherwise, it's set via `checkout h5`
 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
1ea9c15bb8 Put total on the summary box on the right 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
cc838d2c88 Remove sentence 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
99fcbad0f0 On split checkout, do not display footer on order summary 
introduced via `display_footer` which is by default `true`
 2023-01-20 11:20:34 +01:00
Jean-Baptiste Bellet
52959a913f New step3: two columns, more condensed 2023-01-20 11:20:34 +01:00
David Cook
097bfd953f Suggest using SSH instead of HTTPS for cloning 
This basically reverts 3a0c5bf0c3
 2023-01-20 14:46:47 +11:00
dependabot[bot]
b9039f4b1f Bump globalid from 1.0.0 to 1.0.1 
Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/rails/globalid/releases)
- [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: globalid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 22:24:49 +00:00
filipefurtad0
f7d4d7595c Filters by customer/billing address first and last names 2023-01-19 16:22:53 +00:00
filipefurtad0
28782775ad adds filter by Email assertion 2023-01-19 16:22:53 +00:00
filipefurtad0
6f35b38fa8 Asserts on the correct display of orders 
(for a given distributor)
 2023-01-19 16:22:53 +00:00
filipefurtad0
9757ab2a6c Creates customers and enterprise owners (users) 
Fixes typo and removes unecessary js: true line
 2023-01-19 16:22:53 +00:00
dependabot[bot]
381c4e6146 Bump aws-sdk-s3 from 1.117.2 to 1.118.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.117.2 to 1.118.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-19 09:08:10 +00:00
David Cook
4e7c50e22b Merge pull request #10283 from mkllnk/application-job 
Add Rails standard ApplicationJob for consistency
v4.2.31 		2023-01-19 14:23:22 +11:00
David Cook
9b4538790e Update translations 2023-01-19 13:29:59 +11:00
Maikel Linke
075b8d2585 Add Rails standard ApplicationJob for consistency 
New Rails apps come with this class already, the job generator creates
it for every new job and Rubocop requires it as well. Let's make our
lives easier and use the same structure as other Rails projects. This
class may be handy one day.
 2023-01-19 13:25:46 +11:00
dependabot[bot]
828c6e5427 Bump rack from 2.2.4 to 2.2.6.2 
Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.2)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 00:47:53 +00:00
Filipe
b54f4ef686 Merge pull request #10258 from mkllnk/report-job 
Render reports in a separate process (feature-toggled)
 2023-01-18 23:47:09 +00:00
Maikel
4a8e3a751d Explain what Process.waitall does 
Co-authored-by: David Cook <david@redcliffs.net>
 2023-01-18 23:12:26 +00:00
Maikel Linke
6472070517 Configure MiniRacer to allow forking 
The spec for forking was hanging. This could be revisited after
upgrading to mini_racer 0.6.1.
 2023-01-18 23:12:26 +00:00
Maikel Linke
26402397ea Stop report workers when parent times out 
No need to keep running when nobody is collecting the result (yet).
 2023-01-18 23:12:26 +00:00
Maikel Linke
b19456535d Isolate report rendering in separate child process 
Sidekiq doesn't have any features to limit memory usage or execution
time. We need a separate process for this. Forking avoids the boot time
of a fresh process and copy-on-write ensures minimal memory overheads.
 2023-01-18 23:12:26 +00:00
Maikel Linke
a177f4c066 Add feature to render reports in the background 
This is supposed to lower the memory footprint of all Puma workers. The
reports code will occupy needed memory in one Sidekiq worker instead of
in several Puma processes.

The current code doesn't limit the execution time yet. We either need a
way to terminate the report rendering after a while or send an email
with a link to access a rendered report.
 2023-01-18 23:12:26 +00:00
Maikel Linke
19c4596b9e Untie report from request object 
We want simple report arguments to store it as background job.
 2023-01-18 23:12:26 +00:00
Maikel Linke
0c769706aa Split method for easier reading 2023-01-18 23:12:26 +00:00
Maikel Linke
65843fbd68 Render on-screen report as HTML in renderer 
So it can be treated like any other format.
 2023-01-18 23:12:26 +00:00