Maikel Linke
99c098f567
Ignore StockLocation#active, it's always active
2024-10-03 08:24:16 +10:00
Maikel
196956140e
Merge pull request #12856 from mkllnk/dfc-order
...
Place backorders for linked products via DFC integration
2024-10-01 10:51:00 +10:00
Gaetan Craig-Riou
91f2ca9286
Merge pull request #12734 from cillian/replace-text-angular-with-trix
...
Replace text angular editor with trix editor in About Us and Shopfront message fields
2024-09-30 09:40:48 +10:00
Filipe
852dd41f89
Merge pull request #12836 from wandji20/wb-OFN-11600
...
Add browser unsaved changes modal when navigating from order summary page [OFN-11600]
2024-09-27 17:41:04 -06:00
wandji20
84a2e6c24d
Add browser unsaved changes modal when navigation form order sumary page [OFN-11600]
2024-09-27 16:52:55 -06:00
David Cook
be4e0a259e
Specify alternate html_title
...
Because the page title has extra content.
2024-09-27 15:48:28 -06:00
David Cook
c362e8dd0d
Use page titles in HTML head
...
This is much more meaningful than the controller name, and is helpful for browser tab history.
2024-09-27 15:48:28 -06:00
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
wandji20
37ab832b86
Remove window unload event listener from edit order cycle cancel link
2024-09-27 10:02:49 +02:00
wandji20
a11873559b
Make OC edit warning modal cancel button redirect user to OC list [OFN-12774]
2024-09-27 10:02:49 +02:00
Maikel Linke
989a6d57e0
Notify user of failed backorder completion
2024-09-26 14:32:55 +10:00
Maikel Linke
495634b60c
Send error notification to owner
2024-09-26 14:32:55 +10:00
Filipe
83ab9594f6
Merge pull request #12854 from chahmedejaz/task/11200-conditionally-hide-producer-column
...
[BUU2] Hide producer column when there's only one producer in the admin account
2024-09-19 15:42:15 -06:00
Gaetan Craig-Riou
3f6aaa74cc
Remove duplicated styling for tabs
...
It uses the same styling as #admin now share via mixins
2024-09-13 14:14:30 +10:00
Gaetan Craig-Riou
67f037280a
Add comment in shop view file
...
It wasn't possible to directly reuse the shopfront views because they
are still using angular.
2024-09-11 14:50:37 +10:00
Gaetan Craig-Riou
7e84d41e8c
Simplify modal opening by just rendering the modal in turbo stream
2024-09-11 14:20:41 +10:00
Ahmed Ejaz
f8d3467d46
11200: add specs
2024-09-11 01:59:43 +05:00
Ahmed Ejaz
1580d539df
11200: coniditonally hide producer column
2024-09-11 00:56:52 +05:00
Gaetan Craig-Riou
379e5acfe5
Fix product preview modal opening
...
The previous solution failed to take into account that it would have been
trigger on any turbo steam rendering action, not just the product preview
one. Now the open event is dispatched when the product preview
controller is connected, which happens when the modal html is rendered.
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
5bf6bdf7f0
Fix some display issue with long description
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
8de7c304fe
Add AdminTooltipComponent
...
I left the stimulus controller separated as it is generic enough
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
b6695ba9a2
Add product preview on product edit page
...
Plus translation
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
e8de76dc46
Add style for Shop
...
As before, move imported css to partials to avoid duplication. And use
mixin and variable to handle tooltip styling
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
d56ab9257b
Add tab switch and shop tab
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
f24a4edc68
Add product detail to the modal
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
27dd5def57
Open modal before rendering the received html
...
This way we don't see a blank modal waiting for the content to load
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
561f4648d2
Improve tooltip partial
...
Set up default value optiona locals variable
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
64d3091db9
Add product preview modal
...
Plus open modal when clicking on "preview" link.
It's using event to communicate between stimulus controller :
https://stimulus.hotwired.dev/reference/controllers#cross-controller-coordination-with-events
2024-09-10 13:29:39 +10:00
Gaetan Craig-Riou
4756ab47c2
Wire preview link via turbo-stream
2024-09-10 13:29:39 +10:00
Ahmed Ejaz
983addff0d
12777: use unit_to_display method for variant unit
...
- This method prioritize display_as and after that considers options_text
2024-09-05 10:49:45 +02: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
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
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
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
d61acd2cc1
Unify error messages and display on new product form [OFN-12744]
2024-08-23 09:57:37 +01: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
8f7505d53d
Refactor oc datetime content partial and include warning modal in oc list [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
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
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
Cillian O'Ruanaidh
ae2e92f09d
Don't need to set value on hidden fields for Trix editors, it will be set automatically
2024-08-16 16:20:53 +01: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
