raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

17514 Commits

Author SHA1 Message Date
Ahmed Ejaz
4ba6afa665 12314 - fix Rails/HelperInstanceVariable error 
- InjectionHelper
- OrdersHelper
 2024-04-01 02:19:14 +05:00
Ahmed Ejaz
ac1595e718 12314 - remove shared distributor partial 
- this was only used in the enterprise show view
- the above view was deleted here 4f2389e257
- by removing this, we can remove distributor_link_class method
- it will also fix the rubocop error
 2024-03-31 18:08:22 +05:00
Ahmed Ejaz
3bb44cfe6d 12314 - fix order helper rubocop errors 
- remove the direct access of @order instance variable
- add an attr_reader for order and use it instead
 2024-03-31 17:07:00 +05:00
David Cook
b9b2c876cc Ensure value always shows 
Even thought it's not valid (you can't save items with an empty name), it's disconcerting when the value suddenly disappears from view.
 2024-03-27 20:20:20 +11:00
David Cook
99121943a7 Fix bug 
I missed a bit in a refactor, and it wasn't covered by the spec.
 2024-03-27 20:20:20 +11:00
David Cook
b2881bb169 Add JS specs 
Converted using  https://www.codeconvert.ai/coffeescript-to-javascript-converter
With plenty of manual fixes required too..
 2024-03-27 20:20:20 +11:00
David Cook
924701e161 Load available units from system config 
I'm not sure what's the best way to load data into javascript.. this works.
 2024-03-27 20:20:20 +11:00
David Cook
1d8ed67b0b Handle unit scale changes 
As discussed, this is the desired behaviour. The current screen appears to do this, but fails to save the changes.
 2024-03-27 20:20:20 +11:00
David Cook
d238fc0cad TODO: optimise and fix bug 2024-03-27 20:20:20 +11:00
David Cook
4ddb2ff1e9 Generate unit display with OptionValueNamer 2024-03-27 20:20:20 +11:00
David Cook
cf31d09ad8 Prevent submitting empty value 2024-03-27 20:20:20 +11:00
David Cook
49226ffdbc Extract unit_value and unit_description values 
Copied from display_as.js.coffee (ofn.admin.ofnDisplayAs.variantUnitProperties).
 2024-03-27 20:20:20 +11:00
David Cook
c98956bf5a Add variant controller 
This will manage the various unit fields. Maybe it should have a more specific name.
 2024-03-27 20:20:16 +11:00
David Cook
9beaf0a0c2 Use textContent FTW 
Oh look, the test works better now too.
 2024-03-27 17:35:09 +11:00
David Cook
6291cce5d1 Fix style for empty popout button 
There's still an odd 1px height change on hover that I can't track down. I think it would be better to just give new variants a default of 1 (blank is not valid anyway).
 2024-03-27 17:35:09 +11:00
David Cook
e589605e3c Rename popout style classes 2024-03-27 17:35:08 +11:00
David Cook
e110cd1145 Fix popout to focus first _visible_ field 2024-03-27 14:34:31 +11:00
David Cook
26723194d5 Prevent popout from updating display value 
Watch out, HAML will strip an attribute with boolean false, so we need to use a string. Or reconsider using false as a default value..

I wish Jest had the rspec concept of `let`.
 2024-03-27 14:34:31 +11:00
David Cook
e94fddb0f8 Style label in popout 
And tweaked global style as per design.
And cleanup unused classes.
 2024-03-27 14:34:31 +11:00
David Cook
4f7d50ca4b Refactor CSS to reduce scope 
We don't want the fields inside the popout to be naked, so need to be more specific.
 2024-03-27 14:34:31 +11:00
David Cook
f13f2cfa2f Move values to variables 
I didn't end up using these, but it's probably worth keeping for consistency.
 2024-03-27 14:34:31 +11:00
David Cook
4a776233db Move fields into a popout 2024-03-27 14:34:31 +11:00
David Cook
436f733213 Add variant unit fields 
Unfortunately we can't use an input[type=number] because you're allowed to type text for unit_description.

These fields will be conditionally shown/hidden in upcoming steps.
 2024-03-27 14:34:31 +11:00
David Cook
a5741a1ca8 Sync hidden variant unit fields 
This will be necessary for managing the 'display as' state.
..or is it?
 2024-03-27 14:34:19 +11:00
David Cook
45b4e6c87c Add comments 
To save me or someone else having to figure it out again.
 2024-03-27 14:33:32 +11:00
