Filipe
a5d17b4da9
Merge pull request #12459 from mkllnk/description-html
...
Sanitise HTML in long description of enterprise
2024-09-19 16:12:45 -06: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
Filipe
562a24524b
Merge pull request #12848 from rioug/12770-product-preview
...
Product preview
2024-09-19 15:20:18 -06:00
David Cook
a9ad6a2851
Grant product managers ability to create reports
...
We missed this in c31416c
2024-09-17 13:08:49 +10:00
Gaetan Craig-Riou
a25937321a
Remove ability of any admin user to see all product
...
And fix related spec
2024-09-17 11:46:55 +10:00
Ahmed Ejaz
5be53a40a9
11200: rename products scope
2024-09-11 11:54:38 +05: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
Maikel Linke
d061fe8ad9
Remove unnecessary sanitising
...
Existing descriptions have been sanitised in a migration. New
descriptions are sanitised when assigned. That should cover everything.
2024-09-05 12:38:33 +10:00
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
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
wandji20
d61acd2cc1
Unify error messages and display on new product form [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
de063fecb1
Move same_datetime_value method to OrderCycle model [OFN-12775]
2024-08-22 22:17:12 +01:00
Joseph Johansen
4718fdb0be
Optimise Spree::Taxon.supplied_taxons
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
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
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
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
c31416c536
Separate showing and rendering report
2024-08-16 14:37:57 +10: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
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
wandji20
1e71db9315
Remove permalinmk from taxons [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
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
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
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
Joseph Johansen
a2f4df191a
Improve effiency of OrderCycle.earliest_closing_times
2024-08-06 16:12:13 +01: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
fcea437d7e
Only show connected apps in enterprise settings, if system setting is enabled
2024-08-06 11:26:03 +02: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
Maikel Linke
e9f89362f4
Remove validation of positive stock when on demand
...
We weren't allowing negative stock to stop any bug from accidentally
drawing too much stock. But now we want to implement a backordering
logic that depends on negative stock levels to know how much is needed
to replenish stock levels.
2024-08-02 14:40:17 +10: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
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
wandji20
2709479bf2
Require varian t category when creating new product variant [OFN-12666]
2024-07-30 12:07:50 +01:00
David Cook
c5fc621aa4
Use scope to determine which enterprises are ready to be affiliated
2024-07-30 15:21:29 +10:00
David Cook
e9d7a0b099
Add User#affiliate_enterprises
2024-07-25 21:14:01 +10:00
David Cook
da7bbcf82f
Enable/disable affiliate sales data
2024-07-25 17:06:13 +10:00
David Cook
d3c5e2365a
Add AffiliateSalesData model
...
Using namespace subfolder to help organise it and show the inheritance.
Hmm, instead of scopes, we could have different has_many relationships on the Enterprise. Maybe it should be in a concern. We can refactor later I guess.
2024-07-25 17:06:13 +10:00
David Cook
9d89b4726b
Move connect logic to model
...
Then subtypes can override as needed.
2024-07-25 17:06:13 +10:00
David Cook
9b37eacb8d
add scope for discover_regen
2024-07-25 17:06:13 +10:00
David Cook
85d5e2ee70
Expect single connected_app record for discover regen
2024-07-25 17:05:42 +10:00
Gaetan Craig-Riou
0f04b2fb10
Fix call to ActiveSupport::NumberHelper.number_to_rounded
...
When running with :hu locale, call to `number_to_rounded` wiht parameter
precision: nil breaks, adding significant: false fixes the issue
2024-07-23 13:51:32 +10:00
