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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve payment & store credits views
Damian Legawiec4b415f348a19
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss b/admin/app/assets/stylesheets/spree/admin/components/_filters.scssindex 2461d95012..aeabd2c6ee 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss@@ -5,6 +5,7 @@.btn {height: 2.125rem;+ border-style: dashed;}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssindex 967e163d3f..3329eda3b2 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss@@ -2,16 +2,6 @@color: $gray-800;}-.filter-wrap {- padding: 0.5rem;- border-bottom: 1px solid $border-color;- gap: 0.5rem;-- .btn {- height: 2.375rem;- }-}-#filters-search-bar {max-width: 300px;margin-right: auto;diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex d369aa443a..0356a5608e 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -5,7 +5,7 @@</h5><% if can?(:update_customer, @order) || can?(:update_addresses, @order) %><div class="dropdown ml-auto" id="customer-edit-dropdown">- <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>+ <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-1', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %><div class="dropdown-menu dropdown-menu-right" ><div data-toggle="modal" data-target="#modal"><% if can?(:update_customer, @order) && [email protected]? %>diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex 59697a4532..dae5f080f6 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -1,10 +1,12 @@<div class="card" id="<%= dom_id(payment) %>"><div class="card-header d-flex align-items-center gap-2">- <span class="badge badge-<%= payment.state %>">+ <span class="badge badge-<%= payment.state %> gap-1"><% if payment.completed? %>- <%= icon('check', class: 'mr-2') %>+ <%= icon('check') %>+ <% elsif payment.invalid? || payment.void? || payment.failed? %>+ <%= icon('x') %><% else %>- <%= icon('progress', class: 'mr-2') %>+ <%= icon('progress') %><% end %><%= Spree.t('payment_states.' + payment.state) %></span>@@ -15,7 +17,7 @@<%= local_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %><div class="dropdown">- <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">+ <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false"><%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu">@@ -46,11 +48,14 @@<div class="card-body"><div class="d-flex"><div class="w-50">- <p class="mb-2"><%= Spree.t(:payment_method) %>:</p>+ <p class="mb-1"><%= Spree.t(:amount) %>:</p>+ <strong><%= payment.display_amount %></strong>++ <p class="mb-1 mt-2"><%= Spree.t(:payment_method) %>:</p><strong><%= link_to payment.payment_method.name, spree.admin_payment_method_path(payment.payment_method) %></strong><% if payment.transaction_id.present? %>- <p class="mb-2 mt-3">+ <p class="mb-1 mt-2"><%= Spree.t(:transaction_id) %><%= help_bubble(Spree.t(:transaction_id_help)) %></p>diff --git a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erbindex 19b811a4da..d1b2bee2f9 100644--- a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb@@ -5,7 +5,7 @@<% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %><div class="dropdown">- <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">+ <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false"><%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu">diff --git a/admin/app/views/spree/admin/promotion_actions/edit.html.erb b/admin/app/views/spree/admin/promotion_actions/edit.html.erbindex 9e3e9b3429..9bc6334a13 100644--- a/admin/app/views/spree/admin/promotion_actions/edit.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/edit.html.erb@@ -1,10 +1,10 @@<%= turbo_frame_tag @promotion_action do %><%= form_with model: @promotion_action, url: spree.admin_promotion_action_path(@promotion, @promotion_action), method: :put, scope: :promotion_action do |f| %>- <div class="card mb-3" id="<%= spree_dom_id(@promotion_action) %>">+ <div class="card" id="<%= spree_dom_id(@promotion_action) %>"><div class="card-header d-flex justify-content-between align-items-center"><h5 class="card-title"><%= @promotion_action.human_name %></h5></div>- <div class="card-body pb-0">+ <div class="card-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %><%= render "spree/admin/promotion_actions/forms/#{@promotion_action.key}", f: f %></div>diff --git a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erbindex a874e4958f..f38d8a65e7 100644--- a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb@@ -5,7 +5,7 @@<% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %><div class="dropdown">- <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">+ <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false"><%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu">diff --git a/admin/app/views/spree/admin/promotion_rules/edit.html.erb b/admin/app/views/spree/admin/promotion_rules/edit.html.erbindex 6602332fa7..4d495dbfaf 100644--- a/admin/app/views/spree/admin/promotion_rules/edit.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/edit.html.erb@@ -1,10 +1,10 @@<%= turbo_frame_tag @promotion_rule do %><%= form_with model: @promotion_rule, url: spree.admin_promotion_rule_path(@promotion, @promotion_rule), method: :put, scope: :promotion_rule do |f| %>- <div class="card mb-3" id="<%= spree_dom_id(@promotion_rule) %>">+ <div class="card" id="<%= spree_dom_id(@promotion_rule) %>"><div class="card-header d-flex justify-content-between align-items-center"><h5 class="card-title"><%= @promotion_rule.human_name %></h5></div>- <div class="card-body pb-0">+ <div class="card-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %><%= render "spree/admin/promotion_rules/forms/#{@promotion_rule.key}", f: f %></div>diff --git a/admin/app/views/spree/admin/store_credits/_form.html.erb b/admin/app/views/spree/admin/store_credits/_form.html.erbindex 616451ef91..3de6cc27b4 100644--- a/admin/app/views/spree/admin/store_credits/_form.html.erb+++ b/admin/app/views/spree/admin/store_credits/_form.html.erb@@ -3,7 +3,7 @@<div class="col-6"><div class="form-group"><%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>- <%= f.number_field :amount, class: 'form-control', step: 0.01, required: true, disabled: !f.object.editable? %>+ <%= f.number_field :amount, class: 'form-control', min: 0.01, step: 0.01, required: true, disabled: !f.object.editable? %><%= f.error_message_on :amount %></div></div>diff --git a/admin/app/views/spree/admin/store_credits/new.html.erb b/admin/app/views/spree/admin/store_credits/new.html.erbindex a5f7a4d0f7..49fd583f8f 100644--- a/admin/app/views/spree/admin/store_credits/new.html.erb+++ b/admin/app/views/spree/admin/store_credits/new.html.erb@@ -10,17 +10,20 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %><%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %>- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:store_credits) %>- </h5>- </div>+ <div class="row">+ <div class="col-lg-6 offset-lg-3">+ <div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:store_credits) %>+ </h5>+ </div>- <div class="card-body">- <%= render 'form', f: f %>+ <div class="card-body">+ <%= render 'form', f: f %>+ </div>+ </div>+ <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %></div></div>-- <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %><% end %>diff --git a/admin/app/views/spree/admin/users/show.html.erb b/admin/app/views/spree/admin/users/show.html.erbindex 39b407ede8..1eb7b88972 100644--- a/admin/app/views/spree/admin/users/show.html.erb+++ b/admin/app/views/spree/admin/users/show.html.erb@@ -1,7 +1,7 @@<% content_for :page_title do %><%= page_header_back_button spree.admin_users_path, @user %><%= customer_full_name(@user) || @user.email %>- <span class="font-size-base font-weight-normal ml-3">+ <span class="font-size-base font-weight-normal"><%= customer_location_flag(@user) %><%= customer_location(@user) %></span>