raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-21 05:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,348 Commits 17 Branches 458 Tags
27be0f6fd117ee2b9a23a6b5ace38dd88cd1dede
Commit Graph

2735 Commits

Author SHA1 Message Date
Rachel Arnould
27be0f6fd1 Merge pull request #13912 from dacook/sourced-variant1-13887 
Create linked variants
 2026-03-20 10:59:46 +01:00
Maikel
c5aaecf76a Merge pull request #13961 from mkllnk/taler-checkout-stock-error 
Taler checkout stock error
 2026-03-20 11:29:58 +11:00
Gaetan Craig-Riou
4946ffc329 Add specs for CustomerAccountTransaction ability 2026-03-11 15:45:33 +11:00
Gaetan Craig-Riou
c134bbf49b Add missing ability for credit customer 
Fix the specs to use a non super admin user, so it should catch missing
ability in the future.
 2026-03-11 15:34:27 +11:00
Maikel Linke
9ca1a9e33f Allow orders to be paid before checkout 
Taler puts the payment completion into the hands of the user. So we
can't strictly finalise the payment and order together.

And in the bigger picture, it should be okay if a payment goes through
but we have to abort checkout due to stock issues. Then we want to be
able to check out again, using the existing complete payment. Any
refunds can be handled later by the shop owner.
 2026-03-11 14:46:06 +11:00
David Cook
18fb1cfa74 Rename variant 'owner' to 'hub' 
As discussed by team, and using same nomenclature as VariantOverride.
 2026-03-11 11:09:13 +11:00
David Cook
e9ce2df5a9 Rename 'source variant' to linked variant (in most places) 
There are two types of linked variant associations: source and target, so we need to keep the name there.
But when cloning a variant and retaining a link as source,  we will prefer the general term 'linked variant'. Hopefully this name works well.
 2026-03-11 11:09:13 +11:00
David Cook
c165ade4ba Avoid unnecessary save 
Actually, the variant factory is still adding an extra save. We should refactor Variant to avoid that.. but the afternoon slump has got me.
 2026-03-11 11:09:12 +11:00
David Cook
299ada1220 Refactor: move variant duplication to model 
I tried to avoid it but rubocop made me move it. I think maybe it will need to go into a concern or service class later, but hopefully it's ok here for now.
 2026-03-11 11:09:12 +11:00
David Cook
8955ffe126 AddOwnerToSpreeVariants [migration] 
Should existing variants be migrated to have an owner (copied from supplier)? No, because you can change supplier. This concept needs work.
 2026-03-11 11:09:09 +11:00
copilot-swe-agent[bot]
04c0adf960 Fix source_variants and target_variants associations in Variant model 
Co-authored-by: dacook <4188088+dacook@users.noreply.github.com>

Thanks co-pilot for sending me in the right direction.
Would this be neater as a has_and_belongs_to_many? Maybe but I will try to keep moving.
 2026-03-11 11:08:50 +11:00
