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

6927 Commits

Author SHA1 Message Date
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
5e4cd4d51d Remove unused helper 2026-03-10 16:07:42 +11:00
Gaetan Craig-Riou
a60afd10e4 Display credit used on the order confirmation page 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
152fd15bd0 Use display_name and display_description for payment method 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
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
f063e2e8c6 Change to email field 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
d3eb887664 Align button 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
50265780cf Call AdminTooltipComponent directly and remove unnecessary partial 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
f1071575cd Remove Angular from Enterprise > Settings > Users section 2026-03-04 10:28:36 +11:00
Rachel Arnould
c7d4c6f3c4 Merge pull request #13835 from prikeshsavla/13569-remove-v3-admin-styles 
Refactor admin CSS: Promote v3 to canonical admin styles
 2026-03-02 12:29:33 +01:00
Rachel Arnould
c13785f2e3 Merge pull request #13943 from pavelk-lab/replace-brand-story-angular-with-details 
Replace Angular expand/collapse with native HTML <details>/<summary> for brand story
 2026-02-27 15:37:00 +01:00
Arun Guleria
b7a1754879 13864 - remove unnecessary routes for update positions 2026-02-25 16:29:20 +05:30
Arun Guleria
ab811b2c83 13864-Remove dead feature to re-arrange variants 2026-02-24 18:16:34 +05:30
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
Rachel Arnould
68c7d8f9f5 Merge pull request #13934 from chahmedejaz/bugfix/13827-tag-filters-reset-upon-product-update 
Tag filters are reset after updating a product
 2026-02-24 10:20:11 +01:00
Maikel Linke
702db32595 Connect unit label to input 
And replace redundant spec helper method.
 2026-02-23 13:08:55 +11:00
Maikel Linke
9d79119eb0 Link to payment action with title 
The custom helper was adding a PowerTip which replaced the title
attribute with its own display. I removed the PowerTip and use a simple
title attribute. This should have several benefits:

- Capybara can find the link by the title.
- Screenreaders should be able read the title.
- Browser can show the title in the best position.
- Using the browser feature is more consistent and efficient.
 2026-02-23 13:00:02 +11:00
Maikel Linke
f2eec5685e Include amount in refund email 2026-02-23 13:00:02 +11: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
Pavel
b348536d12 Clean up dead code after Angular brand story removal 
- Delete HomeCtrl controller file (nothing references it anymore)
- Remove misplaced .text-vbig class from <details> (was on the old <a> toggle; summary has no visible text)
- Remove redundant cursor: pointer on #brand-story-text (<summary> already sets it)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-02-19 21:39:32 +00:00
Pavel
b528bb47a0 Replace Angular expand/collapse with native HTML details/summary for brand story 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-19 21:23:09 +00: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
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
Ahmed Ejaz
1d4bbfa506 Supports tag filters persistence during product updates 
Adds functionality to retain tag filters applied in the admin product interface after bulk updates. Updates controller parameters to include tags_name_in, adds hidden fields for tag persistence in the view, and includes specs to verify filter state retention across update operations.
 2026-02-18 01:37:41 +05:00
Maikel Linke
9da3b0ea01 User must choose payment method type on creation 2026-02-12 15:15:27 +11:00
Maikel Linke
3be0cca230 Move options code into helper 2026-02-12 11:47:01 +11:00
Maikel Linke
283d13eb35 Move payment method display logic to helper 
So we don't need to convert strings into classes to then only convert it
into the same string again.
 2026-02-12 11:25:13 +11:00
Sigmund Petersen
f8c88ea8c7 Merge pull request #13859 from rioug/10298-upgrade-to-shakapaker_v8 
Upgrade to shakapaker v8
 2026-02-04 12:51:42 +01:00
Maikel
813249bad7 Merge pull request #13897 from arunguleria/13893-products-table-layout-changes 
13893-hiding too many columns in Admin product list, the table layout breaks
 2026-02-04 12:42:17 +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
Arun Guleria
36d617bceb 13893-hiding too many columns in Admin product list, the table layout breaks 2026-02-02 10:47:02 +05:30
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
cc9cb966b5 Fix images/font path 
Now `additional_paths` are stripped like `source_path`
 2026-01-26 14:54:48 +11: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
Prikesh Savla
5a9aa87831 Rename admin-style-v3 to admin-style and remove the admin_legacy styles folder that has no references 2026-01-25 21:15:40 +05:30
Ahmed Ejaz
d4811648f1 Merge branch 'master' into bugfix/13625-enterprise-fee-reports-throws-504 2026-01-25 11:22:57 +05:00
Ahmed Ejaz
77fe1fa6f9 Refactor SearchableDropdownComponent and integrate remote data loading with TomSelect 2026-01-25 11:14:49 +05:00
Gaetan Craig-Riou
a0c23825b8 Top level dir is not stripped anymore for static assets 2026-01-23 16:23:14 +01:00
David Cook
1e2b8bad3f Fix linter error 2026-01-22 12:32:12 +11:00
wandji20
f5823bd618 Refactor to render turbo responses inline 2026-01-22 12:06:56 +11:00
wandji20
d9453979b1 Small improvements 2026-01-22 12:06:56 +11:00