raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,900 Commits 18 Branches 452 Tags
ac1595e718fd1bf15eeec1503fa6bdcc4fa83489
Commit Graph

10966 Commits

Author SHA1 Message Date
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
David Cook
266e94eba8 Fixup spec 2024-03-27 20:20:20 +11: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
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
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
9beaf0a0c2 Use textContent FTW 
Oh look, the test works better now too.
 2024-03-27 17:35:09 +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
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
189cd88848 Remove duplicate spec 
Must have been an accident while merging conflicts
 2024-03-27 14:33:32 +11:00
David Cook
9b040d87f6 Update spec 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
Gaetan Craig-Riou
502d7c6d4a Update Stripe API recordings for new version 2024-03-25 12:07:08 +11:00
Maikel
4c1268b3ce Merge pull request #12274 from mkllnk/dfc-product-import 
Import products from DFC catalog
 2024-03-22 09:25:02 +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
David Cook
acb53a6ddc Merge pull request #12273 from mkllnk/rubocop 
Rubocop
 2024-03-19 10:14:01 +11:00
Gaetan Craig-Riou
73eeaaabc2 Update Stripe API recordings for new version 2024-03-19 09:33:07 +11:00
Feruz Oripov
bdcb0856af Fix failed specs 2024-03-16 19:23:17 +05:00
Feruz Oripov
778ed46d50 cops 2024-03-16 19:14:18 +05:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05: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
2e101c5fe6 Refresh OIDC token and try again 
Access tokens are only valid for half an hour. So if requesting a DFC
API fails, it's likely due to an expired token and we refresh it.
 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
477336c660 Style RSpec/NotToNot 2024-03-15 12:17:48 +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
Maikel
696559200f Merge pull request #12267 from cyrillefr/BUU-Improve-Product-Search-Keywords 
Add tests to the search product feature
 2024-03-15 10:36:07 +11:00
Konrad
acc52cc45f Merge pull request #11918 from abdellani/11896-prevent_bulk_printing_sending_when_ABN_not_set 
Bulk printing/sending should show warning if ABN is required but not set.
 2024-03-14 13:33:41 +01:00
cyrillefr
261cb2d81b Requested changes: trimming number of examples 
- to improve speed of testing
 2024-03-14 10:55:09 +01:00
cyrillefr
43d13253e7 Add tests to the search product feature 2024-03-13 10:54:06 +01:00
Maikel
331894017a Merge pull request #12252 from filipefurtad0/bump_stripe_10.11.0 
Bumps Stripe from 10.10.0 to 10.11.0
 2024-03-12 13:55:13 +11:00
Gaetan Craig-Riou
4f77ad40a3 Update recording with new filtering 2024-03-12 12:17:21 +11:00
Gaetan Craig-Riou
a33eb80f56 Fix filtering of sensible data 
* Hide Stripe Client User Agent header, it contains the hostname of
the machine generating the cassettes
* Hide client_secret
 2024-03-12 12:17:15 +11:00
Gaetan Craig-Riou
ff52a66e75 Merge pull request #12250 from mkllnk/not-to-not 
Enforce RSpec expect(..).not_to over to_not
 2024-03-12 10:35:16 +11:00
cyrillefr
7d99197dde Requested changes: original fix moved up in code 
- instead of selecting out unapplied tax rates in the total tax
    method, did it in the query_result instead. Reverted the
    total_excl_tax method to its initial state.
  - spec and logic of testing affected also.
 2024-03-11 10:13:46 +01:00
cyrillefr
62739c0458 Requested changes in spec 
- use of new service instead of manually advancing an order
 2024-03-11 10:13:46 +01:00
cyrillefr
7fdf1a110d Fix incorrect results for multiple tax rates in report 
- total_excl_tax would sum amounts and taxes without
    knowledge if taxes rates were really applied or not
  - spec shows use case described in issue 12066
 2024-03-11 10:13:46 +01:00
Filipe
9abaf90907 Merge pull request #12233 from dacook/buu/unit-scale-basic-12005 
[BUU] Unit Scale - basic implementation
 2024-03-07 17:20:45 +00:00
Filipe
de9446f5f3 Merge pull request #12167 from mkllnk/haml-up 
Update Haml syntax and gem to version 6
 2024-03-07 15:36:29 +00:00
filipefurtad0
5653d542f6 Hides sensitive data 2024-03-07 15:15:18 +00:00
filipefurtad0
7f3953882d Update Stripe API recordings for new version 2024-03-07 14:49:11 +00:00
filipefurtad0
f126b8b316 Update Stripe API recordings for new version 2024-03-07 14:41:40 +00:00
filipefurtad0
7849f30f46 Update Stripe API recordings for new version 2024-03-07 14:20:16 +00:00
Rachel Arnould
cd9bef4f7b Merge pull request #12172 from abdellani/12067-fix-invoice-render-multiple-tax-rates 
fix invoice render multiple tax rates
 2024-03-07 10:53:52 +01:00
Maikel Linke
bd6b0ddbf3 Enforce RSpec expect(..).not_to over to_not 2024-03-07 16:57:54 +11:00