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
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
Filipe
ce44f19b4a
Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet
...
Fixes 422 error due to bad sql building
2024-07-31 19:45:09 +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
Filipe
8b1713d169
Merge pull request #12665 from wandji20/wb-OFN-12532
...
Pluralize admin products search result [OFN-12532]
2024-07-31 18:55:53 +01:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02: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
Konrad
00a0006ff2
Merge pull request #12691 from ccozkan/use-vertical-transitions-for-cloning-and-deleting
...
Use vertical transitions for cloning and deleting products
2024-07-28 18:25:07 +02:00
Konrad
325f9aa6f3
Merge pull request #12664 from wandji20/wb-OFN-12551
...
Remove SR from clear search button [OFN-12551]
2024-07-28 14:31:08 +02:00
wandji20
ef87cdb167
Revert changes and use selectable locales for helper local_options [OFN-11513]
2024-07-28 12:52:01 +02:00
wandji20
a9e295bc11
(Fix) [User->New] Language is displayed twice [OFN-11513]
2024-07-28 12:52:01 +02:00
Abdul Aziz Ali
ac8caf7710
Revert to use .order_cycle_id #11326
2024-07-28 17:57:56 +08:00
Abdul Aziz Ali
8a1e61fd60
Fix incoming_controller_spec. Remove .order_cycle_id usage #11326
2024-07-27 17:54:39 +08:00
Abdul Aziz Ali
baf38b6b30
Only set per_item flag in order_cycle incoming controller #11326
2024-07-27 16:12:26 +08:00
Filipe
c25fe6ae57
Merge pull request #12654 from wandji20/wb-OFN-112509
...
Use public contact email at the bottom of order confirmation email [OFN-12509]
2024-07-25 20:14:47 +01:00
Filipe
7bcf3206d8
Merge pull request #12678 from chahmedejaz/bugfix/11640-products-page-broken-URL
...
Fix URL State management on the Products page
2024-07-25 20:00:49 +01: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
1742d2807f
Add affiliate sales data to form
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
27e53f9dcc
Scope spec to section
...
Because there's going to be a new section with the same button label
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
David Cook
9a4051f37b
Move discover regen to named partial
...
To make way for a new type of connected app.
If only we could use [relative partial paths](https://github.com/rails/rails/issues/1143 )
2024-07-25 17:05:42 +10:00
cyrillefr
05ed4639b2
Fixes 422 error due to bad sql building
...
- first part of query use supplier_properties parameter, but not
second part, that can leads to mismatch between the 2 parts.
Remove supplier_properties parameter + modify SQL to get it right.
- spec tests category filtering & sorting + producer properties
2024-07-24 21:49:11 +02:00
wandji20
0b46c41ffd
Update reply email for order confirmation mail [OFN-12509]
2024-07-23 08:54:06 +01:00
wandji20
4fe3f60009
Use public contact email at the bottom of order confirmation email [OFN-12509]
2024-07-23 08:35:30 +01:00
Gaetan Craig-Riou
dfea0cd805
Merge pull request #12700 from rioug/fix-number-rounding-with-hu-locale
...
[BUU] fix error 500 on hungary instance
2024-07-23 16:35:48 +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
Ahmed Ejaz
a6efad73a8
12551 - add no-cache policy for Turbo cache control
2024-07-22 13:45:01 +05:00
Gaetan Craig-Riou
7f9bbd23e5
Revert fix introduced in https://github.com/openfoodfoundation/openfoodnetwork/issues/10685
...
It breaks wit Safari on Iphone
2024-07-22 14:59:30 +10:00
Çağrı Özkan
29d63b0f0f
Change slide in animation to appear from top
2024-07-22 06:01:01 +03:00
Çağrı Özkan
25e9fd22d8
Change slide out animation to disappear towards top
2024-07-22 06:01:01 +03:00
wandji20
bb427db66a
Add spec for clearing search input when no results is found [OFN-12551]
2024-07-19 14:25:46 +01:00
wandji20
1165b00600
Remove SR from clear search button [OFN-12551]
2024-07-19 14:21:35 +01:00
Konrad
4c9507caa3
Merge pull request #12602 from chahmedejaz/bugfix/12570-variant-unit-field-out-of-sync
...
12570 - Fix Variant Unit field is Out of Sync with the Pop-out
2024-07-18 13:32:27 +02:00
Filipe
f1e6f8bb66
Merge pull request #12683 from dacook/buu-troubleshoot-12682
...
[BUU] Handle corrupt data and troubleshooting
2024-07-18 12:28:18 +01:00
David Cook
918d4401ff
Gracefully handle empty string
2024-07-18 12:05:56 +10:00
David Cook
bba59c1ffd
Force significant: false for NumberHelper
...
Although it defaults to false, somehow it seems to be evaluated as true on hu_prod...??!?!!1! (https://github.com/openfoodfoundation/openfoodnetwork/issues/12682 )
Maybe this will help.
2024-07-18 11:06:45 +10:00
Filipe
f3e7ba0462
Merge pull request #12675 from zsoltiNagy/insert_cloned_below_the_original_product
...
Changed a single line in turbo to insert cloned products after the original product
2024-07-17 20:14:13 +01:00
Filipe
23fc77351e
Merge pull request #12663 from cyrillefr/Inventory_Producer_column_is_empty_in_review_page
...
Replace product by variant to see producer name on views
2024-07-17 18:17:58 +01:00
Ahmed Ejaz
1af811cf51
11640 - fix per_page issue when the page is changed
...
- Fix the scenario when per_page is selected as 100 and next page is clicked, then per_page is empty in the request.
- Expected behavior should be that it retains the per_page selected previously
2024-07-17 10:17:06 +05:00
Ahmed Ejaz
1850f298a6
11640 - use turbo navigation
2024-07-17 10:16:52 +05:00
Gaetan Craig-Riou
ae3fa00429
Add ordering by producer and product name
...
It looks like the ordering by producer got lost in some rebase.
2024-07-17 11:22:49 +10:00
wandji20
80ade22bd6
Pluralize admin products search result [OFN-12532]
2024-07-16 13:10:22 +01:00
zsoltiNagy
c25750387f
Changed a single line in turbo to insert cloned products after the original product
2024-07-16 07:23:03 +02:00
Ahmed Ejaz
5b7fbc875a
12570 - address PR comments
2024-07-15 22:48:20 +05:00
