Maikel
e9c7e1778c
Merge pull request #12782 from mkllnk/reports
...
Add fallback report loading in case websockets fail
2024-08-23 09:23:42 +10:00
wandji20
95135ca526
Move order_cycle datetime verification logic to service files [OFN-12775]
2024-08-22 22:17:12 +01:00
Maikel Linke
23aa762be2
Add fallback report loading in case websockets fail
...
This also resolves a race condition scenario. Even if the report gets
rendered via websockets before the controller response is rendered then
the fallback script loads the report again. It's not the most beautiful
but probably okay until we replace websockts altogether.
I'm leaving websockets in at the moment because it can render the report
much quicker than polling can.
2024-08-16 15:24:34 +10:00
Maikel Linke
d354317c73
Replace cable_ready report loading w/ Turbo stream
...
I'm adding TurboPower for the scroll_into_view action. It adds all the
nice CableReady actions to Turbo Streams.
Note that I omitted `block: "start"` because that option is the default
in Javascript. And the generic `action` method doesn't support
parameters like this anyway. I'll work on that in the next commit.
I also re-introduced a race condition by rendering the "loading"
indicator after triggering the report rendering job. I'm planning to
resolve that later.
2024-08-16 14:37:57 +10:00
Maikel Linke
19ef047193
Create observable reports blob early
...
This will allow us to check for completion of the report later in case
websockets fail.
2024-08-16 14:37:57 +10:00
Maikel Linke
037eb456c0
Remove unused controller ivar
2024-08-16 14:37:57 +10:00
Maikel Linke
aed78f3138
Simplify reports controller code branching
2024-08-16 14:37:57 +10:00
Maikel Linke
c31416c536
Separate showing and rendering report
2024-08-16 14:37:57 +10:00
Konrad
059dceb304
Merge pull request #12735 from chahmedejaz/bugfix/12698-fix-products-stateful-navigataion
...
Fix 'Back to products list' stateful navigation
2024-08-15 10:43:13 +02:00
wandji20
ad3e772944
Refactor and update order cycle form controller [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
6a438a07fe
Add stimulus controler to monitor order cycle status message data attribute change and trigger warning modal [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
ea238829a8
Revert front end validation and implement backend validation for changes in datetime order cycle values [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
0de8a90b14
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-12 09:05:48 +01:00
Gaetan Craig-Riou
1f55ff4b72
Merge pull request #12729 from mkllnk/fdc-update
...
Remove now unneeded FDC compatibility code from product import
2024-08-12 11:14:44 +10:00
Maikel Linke
ec828c335d
Remove superfluous FDC-specific request class
2024-08-07 15:09:05 +10:00
David Cook
40c77948b9
Show success message
...
I'm not sure, but I assume that Config.set will raise an exception if it failed.
2024-08-07 10:31:06 +10:00
David Cook
a95aa1b3e9
Submit blank value if nothing selected
...
If a checkbox is not selected, the browser does not submit it at all.
2024-08-07 10:30:45 +10:00
David Cook
5d732d80a6
Add connected apps settings screen
...
I considered adding a request spec, but figured it still doesnt' test the form, so better to use a full system spec.
2024-08-06 11:26:03 +02:00
Ahmed Ejaz
c101c4e42f
12698 - fix 'go back to products' stateful navigation
2024-08-05 13:51:59 +05:00
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
David Cook
da7bbcf82f
Enable/disable affiliate sales data
2024-07-25 17:06:13 +10:00
David Cook
9d89b4726b
Move connect logic to model
...
Then subtypes can override as needed.
2024-07-25 17:06:13 +10:00
David Cook
2ab6bcb2e4
Use system method to generate temporary file path
...
This method is not documented, but is used by Dir.mktmpdir. https://apidock.com/ruby/Dir/Tmpname/create
2024-07-09 16:01:50 +10:00
David Cook
ca612282f9
Use Rails tmp dir for product imports again
...
In https://github.com/openfoodfoundation/openfoodnetwork/pull/3435 , it was switched to the system tmp dir because it conventiently provided a method to generate a unique filename. However it didn't handle the case where the system provided a symlink (macOS).
I could have fixed that, but surely it's safer to use the Rails tmp directory.
So I changed back to that, using a tip from https://stackoverflow.com/questions/13787746/creating-a-thread-safe-temporary-file-name to generate a unique name. Perhaps we could use a larger string (eg uuid) or append a timestamp too, but I don't know that it's necessary. Instead, we can just check that the dir didn't exist first (as mentioned in the PR). Let's do that..
2024-07-09 15:47:54 +10:00
Gaetan Craig-Riou
1ea3160a6a
Fic enterprises controller
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
78abe36327
Fix BUU product page specs
2024-07-03 11:05:00 +10:00
Konrad
5bb47823c6
Merge pull request #12619 from rioug/12559-disable-report-button
...
[Reports] Disable GO button once clicked
2024-06-28 17:11:29 +02:00
David Cook
d799230440
Update controller to catch more specific error
...
We now know which errors to expect. We still let other unknown errors raise higher up, where they will be logged with BugSnag, and treated as internal_server_error.
2024-06-27 12:51:28 +10:00
David Cook
92bd7a5d37
Revert new product duplicator behaviour
2024-06-27 11:39:49 +10:00
Ahmed Ejaz
5a259f1b91
Merge branch 'master' into task/11987-remove-SR-from-clone
2024-06-26 16:18:42 +05:00
Ahmed Ejaz
95972c75c6
11987: remove rescue StandardError from controller
2024-06-26 16:10:31 +05:00
David Cook
0001ffa970
Fix product index
...
The param product_index wasn't present, so it was always choosing 1.
The products on page are indexed 0-14, so of course it would always conflict.
It would be simpler if we just used product IDs as the index, I think I did earlier but don't remember why not.
Anyway, using a negative number seems to work.
If there's an error, there will only be one at a time.
2024-06-26 17:04:49 +10:00
Gaetan Craig-Riou
74fb6c3143
Disable GO button once clicked
...
It is disabled both on client side and server side, so even if the
server takes a while to respond the button is disabled
2024-06-26 16:01:05 +10:00
Abdul Aziz Ali
b3570991f4
Rubocop. Fix cyclomatic complexity in fees controller #11326
2024-06-26 06:36:42 +08:00
Ahmed Ejaz
98e0b0e703
12346 - fix rubocop rails/pluck errors
2024-06-22 01:45:58 +05:00
Abdellani
7a015bad96
populate destroyed_by on produce_v3_controller#destory
2024-06-19 15:14:32 +01:00
Maikel
af2e7db155
Merge pull request #12582 from cyrillefr/FixRails_UnusedRenderContentIssues
...
Fixes offenses raised by Rails/UnusedRenderContent
2024-06-19 11:19:22 +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
cyrillefr
a155630b1c
Fixes offenses raised by Rails/UnusedRenderContent
...
- in any cases, adding status: :no_content dropes content from response
- replaced by head :no_content (HTTP 204)
2024-06-18 13:33:19 +02:00
Ahmed Ejaz
d2737bd8b0
11987: refactored code
2024-06-18 00:44:10 +05:00
Ahmed Ejaz
05fe7cd4b9
11987: add flash messages for product clone
2024-06-17 23:17:32 +05:00
Ahmed Ejaz
fa3b84b71f
11987: add clone action
2024-06-17 21:58:07 +05: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
e7774d7a24
Lint fix
...
Sorry didn't have time to go back and rebase
2024-06-13 10:39:19 +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
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
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
