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
Gaetan Craig-Riou
55ae1ba29f
Merge pull request #12579 from openfoodfoundation/dependabot/npm_and_yarn/ws-6.2.3
...
chore(deps): bump ws from 6.2.2 to 6.2.3
2024-06-19 09:17:53 +10:00
David Cook
6fd3cada8c
Fix classname
2024-06-19 09:13:53 +10: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
David Cook
b8f8d6d042
Show/hide columns with CSS selectors instead
...
Well, that made the JS way simpler.
Adds a lot of classes though. Maybe we could do it based on column index instead, but this will do for now.
table.hide-col0 { td:nth-child(0) { display: none; } }
2024-06-18 15:35:53 +10:00
dependabot[bot]
9543b597d0
chore(deps): bump ws from 6.2.2 to 6.2.3
...
Bumps [ws](https://github.com/websockets/ws ) from 6.2.2 to 6.2.3.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/6.2.2...6.2.3 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-06-18 02:16:27 +00: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
cyrillefr
e07cf6c628
Do not use rescue as control flow
2024-06-16 23:38:38 +02:00
Maikel Linke
885f679eb1
Update all locales with the latest Transifex translations
2024-06-14 11:26:09 +10:00
Maikel
70ad8c80e1
Merge pull request #12568 from openfoodfoundation/revert-12458-12374-bulkk-sending-invoice-must-show-error-if-abn-require-and-not-set
...
Revert "[Invoices] Notify if any order cannot be invoiced on bulk invoice sending"
2024-06-14 11:23:52 +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
Maikel Linke
3c9f77dc2b
Restore image display with absolute width
...
The `min-width` property is ignored by Firefox. And we don't need the
column to grow any bigger than the picture size anyway. An absolute
width is correct here.
The specification says:
> Applies to all elements but non-replaced inline elements, table rows,
> and row groups.
Firefox is totally right in ignoring it.
2024-06-14 09:48:55 +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
David Cook
b25d2ed32a
Refactor to fix Metrics/AbcSize linter
2024-06-13 10:51:35 +10:00
David Cook
db27fc5a2b
Remove dead code
...
I'm pretty sure that case doesn't happen, and besides there's no spec for it.
2024-06-13 10:51:00 +10:00
David Cook
a7ef243262
Enable all columns by default
2024-06-13 10:43:33 +10:00
David Cook
e7774d7a24
Lint fix
...
Sorry didn't have time to go back and rebase
2024-06-13 10:39:19 +10:00
David Cook
9ae4d347aa
Update widths
...
For some reason, minimum widths work now (I swear they didn't before).
Hmm i would really like to shorten that stimulus controller name.
2024-06-13 10:36:28 +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
d5456a85b7
Reset cell colspans
...
This might be a little simpler if we move the 'new variant' button to col 0, and assume colspan cells always span the whole table.
2024-06-13 10:09:02 +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
0190d6f31d
Update dropdown styles
...
The v2 dropdown is used in various places, and now looks more in line with the new design.
2024-06-13 10:08:02 +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
9ba3b4f2d5
Fix up styles
2024-06-12 14:58:09 +10:00
David Cook
c6452efa92
Isolate styles for their intended use
...
This also improves the styling of the orders action dropdowns (on index and edit pages). It adds the new chevron icon, but needed some fiddling to make it look right.
2024-06-12 14:58:09 +10:00
David Cook
e516e7f335
Tweak checkbox dropdown styles
...
Use the new design for checkboxes and fix alignment.
Removes redesigned-input, which is a small regression on the old design, but I think it's acceptable bcause we're going to shut it down soon.
2024-06-12 14:58:09 +10:00
David Cook
ae66a85cc5
Show error messages
...
There shouldn't normally be errors, but I got one due to bad data during development, and this helped sort it out.
2024-06-12 14:58:09 +10: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
50469fe53e
Use consistent translation keys
...
Ensures that the column table names match the names in the selector.
I thought 'there must be a way to set the translation scope once'. With Rails, there's usually a way. Thankfully this one was quite simple. Or is it too much magic.. 🧙
https://coderwall.com/p/dvme9q/set-scope-of-i18n-translations-in-rails-with-a-block
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
