raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,508 Commits 18 Branches 451 Tags
ccfb83d2cd0a78f4bbd2cb2e9423948246eaa950
Commit Graph

4074 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
23f9c41fec Update all locales with the latest Transifex translations 2022-11-17 17:58:42 +01:00
Sigmund Petersen
52487a270d Merge pull request #9889 from mkllnk/dfc-products 
Activate DfcProvider with feature toggle, not prod
 2022-11-16 12:26:44 +01:00
Konrad
c44195c8a0 Merge pull request #9911 from viniciusueharaweb/9781-improve-shipping-category-not-found-error-message 
[Product Import] Wrong error message when shipping category does not match predefined shipping categories
 2022-11-10 22:48:25 +01:00
Konrad
5b44dc9609 Corrected missspelling of 'mispelling' in en.yml 2022-11-10 20:53:30 +01:00
Jean-Baptiste Bellet
dff9c6d333 Update all locales with the latest Transifex translations 2022-11-10 20:39:17 +01:00
Filipe
a7353eb69f Merge pull request #9575 from apricot12/9487-Dimensions-Packing-Reports 
Added HEIGHT, WEIGHT, WIDTH, DEPTH columns to packing reports by customer.
 2022-11-10 09:55:26 +00:00
David Cook
076244ee1c Update translations 2022-11-03 17:30:01 +11:00
Vinicius Uehara
1f498e6052 Improve shipping category not found error message 2022-10-30 20:02:05 -03:00
Maikel Linke
d1cd1fdefe Update translations 2022-10-27 11:00:42 +11:00
Maikel Linke
7c562d321d Activate DfcProvider with feature toggle, not prod 
We want to test in dev and on staging, too.
 2022-10-26 14:08:27 +11:00
Nihal Mohammed
5c0f3a2d4b Add weight, height, width, depth fields to pack by customer reports 
+ update specs by adding dimensions fields into reports specs
 2022-10-25 10:09:26 +02:00
Konrad
df925d6412 Merge pull request #9737 from Laurel16/fix_issue#9559 
Translate error messages when creating products
 2022-10-24 23:17:32 +02:00
Rachel Arnould
3c9b7a10f4 Merge pull request #9058 from Matt-Yorkley/oidc-redux 
Add OIDC authentication for Les Communs
 2022-10-24 13:18:36 +02:00
Jean-Baptiste Bellet
5a1d9013c6 Update all locales with the latest Transifex translations 2022-10-20 23:12:32 +02:00
jibees
3a68e237de Merge pull request #9772 from mkllnk/revenue-report-for-au 
Add more fields to revenue report as used by Aus
 2022-10-20 23:10:17 +02:00
jibees
fdc362cb44 Merge pull request #9806 from mkllnk/feature-constraint 
Generalise feature toggle constraint
 2022-10-20 17:27:46 +02:00
Maikel Linke
c22f6cb805 Add more fields to revenue report as used by Aus 
We currently maintain our own CSV generation script which could be
replaced if we got all this information here.
 2022-10-18 12:51:13 +11:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Laurel16
ec65e4dcaa Fix: Missing translation in error messages issue#9559 
Fix: changing local translation for variant_unit in spree/product en.yml

Fix: add unite_value key to en.yml
 2022-10-17 15:32:04 +11:00
Maikel Linke
bc805d94d8 Update translations 2022-10-13 16:03:26 +11:00
Maikel Linke
81461684f3 Generalise feature toggle constraint 
Now we can re-use it for any feature.
 2022-10-13 10:42:20 +11:00
Jean-Baptiste Bellet
7d15baef9d Do not use a variable filter_placeholder but translate it in the view 2022-10-11 10:05:06 +02:00
Maikel
5894246474 Merge pull request #9682 from binarygit/picked_up_email 
Send picked up emails when orders are picked up
 2022-10-10 13:15:24 +11:00
Maikel
058a45f4e5 Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices 
Display fees name instead of type on invoices
 2022-10-10 13:15:01 +11:00
Maikel Linke
52e934ec2b Consistently use our FeatureToggle module 
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
 2022-10-08 16:23:17 +02:00
