Filipe
98eabc9d0f
Merge pull request #12826 from chahmedejaz/bugfix/12815-fix-inconsistent-unit-values
...
Fix Inconsistent Behavior When Editing Products to mg Units in Hungarian Locale
2024-08-29 17:47:44 -06:00
Konrad
afc4c1e967
Merge pull request #12760 from wandji20/wb-OFN-12744
...
UX improvements for creation of new products [OFN-12744]
2024-08-29 17:22:36 +02:00
Konrad
ae993784d8
Merge pull request #12813 from chahmedejaz/task/12810-increase-price-column-width
...
[BUU] Fix the too Narrow Price field
2024-08-29 15:22:27 +02:00
Filipe
2817b8891e
Merge pull request #12814 from dacook/buu/cell-padding
...
Increase column space in bulk products table
2024-08-28 21:30:03 -06:00
Filipe
ab87610d91
Merge pull request #12807 from kernal053/fix-broken-column-after-cloning
...
Fix broken column after cloning product
2024-08-28 21:03:53 -06:00
David Cook
54252f5444
Add comment
2024-08-29 09:42:59 +10:00
Ahmed Ejaz
7b6b0dbb78
12815: use en formatting for unit value conversion
2024-08-29 03:36:46 +05:00
Konrad
0c2dcbc50d
Merge pull request #12812 from chahmedejaz/bugfix/12809-irresponsive-products-column-widths
...
[BUU] Fix Table width not responsive to the amount of selected columns
2024-08-28 16:45:07 +02:00
David Cook
5324747f89
Reduce cell padding
...
This is closer to the original design:
* 6px between inputs
* 6px vertical padding on condensed rows
* 12px vertical padding on relaxed rows
Note that 'relaxed' rows are now smaller than the regular rows, which was not the original intention. But we haven't got spare time to do a broader review of table styles right now.
2024-08-26 16:53:19 +10:00
Gaetan Craig-Riou
ef2856d169
Remove added eventListener on disconnect
...
It's good practise to remove added event listener to avoid memory leak
2024-08-26 11:15:26 +10:00
Ahmed Ejaz
d9c79ee49c
12810: increase price width
...
- make it to 10% which makes sure that any price value acceptable by the system is displayed fully
- Reduce On Hand to 8% to make up for some space for the above
2024-08-24 17:37:59 +05:00
Ahmed Ejaz
d1f9b0855d
12809: fix the class name for the producer column in product
2024-08-24 02:05:04 +05:00
kernal053
e35a5179bb
Fix broken column after cloning product
2024-08-23 16:01:56 +05:30
wandji20
94b98867d8
Revert use of searchableDropdownComponent for product unit
2024-08-23 09:57:37 +01:00
wandji20
35ef1b9c7f
Refactor new product dropdown to use SeachableDropdown component [OFN-12744]
2024-08-23 09:57:37 +01:00
wandji20
8badfb2505
Allow extra attributes to be passed to searchable dropdown component [OFN-12744]
2024-08-23 09:57:37 +01:00
wandji20
d61acd2cc1
Unify error messages and display on new product form [OFN-12744]
2024-08-23 09:57:37 +01:00
wandji20
7417cee20a
Fix leaked trix editor event listener [OFN-12744]
2024-08-23 09:57:37 +01:00
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
