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
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
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
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
Joseph Johansen
a2f4df191a
Improve effiency of OrderCycle.earliest_closing_times
2024-08-06 16:12:13 +01: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
wandji20
b49da46842
Pluralize admin products search result [OFN-12532-v1]
2024-08-06 08:52:51 +01: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
wandji20
2d24593403
Update product variant unit display name, price, and total price widths on different screen sizes [OFN-6567]
2024-08-02 13:03:42 +01: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
Maikel Linke
2201d2e8c2
VariantOverride with on_demand now overriding stock
...
Otherwise we would try to take stock from the producer stock level
without respecting their on-demand settings. So from now on:
If stock level or on_demand are set on the override then it's not using
producer stock levels.
2024-08-02 14:40:17 +10:00
Maikel Linke
b6c407971d
Allow on-demand VariantOverride to track stock
...
We allowed this for producer stock and need to do the same for inventory
stock. This will allow us to create backorders for missing, but promised
stock.
2024-08-02 14:40:17 +10:00
Maikel Linke
a1887bdc76
Update stock levels of on-demand items
...
We weren't bothering with stock when items were on demand anyway. But we
want to track stock now so that we can backorder more when local stock
levels become negative.
2024-08-02 14:40:17 +10:00
