raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,130 Commits 19 Branches 453 Tags
477ca39e58f07df3438592fcba7863e4bb80dfc4
Commit Graph

29130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
477ca39e58 Update spec 2023-10-12 15:40:06 +11:00
Maikel Linke
f4fde0a42c Trying to clarify voucher tax amount 
The whole concept is confusing. Maybe translators will find better
versions.
 2023-10-12 15:20:17 +11:00
Maikel Linke
f83e78a5b8 Clarify adjustment data only for display 
We are not creating a new adjustment here.
 2023-10-12 15:16:38 +11:00
Maikel Linke
74c8f06e80 Simplify helper with extracted method 2023-10-12 14:17:41 +11:00
Gaetan Craig-Riou
7f2c1feaf8 Fix rubocop warning 2023-10-02 15:58:13 +11:00
Gaetan Craig-Riou
1a66f3d94f Fix system spec to take into account discounted tax 2023-10-02 15:58:13 +11:00
Gaetan Craig-Riou
8d639c14cb Add a fake adjustment voucher tax on admin order page 
When tax are included in price, voucher tax is stored in the voucher
adjustment and not as its own adjustment. So we add a "fake adjustment"
for display purposes.
 2023-10-02 15:58:12 +11:00
Gaetan Craig-Riou
8254bd9625 Take into account voucher tax part when displaying tax included in price 2023-10-02 15:58:12 +11:00
Maikel
350ca3b778 Merge pull request #11479 from filipefurtad0/split_split_checkout 
Splits checkout files
 2023-10-02 12:01:20 +11:00
Konrad
8150a8b04a Merge pull request #11579 from macanudo527/remove_delegate_belongs_to 
Remove Deprecated delegate_belongs_to
 2023-10-01 13:19:22 +02:00
Konrad
11ea4d93a9 Merge pull request #11584 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.0.6 
chore(deps): bump trix from 2.0.5 to 2.0.6
 2023-10-01 12:49:32 +02:00
Konrad
33d9ed4000 Merge pull request #11591 from dacook/admin-users-api-key-9833 
Redirect to admin users edit path on success
 2023-10-01 12:20:46 +02:00
Konrad
06ebeeac0f Merge pull request #11543 from rioug/11364-Voucher-fix-tax-report 
[Vouchers] Fix Sales Tax Totals By Order report
 2023-10-01 02:09:33 +02:00
Gaetan Craig-Riou
dd0279c983 Update all locales with the latest Transifex translations v4.4.13 2023-09-28 11:52:49 +02:00
David Cook
e844d71abc Redirect to edit path on success 
Simply rendering the edit form on the posted path is problematic. For example if you refresh the path you get a 404.
But if there's errors, we want to render the form with unsaved values so you can see the errors and try again.
 2023-09-28 09:41:44 +10:00
Maikel
c1587b689a Merge pull request #11589 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.136.0 
chore(deps): bump aws-sdk-s3 from 1.135.0 to 1.136.0
 2023-09-28 09:20:36 +10:00
Maikel Linke
3fc78e1f7f Update Rubocop todo file 2023-09-28 08:26:35 +10:00
filipefurtad0
a634283ec5 Removes unecessary shipping method setup - guest 2023-09-27 22:20:31 +01:00
filipefurtad0
adede9df03 Removes unecessary shipping method setup - details 2023-09-27 22:19:37 +01:00
filipefurtad0
6763095f26 Removes unecessary shipping method setup - payment 2023-09-27 22:19:37 +01:00
filipefurtad0
3702a2e7b1 Removes unecessary shipping method setup - summary 2023-09-27 22:19:31 +01:00
filipefurtad0
25c58426db Moves split-checkout files to own folder 
Removes split_ prefix
 2023-09-27 21:45:03 +01:00
