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
68da9c9e04
Add form to save column preferences
2024-06-12 14:49:53 +10:00
Abdul Aziz Ali
e2aca63fff
Rubocop. Change yield_self to then #11326
2024-06-12 08:52:43 +08:00
Abdul Aziz Ali
e537bda9b7
Display only per_item fees for oc incoming exchange #11326
...
Add per_item param to EnterpriseFee angular service and rails controller
2024-06-12 08:29:34 +08: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
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
e06df7d658
- Refactor method to fix StringConcatenation cop
2024-06-11 15:17:45 +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
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
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
Maikel Linke
d9f013abbc
Style/SendWithLiteralMethodName
...
Use method call directly instead of `public_send` with fixed argument.
The cop is declared unsafe. I think that is because it can also replace
`send` but we replace only `public_send` here.
2024-06-05 09:38:21 +10:00
Maikel Linke
e6ac2f0d88
Style/SuperArguments
...
Call super without arguments and parentheses when the signature is identical.
2024-06-05 09:29:42 +10:00
cyrillefr
87f0be42e2
Fixes rubocop offenses on Spree::Order model
...
- removes old Rails 5 flag to not validating
belongs to association. Therefore optional fields must be marked so.
2024-06-04 18:17:12 +02:00
Filipe
db255b0d61
Merge pull request #12511 from chahmedejaz/task/12398-remove-reflex-from-product-variant-delete
...
Task/12398 remove reflex from product variant delete
2024-06-04 16:03:57 +02:00
David Cook
5a8eea398e
Add comment
2024-06-04 10:24:40 +10:00
Filipe
dc994692a9
Merge pull request #12521 from dacook/buu/fix-blank-selects-12473
...
[BUU] Fix for blank dropdowns
2024-06-03 17:04:40 +02:00
Ana Nunes da Silva
205c7dafd2
Add div to sanitizer supported tags
2024-06-03 11:45:50 +01:00
Ana Nunes da Silva
5f54ea3877
Add safe trix tags to html sanitizer;
...
Use custom html sanitizer in product description.
2024-06-03 11:45:50 +01:00
Ana Nunes da Silva
a7dc243db9
Sanitize product description using rails default sanitizer
2024-06-03 11:45:49 +01:00
Abdul Aziz Ali
369ea7cd16
Define tax_on_fees i8n key #11680
2024-06-03 13:04:36 +08:00
Gaetan Craig-Riou
d5dac4d890
Merge pull request #12535 from mkllnk/panel-beating
...
Restore enterprise edit form as manager
2024-06-03 15:00:30 +10:00
Abdul Aziz Ali
82f75e344f
Display additional tax total in order #11680
...
Add new text key admin.order.edit.additional_tax_included_in_price
Add spec file for additional tax display. Add new trait for enterprise fee and calculator factory
2024-06-03 12:50:37 +08:00
Gaetan Craig-Riou
5326b332ee
Merge pull request #12529 from cyrillefr/RedundantPresenceValidationOnBelongs_part_VI
...
Fix Redundant presence validation on belongs part VI
2024-06-03 12:53:35 +10:00
Filipe
706da37f15
Merge pull request #12507 from mkllnk/connected-apps-super-admin
...
Allow only enterprise managers to connect apps
2024-06-01 18:16:28 +02:00
cyrillefr
073dfc4ab6
Update and Recalculate Fees after Order Adjusted in Backend
...
- when update on adjustment in payment, recalculation of
correct adjustment was not done
- the corresponding spec
- an id to easy the finding of the change of fees in the spec
2024-05-31 16:39:02 +02:00
Filipe
925d257dc5
Merge pull request #12495 from cillian/osm-registration-map
...
Get registration location map working with OSM
2024-05-31 14:32:05 +02:00
Maikel Linke
ecbba894f7
Update stock levels of on-demand items
...
We weren't bothering with stock when items were on demand anyway. But we
want to track stock now so that we can backorder more when local stock
levels become negative.
2024-05-31 16:38:24 +10:00
Maikel Linke
d391faac64
Remove validation of positive stock when on demand
...
We weren't allowing negative stock to stop any bug from accidentally
drawing too much stock. But now we want to implement a backordering
logic that depends on negative stock levels to know how much is needed
to replenish stock levels.
2024-05-31 16:37:15 +10:00