Matt-Yorkley
c01bab5f27 Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads 
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
 2024-03-26 13:39:16 +00:00
David Cook
6240f37adf Merge pull request #12308 from dacook/update-rails-nested-form 
chore(deps): update rails-nested-form from fork to v5.0.0
 2024-03-26 13:26:50 +11:00
David Cook
52a36f33bc Merge pull request #12298 from mkllnk/devise-links 
Remove unused Devise login links partial
 2024-03-25 12:57:39 +11:00
David Cook
6b2c54a25e Update event name 
The event name has changed in the official release.
 2024-03-25 11:01:23 +11:00
David Cook
51404f4d66 chore(deps): update rails-nested-form from fork to v5.0.0 
We were using our own fork, while waiting for a new feature to be merged. It's now been released, albeit with a modification. The gem has changed it's name too.
 2024-03-25 11:00:51 +11:00
Arun
0ab3c3d875 Merge branch 'master' into 12295-translation-fixes-on-return-authorizaton 2024-03-22 18:16:57 +05:30
Arun Guleria
03630f27af 12295-Translation fixes for return authorization status 2024-03-22 17:16:35 +05:30
Maikel
4c1268b3ce Merge pull request #12274 from mkllnk/dfc-product-import 
Import products from DFC catalog
 2024-03-22 09:25:02 +11:00
Maikel Linke
54738fc552 Remove unnecessary method checkout_steps 
It allowed introspection of a dynamic state machine. But the only two
usages of this method only referred to the first state which is always
the same. Our complicated checkout logic needs more clarity and
introducing some hardcoded state names here can only help.
 2024-03-21 13:43:54 +11:00
Maikel Linke
c6e88e70c3 Remove unused Devise login links partial content 
The purpose of this file was unclear and it was flagging additional
maintenance like missing translations.
 2024-03-21 10:21:49 +11:00
Anthony Musyoki
25e3f30f97 Fix Rubocop Rails issue: Rails/FindEach 2024-03-20 15:34:30 +03:00
Konrad
214f7ec23c Merge pull request #12229 from cyrillefr/Decreasing-the-quantity-of-an-item-does-not-update-enterprise-fees-per-item 
[BO Orders] Update Entreprise fees when decreasing quantity
 2024-03-20 11:53:06 +01:00
Maikel
b679a20f23 Merge pull request #12285 from dacook/comments 
Add placeholder file with comments
 2024-03-20 14:26:48 +11:00
David Cook
794f92d9f5 Add placeholder file with comments 
I was surprised to find there's a channel defined by our app code, because it's not defined in the standard place.
 2024-03-19 15:06:23 +11:00
David Cook
69df56ae76 Merge pull request #12247 from dacook/buu/broadcast-queue-12020 
[BUU] Enqueue actions to perform at end of reflex
 2024-03-18 11:38:21 +11:00
David Cook
63549b3dca Add comment 
I still don't know why the morph method doesn't work in this context..
 2024-03-18 11:17:15 +11:00
David Cook
8a84e0084f Enqueue cable_ready actions to perform at end of reflex 
I think this resolves [this discussion](https://github.com/openfoodfoundation/openfoodnetwork/pull/11163#discussion_r1260531844)

I guess we just didn't know [how it works](https://docs.stimulusreflex.com/guide/cableready.html#order-of-operations) before..
 2024-03-18 11:16:38 +11:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05:00
Maikel Linke
8efc215a14 Include product submenu on product import confirmation 2024-03-15 16:46:41 +11:00
Maikel Linke
3af7fa7521 Offer nice select box for enterprise id 2024-03-15 16:46:41 +11:00
Maikel Linke
d47d3eba8f Add SemanticLink model for variants 
We want to link variants/products to external DFC SuppliedProducts to
trigger supplier orders when local stock is exhausted. This is the first
step to enable the link.
 2024-03-15 16:46:41 +11:00
Maikel Linke
1c09b5d16c Move DFC API request logic to service object 
I'm planning to add more to it.
 2024-03-15 16:46:41 +11:00
Maikel Linke
d6da52929f Allow local DFC import in development 2024-03-15 16:46:41 +11:00
Maikel Linke
30e8f9eb28 Importing products from DFC catalog 
Technical demonstration of a complete product export-import roundtrip
which we could now do between OFN instances.
 2024-03-15 16:46:41 +11:00
Maikel Linke
96ccea3691 Add controller to handle import of DFC products 
It's not doing anything yet, but this is the basic setup.
 2024-03-15 11:40:10 +11:00