raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,589 Commits 20 Branches 451 Tags
0dd7f264b95eebfa08592b5fa7d18c339cc4e706
Commit Graph

11245 Commits

Author SHA1 Message Date
Ana Nunes da Silva
d2c6db0d04 Sanitize CustomTab#content 2024-06-20 11:56:09 +02:00
Konrad
25d375bf8e Merge pull request #12577 from cyrillefr/WhiteLabelButtonAlwaysInactive 
Update button should change status on modified white label
 2024-06-20 11:39:58 +02:00
David Cook
0e0a7d9d3e Merge pull request #12589 from cyrillefr/FixRailsRedundantActiveRecordAllMethodIssue 
Fixes Rails/RedundantActiveRecordAllMethod issues
 2024-06-20 09:40:56 +10:00
David Cook
66606eeeab Merge pull request #12584 from mkllnk/spec-refactor 
Update spec for quotation mark replacement
 2024-06-20 09:37:09 +10:00
cyrillefr
654fda89ca Fix Rails/RedundantActiveRecordAllMethod issues 
- Cop: Rails/RedundantActiveRecordAllMethod
- if receiver is an Active Record object, ".all" can be safely removed
- There are 2 allowed receivers that are listed in the
  styleguide file (those are defaults cf. cop documentation).
 2024-06-19 14:32:21 +02:00
Maikel
8837f1caa2 Revert "Allow negative stock levels for on-demand products" 2024-06-19 15:18:57 +10:00
Maikel Linke
10f0eeef0b Update spec for quotation mark replacement 
I'm not sure why, but the pre-compiling of assets triggered Rails to
render `style="..."` instead of `style='...'` in this case. But when
assets are compiled on-demand, we get the single quotes. So I changed
the spec to be agnostic of this detail. We actually just want to know
about the link and its href.
 2024-06-19 11:40:09 +10:00
Maikel
2188e96dfb Merge pull request #12575 from zanetagebka/RedundantInterpolationCops 
Solve Rubocop RedundantInterpolation cops
 2024-06-19 11:01:42 +10:00
David Cook
2676891322 Merge pull request #12546 from dacook/buu/change-columns-11055 
[BUU] Change product columns to be shown
 2024-06-19 09:25:47 +10:00
zaneta.gebka
5cc33d1e0c Merge branch 'master' into RedundantInterpolationCops 2024-06-18 14:33:12 +02:00
Rachel Arnould
0c6cc9b822 Merge pull request #12558 from cyrillefr/BUUUploadingCorruptProductImagesFailsSilently 
BUU Display error messages when file not valid
 2024-06-18 12:12:51 +02:00
cyrillefr
8616847793 Update button should change status on modified white label 
- swap position between users & white label so that user's inner form
- does not interfere with white_label own position in outer form
- modified spec so that lowermost user is clickable
 2024-06-17 17:11:19 +02:00
zanetagebka
ad92d4b129 Solve Rubocop RedundantInterpolation cops 2024-06-17 15:37:39 +02:00
David Cook
aff50f66c4 Name and Producer columns grow to fill and other tweaks 
If neither are visible, the first column on the left (eg image) will grow. But that's not a likely scenario.

Min-widths help manage sizes on smaller screens in Chrome.
The title for Inherits Properties gets cut off, but I think it's better than cutting off content.

Oh look, it fixed a spec too!
 2024-06-17 12:27:06 +10:00
Gaetan Craig-Riou
cc45b9a0d3 Merge pull request #12557 from filipefurtad0/feature_parity_buu 
Updating specs for BUU (feature parity)
 2024-06-17 09:39:01 +10:00
Maikel Linke
6a4a238378 Avoid flakiness with Capybara features 
Capybara should be clever enought to scroll to an element. The old
method failed nine times in CI. I couldn't reproduce it locally but
let's see if this is better.
 2024-06-14 10:47:35 +10:00
filipefurtad0
9cd1977cf8 Removes product creation test 
This is already covered some lines above and on e22bec014b/spec/system/admin/products_spec.rb (L29)
 2024-06-13 12:15:24 -06:00
filipefurtad0
9e5c21f7cd Corrects test case by adding expect 
has_select? only returns true or false, it requires an assertion to assure the test is evaluated

Improves syntax
 2024-06-13 12:06:34 -06:00
Filipe
df30c1af98 Revert "[Invoices] Notify if any order cannot be invoiced on bulk invoice sending" 2024-06-13 08:55:59 -06:00
Filipe
e22bec014b Merge pull request #12538 from cyrillefr/UpdateAndRecalculateFeesAfterOrderAdjustedInBackend 
Update and Recalculate Fees after Order Adjusted in Backoffice
 2024-06-13 08:53:43 -06:00
cyrillefr
0470efa502 Requested changes: turbo_stream for success 
- must respond via turbo for create and update for success
- changed the spec accordingly
 2024-06-13 15:22:54 +02:00
David Cook
5d0e241f8c Pending spec 
Probably due to column tweaks, revealing different existing problems.
 2024-06-13 11:12:31 +10:00
