raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,182 Commits 18 Branches 452 Tags
f00aeb006eac23a63a680e004fef84127a93ff23
Commit Graph

4055 Commits

Author SHA1 Message Date
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Maikel Linke
bc805d94d8 Update translations 2022-10-13 16:03:26 +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
Cillian O'Ruanaidh
9a6e8a1113 Add an OrderCycleShippingMethod model to handle attaching shipping methods to order cycles 2022-09-30 13:13:39 +01:00
binarygit
ebe4a3d6ab Add StimulusReflex 2022-09-29 16:03:45 +02:00
Jean-Baptiste Bellet
a024d0e5ac Remove uglifier 2022-09-29 15:24:31 +02:00
Jean-Baptiste Bellet
cba9779168 Update all locales with the latest Transifex translations 2022-09-22 16:35:32 +02:00
Maikel
a4de128a76 Merge pull request #9674 from filipefurtad0/wicked_pdf_config 
Makes wicked-pdf config ENV-dependent
 2022-09-21 13:16:41 +10:00
filipefurtad0
e4cceffd5c Makes wicked-pdf config env dependent 2022-09-15 12:12:47 +01:00
Maikel Linke
887f886110 Update translations 2022-09-15 16:25:33 +10:00
Jean-Baptiste Bellet
86cb86e8b5 Add a flash error where no available shipping methods to the customer 
+ update specs as well
 2022-09-12 09:42:26 +02:00
Jean-Baptiste Bellet
49f78f3706 Update all locales with the latest Transifex translations 2022-09-08 16:40:17 +02:00
Jean-Baptiste Bellet
53978de632 Create a new report that show revenues (incl. or excl. taxes) by hub 
+ Create spec
 2022-09-08 09:04:44 +02:00
Maikel
21054c1a8a Merge pull request #9594 from binarygit/remove-angular-from-primary-details 
Remove Angular from Primary Details Tab
 2022-09-06 10:17:14 +10:00
Maikel Linke
728eee6d3f Load storybook after view_component has been loaded automatically 2022-09-02 16:10:19 +10:00
Maikel Linke
2aade10aaf Load storybook only in development 
The gem is not available in other environments an the app fails to boot.
 2022-09-02 16:07:25 +10:00
Maikel Linke
30a9e80024 Update translations 2022-09-01 11:55:03 +10:00
binarygit
8861b6d077 Replace permalinks angular ctrl with stimulus 2022-08-31 10:06:51 +05:45
Maikel Linke
d55a43d4b1 Avoid storybook deprecation warning 
Loading the engine directly is deprecated and I followed the current
documentation to load storybook in the app. This avoids a warning:

> DEPRECATION WARNING: This manually engine loading is deprecated and will be removed in v1.0.0. Remove `require "view_component/storybook/engine"`. (called from <top (required)> at config/application.rb:30)
 2022-08-29 14:57:14 +10:00
Filipe
ae391f8af4 Merge pull request #9414 from Philwi/user-generates-api-key 
Let users view and regenerates api key
 2022-08-17 21:36:13 +01:00
Filipe
f28c52342c Merge pull request #9532 from jibees/9492-translate-404,-500,-422-errors-pages 
Translate 404, 500, 422 errors pages
 2022-08-17 21:12:04 +01:00
Filipe
10aa534f52 Merge pull request #9554 from apricot12/9179-Note-on-invoices 
Add order note at the end of both invoices following current UI patterns.
 2022-08-17 17:41:23 +01:00