David Cook
940aa57daf Set up permissions for creating source variants 2026-03-11 11:07:08 +11:00
Gaetan Craig-Riou
d5dec05ab1 Remove payment method ApiCustomerCredit 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
7790259c27 Add transaction origin for internal credit payments 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
e7a2b7ea48 Remove payment method from customer account transaction 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
bd0dcd99f3 Fix failing spec 
I wrongly fixed it due to my local database having rogue data
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
bc23423521 Remove the link between enterprise and internal payment method 
Enterprise have access to the internal payment method by default.
The access is handled at the application level so we don't have to
manage database links.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
a4ca56c7a5 Refactored internal payment method 
We now check on known payment method type, instead of using the internal
collumn.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
ec106a8f83 Add new payment method ApiCustomerCredit 
It was previously modelled by a "Check" payment method
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
2e7237197a Refactor customer credit payment method 
Set fixed name and description
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
3b068b7125 Add created_by to customer account transactions 
It allows tracking of who credited the customer via :
- customer account transaction API
- order payment screen
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
b9b91620ef Make sure to link credit payment method on create and update 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
c67d47a773 Check if internal payment can be voided 
Add extra security, we don't want to void a credit payment that is not
completed, otherwise we would be refunding credit that was not used.
A credit payment should not be in a non completed state, but you never
know.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
34c91613f7 Customer account transaction, simplify balance calculation 
Lock the customer to ensure the balance calculation is correct. Much
simpler than locking the first transaction.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
628810eb33 Fix spec to work with the internal payment method 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
d95aac333b Add internal to payment method 
It's used to hide the payment method used for paying with credit. These
payment method are for internal use only.
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
d5bd8fa086 Add ability to "void" a customer credit payment 
Voiding the payment will refund the credit used to the customer.
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
c0823d24c2 Fix deprecation warning 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
41e4fd79a3 Move logic to apply customer credit to it's on service 
It's now called as a before transition callback when the order move to
payment. We need to apply the credit at this point to account for
order fees, ie: shippment fees.
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
152fd15bd0 Use display_name and display_description for payment method 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
5bdb6e6d69 Clean up spec 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
cb6b1f2dd0 Link producer enterprise to credit payment method 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
130401263a Add CreditPaymentMethod::Linker 
It links the given enterprise to credit related payment method. It
will create the methods if missing.
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
29a8a6641c Add ability to use payment with credit 
Currently it works like any other payment method you can select on
checkout. It will eventually be added automatically to the order, when a
customer has credit available.
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
c58a65a52b Add a tab to list customer payment on the account page 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
e21fadd124 Add CustomerAccountTransactions::DataLoaderService 
It's used to load customer transactions related to a user and a specific
enterprise
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
6915836a14 Add balance to customer account transaction 
It stores the running balance for the customer account, so we don't have
to calulate it on the fly.
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
7d400e9860 Add CustomerAccountTransaction model 
It's used to store payment against a customer, to model customer credit
 2026-03-10 16:07:41 +11:00
Maikel
f7f7a5738a Merge pull request #13895 from cillian/remove-angular-from-enterprise-settings-users 
Remove Angular from Enterprise > Settings > Users section
 2026-03-06 14:05:13 +11:00
Cillian O'Ruanaidh
f1071575cd Remove Angular from Enterprise > Settings > Users section 2026-03-04 10:28:36 +11:00
François Turbelin
6cacde837d Remove duplicated test 2026-03-03 14:27:20 +01:00
François Turbelin
7010cda9f7 Tidy up the tests 2026-03-02 22:07:45 +01:00
François Turbelin
28dde86960 Repair ProxyOrder to support order cycle without closing time 2026-02-27 14:36:20 +01:00
Maikel Linke
de873ae42c Add void action to Taler for refunds 2026-02-20 13:43:09 +11:00
Maikel Linke
ed701b00dc Stop storing now redundant redirect URL 
The Taler gem now computes it from the order id. No need to store it.
 2026-02-20 13:43:04 +11:00
Gaetan Craig-Riou
e276fb0386 Merge pull request #13930 from openfoodfoundation/dependabot/bundler/rubocop-1.84.1 
Bump rubocop from 1.81.7 to 1.84.2
 2026-02-20 09:05:41 +11:00
Rachel Arnould
f86eb3fb82 Merge pull request #13920 from mkllnk/clean-name 
Stop pre-selecting Paypal when creating a payment method
 2026-02-19 11:38:56 +01:00
Rachel Arnould
0d46a3bc2e Merge pull request #13902 from mkllnk/refund-simple 
Simplify refund logic
 2026-02-19 11:06:00 +01:00
Maikel Linke
da1e1a9859 Style indentation 2026-02-18 09:42:07 +11:00
Maikel Linke
482c2a4a6e Delete now unused method clean_name 2026-02-13 12:36:26 +11:00