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
Open source more controllers tied to orders, add missing views and specs (#12293)
Łukasz Adamczyk0aa45385d943
diff --git a/admin/app/controllers/spree/admin/payments_controller.rb b/admin/app/controllers/spree/admin/payments_controller.rbnew file mode 100644index 0000000000..d1c3f17bf4--- /dev/null+++ b/admin/app/controllers/spree/admin/payments_controller.rb@@ -0,0 +1,111 @@+module Spree+ module Admin+ class PaymentsController < Spree::Admin::ResourceController+ belongs_to 'spree/order', find_by: :number++ before_action :load_data++ def new+ # Move order to payment state in order to capture tax generated on shipments+ @order.next if @order.can_go_to_state?('payment')++ payment_method = params[:payment_method_id] ? @payment_methods.find { |pm| pm.id == params[:payment_method_id] } : @payment_methods.first++ @payment = @order.payments.build(+ amount: @order.total_minus_store_credits - @order.payment_total,+ payment_method: payment_method+ )++ if payment_method.try(:source_required?)+ source_class = (payment_method.try(:payment_source_class) || Spree::CreditCard)+ @payment.source = source_class&.new+ end+ end++ def create+ invoke_callbacks(:create, :before)++ @order.transaction do+ @object.attributes = permitted_resource_params+ @object.build_source+ @object.save!++ if @order.billing_address.nil?+ @order.clone_shipping_address+ @order.save!+ end+ end++ @object.process!++ # Transition order as far as it will go.+ while @order.next; end+ # If "@order.next" didn't trigger payment processing already (e.g. if the order was+ # already complete) then trigger it manually now++ invoke_callbacks(:create, :after)++ redirect_to location_after_save+ rescue Spree::Core::GatewayError => e+ @object.failure if defined?(@object) && @object.persisted?+ invoke_callbacks(:create, :fails)++ flash[:error] = e.message.to_s+ render :new, status: :unprocessable_entity+ rescue ActiveRecord::RecordInvalid => _e+ @object.failure if defined?(@object) && @object.persisted?+ invoke_callbacks(:create, :fails)++ render :new, status: :unprocessable_entity+ end++ def capture+ if @payment.capture!+ flash[:success] = Spree.t(:payment_updated)+ # move order to next state if possible+ while @order.next; end+ else+ flash[:error] = @payment.errors.full_messages.to_sentence+ end+ redirect_to location_after_save+ rescue Spree::Core::GatewayError => ge+ flash[:error] = ge.message.to_s+ redirect_to location_after_save+ end++ def void+ if @payment.void_transaction!+ flash[:success] = Spree.t(:payment_updated)+ else+ flash[:error] = Spree.t(:cannot_perform_operation)+ end+ redirect_to location_after_save+ rescue Spree::Core::GatewayError => ge+ flash[:error] = ge.message.to_s+ redirect_to location_after_save+ end++ private++ def model_class+ Spree::Payment+ end++ def permitted_resource_params+ params.require(:payment).permit(permitted_payment_attributes)+ end++ def collection_url+ spree.edit_admin_order_path(@order)+ end++ def location_after_save+ collection_url+ end++ def load_data+ @payment_methods = @order.collect_backend_payment_methods+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/refunds_controller.rb b/admin/app/controllers/spree/admin/refunds_controller.rbnew file mode 100644index 0000000000..71b2cc7cb4--- /dev/null+++ b/admin/app/controllers/spree/admin/refunds_controller.rb@@ -0,0 +1,43 @@+module Spree+ module Admin+ class RefundsController < ResourceController+ belongs_to 'spree/payment', find_by: :number++ before_action :load_order+ before_action :assign_refunder, only: :create++ helper_method :refund_reasons++ rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error++ private++ def location_after_save+ spree.edit_admin_order_path(@payment.order)+ end++ def load_order+ @order = @payment.order if @payment+ end++ def refund_reasons+ @refund_reasons ||= RefundReason.active.all+ end++ def build_resource+ super.tap do |refund|+ refund.amount = refund.payment.credit_allowed+ end+ end++ def spree_core_gateway_error(error)+ flash[:error] = error.message+ render :new+ end++ def assign_refunder+ @refund.refunder = try_spree_current_user+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/shipments_controller.rb b/admin/app/controllers/spree/admin/shipments_controller.rbnew file mode 100644index 0000000000..ceb0ae5675--- /dev/null+++ b/admin/app/controllers/spree/admin/shipments_controller.rb@@ -0,0 +1,102 @@+module Spree+ module Admin+ class ShipmentsController < Spree::Admin::ResourceController+ include Spree::Admin::StockLocationsHelper++ layout 'turbo_rails/frame'++ belongs_to 'spree/order', find_by: :number++ before_action :load_variant, only: [:split, :transfer]+ before_action :refresh_shipping_rates, only: :edit++ def update+ @result = Spree::Dependencies.shipment_update_service.constantize.call(shipment: @shipment, shipment_attributes: shipment_params)+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:shipment)) if @result.success?++ redirect_back fallback_location: spree.edit_admin_order_path(@order)+ end++ def ship+ if @shipment.shippable? && @shipment.ship+ flash[:success] = Spree.t(:shipment_successfully_shipped)+ else+ flash[:error] = Spree.t(:cannot_ship)+ end++ redirect_back fallback_location: spree.edit_admin_order_path(@order)+ end++ def split+ @max_quantity = @shipment.inventory_units.where(variant_id: @variant.id).sum(:quantity)+ end++ def transfer+ destination_name, destination_id = params[:destination].split('_')+ quantity = params[:quantity]&.to_i || 1++ errors = []+ errors << "#{Spree.t(:quantity)} #{Spree.t('validation.is_too_large')}" if quantity <= 0++ transfer = nil++ case destination_name+ when 'stock-location'+ destination = available_stock_locations.find(destination_id)+ transfer = @shipment.transfer_to_location(@variant, quantity, destination)+ when 'shipment'+ destination = parent.shipments.+ where(stock_location: available_stock_locations).+ find(destination_id)+ transfer = @shipment.transfer_to_shipment(@variant, quantity, destination)+ end++ errors << Spree.t('shipment_transfer.wrong_destination') if transfer.nil?++ if errors.any?+ flash[:error] = errors.to_sentence+ return redirect_back_or_default(spree.edit_admin_order_path(@order))+ end++ if transfer.valid? && transfer.run!+ flash[:success] = Spree.t(:shipment_transfer_success)+ else+ flash[:error] = transfer.errors.full_messages.to_sentence+ end++ redirect_back_or_default(spree.edit_admin_order_path(@order))+ end++ private++ def refresh_shipping_rates+ unless @order.completed?+ ActiveRecord::Base.connected_to(role: :writing) do+ @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END)+ end+ end+ end++ def model_class+ Spree::Shipment+ end++ def find_resource+ record = parent.shipments.find_by!(number: params[:id])+ authorize! action, record+ end++ def collection_url+ spree.edit_admin_order_path(@order)+ end++ def load_variant+ @variant = current_store.variants.accessible_by(current_ability, :manage).find(params[:variant_id])+ end++ def shipment_params+ params.require(:shipment).permit(permitted_shipment_attributes)+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/checkouts_controller.rb b/admin/app/helpers/spree/admin/checkouts_controller.rbnew file mode 100644index 0000000000..b09800af44--- /dev/null+++ b/admin/app/helpers/spree/admin/checkouts_controller.rb@@ -0,0 +1,23 @@+module Spree+ module Admin+ class CheckoutsController < BaseController+ include Spree::Admin::OrdersFiltersHelper++ before_action :load_user, only: [:index]++ def index+ params[:q] ||= {}+ params[:q][:s] ||= 'created_at desc'++ load_orders+ render template: 'spree/admin/orders/index'+ end++ private++ def scope+ current_store.checkouts.accessible_by(current_ability, :index)+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rbindex 48b9ca6ee6..1c062ccdec 100644--- a/admin/app/helpers/spree/admin/orders_helper.rb+++ b/admin/app/helpers/spree/admin/orders_helper.rb@@ -93,11 +93,17 @@ module Spreeenddef ready_to_ship_orders_count- @ready_to_ship_orders_count ||= if defined?(current_vendor) && current_vendor.present?- current_vendor.orders.complete.ready_to_ship.count- else- current_store.orders.without_vendor.complete.ready_to_ship.count- end+ @ready_to_ship_orders_count ||= begin+ if defined?(current_vendor)+ if current_vendor.present?+ current_vendor.orders.complete.ready_to_ship.count+ else+ current_store.orders.without_vendor.complete.ready_to_ship.count+ end+ else+ current_store.orders.complete.ready_to_ship.count+ end+ endenddef avs_response_codediff --git a/admin/app/helpers/spree/admin/shipment_helper.rb b/admin/app/helpers/spree/admin/shipment_helper.rbnew file mode 100644index 0000000000..0e9b3a5597--- /dev/null+++ b/admin/app/helpers/spree/admin/shipment_helper.rb@@ -0,0 +1,27 @@+module Spree::Admin+ module ShipmentHelper+ def can_ship?(shipment)+ can?(:update, shipment) && shipment.shippable?+ end++ def stock_locations_for_split(variant)+ available_stock_locations.+ joins(:stock_items).+ where(spree_stock_items: { variant_id: variant.id }).+ group(:id).+ pluck(:name, "sum(spree_stock_items.count_on_hand)", :id).+ map { |name, count, id| ["#{name.capitalize} (#{count} on hand)", "stock-location_#{id}"] }+ end++ def shipments_for_transfer(current_shipment)+ current_shipment.+ order.+ shipments.+ ready_or_pending.+ where(stock_location: available_stock_locations).+ where.not(id: current_shipment.id).+ pluck(:number, :id).+ map { |n, i| [n, "shipment_#{i}"] }+ end+ end+enddiff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex 2acab03d45..333e75a969 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -29,7 +29,7 @@<% end %></div><div class="card-body">- <% unless current_vendor %>+ <% unless defined?(current_vendor) && current_vendor %><% unless @order.user.present? %><h6><%= Spree.t(:contact_information) %></h6><% end %>@@ -49,7 +49,7 @@<% end %></div><% end %>- <h6 class="<%= current_vendor ? "" : "mt-4" %> font-weight-bold"><%= Spree.t(:shipping_address) %></h6>+ <h6 class="<%= defined?(current_vendor) && current_vendor ? "" : "mt-4" %> font-weight-bold"><%= Spree.t(:shipping_address) %></h6><%= turbo_frame_tag :order_ship_address do %><% if @order.ship_address.present? %><%= render 'spree/admin/shared/address', address: @order.ship_address %>diff --git a/admin/app/views/spree/admin/orders/_customer_summary.html.erb b/admin/app/views/spree/admin/orders/_customer_summary.html.erbindex f07429bf44..69e7f767f2 100644--- a/admin/app/views/spree/admin/orders/_customer_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_customer_summary.html.erb@@ -4,7 +4,7 @@<%#= image_tag(avatar_url_for( order.user), width: 24, height: 24, class: 'mr-2 rounded') %><% if can?(:manage, order.user) %>- <%= link_to order.full_name, [:admin, order.user], class: 'text-dark', data: { 'turbo-frame': '_top' } %>+ <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-dark', data: { 'turbo-frame': '_top' } %><% else %><%= order.full_name %><% end %>diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erbindex 6ab72ee791..a876bbc6b1 100644--- a/admin/app/views/spree/admin/orders/_filters.html.erb+++ b/admin/app/views/spree/admin/orders/_filters.html.erb@@ -12,7 +12,7 @@<div class="d-flex align-items-center justify-content-between"><div class="mr-2 h-100"><% if controller_name == 'checkouts' %>- <%= render 'shared/calendar_range_picker',+ <%= render 'spree/admin/shared/calendar_range_picker',date_from_input_name: 'q[created_at_gt]',date_to_input_name: 'q[created_at_lt]',date_from_value: params.dig(:q, :created_at_gt),@@ -20,7 +20,7 @@dropdown_direction: 'right'%><% else %>- <%= render 'shared/calendar_range_picker',+ <%= render 'spree/admin/shared/calendar_range_picker',date_from_input_name: 'q[completed_at_gt]',date_to_input_name: 'q[completed_at_lt]',date_from_value: params.dig(:q, :completed_at_gt),@@ -84,7 +84,7 @@</div></div>- <% if !current_vendor && !@vendor %>+ <% if defined?(current_vendor) && !current_vendor && !@vendor %><div class="col-12 col-lg-4"><div class="form-group"><%= f.label :vendor_orders_vendor_id_eq, Spree.t(:vendor) %>diff --git a/admin/app/views/spree/admin/orders/_header.html.erb b/admin/app/views/spree/admin/orders/_header.html.erbindex 44bac7d9e6..38493bb13b 100644--- a/admin/app/views/spree/admin/orders/_header.html.erb+++ b/admin/app/views/spree/admin/orders/_header.html.erb@@ -11,7 +11,7 @@<% end %><% content_for(:page_actions_dropdown) do %>- <% if @order.completed? %>+ <% if @order.completed? && spree.respond_to?(:order_path) %><%= link_to_with_icon 'eye',Spree.t(:preview),spree.order_path(@order, host: current_store.url, token: @order.token),diff --git a/admin/app/views/spree/admin/orders/_list.html.erb b/admin/app/views/spree/admin/orders/_list.html.erbindex 16ad157dd4..73c68ddf41 100644--- a/admin/app/views/spree/admin/orders/_list.html.erb+++ b/admin/app/views/spree/admin/orders/_list.html.erb@@ -18,7 +18,7 @@</tr></thead><tbody>- <%= render collection: @orders, partial: 'spree/admin/orders/order', cached: !current_vendor ? spree_base_cache_scope : false %>+ <%= render collection: @orders, partial: 'spree/admin/orders/order', cached: !(defined?(current_vendor) && current_vendor) ? spree_base_cache_scope : false %></tbody></table></div>diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erbindex 119926f2d7..c001f04670 100644--- a/admin/app/views/spree/admin/orders/_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_summary.html.erb@@ -47,7 +47,7 @@</li><% end %>- <% if @order.parent_order? && @order.included_tax_total != 0 %>+ <% if @order.included_tax_total != 0 %><li class="list-group-item d-flex justify-content-between align-items-center border-0"><span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span><span id='included_tax_total'>@@ -56,7 +56,7 @@</li><% end %>- <% if @order.parent_order? && @order.additional_tax_total != 0 %>+ <% if @order.additional_tax_total != 0 %><% tax_lines = order_summary_tax_lines_additional(@order) %><li class="list-group-item border-0">diff --git a/admin/app/views/spree/admin/payments/new.html.erb b/admin/app/views/spree/admin/payments/new.html.erbnew file mode 100644index 0000000000..4428d6cdb4--- /dev/null+++ b/admin/app/views/spree/admin/payments/new.html.erb@@ -0,0 +1,59 @@+<%= render 'spree/admin/orders/header' %>++<div class="row">+ <div class="col-lg-6">+ <%= render 'spree/admin/shared/error_messages', target: @payment %>++ <%= form_with url: spree.admin_order_payments_path(@order), model: @payment, method: :post do |f| %>+ <div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title"><%= Spree.t(:new_payment) %></h5>+ </div>+ <div class="card-body">+ <div class="form-group mb-3">+ <%= f.label :amount, Spree.t(:amount) %>+ <div class="input-group">+ <%= f.number_field :amount, value: @order.total_minus_store_credits - @order.payment_total, max: @order.total_minus_store_credits - @order.payment_total, class: 'form-control', required: true %>+ <div class="input-group-append">+ <span class="input-group-text"><%= currency_symbol(@order.currency) %></span>+ </div>+ </div>+ </div>++ <%= f.label :payment_method_id, Spree.t(:payment_method) %>+ <ul class="list-group mb-3">+ <% @payment_methods.each do |payment_method| %>+ <li class="list-group-item p-0">+ <%= link_to spree.new_admin_order_payment_path(@order, payment_method_id: payment_method.id), class: "form-check-label d-flex align-items-center gap-3 px-3 py-3 w-100 cursor-pointer hover-light text-dark" do %>+ <div class="form-check flex align-items-center">+ <%= f.radio_button :payment_method_id, payment_method.id, class: "form-check-input" %>+ </div>++ <% if payment_method_icon_tag(payment_method.payment_icon_name).present? %>+ <%= payment_method_icon_tag(payment_method.payment_icon_name) %>+ <% end %>++ <%= payment_method.name %>+ <% end %>+ </li>+ <% end %>+ </ul>++ <% if @payment.payment_method.present? && @payment.payment_method.source_required? %>+ <%= f.label :source, Spree.t(:payment_source) %>+ <div class="my-3">+ <%= render partial: "spree/admin/payments/source_forms/#{@payment.payment_method.method_type}",+ locals: {+ f: f,+ payment_method: @payment.payment_method,+ previous_cards: @payment.payment_method.reusable_sources(@order)+ } %>+ </div>+ <% end %>+ </div>+ </div>++ <%= render 'spree/admin/shared/new_resource_links' %>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erb b/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erbnew file mode 100644index 0000000000..8f1b3e92f7--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erb@@ -0,0 +1,54 @@+<% if previous_cards.any? %>+ <div class="card my-3">+ <div class="card-header">+ <h5 class="card-title mb-0 h6"><%= Spree.t(:previously_used_card) %></h5>+ </div>+ <div class="form-group previous_cards card-body mb-0">+ <ul class="m-0 p-0">+ <% previous_cards.each do |card| %>+ <li>+ <label>+ <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_brand + ' - ' + card.display_number %>+ </label>+ </li>+ <% end %>+ <li>+ <hr>+ <label>+ <%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %>+ </label>+ </li>+ </ul>+ </div>+ </div>+<% end %>++<div id="card_form<%= payment_method.id %>" class="mt-3 row">+ <% param_prefix = "payment_source[#{payment_method.id}]" %>++ <div class="form-group col-12">+ <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>+ <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>+ <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>+ <span id="card_type" style="display:none;">+ ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span>+ <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>+ )+ </span>+ </div>++ <div class="form-group col-12">+ <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + required_span_tag) %>+ <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>+ </div>++ <div class="form-group col-6">+ <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>+ <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM/YYYY" %>+ </div>++ <div class="form-group col-6">+ <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + required_span_tag) %>+ <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb b/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erbnew file mode 100644index 0000000000..1257019fe4--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb@@ -0,0 +1,21 @@+<% if previous_cards.any? %>+ <ul class="list-group mb-3">+ <%= f.fields_for :source, @payment.source do |source_form| %>+ <% previous_cards.each do |card| %>+ <li class="list-group-item p-0">+ <%= source_form.label :id, value: card.id, class: "form-check-label d-flex align-items-center gap-3 px-3 py-3 w-100 cursor-pointer hover-light" do %>+ <div class="form-check flex align-items-center">+ <%= source_form.radio_button :id, card.id, class: "form-check-input" %>+ </div>+ <%= payment_method_icon_tag(card.brand, width: 32, height: 32) %>+ <%= card.display_number %>+ <% if card.wallet_type.present? %>+ <%= payment_method_icon_tag(card.wallet_type, width: 32, height: 32) %>+ <% end %>+ <span class="text-muted ms-auto">(<%= card.month %>/<%= card.year %>)</span>+ <% end %>+ </li>+ <% end %>+ <% end %>+ </ul>+<% end %>diff --git a/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erb b/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erbnew file mode 100644index 0000000000..6f81f92f24--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erb@@ -0,0 +1,7 @@+<% if previous_cards.any? %>+ <%= render 'spree/admin/payments/source_forms/previous_cards', previous_cards: previous_cards, f: f %>+<% else %>+ <span class="text-muted">+ <%= Spree.t(:no_saved_cards) %>+ </span>+<% end %>diff --git a/admin/app/views/spree/admin/payments/source_forms/_storecredit.html.erb b/admin/app/views/spree/admin/payments/source_forms/_storecredit.html.erbnew file mode 100644index 0000000000..781fe757eb--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_forms/_storecredit.html.erb@@ -0,0 +1,9 @@+<% if @order.could_use_store_credit? %>+ <div class="alert alert-info text-center" data-hook="admin_payment_store_credit_available">+ <h4><%= Spree.t('admin.user.available_store_credit', amount: @order.display_total_available_store_credit) %></h4>+ </div>+<% else %>+ <div class="alert alert-danger text-center" data-hook="admin_payment_no_store_credit">+ <h4><strong><%= Spree.t('admin.user.no_store_credit') %></strong></h4>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/payments/source_views/_check.html.erb b/admin/app/views/spree/admin/payments/source_views/_check.html.erbnew file mode 100644index 0000000000..e69de29bb2diff --git a/admin/app/views/spree/admin/payments/source_views/_gateway.html.erb b/admin/app/views/spree/admin/payments/source_views/_gateway.html.erbnew file mode 100644index 0000000000..317f84cdb5--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_views/_gateway.html.erb@@ -0,0 +1,22 @@+<div>+ <div class="table-responsive border rounded bg-white mb-3">+ <table class="table table-condensed">+ <tr>+ <th width="20%"><%= Spree.t(:name_on_card) %>:</th>+ <td><%= payment.source.name %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:card_type) %>:</th>+ <td><%= payment.source.display_brand %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:card_number) %>:</th>+ <td><%= payment.source.display_number %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:expiration) %>:</th>+ <td><%= payment.source.month %>/<%= payment.source.year %></td>+ </tr>+ </table>+ </div>+</div>diff --git a/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erbnew file mode 100644index 0000000000..12e22c9445--- /dev/null+++ b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb@@ -0,0 +1,31 @@+<fieldset data-hook="store_credit">+ <legend><%= Spree.t(:store_credit_name) %></legend>+ <div class="table-responsive border rounded bg-white">+ <table class="table table-condensed border rounded">+ <tr>+ <th width="20%"><%= Spree.t(:used) %>:</th>+ <td><%= payment.source.display_amount_used %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:amount) %>:</th>+ <td><%= payment.source.display_amount %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:memo) %>:</th>+ <td><%= payment.source.memo %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:type) %>:</th>+ <td><%= payment.source.category_name %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:created_by) %>:</th>+ <td><%= payment.source.created_by_email %></td>+ </tr>+ <tr>+ <th><%= Spree.t(:issued_on) %>:</th>+ <td><%= pretty_time(payment.source.created_at) %></td>+ </tr>+ </table>+ </div>+</fieldset>diff --git a/admin/app/views/spree/admin/refunds/_form.html.erb b/admin/app/views/spree/admin/refunds/_form.html.erbnew file mode 100644index 0000000000..14e53c5e00--- /dev/null+++ b/admin/app/views/spree/admin/refunds/_form.html.erb@@ -0,0 +1,14 @@+<div class="form-group">+ <%= f.label :amount, Spree.t(:amount) %>+ <div class="input-group">+ <%= f.text_field :amount, class: 'form-control', required: true %>+ <div class="input-group-append">+ <span class="input-group-text"><%= currency_symbol(@order.currency) %></span>+ </div>+ </div>+</div>+<div class="form-group mb-0">+ <%= f.label :refund_reason_id, Spree.t(:reason) %>+ <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, { include_blank: true }, { data: { controller: 'autocomplete-select' }, required: true }) %>+ <%= f.error_message_on :reason %>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/refunds/edit.html.erb b/admin/app/views/spree/admin/refunds/edit.html.erbnew file mode 100644index 0000000000..ab75901e23--- /dev/null+++ b/admin/app/views/spree/admin/refunds/edit.html.erb@@ -0,0 +1,20 @@+<%= turbo_frame_tag :dialog_modal do %>+ <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund], data: { turbo: false } do |f| %>+ <div class="modal-content">+ <div class="modal-header">+ <h5 class="modal-title" id="exampleModalLabel">+ <%= Spree.t(:edit_refund) %>+ </h5>+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />+ </div>+ <div class="modal-body">+ <%= render 'spree/admin/shared/error_messages', target: @refund %>+ <%= render 'spree/admin/refunds/form', f: f %>+ </div>+ <div class="modal-footer d-flex justify-content-between">+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>+ <%= turbo_save_button_tag %>+ </div>+ </div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/refunds/new.html.erb b/admin/app/views/spree/admin/refunds/new.html.erbnew file mode 100644index 0000000000..52a916505d--- /dev/null+++ b/admin/app/views/spree/admin/refunds/new.html.erb@@ -0,0 +1,29 @@+<%= render 'spree/admin/orders/header' %>++<div class="row">+ <div class="col-lg-6">+ <%= render 'spree/admin/shared/error_messages', target: @refund %>++ <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>+ <div class="card mb-4">+ <div class="card-header">+ <h6 class="card-title">+ <%= Spree.t(:new_refund) %>+ </h6>+ </div>+ <div class="card-body">+ <div class="form-group">+ <%= f.label :payment_amount, Spree.t(:payment_amount) %><br>+ <%= @refund.payment.display_amount %>+ </div>+ <div class="form-group">+ <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>+ <%= @refund.payment.display_credit_allowed %>+ </div>+ <%= render 'spree/admin/refunds/form', f: f %>+ </div>+ </div>+ <%= render 'spree/admin/shared/new_resource_links' %>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/shared/_address.html.erb b/admin/app/views/spree/admin/shared/_address.html.erbnew file mode 100644index 0000000000..1c40824fe9--- /dev/null+++ b/admin/app/views/spree/admin/shared/_address.html.erb@@ -0,0 +1,42 @@+<% cache spree_base_cache_scope.call(address) do %>+ <div class="address vcard">+ <% if address.full_name.present? %>+ <div class="fn"><%= address.full_name %></div>+ <% end %>+ <% unless address.company.blank? %>+ <div class="org">+ <%= address.company %>+ </div>+ <% end %>+ <div class="adr">+ <div class="street-address">+ <div class="street-address-line">+ <%= address.address1 %>+ </div>+ <% unless address.address2.blank? %>+ <div class="street-address-line">+ <%= address.address2 %>+ </div>+ <% end %>+ </div>+ <div class="local">+ <span class="locality"><%= address.city %></span>+ <span class="region"><%= address.state_text %></span>+ <span class="postal-code"><%= address.zipcode %></span>+ <div class="country-name"><%= address.country.try(:name) %></div>+ </div>+ </div>+ <% unless address.phone.blank? %>+ <div class="tel">+ <span class="type"><%= Spree.t(:phone) %></span>+ <%= address.phone %>+ </div>+ <% end %>+ <% unless address.alternative_phone.blank? %>+ <div class="alternative-phone tel">+ <span class="type"><%= Spree.t(:alternative_phone) %></span>+ <%= address.alternative_phone %>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erbnew file mode 100644index 0000000000..2d742a953f--- /dev/null+++ b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb@@ -0,0 +1,29 @@+<% date_from_input_name ||= :date_from %>+<% date_to_input_name ||= :date_to %>+<% css_classes ||= "btn btn-light d-inline-flex align-items-center h-100" %>++<% date_from_value ||= params[date_from_input_name] %>+<% date_to_value ||= params[date_to_input_name] %>++<% dropdown_direction ||= 'left' %>++<div data-controller="calendar-range" class="dropdown h-100"+ data-action="click->calendar-range#open">+ <div class="<%= css_classes %>" data-toggle="dropdown">+ <%= icon('calendar') %>+ <div data-calendar-range-target="label">+ <% if date_from_value.present? && date_to_value.present? %>+ <%= date_from_value.to_date %> - <%= date_to_value.to_date %>+ <% else %>+ All time+ <% end %>+ </div>+ <%= icon 'chevron-down', class: 'arrow mr-0 ml-2 text-muted' %>+ </div>+ <div class="dropdown-menu dropdown-menu-<%= dropdown_direction %> pb-0 pr-0 pl-1 pt-1" onclick="event.stopPropagation()">+ <div data-calendar-range-target="picker" class="d-none"></div>+ </div>++ <%= hidden_field_tag date_from_input_name, date_from_value&.to_date, data: { 'calendar-range-target': 'dateFrom' } %>+ <%= hidden_field_tag date_to_input_name, date_to_value&.to_date, data: { 'calendar-range-target': 'dateTo' } %>+</div>diff --git a/admin/app/views/spree/admin/shared/_index_table_options.html.erb b/admin/app/views/spree/admin/shared/_index_table_options.html.erbnew file mode 100644index 0000000000..e981888b33--- /dev/null+++ b/admin/app/views/spree/admin/shared/_index_table_options.html.erb@@ -0,0 +1,22 @@+<% args = params.clone %>+<% entry_name ||= nil %>++<% if defined?(per_page_action) %>+ <% args[:action] = per_page_action %>+<% end %>++<% if collection.any? && collection.total_pages > 1 %>+ <div class="py-2 border-top">+ <div class="index-pagination-row d-flex align-items-center">+ <div class="col-6 col-lg-3">+ <%= per_page_dropdown %>+ </div>+ <div class="d-none d-lg-block col-lg-6 text-center text-muted small">+ <%= page_entries_info(collection, entry_name: entry_name) %>+ </div>+ <div class="col-6 col-lg-3 text-right pr-lg-2">+ <%= paginate collection, theme: 'admin-twitter-bootstrap-4' %>+ </div>+ </div>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/shared/_payment.html.erb b/admin/app/views/spree/admin/shared/_payment.html.erbnew file mode 100644index 0000000000..18e9fd4b38--- /dev/null+++ b/admin/app/views/spree/admin/shared/_payment.html.erb@@ -0,0 +1,46 @@+<div class="d-flex justify-content-between align-items-center" id="<%= spree_dom_id(payment) %>">+ <div class="w-40">+ <%= render 'spree/shared/payment', payment: payment %>+ </div>+ <div class="text-xs text-muted w-20">+ <%= local_time(payment.updated_at) %>+ </div>++ <div class="text-xs text-muted w-15">+ <%= payment_state_badge(payment.state) %>+ </div>++ <div class="text-xs text-muted w-10">+ <%= payment.display_amount %>+ </div>++ <div class="w-10 d-flex justify-content-end">+ <div class="dropdown">+ <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">+ <%= icon('dots', class: 'mr-0') %>+ </button>+ <div class="dropdown-menu">+ <% if payment.try(:gateway_dashboard_payment_url).present? %>+ <%= link_to_with_icon 'eye', Spree.t(:details), payment.gateway_dashboard_payment_url, class: 'dropdown-item', target: '_blank' %>+ <% end %>+ <% if payment.source.is_a?(Spree::StoreCredit) && payment.source.gift_card %>+ <%= link_to_with_icon 'eye', Spree.t(:details), spree.edit_admin_gift_card_path(payment.source.gift_card), class: 'dropdown-item' %>+ <% end %>++ <% if payment.checkout? || payment.pending? %>+ <%= link_to_with_icon 'check', Spree.t(:capture), spree.capture_admin_order_payment_path(@order, payment), class: 'dropdown-item', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>+ <% end %>+ <% if can?(:refund, @order) && (payment.completed? || payment.pending?) %>+ <%= link_to_with_icon 'credit-card-refund', Spree.t(:refund), spree.new_admin_order_payment_refund_path(@order, payment), class: 'dropdown-item' %>+ <% end %>+ <% if payment.void? || payment.pending? %>+ <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>+ <% end %>+ <% if payment.checkout? && payment.can_be_deleted? %>+ <div class="dropdown-divider"></div>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %>+ <% end %>+ </div>+ </div>+ </div>+</div>diff --git a/admin/app/views/spree/admin/shared/_user.html.erb b/admin/app/views/spree/admin/shared/_user.html.erbnew file mode 100644index 0000000000..9763ea3efd--- /dev/null+++ b/admin/app/views/spree/admin/shared/_user.html.erb@@ -0,0 +1,24 @@+<%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top} do %>+ <% if user.name.present? %>+ <%= image_tag(avatar_url_for(user), width: 48, height: 48, class: 'mr-3 rounded-lg') %>+ <% else %>+ <div style="width: 48px; height: 48px" class="mr-3 rounded-lg bg-light"></div>+ <% end %>+ <div class="text-left">+ <% if customer_full_name(user) %>+ <span class="font-weight-bold text-dark"><%= customer_full_name(user) %></span>+ <br />+ <% end %>+ <% unless defined?(current_vendor) && current_vendor %>+ <span class="text-muted with-tip" title="<%= user.email %>">+ <%= user.email %>+ </span>+ <span data-controller="clipboard">+ <%= hidden_field_tag :user_email, user.email, data: { clipboard_target: 'source' } %>+ <button data-action="clipboard#copy" class="btn btn-sm text-muted with-tip mx-1" title="Copy email">+ <%= icon 'files', class: 'mr-0' %>+ </button>+ </span>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/shipments/edit.html.erb b/admin/app/views/spree/admin/shipments/edit.html.erbnew file mode 100644index 0000000000..9e8602cf4d--- /dev/null+++ b/admin/app/views/spree/admin/shipments/edit.html.erb@@ -0,0 +1,28 @@+<%= turbo_frame_tag dom_id(@shipment, :shipping_method) do %>+ <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 d-flex justify-content-between align-items-center" do |f| %>+ <div>+ <%= f.select :selected_shipping_rate_id, options_for_select(@shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, @shipment.selected_shipping_rate_id),+ {}, class: 'custom-select' %>+ </div>+ <div class="d-flex h-100 align-items-center">+ <% if can? :update, @shipment %>+ <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>+ <% end %>+ </div>+ <% end %>+<% end %>+<%= turbo_frame_tag dom_id(@shipment, :tracking) do %>+ <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 py-1 d-flex justify-content-between align-items-center" do |f| %>+ <div class="form-inline">+ <%= f.label :tracking, Spree.t(:tracking_number) %>+ <%= f.text_field :tracking, class: 'form-control ml-3', required: true %>+ </div>+ <div class="d-flex h-100 align-items-center">+ <% if can? :update, @shipment %>+ <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>+ <% end %>+ </div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/shipments/split.html.erb b/admin/app/views/spree/admin/shipments/split.html.erbnew file mode 100644index 0000000000..3098d704f8--- /dev/null+++ b/admin/app/views/spree/admin/shipments/split.html.erb@@ -0,0 +1,16 @@+<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>+ <%= form_with url: transfer_admin_order_shipment_path(@order, @shipment), class: "shipment-line-items__form" do |f| %>+ <%= hidden_field_tag :variant_id, @variant.id %>+ <div class="d-flex flex-row gap-2 align-items-center w-full form-group mb-0">+ <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-muted font-size-sm font-weight-bold' %>+ <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "flex-grow-1" %>+ </div>+ <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-control", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>+ <span class="d-flex justify-content-end align-items-center gap-2 w-100" style="grid-column: quantity/-1">+ <% if can?(:split, @shipment) %>+ <%= turbo_save_button_tag Spree.t(:move), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>+ <% end %>+ <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>+ </span>+ <% end %>+<% end %>diff --git a/admin/config/routes.rb b/admin/config/routes.rbindex 2b7165129d..3cccda8de1 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -50,6 +50,8 @@ Spree::Core::Engine.add_routes doresources :webhooks_subscribers# orders+ resources :checkouts, only: %i[index]+resources :orders, only: [:index, :edit, :create] domember dopost :resend@@ -137,6 +139,9 @@ Spree::Core::Engine.add_routes doget '/taxons/select_options' => 'taxons#select_options', as: :taxons_select_options, defaults: { format: :json }+ # users+ resources :users+# variantspost 'variants/search'get 'variants/search', defaults: { format: :json }diff --git a/admin/spec/controllers/spree/admin/checkouts_controller_spec.rb b/admin/spec/controllers/spree/admin/checkouts_controller_spec.rbnew file mode 100644index 0000000000..ae307dd1e9--- /dev/null+++ b/admin/spec/controllers/spree/admin/checkouts_controller_spec.rb@@ -0,0 +1,32 @@+require 'spec_helper'++describe Spree::Admin::CheckoutsController, type: :controller do+ stub_authorization!+ render_views++ describe '#index' do+ let!(:order) { create(:order_with_totals) }+ let!(:completed_order) { create(:completed_order_with_totals) }+ let(:line_item) { order.line_items.first }++ it 'renders index' do+ get :index+ expect(response).to have_http_status(:ok)+ end++ it 'return all checkouts' do+ get :index+ expect(assigns(:orders).to_a).to include(order)+ expect(assigns(:orders).to_a).not_to include(completed_order)+ end++ context 'filtering by number' do+ let(:order) { create(:order, number: 'R123456789') }++ it 'returns orders with matching number' do+ get :index, params: { q: { number_cont: 'R123456789-10' } }+ expect(assigns(:orders).to_a).to include(order)+ end+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex 2fa89d9e30..7aa15c9507 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -2,6 +2,7 @@ require 'spec_helper'RSpec.describe Spree::Admin::OrdersController, type: :controller dostub_authorization!+ render_viewslet(:user) { create(:admin_user) }diff --git a/admin/spec/controllers/spree/admin/payments_controller_spec.rb b/admin/spec/controllers/spree/admin/payments_controller_spec.rbnew file mode 100644index 0000000000..68a5b91568--- /dev/null+++ b/admin/spec/controllers/spree/admin/payments_controller_spec.rb@@ -0,0 +1,175 @@+require 'spec_helper'++RSpec.describe Spree::Admin::PaymentsController, type: :controller do+ stub_authorization!+ render_views++ let(:order) { create(:order_with_line_items, state: 'payment') }+ let(:payment_method) { create(:credit_card_payment_method, display_on: 'back_end') }++ describe 'PUT #capture' do+ subject { put :capture, params: params }+ let(:params) { { order_id: order.number, id: payment.id } }+ let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total) }++ it 'captures unprocessed payment' do+ subject++ expect(payment.reload.state).to eq('completed')+ expect(flash[:success]).to eq(Spree.t(:payment_updated))+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(order.reload.state).to eq('complete')+ end++ context 'when something goes wrong' do+ it 'sets an error message and redirects back' do+ allow_any_instance_of(Spree::Payment).to receive(:capture!).and_raise(Spree::Core::GatewayError.new('An error occurred'))++ subject++ expect(flash[:error]).to eq('An error occurred')+ expect(payment.reload.state).to eq('checkout')+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(order.reload.state).to eq('payment')+ end+ end+ end++ describe 'PUT #void' do+ subject { put :void, params: params }+ let(:params) { { order_id: order.number, id: payment.id } }+ let(:payment) { create(:payment, order: order, payment_method: payment_method, amount: order.total, state: 'completed') }++ it 'voids completed payment' do+ subject++ expect(payment.reload.state).to eq('void')+ expect(flash[:success]).to eq(Spree.t(:payment_updated))+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(order.reload.state).to eq('payment')+ end++ context 'when something goes wrong' do+ it 'sets an error message and redirects back' do+ allow_any_instance_of(Spree::Payment).to receive(:void_transaction!).and_raise(Spree::Core::GatewayError.new('An error occurred'))++ subject++ expect(flash[:error]).to eq('An error occurred')+ expect(payment.reload.state).to eq('completed')+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(order.reload.state).to eq('payment')+ end+ end+ end++ describe 'POST #create' do+ subject { post :create, params: params }++ before do+ order.ship_address.update(user: order.user)+ order.bill_address.update(user: order.user)+ end++ context 'with invalid params' do+ let(:params) { { order_id: order.number, payment: { amount: order.total, payment_method_id: payment_method.id.to_s } } }++ it 'does not create a payment' do+ subject++ expect(order.payments.count).to eq(0)+ expect(response).to render_template(:new)+ expect(response.status).to eq(422)+ expect(order.reload.state).to eq('payment')+ end+ end++ context 'with a valid credit card' do+ let(:params) do+ {+ order_id: order.number,+ card: 'new',+ payment: {+ amount: order.total,+ payment_method_id: payment_method.id.to_s,+ source_attributes: {+ name: 'Test User',+ number: '4111 1111 1111 1111',+ expiry: "09 / #{Time.current.year + 1}",+ verification_value: '123'+ }+ }+ }+ end++ it 'processes payment correctly' do+ subject++ expect(order.payments.count).to eq(1)+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(order.reload.state).to eq('complete')+ end+ end++ context 'with an invalid credit card' do+ let(:params) do+ {+ order_id: order.number,+ card: 'new',+ payment: {+ amount: order.total,+ payment_method_id: payment_method.id.to_s,+ source_attributes: {+ name: 'Test User',+ number: '4111 2111 1111 1111',+ expiry: "09 / #{Time.current.year + 1}",+ verification_value: '123'+ }+ }+ }+ end++ it 'set an flash message and stops at payment state' do+ subject++ expect(order.payments.count).to eq(1)+ expect(response).to render_template(:new)+ expect(response.status).to eq(422)+ expect(flash[:error]).to eq('Bogus Gateway: Forced failure')+ expect(order.reload.state).to eq('payment')+ end+ end++ context 'when billing address is missing' do+ before do+ order.update!(bill_address_id: nil)+ end++ let(:params) do+ {+ order_id: order.number,+ card: 'new',+ payment: {+ amount: order.total,+ payment_method_id: payment_method.id.to_s,+ source_attributes: {+ name: 'Test User',+ number: '4111 1111 1111 1111',+ expiry: "09 / #{Time.current.year + 1}",+ verification_value: '123'+ }+ }+ }+ end++ it 'copies shipping address to billing address' do+ subject++ expect(order.reload.state).to eq('complete')+ expect(order.reload.billing_address.reload).to eq(order.shipping_address)+ expect(order.payments.count).to eq(1)+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ end+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/refunds_controller_spec.rb b/admin/spec/controllers/spree/admin/refunds_controller_spec.rbnew file mode 100644index 0000000000..aea0ceff71--- /dev/null+++ b/admin/spec/controllers/spree/admin/refunds_controller_spec.rb@@ -0,0 +1,41 @@+require 'spec_helper'++describe Spree::Admin::RefundsController, type: :controller do+ stub_authorization!+ render_views++ let(:user) { create(:admin_user) }++ before do+ allow(controller).to receive(:current_ability).and_return(Spree::Dependencies.ability_class.constantize.new(user))+ end++ describe '#create' do+ context 'when successful' do+ subject do+ post :create, params: {+ refund: { amount: amount.to_s, refund_reason_id: refund_reason.id.to_s },+ order_id: payment.order.to_param,+ payment_id: payment.to_param+ }+ end++ let!(:refund_reason) { create(:refund_reason) }+ let(:payment) { create(:payment, amount: payment_amount, order: create(:completed_order_with_totals)) }+ let(:payment_amount) { amount * 2 }+ let(:amount) { 100.0 }+ let(:amount_in_cents) { amount * 100 }+ let(:authorization) { generate(:refund_transaction_id) }++ it 'creates refund' do+ expect { subject }.to change { Spree::Refund.count }.from(0).to(1)+ end++ it 'assigns refunder to created refund' do+ subject++ expect(payment.refunds.last.refunder).to eq user+ end+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/shipments_controller_spec.rb b/admin/spec/controllers/spree/admin/shipments_controller_spec.rbnew file mode 100644index 0000000000..b4f933f9e6--- /dev/null+++ b/admin/spec/controllers/spree/admin/shipments_controller_spec.rb@@ -0,0 +1,52 @@+require 'spec_helper'++RSpec.describe Spree::Admin::ShipmentsController, type: :controller do+ stub_authorization!+ render_views++ let(:order) { create(:order_ready_to_ship) }+ let(:shipment) { order.shipments.first }+ let(:other_shipping_method) { create(:shipping_rate, shipment: shipment) }+ let(:shipment_params) { { tracking: '12345', selected_shipping_rate_id: other_shipping_method.id } }++ describe 'PUT #update' do+ context 'when update is successful' do+ before do+ put :update, params: { order_id: order.number, id: shipment.number, shipment: shipment_params }+ end++ it 'updates shipment' do+ expect(flash[:success]).to eq(Spree.t(:successfully_updated, resource: Spree.t(:shipment)))++ shipment.reload+ expect(shipment.tracking).to eq '12345'+ expect(shipment.selected_shipping_rate_id).to eq other_shipping_method.id+ end++ it 'redirects to the edit order page' do+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ end+ end+ end++ describe '#ships' do+ context 'when shipment can be shipped' do+ it 'ships the shipment' do+ post :ship, params: { order_id: order.number, id: shipment.number }+ expect(shipment.reload.state).to eq('shipped')+ end+ end++ context 'when shipment cannot be shipped' do+ before do+ shipment.update(tracking: nil)+ expect(shipment.tracking).to be_nil+ end++ it 'flashes error' do+ post :ship, params: { order_id: order.number, id: shipment.number }+ expect(flash[:error]).to eq(Spree.t(:cannot_ship))+ end+ end+ end+enddiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex e48170c03d..5392cf123d 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -382,6 +382,14 @@ module Spreeendend+ def full_name+ @full_name ||= if user.present? && user.name.present?+ user.name.full+ else+ billing_address&.full_name || email+ end+ end+def can_ship?complete? || resumed? || awaiting_return? || returned?enddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex de1ae841e4..dd91a6c8de 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -37,6 +37,7 @@ module Spreeacts_as_paranoid+ has_many :checkouts, -> { incomplete }, class_name: 'Spree::Order', inverse_of: :storehas_many :orders, class_name: 'Spree::Order'has_many :line_items, through: :orders, class_name: 'Spree::LineItem'has_many :shipments, through: :orders, class_name: 'Spree::Shipment'diff --git a/core/app/views/spree/shared/_payment.html.erb b/core/app/views/spree/shared/_payment.html.erbnew file mode 100644index 0000000000..3a303ac646--- /dev/null+++ b/core/app/views/spree/shared/_payment.html.erb@@ -0,0 +1,40 @@+<% source = payment.source %>+<div class="d-flex flex items-top gap-2">+ <% if source.is_a?(Spree::CreditCard) %>+ <div class="flex-shrink-0">+ <% # display wallet icon, eg. Apple Pay, Google Pay, etc. %>+ <%= payment_method_icon_tag source.wallet_type, height: 30 if source.try(:wallet_type).present? %>+ <% # display card type icon, eg. Visa, Mastercard, etc. %>+ <%= payment_method_icon_tag source.cc_type, height: 30 %>+ </div>+ <div>+ <p class="mb-1"><%= Spree.t(:ending_with) %> <%=source.last_digits %></p>+ <p class="mb-0"><%= Spree.t(:expires) %> <%= source.month %> / <%= source.year %></p>+ </div>+ <% elsif source.is_a?(Spree::StoreCredit) %>+ <% if source.gift_card %>+ <div class="d-flex flex rounded bg-light px-3 py-2 mb-3 align-items-center">+ <%= icon('gift', height: 30, class: 'mr-3 text-muted') %>+ <div>+ <p class="mb-1">Gift card: <strong><%= source.gift_card.code.upcase %></strong></p>+ <%= @order.display_gift_card_total %>+ </div>+ </div>+ <% else %>+ <div class="rounded bg-light px-3 py-2 mb-3">+ <%= Spree.t(:store_credits) %>: <%= @order.display_total_applied_store_credit.abs %>+ </div>+ <% end %>+ <% elsif source.present? %>+ <div class="flex-shrink-0">+ <%= payment_method_icon_tag source.class.to_s.demodulize.downcase, height: 30 %>+ </div>+ <% else %>+ <div class="flex-shrink-0">+ <%= payment_method_icon_tag payment.payment_method.payment_icon_name %>+ </div>+ <div>+ <%= payment.payment_method.name %>+ </div>+ <% end %>+</div>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 58ac9ceb32..b2a8c6d4ec 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -640,6 +640,7 @@ en:cannot_perform_operation: Cannot perform requested operationcannot_return_more_than_bought_quantity: Cannot return more than bought quantity.cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.+ cannot_ship: Shipment cannot be shippedcapture: Capturecapture_events: Capture eventscard_code: Card Verification Code (CVC)@@ -1052,7 +1053,9 @@ en:missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'month: Monthmore: More+ move: Movemove_stock_between_locations: Move Stock Between Locations+ move_variant_to: Move variant tomy_account: My Accountmy_orders: My Ordersname: Name@@ -1525,6 +1528,7 @@ en:thanks: Thank you for your business.track_information: ! 'Tracking Information: %{tracking}'track_link: "Tracking Link: %{url}"+ shipment_successfully_shipped: Shipment successfully shippedshipment_state: Shipment Stateshipment_states:backorder: backorderdiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 8bcd1c2864..d77efb6199 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -54,6 +54,39 @@ describe Spree::Order, type: :model doendend+ describe '#full_name' do+ subject { order.full_name }++ let(:order) { build(:order, user: user, bill_address: bill_address, email: email) }++ let(:bill_address) { nil }+ let(:email) { '[email protected]' }++ context 'for an order with user' do+ let(:user) { build(:user, first_name: 'John', last_name: 'Doe') }++ it { is_expected.to eq('John Doe') }++ context 'without name' do+ let(:user) { build(:user, first_name: nil, last_name: nil) }++ it { is_expected.to eq('[email protected]') }+ end+ end++ context 'for a guest order' do+ let(:user) { nil }++ it { is_expected.to eq('[email protected]') }++ context 'with billing address' do+ let(:bill_address) { build(:address, first_name: 'Jane', last_name: 'Dane') }++ it { is_expected.to eq('Jane Dane') }+ end+ end+ end+describe '#update_with_updater!' dolet(:updater) { Spree::OrderUpdater.new(order) }