David Cook
bbc7f21ecd
Rename field label
...
This could have been done in Transifex, but I figured it would be quicker to just go ahead and update here.
2025-02-10 14:11:03 +11:00
David Cook
e7054f7f13
Use test locale instead of real one in development
...
en_AU contains translations for most keys, and is subject to change. So if you change the value of an existing key in en.yml, you won't see the change in your dev environment.
Maybe it's confusing because it's not called 'development', but I think the comment above explains well enough.
2025-02-10 14:04:20 +11:00
David Cook
4624d49e5e
Add translations
2025-02-10 10:33:09 +11:00
David Cook
9f7000009d
Only import selected products
2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd
Show list of products to import
...
If there's a matching product in OFN already, a link will appear.
2025-02-06 16:28:15 +11:00
David Cook
c3b23a9fba
Move import to new action
...
Making way for a review step.
2025-02-06 13:50:26 +11:00
David Cook
8acefed857
Swap input positions
...
Makes it clearer where things are going from, and to. I will re-use this order on the next screen.
2025-02-06 13:50:26 +11:00
Maikel
0eb9dcc8f6
Merge pull request #13109 from mkllnk/product-type-lookup
...
DFC import: Find broader taxon if we don't have a specific one
2025-02-04 15:56:13 +11:00
Maikel Linke
757a1548e6
Fix whitespace
2025-02-04 15:52:28 +11:00
filipefurtad0
c08f925ff8
Update all locales with the latest Transifex translations
2025-01-30 22:03:47 -06:00
Filipe
54fad01a91
Merge pull request #13104 from mkllnk/test-seeds
...
Remove unused preference default_country_id
2025-01-30 21:59:46 -06:00
Filipe
32c4b4557b
Merge pull request #13086 from rioug/fix-tax-rate-refund
...
Remove tax rate refund code path
2025-01-30 21:54:30 -06:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Maikel
139dba6637
Merge pull request #13108 from dacook/reduce-rack-timeout-logs
...
Log rack-timeout ready and completed messages in DEBUG mode
2025-01-31 10:49:41 +11:00
Maikel Linke
c9f319aa96
Find broader taxon if we don't have a specific one
...
For example, when importing `beef` products associate the type `meat-product`
instead because we don't have a specific beef category.
2025-01-30 11:10:47 +11:00
David Cook
a0833af780
Log rack-timeout ready and completed messages in DEBUG mode
...
Instead of default INFO, because it pollutes the logs unnecessarily.
Error messages will still be logged the same as before.
2025-01-30 10:20:58 +11:00
Maikel Linke
26d09acafe
Move taxon discovery to own class for additions
2025-01-30 10:17:20 +11:00
Maikel Linke
1fcefcfcd0
Remove now useless wrapper class
2025-01-30 10:11:03 +11:00
Maikel Linke
236e706f2c
Replace custom product type discovery with DFC lookup
...
We didn't actually need the extra class.
2025-01-30 10:08:32 +11:00
Maikel
0797614769
Merge pull request #13106 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.4.2
...
chore(deps): bump tom-select from 2.4.1 to 2.4.2
2025-01-30 08:51:23 +11:00
dependabot[bot]
c84881252c
chore(deps): bump tom-select from 2.4.1 to 2.4.2
...
Bumps [tom-select](https://github.com/orchidjs/tom-select ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/orchidjs/tom-select/releases )
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.4.1...v2.4.2 )
---
updated-dependencies:
- dependency-name: tom-select
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-01-29 09:19:24 +00:00
Gaetan Craig-Riou
1ee2f4d18e
Merge pull request #13103 from mkllnk/gmaps-region-code
...
Simplify default country code lookup
2025-01-29 09:54:43 +11:00
Maikel Linke
6885184bcc
Remove unused preference default_country_id
2025-01-28 16:31:45 +11:00
Maikel Linke
1a393592b4
Reduce database writes seeding zones
2025-01-28 15:47:32 +11:00
Maikel
f8e55f1eb3
Merge pull request #13098 from cillian/osm-marker-positioning
...
Specify OpenStreetMap marker size and tip position so they are positioned correctly at all zoom levels
2025-01-28 13:40:18 +11:00
Maikel Linke
e1f62148c9
Remove now unnecessary country seeding for assets
2025-01-28 13:26:42 +11:00
Maikel Linke
ea6efa9164
Simplify default country code lookup
...
The code was using the code from the environment variables to load a
reocrd from the database to then return the initial code again.
The only use of `DefaultCountry.code` is currently in the geocoder JS
compilation. Now it doesn't need the database anymore.
2025-01-28 13:22:26 +11:00
Maikel
4b6c3fe1d0
Merge pull request #13099 from rioug/compile-test-asset-path
...
Specify test assets output path
2025-01-28 10:58:41 +11:00
Gaetan Craig-Riou
3bf01602d9
Specify test assets output path
...
Test assets need to be compiled to a specific path for system test
to work. It was mistakenly remove here :
https://github.com/openfoodfoundation/openfoodnetwork/pull/13096/files#diff-46b7721b943217c3670f6818a10c2661ec1f9f72dfea66469fd9f026dc74c36a
2025-01-27 14:14:54 +11:00
Gaetan Craig-Riou
fa4785bc85
Merge pull request #13096 from mkllnk/assets
...
Compile assets on demand in test local environment
2025-01-27 13:00:10 +11:00
Gaetan Craig-Riou
6fb86dd4ac
Merge pull request #13093 from mkllnk/dfc-token-error
...
Handle wrong OIDC tokens gracefully
2025-01-27 12:56:23 +11:00
Gaetan Craig-Riou
c4d74ac10d
Apply Rubocop linting
2025-01-27 11:03:54 +11:00
Gaetan Craig-Riou
6ef73acfcd
Fix seeding file for Spree::Zones
2025-01-27 11:03:48 +11:00
David Cook
ffad3f249b
Update comment
...
See: https://github.com/openfoodfoundation/openfoodnetwork/blob/master/spec/system/admin/adjustments_spec.rb
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
be78c2ac41
Fix system admin adjustment spec
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
900b751559
Revert change from d58aa2b14f44fa15b67a18cf3457eccaaca5a56c
...
Turns out there seem to be a legitimate use for this code, see
spec/system/admin/adjustments_spec.rb ie, adding a manual discount to an
order using an adjustment.
2025-01-27 11:02:50 +11:00
Gaetan Craig-Riou
cd7e92c6ca
Fix various spec
2025-01-27 11:02:41 +11:00
Gaetan Craig-Riou
6b7373e4cf
Clean up spec syntax
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
6e8eb443c1
Consolidate .adjust specs
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
42df158669
Fix TaxRate#compute_amount
...
Remove the code path that can create a tax refund, it is unlikely to
happen with the configuration our instances are using. Instead return 0
do that no adjustment gets created
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
5e42a9be55
Fix TaxRate spec to work with the zone changes
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
d4a060c6a2
Fix Zone system spec
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
f7998f6570
Fix zone new form to allow adding state or country
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
a953e3dde3
Fix Spree::Zone spec and factory
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
75c0752340
Sree::Zone, require at least one member
...
Add validations and specs
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
bcb4525cdd
Clean up spec, use describe instead of context
...
Although `describe` and `context` are functionally equivalent, they
don't convey the same message
2025-01-27 11:01:07 +11:00
Cillian O'Ruanaidh
ff7c1e6d1f
Specify OpenStreetMap marker size and tip position so they are positioned correctly at all zoom levels
2025-01-25 12:55:48 +00:00
Konrad
01036e6321
Merge pull request #13087 from mkllnk/stock-location
...
Remove class Spree::StockLocation
2025-01-25 12:41:37 +01:00
Maikel Linke
95625c16b2
Comment on seeds
2025-01-24 16:55:19 +11:00
Maikel Linke
690d137971
Combine rake tasks for efficiency
2025-01-24 16:54:56 +11:00