binarygit
8335594351 Add different subject for picked up email 2022-10-08 12:31:26 +02:00
binarygit
44db511e66 Send a picked up email (rather than shipped email) when orders are picked up by customers 2022-10-08 12:31:26 +02:00
Jean-Baptiste Bellet
8b89c901ef Do not display "Admin and Handling" ie. fees total 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
7b57f2358c Create a new key instead of modifying the old one 
it could lead to issues when key is not updated and we should avoid that kind of issue.
 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
0cc8349c71 Use fee name for the adjustment label instead of type 
+ update specs as well
 2022-10-08 10:00:57 +02:00
Maikel Linke
a64d146bb1 Update translations 2022-10-06 12:31:39 +11:00
Maikel
a43d31a9d5 Merge pull request #9711 from dacook/translation-cleanup 
Translation cleanup
 2022-10-06 09:51:28 +11:00
Rachel Arnould
b078d3e0cc Merge pull request #9719 from mkllnk/secrets-config 
Simplify config of secret token
 2022-10-04 20:36:03 +02:00
David Cook
0fc8c719fe Scope Enterprise side menu translations 
And removed some now-unused global translations, yay! I searched for these in the codebase, eg with regex:
/\bt[\( ]["':]shop_preferences/
 2022-10-04 19:39:29 +02:00
David Cook
4c3e20d25a Scope Enterprise form legend translations 2022-10-04 19:39:29 +02:00
David Cook
13d95ecf1d Scope Enterprise Group side menu translations 
With it's own lazy scope, we no longer need to define labels separately.
 2022-10-04 19:39:29 +02:00
David Cook
7803e5d4ff Scope Enterprise Group form legend translations 
Using lazy-lookup builtin scopes, instead of sharing the global translations, as per our guidelines.
 2022-10-04 19:39:29 +02:00
David Cook
3a61cf05ad Remove unused locale message 
I can't find any reference to this in the code. The wiki says maybe it's looked up with a variable, but I don't see how it could be used unless this string is defined in code somewhere (we wouldn't translate data from the database, would we?).
Maybe it's used in a gem? In that case, hopefully CI will pick up the error.
 2022-10-04 19:39:29 +02:00
Maikel Linke
57a70455a8 Simplify setting of secret token 
We define it in the dotenv files already which has the advantage of
being overridable. I adjusted the dotenv files to have the same value as
was set before, 30 times `x`.
 2022-10-04 19:35:40 +02:00
binarygit
25ae10dbe8 Create bulk orders cancellation feature 2022-10-04 16:57:31 +02:00
Jean-Baptiste Bellet
0468d46241 Update all locales with the latest Transifex translations 2022-09-30 16:37:59 +02:00
Cillian O'Ruanaidh
4b0b4ad991 Revert "Use a more simple layout on the order cycle checkout options form" 
This reverts commit 0dddaa6c2b9f1925adca6ff8deac8181691ae119.
 2022-09-30 13:13:39 +01:00
Maikel Linke
195f1e1237 Make "Select all" translatable 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
0673f9a5ae Use a more simple layout on the order cycle checkout options form 
Before there was a row for each distributor and a 'shared' row for shipping methods which were shared among more than one distributor. This layout displays a single list of shipping methods with the distributor or distributors it belongs to beside it as suggested by @lin-d-hop
 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
80b7a5d39a Remove OrderCycleShippingMethod model and use a :has_and_belongs_to_many association instead 
Before the OrderCycleShippingMethod had a validation which checked the shipping method belonged to the order cycle distributor. Instead of this validation this just ignores shipping methods which don't belong to one of the order cycle's distributors when they are being attached in the OrderCycleForm service. This pattern is already being used in the OrderCycleForm service for ignoring Schedules that the person doesn't own.

Co-authored-by: Maikel <maikel@email.org.au>
 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
593da4996f A shop won't be shown as open if it doesn't have useable shipping method so these shipping method validations are really necessary 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
fc4f951a1a Only require OrderCycleShippingMethod records if people want to override the default shipping methods 
It makes things much simpler if we return all shipping methods by default without needing OrderCycleShippingMethod records to be added to the database.

Co-authored-by: Maikel <maikel@email.org.au>
 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
855ec1a708 Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
1e817af5aa Validate deleting a shipping method or switching it to backoffice only doesn't invalidate any order cycles 2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
ca97a7f52d Add :shipping_methods association to OrderCyle and validations 2022-09-30 13:13:39 +01:00