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
61f2954973
Add TurboPower Rails gem for nice helpers
...
The helpers are more convenient but also allow us to add options like
smooth scrolling. I thought that looked nicer and is less confusing.
Please note that the `scroll_into_view` helper uses the `targets`
attribute instead of `target`. That attribute needs CSS selectors with a
leading `#` for ids.
2024-08-16 14:37:57 +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
David Cook
917079931e
Merge pull request #12778 from chahmedejaz/bugfix/12596-fix-annoying-oc-warning-display
...
[BUU] Fix Messy flash notifications on new products page
2024-08-16 10:29:43 +10:00
Ahmed Ejaz
46e54f48c9
12596: keep flash[:notice] check
2024-08-15 14:50:32 +05: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
Ahmed Ejaz
3474c60f4c
12596 - fix annoying oc warning display
...
- such that it only displays once per user session
2024-08-15 05:59:17 +05:00
Konrad
503148b13b
Merge pull request #12653 from wandji20/wb-OFN-11613
...
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-14 18:14:33 +02:00
Ahmed Ejaz
b14cd08990
12698 - keep old UI URL as it is
2024-08-13 14:23:39 +05:00
wandji20
1e71db9315
Remove permalinmk from taxons [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
82b742608d
Remove jquery/js.tree plugin [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
a85cfab506
Remove awesome nested set gem and dependencies [OFN-11636]
2024-08-12 18:47:16 +01:00
Gaetan Craig-Riou
43d983cac2
Remoce left over console.log
2024-08-12 09:05:48 +01: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
91fddeaa8b
Fix failing spec [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
93edf4e3ad
Load MiniMagick before use
...
We only reference MiniMagick when rescuing errors but when it's not
loaded, that code fails to find the error class itself to apply the
rescue block.
The rescue block is covered by a spec but the code passes there as
MiniMagick is loaded.
We can see this error only in development, staging and production.
2024-08-09 14:25:29 +10:00
Ahmed Ejaz
787205dcca
Merge branch 'master' into bugfix/12739-fix-number-rounding-with-hu-locale
2024-08-09 01:59:50 +05:00
Filipe
fcb0996a76
Merge pull request #12713 from dacook/buu/style-fixes2
...
[BUU] Style fixes
2024-08-08 17:31:20 +01:00
Filipe
76d874d5f9
Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page
...
[BUU] Fixes Products Page ActionView::Template::Error
2024-08-08 16:20:26 +01:00
Rachel Arnould
81711e4c43
Merge pull request #12721 from dacook/connected-apps-settings-12549
...
New settings screen to activate each connected app type
2024-08-08 16:56:33 +02:00
Ahmed Ejaz
6757c8df74
12739 - fix number_with_precision method
2024-08-07 18:54:35 +05: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
Konrad
cb42e7e119
Merge pull request #12671 from wandji20/wb-OFN-12591
...
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-06 14:09:59 +02: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
David Cook
254e11aa36
Use whitelist
...
It wasn't really necessary, but I'm going to need this list in a moment, so we might as well use it.
Also it allows us to ensure the options are listed in a certain order.
Also maybe it will help protect against corrupt preferences.
2024-08-06 11:26:03 +02:00
David Cook
4223b36bc3
Only show enabled connected app types
...
The preference will be set from the admin interface in a new commit
It would be nice if we had an array/list type for preferences. Probably not too hard to implement, but this will do.
2024-08-06 11:26:03 +02:00
David Cook
fcea437d7e
Only show connected apps in enterprise settings, if system setting is enabled
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
Gaetan Craig-Riou
7e1af9e04b
Merge pull request #12723 from johansenja/optimise-shops-page
...
Preload enterprise logos and promo images for /shops page
2024-08-05 13:54:20 +10:00
Filipe
7939bf8038
Revert "Pluralize admin products search result [OFN-12532]"
2024-08-05 10:03:58 +10:00
Ahmed Ejaz
1014a50aff
12705 - incorporate old UI behavior
...
- if unit_value is not present and unit_description then display unit_description only.
- if both are not present then display empty fields
2024-08-04 17:47:02 +05:00
Filipe
5012c52438
Merge pull request #12711 from cillian/wider-item-column-on-invoice-pdf
...
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-08-02 10:20:24 +01: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
Joseph Johansen
ffe4603f2f
Preload enterprise logos and promo images for shops page
2024-08-01 14:10:53 +01:00
wandji20
ebc794194f
Add product spec when supplier is empty and remove error status code from product create action [OFN-12591]
2024-08-01 09:03:26 +01:00
wandji20
287f65ec8e
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-01 08:58:54 +01:00
Filipe
ce44f19b4a
Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet
...
Fixes 422 error due to bad sql building
2024-07-31 19:45:09 +01:00
Filipe
6c214543ad
Merge pull request #12690 from wandji20/wb-OFN-12666
...
Require variant category and supplier when creating new product variants [OFN-12666]
2024-07-31 19:28:31 +01:00
Filipe
8b1713d169
Merge pull request #12665 from wandji20/wb-OFN-12532
...
Pluralize admin products search result [OFN-12532]
2024-07-31 18:55:53 +01:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00