raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 17 Branches 454 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

31934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mohamed ABDELLANI
d77a94d377 add comment about mini_protile2 gem 2023-10-25 09:17:21 +01:00
David Cook
fac354e678 Merge pull request #11700 from macanudo527/fix_stylehash_12 
Fix Style/HashSyntax 13/13
 2023-10-25 10:40:52 +11:00
yasir azgar
3ba208e3d3 11318 - fix flaky packing_report_spec 
fix rubocop DurationArithmetic
 2023-10-24 22:21:42 +05:30
David Cook
08ac46fd91 Refactor spec: Only create necessary records 
This was creating a lot of records for every single test. Now it's much more efficient and spec conditions are clearer.
 2023-10-24 16:44:34 +11:00
David Cook
671dc570ec Refactor: with form builder 2023-10-24 15:21:14 +11:00
David Cook
aa4630d74c Mark fields as changed if they contain unsaved values. 
This can happen when there's a validation error. The field with error will also be marked changed, but the error style will override it.

I'd like to move this into a FormBuilder. Existing formbuilder gems don't seem to support it (though I didn't look very hard).
 2023-10-24 15:21:14 +11:00
David Cook
04032e61e2 Prettier 2023-10-24 15:21:13 +11:00
David Cook
fdad45bb46 Rename 'modified' state to 'changed' 
This conveniently matches the terminology used in both JavaScript and ActiveModel::Dirty.
 2023-10-24 15:21:13 +11:00
David Cook
ceb9d9af92 Add comment 
I decided to look into why this is so complicated, in case some of the complexity can be removed. It can't :(
 2023-10-24 15:21:13 +11:00
David Cook
1534908895 Move generic method to base class 
Because rubocop complained about the size of ProductSet.
 2023-10-24 15:21:13 +11:00
David Cook
89e53c88f3 Move context up a level 
Best viewed with whitespace ignored.
 2023-10-24 15:21:13 +11:00
David Cook
8293f24ed3 Remove redundant context 
Best viewed with whitespace ignored.
 2023-10-24 15:21:13 +11:00
David Cook
224b6f514b Remove concept of master variant 
from old bulk product screen. Hmm I just realised we're deleting that screen soon anyway.

But this helps clean up the spec before I refactor it further.
 2023-10-24 15:21:13 +11:00
David Cook
be6481dac3 Refactor spec: combine expectations 
These expectations have the same conditions, so why set it up three times?
 2023-10-24 15:21:13 +11:00
David Cook
3710aa2149 Refactor spec 
Better to explicitly test for the change, and specify expected values.
 2023-10-24 15:21:13 +11:00
Neal Chambers
cf072fb56f Update .rubocop_todo.yml 2023-10-24 08:49:48 +09:00
Neal Chambers
dc607b654d Fix Style/HashSyntax 2023-10-24 08:49:34 +09:00
David Cook
a2f8b0db16 Update ansible group name 2023-10-24 10:37:32 +11:00
Maikel
42f5469de5 Merge pull request #11674 from mkllnk/money 
Format money amounts according to locale, not currency
 2023-10-24 09:47:37 +11:00
Sigmund Petersen
0d557eb0f2 Merge branch 'master' into dependabot/bundler/combine_pdf-1.0.24 2023-10-23 09:38:02 +02:00
prateek0411999
a113b5ba01 add condition on warning_forfeit_remaining_amount note 2023-10-23 10:45:35 +05:30
Gaetan Craig-Riou
d5d043880a Fix scenario when no shipment available 
I though that once the shipping method was set it's available on the
order, but apparently it's not always the case. At least some of the
test scenario have order with no shipment, thus no shipping method set.
 2023-10-23 15:38:01 +11:00
Gaetan Craig-Riou
25af178011 Refactor updating order state 
It makes the code a bit easier to read
 2023-10-23 15:37:53 +11:00
Gaetan Craig-Riou
9f426add8d Merge pull request #11690 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.3 
chore(deps): bump tom-select from 2.2.2 to 2.2.3
 2023-10-23 09:48:48 +11:00
Çağrı Özkan
e465015184 Add oninput:"make form dirty" to enterprise_form/name text field 2023-10-21 01:19:41 +03:00
Filipe
44a675bcda Merge branch 'master' into dependabot/bundler/combine_pdf-1.0.24 2023-10-20 16:44:08 +01:00
filipefurtad0
e645ef72a7 Update all locales with the latest Transifex translations v4.4.16 2023-10-20 12:27:28 +01:00
Konrad
2ba5ab7dc1 Merge pull request #11577 from jibees/10956-use-cable_ready-instead-of-morph 
Admin, Orders list: when capturing an order, fix an issue that makes the tooltip invisible (+ errors in the console)
 2023-10-20 11:56:53 +02:00
dependabot[bot]
06eac95a48 chore(deps): bump combine_pdf from 1.0.23 to 1.0.24 
Bumps [combine_pdf](https://github.com/boazsegev/combine_pdf) from 1.0.23 to 1.0.24.
- [Release notes](https://github.com/boazsegev/combine_pdf/releases)
- [Changelog](https://github.com/boazsegev/combine_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/boazsegev/combine_pdf/compare/v1.0.23...v1.0.24)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-20 09:20:47 +00:00
dependabot[bot]
c734f982a1 chore(deps): bump tom-select from 2.2.2 to 2.2.3 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.2.2...v2.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-20 09:06:10 +00:00
Gaetan Craig-Riou
5ba21e486a Recalculate voucher voucher adjusment when needed 
We need to recalculate the voucher adjustment(s) in the following
scenarii :
When a voucher as been added to the order and :
  * Moving to the payment step from details step, to take into account
    potential change in shipment fees. (this happen if we return to the
    details step after reaching the summary step)
  * Moving to the summary step from payment step, to take into account
    payment fees
 2023-10-20 16:49:21 +11:00
Maikel Linke
b83651a7ae Avoid error when generating fee report 
Instead some data is missing from the report. A slightly better outcome
but still wrong. This is tracked in another issue though.
 2023-10-20 15:45:32 +11:00
Maikel Linke
4fc66f6585 Spec fee report failing on removed variant 
Well, creating a unit test level spec in the first place. Edge cases
like this don't need to be tested in slow system specs.
 2023-10-20 15:35:17 +11:00
Gaetan Craig-Riou
f9d2deeb17 Small clean up 2023-10-20 15:28:26 +11:00
Maikel Linke
43b1eca026 Remove unneeded report spec 
Testing for the absence of behaviour is useful when changing code to
assert that the change is successful but in the long term, it doesn't
add any value. If you don't have any reason to believe that the report
may delete parameters then we don't need to test for that.
 2023-10-20 14:22:43 +11:00
Maikel
d45fe44c9f Remove unused Code Climate badge 
It always gave us a good score anyway because we ignored the bad code.
 2023-10-20 10:22:42 +11:00
David Cook
8fad8b9f80 Merge pull request #11687 from filipefurtad0/fix_flaky_spec_#11686 
Moves assertions within before do block
 2023-10-20 09:57:41 +11:00
David Cook
801c30f4d5 Merge pull request #11685 from openfoodfoundation/dependabot/bundler/roadie-rails-3.1.0 
chore(deps): bump roadie-rails from 3.0.0 to 3.1.0
 2023-10-20 09:55:42 +11:00
David Cook
2d68d49c1f Merge pull request #11683 from openfoodfoundation/dependabot/npm_and_yarn/babel/traverse-7.23.2 
chore(deps): bump @babel/traverse from 7.21.5 to 7.23.2
 2023-10-20 09:51:32 +11:00
David Cook
3805988c6e Merge pull request #11682 from filipefurtad0/assert_status_on_order_confirmation_screen 
Adds coverage on order confirmation page
 2023-10-20 09:49:10 +11:00
Maikel
5d2d925eb6 Merge pull request #11547 from filipefurtad0/legal_invoices_associations_comparator_spec 
Adds coverage on order-associated attributes
 2023-10-20 08:52:27 +11:00
filipefurtad0
8d6ed5ec23 Moves assertions within before do block 
Doing so, assures the removal of the invoice is finished, before clicking the 'Next - Order summary' button
 2023-10-19 17:38:27 +01:00
filipefurtad0
c05716cea9 Addresses review suggestions from @dacook 
I've noticed that it was necessary to include a reference to the order like 'order.adjustments << create(:adjustment, order:)' for the tests to pass

Updates test case description
 2023-10-19 15:49:28 +01:00
dependabot[bot]
91f94505c2 chore(deps): bump roadie-rails from 3.0.0 to 3.1.0 
Bumps [roadie-rails](https://github.com/Mange/roadie-rails) from 3.0.0 to 3.1.0.
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md)
- [Commits](https://github.com/Mange/roadie-rails/compare/v3.0.0...v3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-19 09:22:55 +00:00
dependabot[bot]
f35388ef3a chore(deps): bump @babel/traverse from 7.21.5 to 7.23.2 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.5 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-19 02:28:53 +00:00
Çağrı Özkan
a6bcac8a7d Remove text-center from subscription table td's 2023-10-19 05:16:20 +03:00
filipefurtad0
27ecd4224e Sets tests as shared example (further DRYes spec) 2023-10-18 19:12:58 +01:00
filipefurtad0
461ef48c3a DRYes spec 2023-10-18 18:26:42 +01:00
filipefurtad0
80f0b30e5c Adds coverage on order confirmation page 
Related to the changes from PRs #11668 and #11114.
 2023-10-18 16:02:31 +01:00
Filipe
caa655f500 Merge pull request #11668 from drummer83/master 
Don't show credit owed when = 0 in order confirmation
 2023-10-18 12:16:54 +01:00