Filipe
97b6289263
Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant
...
[Product Refactor] Move variant unit sizes to variant
2024-10-15 19:58:45 +01:00
Rachel Arnould
f54552f939
Merge pull request #12886 from rioug/12855-VINE-connected-app
...
[Citi OFN Voucher] Add VINE connected app
2024-10-14 15:32:09 +02:00
Gaetan Craig-Riou
df82dd0759
Fix API v0 variants controller spec
2024-10-14 14:56:47 +11:00
Gaetan Craig-Riou
5ec39f994a
Fix spree admin products controller spec
2024-10-14 14:56:47 +11:00
Gaetan Craig-Riou
d7d253e58d
Fix Unit Price service
2024-10-14 14:56:47 +11:00
Gaetan Craig-Riou
f58a3a859f
Move variant unit attributes to variant 1
...
Update Spree::Variant model and spec
2024-10-14 14:56:46 +11:00
Gaetan Craig-Riou
3b89cd5957
Fix option value namer
...
Uses the variant variant_unit, variant_unit_name, variant_unit_scale
2024-10-14 14:56:46 +11:00
Gaetan Craig-Riou
e33ed5141b
Fix weigths and measures
...
Use variant_unit, variant_unit_scale from the variant
2024-10-14 14:56:46 +11:00
Gaetan Craig-Riou
097c6dee2f
Add VineApiService and specs
...
It handles connection to the VINE API
2024-10-02 16:44:21 +10:00
Gaetan Craig-Riou
f7708d69a7
Add VineJwtService
...
Generate a JWT token to be used to connect to the VINE api
2024-10-02 16:16:28 +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
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
Maikel Linke
61fec653cf
Abstract OrderLocker for re-use
2024-09-26 14:32:55 +10:00
Maikel Linke
7f62b49da5
Move catalog loading to where it's needed
2024-09-25 10:55:41 +10:00
Maikel Linke
070b93c531
Fall back to givin product id w/o retail variant
2024-09-25 10:55:40 +10:00
Maikel Linke
fb96f8f936
Fall back to given product w/o wholesale variant
...
The class is moving to providing all data with several methods instead
of a data class containing the information. That should be more
flexible. Still some work to do.
2024-09-25 10:55:40 +10:00
Maikel Linke
4303f0e974
Build API URLs to work with any FDC Shopify shop
...
We can extend this service class when there are other APIs. And
hopefully the DFC will provide a standard for this discovery at some
point.
2024-09-25 10:55:40 +10:00
Maikel Linke
5ef85aef3e
Handle backorder cancellations
2024-09-25 10:55:40 +10:00
Maikel Linke
283db8f9d0
Adjust quantities of backorder before completion
2024-09-25 10:55:40 +10:00
Maikel Linke
c948efd9ce
Add structure to adjust final quantities
2024-09-25 10:55:40 +10:00
Maikel Linke
efe2b724e6
Find wholesale offer for retail variant
2024-09-25 10:55:40 +10:00
Maikel Linke
8f4f873ba0
Move offer finding into separate class
...
It's going to be more complicated.
2024-09-25 10:55:40 +10:00
Maikel Linke
c0ae2ede2c
Complete order 4 hours after order cycle closed
2024-09-25 10:55:40 +10:00
Maikel Linke
3ec53a7d71
Parse updated order result
2024-09-25 10:55:40 +10:00
Maikel Linke
3849db7c48
Simplify order update call
2024-09-25 10:55:39 +10:00
Maikel Linke
7b286ea31d
Complete test for FDC Orders API
...
Previous specs testing the live API assumed an order to be present or
not present. You needed to provide the right state before recording. I
condensed more into one test that completes the cycle and is repeatable,
assuming no order to start with.
2024-09-25 10:55:39 +10:00
Maikel Linke
3e0eb8708e
Simplify service with ivar
2024-09-25 10:55:39 +10:00
Maikel Linke
c7fa3ff819
Simplify order update logic
2024-09-25 10:55:39 +10:00
Maikel Linke
f839452df9
Complete an open order
2024-09-25 10:55:39 +10:00
Maikel Linke
a7a38890f4
Add needed quantities to existing line items
2024-09-25 10:55:39 +10:00
Maikel Linke
caa6d284f0
Find and update existing open order
2024-09-25 10:55:39 +10:00
Maikel Linke
827e37cada
Start moving backorder logic to service
...
The job class is getting too big.
2024-09-25 10:55:39 +10:00
Joseph Johansen
7d2f3bfa2f
Ensure excluded shops are captured by #closed_shops
2024-09-04 11:46:44 +01:00
Joseph Johansen
6df0b24bcf
Add implementation
2024-09-04 11:46:44 +01: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
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
wandji20
4d222c61c6
Improve readability of order_cycle_set process method
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
Cillian O'Ruanaidh
a6d3909e95
Replace text-angular editor with trix editor in fields for shop messages and about fields for enterprises and enterprise groups
2024-08-09 10:37:23 +01: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
Joseph Johansen
ffe4603f2f
Preload enterprise logos and promo images for shops page
2024-08-01 14:10:53 +01: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
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
Gaetan Craig-Riou
686fe8c028
Per review, remove flag argument from products_relation
...
products_relation is now split in two, products_relation and
products_relation_incl_supplier_properties.
It avoids using a flag argument which is not a a good practice see:
https://martinfowler.com/bliki/FlagArgument.html
2024-07-10 13:19:08 +10:00
Gaetan Craig-Riou
5c3acbbcaf
Per review, remove instance variable @query
2024-07-10 11:45:39 +10:00
Gaetan Craig-Riou
c372bf746a
Refactor ProductRenderer
...
The sorting logic has been moved to
OrderCycles::DistributedProductsService#product_relations
Plus hopefully fix the spec flackiness
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
79a22aefc3
Refactor #products_relation
...
Due to primary_taxon and supplier having moved to the variant, filtering
by_producer and by_category with a custom order involves some
complicated sql queries. So we moved the sorting logic from
ProductsRenderer to OrderCycles::DistributedProductsService so we can
keep the complicated SQL logic contained in one place
2024-07-08 10:35:57 +10:00
Gaetan Craig-Riou
260211cf15
Fix Ruboxop issue
2024-07-03 11:21:28 +10:00
