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
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
Maikel
b24ca03e28
Merge pull request #12547 from zanetagebka/StringConcatenationCops
...
Fix cops StringConcatenation
2024-06-11 15:53:37 +10:00
Maikel Linke
a8f0ebc408
Update Rubocop todo list
2024-06-11 15:33:28 +10:00
zanetagebka
e06df7d658
- Refactor method to fix StringConcatenation cop
2024-06-11 15:17:45 +10: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
a84c947d66
Merge pull request #12548 from cyrillefr/RedundantPresenceValidationOnBelongs_part_VII
...
Fix RedundantPresenceValidationOnBelongs on Spree::Order model
2024-06-11 10:37:11 +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
Mohamed ABDELLANI
55365be299
fix linter issue
2024-06-07 17:53:45 +01:00
Mohamed ABDELLANI
586a7055d7
notify if any distributors doesn't have an abn
2024-06-07 17:53:44 +01:00
Maikel Linke
23c175ea59
Update all locales with the latest Transifex translations
2024-06-07 20:04:53 +10:00
Maikel Linke
4d4d9daf42
Add OFN contact name as DFC main contact person
2024-06-06 14:32:37 +10:00
Maikel Linke
5b7b8872b6
Use standard logo attribute on DFC API
...
Still keeping the custom OFN attribute for compatibility. Integrations
can be updated once this is live.
2024-06-06 10:59:25 +10: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
Filipe
4f7d5adb53
Merge pull request #12427 from abdulazizali77/bugfix/11680-order-additional-tax
...
Display additional tax total in order - fixes #11680
2024-06-05 23:22:31 +02:00
Filipe
5872515a35
Merge pull request #12515 from isidzukuri/12503_skip_saving_of_unchanged_products
...
Do not commit to db unchanged products in bulk save
2024-06-05 18:01:59 +02:00
Filipe
f6de15e196
Merge pull request #12518 from anansilva/12448-sanitise-html-product-description
...
Sanitise HTML in product description [read-only]
2024-06-05 11:13:56 +02:00
David Cook
9c0f55ad22
Refactor
2024-06-05 09:45:30 +10:00
David Cook
d34e7dbf9f
Specify accepted format on client side
...
I don't know why, but even though the client sends http accept header for json, rails is treating it as html. This was being overridden in the route, but I want to support multiple formats next. So, we explicitly choose the format by adding it to the request path.
2024-06-05 09:45:30 +10:00
David Cook
2d0f206e8a
Prepare spec
2024-06-05 09:45:30 +10:00
