raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,181 Commits 16 Branches 456 Tags
85e0da8aebf8d2af669d8bbf4034834ec767b378
Commit Graph

5152 Commits

Author SHA1 Message Date
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
3e2e7f1799 Add button to credit customer when order is credit owed state 
It will add a negative payment, matching the amount credited in the
customer_account_transaction
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
ee13a3abaf Add Orders::CustomerCreditService.refund 
It will be used to credit the customer any fund from an order in
credit_owed state
 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
f5a3093e41 Automatically use credit at checkout when available 
This only cover the ideal scenario, error handling will be added later
 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
28241756aa Add Customer Credit payment method 
It doesn't do anything yet
 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
fec5516fce Backoffice customer, Add pop up to list customer payments 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
6aa4bf7a33 Add available credit on the admin customer page 2026-03-10 16:07:41 +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
be7be9bbc6 Add api endpoing to create customer transactions 
Plus specs and documentation
 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
e10fd0b020 Add api payment method 
It will be used to credit customer via the customer account transaction
API
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
45786780a8 Code formating 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
Rachel Arnould
57186a74a8 Merge pull request #13958 from arunguleria/13864-remove-variants-dead-features 
13864-Remove dead feature to re-arrange variants
 2026-03-05 12:44:05 +01:00
Cillian O'Ruanaidh
f1071575cd Remove Angular from Enterprise > Settings > Users section 2026-03-04 10:28:36 +11:00
Rachel Arnould
83ec97e720 Merge pull request #13944 from pavelk-lab/fix/rails-7-serialize-deprecation 
Fix Rails 7.2 serialize deprecation warnings
 2026-02-26 11:29:27 +01:00
Maikel Linke
c0b6f26338 Update all locales with the latest Transifex translations 2026-02-26 12:43:07 +11:00
Arun Guleria
b7a1754879 13864 - remove unnecessary routes for update positions 2026-02-25 16:29:20 +05:30
Ahmed Ejaz
0a42f15c25 Merge pull request #13960 from chahmedejaz/bugfix/13776-datetime-format-for-finnish 
Update Finnish date and datetime formats in locale file
 2026-02-25 04:19:08 +05:00
Ahmed Ejaz
95412bd203 Update Finnish date and datetime formats in locale file 2026-02-24 20:27:14 +05:00
Rachel Arnould
81aac877a5 Merge pull request #13945 from mkllnk/taler-refund 
Add "void" action to Taler payment admin page
 2026-02-24 11:23:07 +01:00
Pavel
85c903cb7f Remove fixed serialize deprecation from allowed warnings 
The "Passing the class as positional argument" warning was suppressed
while serialize calls were being updated to use the keyword argument
form. Now that the fix is applied, the suppression is no longer needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-02-23 23:30:48 +00:00
Maikel Linke
f2eec5685e Include amount in refund email 2026-02-23 13:00:02 +11:00
Ahmed Ejaz
b455755bfc Update all locales with the latest Transifex translations 2026-02-21 02:34:10 +05:00
Maikel Linke
69108df206 Use Rails to translate email subject 
And translate the subject with the user's locale.
If the subject doesn't need parameters, you don't need to supply it.
Rails finds the translation automatically.
 2026-02-20 13:43:09 +11:00
Maikel Linke
c66b9611b6 Move PaymentMailer translations out of Spree namespace 
The mailer is not in the Spree namespace and we don't need to keep the
clutter.
 2026-02-20 13:43:09 +11:00
Maikel Linke
de873ae42c Add void action to Taler for refunds 2026-02-20 13:43:09 +11:00
Rachel Arnould
fb0f379c43 Merge pull request #13823 from chahmedejaz/bugfix/13625-enterprise-fee-reports-throws-504 
Some Enterprise Fee reports are unusable when managing big shops
 2026-02-18 15:22:21 +01:00
François Turbelin
b21224d5ff Allow s3-compatible provider for db2fog configuration 2026-02-11 13:35:22 +01:00
Ahmed Ejaz
a690d39864 Update Finnish date and datetime formats in locale file 2026-02-08 18:41:49 +05:00
Gaetan Craig-Riou
d33cabd6b2 Update all locales with the latest Transifex translations 2026-02-06 12:32:23 +11:00
Maikel
79af9efd29 Merge pull request #13857 from rioug/10298-remove-rails-sass 
Remove rails-sass dependency
 2026-02-04 09:55:29 +11:00
Ahmed Ejaz
9dcb3ec748 Refactor report routes to use scoped routes for better organization and readability 2026-02-04 03:55:07 +05:00
Rachel Arnould
b731f9b9e4 Merge pull request #12997 from wandji20/wb-OFN-12794-user 
Remove Cable Ready responses from User related controllers
 2026-02-03 15:51:11 +01:00
Rachel Arnould
f86c925209 Merge pull request #13883 from mkllnk/taler 
Add Taler payment method
 2026-02-03 12:30:00 +01:00
Maikel Linke
7b559e2f83 Update all locales with the latest Transifex translations 2026-01-30 14:08:36 +11:00
Maikel Linke
c115ab7a0d Translate Taler payment status to error message 2026-01-29 15:07:28 +11:00
Maikel Linke
c11b93a4dc Demo Taler flow without validating payment yet 2026-01-29 15:07:28 +11:00
Maikel Linke
b3a1d1269a Add Taler as payment method 
It doesn't take payments yet but can be selected during checkout.
 2026-01-29 15:07:27 +11:00
Maikel Linke
a0011bd2e9 Remove orphaned translations of payment methods 2026-01-29 15:07:27 +11:00
Rachel Arnould
2a3b076170 Merge pull request #13826 from chahmedejaz/task/13744-add-none-option-in-tags-filter 
Allow to select "none" in variant tags dropdown
 2026-01-26 22:29:59 +01:00
Gaetan Craig-Riou
9a90e46b78 Move mail css back to be managed by wepack 
It wil allow us to remove dependency on `rails-sass`, and `sass` which
are not maintained anymore.
More or less revert this PR: https://github.com/openfoodfoundation/openfoodnetwork/pull/12743
 2026-01-26 14:50:31 +11:00
Maikel
7bfe51d067 Merge pull request #13849 from rioug/10298-upgrade-to-shakapaker_v7 
Upgrade to shakapaker v7
 2026-01-26 11:14:31 +11:00
Ahmed Ejaz
6ad49cc080 Update all locales with the latest Transifex translations 2026-01-26 03:50:53 +05:00
Ahmed Ejaz
d4811648f1 Merge branch 'master' into bugfix/13625-enterprise-fee-reports-throws-504 2026-01-25 11:22:57 +05:00
Rachel Arnould
2a7e8816c0 Merge pull request #13834 from mkllnk/pay-methods 
Simplify code listing available payment method types
 2026-01-23 22:52:29 +01:00
Gaetan Craig-Riou
108e313e48 Remove ci config that was missed during rebase 2026-01-23 16:23:14 +01:00