Maikel
2f173cb5c2 Merge pull request #12536 from mkllnk/stock-levels 
Allow negative stock levels for on-demand products
 2024-06-13 10:26:01 +10:00
David Cook
70fab2bcc1 Show/hide columns using display instead of visibility 
Visibility was way simpler, but the table doesn't recalculate column widths until you use display:none;

This is now using the same method as the old products screen.
But we still need to update colspans..
 2024-06-13 10:08:56 +10:00
David Cook
8c75e6baa8 Make column selector a dropdown 
With some styling tweaks.
 2024-06-13 10:07:55 +10:00
Maikel
5b95ef3bd9 Merge pull request #12525 from mkllnk/fdc-import 
Add compatibility to the DFC product import for FDC (Shopify) API
 2024-06-13 09:51:05 +10:00
Filipe
b1f7807150 Merge pull request #12458 from abdellani/12374-bulkk-sending-invoice-must-show-error-if-abn-require-and-not-set 
notify the user if any order cannot be invoiced on bulk invoice sending
 2024-06-12 16:48:51 -06:00
David Cook
d81c3cb489 Show/hide columns based on checkboxes 
The cols could have been a lot cleaner with simple classnames, but I preferred to mark up in a way that reveals the purpose (otherwise they could be used for styling).

It doesn't seem to be any faster comparing querySelector('[data]') vs class, or iterating through the dom nodes.
 2024-06-12 14:58:00 +10:00
David Cook
89cedc4287 Submit and render with Turbo Stream 2024-06-12 14:49:59 +10:00
David Cook
68da9c9e04 Add form to save column preferences 2024-06-12 14:49:53 +10:00
cyrillefr
c5decfc58b Bugfix introduced by last commit 
- fixed bug created by last commit
- refactored to new method respond_with_error
- need for 2 cases in request spec: html & turbo
 2024-06-12 00:31:19 +02:00
filipefurtad0
10dbe77f71 Adds test to check permissions when updating a product 2024-06-11 14:51:28 -06:00
filipefurtad0
417fd21470 Adds test to check permissions when creating a new product 2024-06-11 14:51:28 -06:00
filipefurtad0
8e2419040e Adds test around inactive product 2024-06-11 14:51:28 -06:00
filipefurtad0
0392034850 Adds test case on enterprise permissions 2024-06-11 14:51:28 -06:00
filipefurtad0
c4c7f03b6b Addresses Gaetans review 
Removes assertions from before block, as Delete case is tested elsewhere

Declares enterprise_user variable as a non-instance variable
 2024-06-11 14:51:28 -06:00
filipefurtad0
3b0779d3a7 reverts changes on products_spec 2024-06-11 14:51:28 -06:00
filipefurtad0
2725232902 Adds tests around managing rights -> 'as an enterprise manager' 2024-06-11 14:51:28 -06:00
filipefurtad0
d5ae9b5bcc Adds a test to assure that the new product path works as expected 
The funcitonaliy itself should not be affected by BUU, so the tests remain at ./spec/system/admin/products_spec.rb
 2024-06-11 14:51:28 -06:00
filipefurtad0
50359695b5 Removes comment on issue #7180, now closed 2024-06-11 14:51:28 -06:00
filipefurtad0
a8ff696792 Removes deleting and cloning test from the legacy bulk product edit page 
These are covered in the new BUU products page
 2024-06-11 14:51:28 -06:00
filipefurtad0
ae600d4bd6 Removes test case on access rights to the products page 
Moves test on access rights to authentication_spec

The test on accessing the products page as an anonymous does not seem specific to the products page (IMO); as we're testing access rights and the Devise gem (right?) we're probably better off having this test in a more suitable and general context, such as as a spec dealing with authentications and redirects
 2024-06-11 14:51:28 -06:00
filipefurtad0
95092b3b06 Adds test case around shipped product 
Removes test case around shipped product for legacy products page
 2024-06-11 14:51:28 -06:00
cyrillefr
942990612b Requested changes 
- refined the code and applied it to create method too
- modified one request spec to work with turbo_stream
- added  2 examples in system specs
 2024-06-11 22:29:12 +02:00
zanetagebka
e62bdf987d Fix test 2024-06-11 15:17:34 +10:00
zanetagebka
a2a670c848 Fix cops StringConcatenation 2024-06-11 15:17:32 +10:00
Gaetan Craig-Riou
8b31fa1ee5 Merge pull request #12541 from openfoodfoundation/dependabot/bundler/rubocop-1.64.1 
chore(deps-dev): bump rubocop from 1.63.5 to 1.64.1
 2024-06-11 10:30:28 +10:00
cyrillefr
01612843b4 BUU Display error messages when file not valid 
- implements a turbo response in controller
- display error messages on modal -> able for user to re upload
- removes a pending in spec that now tests error message
 2024-06-10 14:32:08 +02:00
Abdellani
b0862d26f6 update tests 2024-06-07 17:58:59 +01:00
Filipe
e4c0523ad1 Merge pull request #12094 from cyrillefr/Reports-500Error-if-date-range-end-is-before-date-range-start-in-Enterprise-Fee-Summary 
Force start date before end date with range mode flatpickr
 2024-06-05 23:39:24 +02:00