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.

fxies for gift cards ui, i18n fixes

Damian Legawiec8e46ba5c3a4e
diff --git a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb b/admin/app/views/spree/admin/gift_card_batches/_form.html.erb
index 5e54e44017..c89984044d 100644
--- a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb
+++ b/admin/app/views/spree/admin/gift_card_batches/_form.html.erb
@@ -24,7 +24,7 @@
<%= f.error_message_on :codes_count %>
</div>
<div class="form-group">
- <%= f.label :expires_at, I18n.t('activerecord.attributes.spree/gift_card.expires_at') %>
+ <%= f.label :expires_at, Spree.t(:expires_at) %>
<%= f.date_field :expires_at, class: 'form-control', disabled: f.object.persisted? %>
<%= f.error_message_on :expires_at %>
</div>
diff --git a/admin/app/views/spree/admin/gift_cards/_list.html.erb b/admin/app/views/spree/admin/gift_cards/_list.html.erb
index 9e1a2ccf45..514e32c33a 100644
--- a/admin/app/views/spree/admin/gift_cards/_list.html.erb
+++ b/admin/app/views/spree/admin/gift_cards/_list.html.erb
@@ -17,14 +17,8 @@
</tbody>
</table>
</div>
+ <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
<% else %>
- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
- <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::GiftCard)) %>
- <%= link_to_with_icon 'plus', Spree.t(:add_one),
- params[:user_id].present? ? spree.new_admin_user_gift_card_path(params[:user_id]) : new_object_url,
- class: 'btn btn-link ml-3',
- data: { 'turbo-frame': '_top' } if can?(:create, Spree::GiftCard) %>
- </div>
-<% end %>
-
-<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
\ No newline at end of file
+ <% new_object_url = @user.present? ? spree.new_admin_user_gift_card_path(@user) : spree.new_admin_gift_card_path %>
+ <%= render 'spree/admin/shared/no_resource_found', model_class: Spree::GiftCard, new_object_url: spree.new_admin_user_gift_card_path(@user) %>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/gift_cards/show.html.erb b/admin/app/views/spree/admin/gift_cards/show.html.erb
index a9fae856b4..832de1d669 100644
--- a/admin/app/views/spree/admin/gift_cards/show.html.erb
+++ b/admin/app/views/spree/admin/gift_cards/show.html.erb
@@ -70,7 +70,7 @@
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted">
- <%= I18n.t('activerecord.attributes.spree/gift_card.expires_at') %>
+ <%= Spree.t(:expires_at) %>
</span>
<% if @object.expires_at %>
<span><%= local_time(@object.expires_at) %></span>
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index dd157ec9a2..990fc26c94 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -85,11 +85,11 @@ en:
active: Active
all: All
all_statuses: All statuses
+ code_help_text: If you leave it blank, we will generate code for you
expired: Expired
issued_to: Issued to
new_gift_card: New gift card
redeemed: Redeemed
- code_help_text: If you leave it blank, we will generate code for you
integrations:
invalid_integration_type: This integration is not allowed
page_subtitle: Connect your store to third-party services to enhance customer experience.
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index df12071fcb..48635cbd27 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -656,7 +656,6 @@ 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!
@@ -1040,6 +1039,7 @@ en:
expiration: Expiration
expiration_date: Expiration Date
expired: Expired
+ expires_at: Expires at
explore_taxon: Explore taxon
export: Export
export_mailer:
@@ -2025,7 +2025,6 @@ 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
diff --git a/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb b/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb
index 5bf578fdaa..8984014b78 100644
--- a/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb
+++ b/storefront/app/views/themes/default/spree/account/gift_cards/_gift_card.html.erb
@@ -20,7 +20,7 @@
</td>
<td class="w-full md:w-auto md:px-4 md:border-y md:border-r border-accent">
- <span class="md:hidden font-medium mr-1"><%= I18n.t('activerecord.attributes.spree/gift_card.expires_at') %>:</span>
+ <span class="md:hidden font-medium mr-1"><%= Spree.t(:expires_at) %>:</span>
<%= gift_card.expires_at.present? ? local_date(gift_card.expires_at) : '-' %>
</td>
</tr>