Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Enhance Store Credit management UI

Damian Legawieca213142b2b8d
diff --git a/admin/app/controllers/spree/admin/store_credits_controller.rb b/admin/app/controllers/spree/admin/store_credits_controller.rb
index c3986bc3a4..89660d2394 100644
--- a/admin/app/controllers/spree/admin/store_credits_controller.rb
+++ b/admin/app/controllers/spree/admin/store_credits_controller.rb
@@ -88,7 +88,7 @@ module Spree
end
def scope
- current_store.store_credits.where(user: @user).without_gift_card
+ current_store.store_credits.where(user: @user)
end
def ensure_unused_store_credit
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 48bbf609f4..df12071fcb 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -656,6 +656,7 @@ en:
advertise: Advertise
agree_to_privacy_policy: Agree to Privacy Policy
agree_to_terms_of_service: Agree to Terms of Service
+ expires_at: Expires at
all: All
all_adjustments_closed: All adjustments successfully closed!
all_adjustments_opened: All adjustments successfully opened!
@@ -2024,6 +2025,7 @@ en:
store_credit:
additional_payment_needed: Select another payment method for the remaining <strong>%{amount}</strong>.
allocated: Added
+ eligible: Eligible
applicable_amount: "<strong>%{amount}</strong> in store credit will be applied to this order."
apply: Apply
authorized: Authorized