dependabot[bot]
4d7f21eec4 chore(deps): bump aws-sdk-s3 from 1.135.0 to 1.136.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.135.0 to 1.136.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-09-27 09:05:00 +00:00
Gaetan Craig-Riou
33f3c660a4 Fix rubocop warning 2023-09-26 11:21:05 +02:00
filipefurtad0
a4abedf3e3 Fixes rubocop issues 2023-09-26 10:18:28 +01:00
filipefurtad0
d3f9f989f6 Moves summary-step scenarios into dedicated file 2023-09-26 10:18:28 +01:00
filipefurtad0
67793c78ad Moves payment-step scenarios into dedicated file 2023-09-26 10:18:28 +01:00
filipefurtad0
a0611057f0 Moves details-step/not selecting shipping method scenarios into dedicated file 2023-09-26 10:18:28 +01:00
filipefurtad0
b8f7d6102e Moves guest/out of stock scenarios into dedicated file 2023-09-26 10:18:28 +01:00
Gaetan Craig-Riou
b129b9f1d0 DRY up specs 2023-09-26 10:50:58 +02:00
Gaetan Craig-Riou
e9051f5c58 As per review comment, clarify specs 
And some DRYing
 2023-09-26 10:26:06 +02:00
David Cook
91b251acd4 Refactor 2023-09-26 10:56:44 +10:00
Neal Chambers
50eb8f31f2 Remove Deprecated delegate_belongs_to 2023-09-26 09:50:08 +09:00
David Cook
4e05047cc6 Merge pull request #11583 from macanudo527/fix_stylehash_10 
Fix Style/HashSyntax 11/13
 2023-09-26 10:38:54 +10:00
dependabot[bot]
8797132117 chore(deps): bump trix from 2.0.5 to 2.0.6 
Bumps [trix](https://github.com/basecamp/trix) from 2.0.5 to 2.0.6.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.5...v2.0.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-25 09:14:02 +00:00
Gaetan Craig-Riou
02aaf6f692 Remove voucher validation on code format 
The code doesn't rely on label match any more so this restriction
is not necessary anymore
 2023-09-25 09:49:55 +02:00
Gaetan Craig-Riou
097b775fa0 Add metadata before saving adjustment 
Rails may put it all in one transaction

Co-authored-by: Maikel <maikel@email.org.au>
 2023-09-25 17:44:16 +10:00
Neal Chambers
48132b055f Update .rubocop_todo.yml 2023-09-25 13:15:54 +09:00
Neal Chambers
70e218d2e9 Fix Style/HashSyntax 2023-09-25 13:15:38 +09:00
Maikel
51f125e301 Merge pull request #11582 from macanudo527/fix_stylehash_9 
Fix Style/HashSyntax 10/13
 2023-09-25 13:43:38 +10:00
Neal Chambers
232ffb1eb8 Update .rubocop_todo.yml 2023-09-24 22:41:48 +09:00
Neal Chambers
35e8f88943 Fix Style/HashSyntax 2023-09-24 22:41:27 +09:00
Rachel Arnould
aa489d4cd6 Merge pull request #11185 from jibees/11155-improve-customer-addresses-report 
Admin, reports: improve customer addresses report
 2023-09-22 18:06:47 +02:00
Jean-Baptiste Bellet
2803f1c6b2 Group all orders by customer_id, email and distributor_id 
Therefore have one (and only) row per customer

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
9ce89125a4 Fix linter error: line is too long 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
d6c10170da Use plain text instead of computed date in specs 
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Code-Conventions#prefer-plain-text-over-method-calls-in-expected-values
 2023-09-22 16:44:33 +01:00
jibees
5eab033a80 Improve indentation 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-09-22 16:44:33 +01:00
Maikel Linke
adc5bf6e93 Simplify date filter in customers report 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
82ccdcca70 Customers report has only one report: Customers 
No more `addresses` report

+ Fix pre-existing rubocop issues

+ Create method to simplify and remove CyclomaticComplexity error
 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
5edc8d8ce1 Delete Mailing List report 2023-09-22 16:44:33 +01:00