Maikel
7f09044ae1
Merge pull request #12755 from johansenja/optimise-shops-page6
...
Optimise shops page: Enable injected enterprise data to be scoped to specific enterprise ids
2024-08-23 09:26:22 +10:00
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
b6bfb4e866
Refactor order cycle same_dates method
2024-08-22 22:21:17 +01:00
wandji20
4d222c61c6
Improve readability of order_cycle_set process method
2024-08-22 22:17:12 +01:00
wandji20
8f7505d53d
Refactor oc datetime content partial and include warning modal in oc list [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
867e17301f
Support passing oc confirmation params for oc list [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
95135ca526
Move order_cycle datetime verification logic to service files [OFN-12775]
2024-08-22 22:17:12 +01:00
wandji20
de063fecb1
Move same_datetime_value method to OrderCycle model [OFN-12775]
2024-08-22 22:17:12 +01:00
Filipe
ef9ca33913
Merge pull request #12772 from drummer83/E500_sub
...
Display admin order page instead of shopfront order page to avoid error 500
2024-08-22 13:26:20 -06:00
Joseph Johansen
4718fdb0be
Optimise Spree::Taxon.supplied_taxons
2024-08-22 17:41:00 +02:00
Joseph Johansen
66b519bd1c
Undo minor unneeded changes
2024-08-22 17:41:00 +02:00
Joseph Johansen
1b8e256e8a
Add unit tests
2024-08-22 17:41:00 +02:00
Joseph Johansen
b73e529bfc
Scope injected enterprise properties to specific enterprises
2024-08-22 17:41:00 +02:00
Konrad
25b1620707
Merge pull request #12743 from wandji20/wb-OFN-12214
...
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
2024-08-22 17:34:20 +02:00
Maikel
0c7448ba43
Merge pull request #12726 from mkllnk/order-stock-spec
...
Track (negative) stock for on-demand products and overrides
2024-08-20 15:05:16 +10:00
Konrad
0bbc3d2758
Merge pull request #12766 from mkllnk/magick-dep
...
Remove direct dependency on MiniMagick
2024-08-18 18:39:48 +02:00
Konrad
ae6182579b
Merge pull request #12762 from EdwardLi-coder/change_colour_of_complete_order
...
change colour of "complete order"
2024-08-18 15:08:46 +02:00
Konrad
1e05811917
Merge pull request #12745 from johansenja/optimise-shops-page5
...
Improve effiency of OrderCycle.earliest_closing_times
2024-08-18 14:40:49 +02:00
Konrad
5f86a26f42
Merge pull request #12733 from wandji20/wb-OFN-6567
...
Update product variant unit display name, price, and total price width on different screen sizes [OFN-6567]
2024-08-18 13:25:24 +02:00
Konrad
3f1b907ef2
Merge pull request #12740 from wandji20/wb-OFN-12532-v1
...
Pluralize admin products search result [OFN-12532-v1]
2024-08-18 12:18:18 +02:00
Maikel Linke
d9c296cdb3
Stabilise flaky report specs
...
It looks like we have a new race condition that may only be a problem in
specs. If you trigger one report, it displays via websockets and then
you trigger the next report, there may still be some Javascript active
that displays the first report while the second one is loading. I'm not
sure if users would navigate that fast though.
To minimise the problem, I adjusted the polling to leave more room for
the default websockets response.
2024-08-16 17:08:57 +10: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
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
drummer83
f154de66f9
Display admin order page instead of shopfront order page to avoid error 500
2024-08-14 14:44:59 +02:00
wandji20
58872a7017
Include mail stylsheet tag in invoice pdf files and mailer layout [OFN-12214]
2024-08-13 18:23:18 +01:00
wandji20
7392079d4d
Move mail related styles to asset pipeline [OFN-12214]
2024-08-13 17:11:29 +01:00
wandji20
fa004d0897
Remove wicked pdf stylsheet include tag in order report pdf [OFN-12214]
2024-08-13 17:11:29 +01:00
Ahmed Ejaz
b14cd08990
12698 - keep old UI URL as it is
2024-08-13 14:23:39 +05:00
Maikel Linke
f21aca234c
Remove direct dependency on MiniMagick
...
We still depend on it as long as we set it as image processor but now we
can switch to another image processor without changing the code around
error handling.
We now rescue from unknown errors during image processing which should
make the app more robust.
2024-08-13 15:25:58 +10:00
EdwardLi-coder
93a6ff4b50
remove background-color
2024-08-13 09:38:20 +08: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
EdwardLi-coder
97a72dfde7
change colour of "complete order"
2024-08-12 12:01:02 +08:00
