solidus_admin 0.2.0 → 0.3.0

data/app/components/solidus_admin/adjustment_reasons/edit/component.yml

@@ -0,0 +1,8 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "Edit Adjustment Reason"
+  cancel: "Cancel"
+  submit: "Update Adjustment Reason"
+  hints:
+    active: "When checked, this adjustment reason will be available for selection when adding adjustments to orders."

data/app/components/solidus_admin/adjustment_reasons/index/component.rb

@@ -13,14 +13,31 @@ class SolidusAdmin::AdjustmentReasons::Index::Component < SolidusAdmin::RefundsA
     :name_or_code_cont
   end
 
+  def page_actions
+    render component("ui/button").new(
+      tag: :a,
+      text: t('.add'),
+      href: solidus_admin.new_adjustment_reason_path, data: { turbo_frame: :new_adjustment_reason_modal },
+      icon: "add-line",
+      class: "align-self-end w-full",
+    )
+  end
+
+  def turbo_frames
+    %w[
+      new_adjustment_reason_modal
+      edit_adjustment_reason_modal
+    ]
+  end
+
   def row_url(adjustment_reason)
-    spree.edit_admin_adjustment_reason_path(adjustment_reason)
+    spree.edit_admin_adjustment_reason_path(adjustment_reason, _turbo_frame: :edit_adjustment_reason_modal)
   end
 
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.adjustment_reasons_path,
         method: :delete,
         icon: 'delete-bin-7-line',

data/app/components/solidus_admin/adjustment_reasons/new/component.html.erb

@@ -0,0 +1,28 @@
+<%= turbo_frame_tag :new_adjustment_reason_modal do %>
+  <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
+    <%= form_for @adjustment_reason, url: solidus_admin.adjustment_reasons_path, html: { id: form_id } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
+        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+        <label class="flex gap-2 items-center">
+          <%= hidden_field_tag "#{f.object_name}[active]", "0" %>
+          <%= render component("ui/forms/checkbox").new(
+            name: "#{f.object_name}[active]",
+            value: "1",
+            checked: f.object.active
+          ) %>
+          <span class="font-semibold text-xs ml-2"><%= Spree::AdjustmentReason.human_attribute_name :active %></span>
+          <%= render component("ui/toggletip").new(text: t(".hints.active")) %>
+        </label>
+      </div>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
+        </form>
+        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= render component("adjustment_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/adjustment_reasons/new/component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::AdjustmentReasons::New::Component < SolidusAdmin::BaseComponent
+  def initialize(page:, adjustment_reason:)
+    @page = page
+    @adjustment_reason = adjustment_reason
+  end
+
+  def form_id
+    dom_id(@adjustment_reason, "#{stimulus_id}_new_adjustment_reason_form")
+  end
+end

data/app/components/solidus_admin/adjustment_reasons/new/component.yml

@@ -0,0 +1,8 @@
+# Add your component translations here.
+# Use the translation in the example in your template with `t(".hello")`.
+en:
+  title: "New Adjustment Reason"
+  cancel: "Cancel"
+  submit: "Add Adjustment Reason"
+  hints:
+    active: "When checked, this adjustment reason will be available for selection when adding adjustments to orders."

data/app/components/solidus_admin/base_component.rb

@@ -13,31 +13,6 @@ module SolidusAdmin
       render component("ui/icon").new(name: name, **attrs)
     end
 
-    module InheritableTranslations
-      def build_i18n_backend
-        return if compiled?
-
-        # We need to load the translations files from the ancestors so a component
-        # can inherit translations from its parent and is able to overwrite them.
-        translation_files = ancestors.reverse_each.with_object([]) do |ancestor, files|
-          if ancestor.is_a?(Class) && ancestor < ViewComponent::Base
-            files.concat(ancestor.sidecar_files(%w[yml yaml].freeze))
-          end
-        end
-
-        # In development it will become nil if the translations file is removed
-        self.i18n_backend = if translation_files.any?
-          ViewComponent::Translatable::I18nBackend.new(
-            i18n_scope: i18n_scope,
-            load_paths: translation_files
-          )
-        end
-      end
-    end
-
-    # Can be removed once https://github.com/ViewComponent/view_component/pull/1934 is released
-    extend InheritableTranslations unless Gem::Version.new(ViewComponent::VERSION::STRING) >= Gem::Version.new("3.9")
-
     def missing_translation(key, options)
       keys = I18n.normalize_keys(options[:locale] || I18n.locale, key, options[:scope])
 

data/app/components/solidus_admin/option_types/index/component.rb

@@ -36,7 +36,7 @@ class SolidusAdmin::OptionTypes::Index::Component < SolidusAdmin::UI::Pages::Ind
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.option_types_path,
         method: :delete,
         icon: 'delete-bin-7-line',

data/app/components/solidus_admin/orders/index/component.rb

@@ -43,7 +43,7 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
   def filters
     [
       {
-        presentation: t('.filters.status'),
+        label: t('.filters.status'),
         combinator: 'or',
         attribute: "state",
         predicate: "eq",
@@ -55,7 +55,7 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
         end
       },
       {
-        presentation: t('.filters.shipment_state'),
+        label: t('.filters.shipment_state'),
         combinator: 'or',
         attribute: "shipment_state",
         predicate: "eq",
@@ -67,7 +67,7 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
         end
       },
       {
-        presentation: t('.filters.payment_state'),
+        label: t('.filters.payment_state'),
         combinator: 'or',
         attribute: "payment_state",
         predicate: "eq",
@@ -79,12 +79,12 @@ class SolidusAdmin::Orders::Index::Component < SolidusAdmin::UI::Pages::Index::C
         end
       },
       {
-        presentation: t('.filters.promotions'),
+        label: t('.filters.store'),
         combinator: 'or',
-        attribute: "promotions_id",
-        predicate: "in",
-        options: Spree::Promotion.all.pluck(:name, :id),
-      },
+        attribute: "store_id",
+        predicate: "eq",
+        options: Spree::Store.all.pluck(:name, :id)
+      }
     ]
   end
 

data/app/components/solidus_admin/orders/index/component.yml

@@ -5,6 +5,7 @@ en:
       other: '%{count} Items'
   filters:
     status: Status
+    store: Store
     shipment_state: Shipment State
     payment_state: Payment State
     promotions: Promotions

data/app/components/solidus_admin/orders/show/address/component.html.erb

@@ -1,67 +1,69 @@
 <div class="<%= stimulus_id %>" data-controller="<%= stimulus_id %>">
-  <%= render component("orders/show").new(order: @order) %>
-
-  <%= render component("ui/modal").new(title: t(".title.#{@type}"), close_path: solidus_admin.order_path(@order)) do |modal| %>
-    <%= form_for @order, url: solidus_admin.send("order_#{@type}_address_path", @order), html: { id: form_id } do |form| %>
-      <div class="w-full flex flex-col mb-4">
-        <div class="flex justify-between items-center mb-4 relative">
-          <h2 class="text-sm font-semibold">
-            <%= t(".subtitle.#{@type}") %>
-          </h2>
+  <%= turbo_frame_tag "edit_order_#{params[:type]}_address_modal" do %>
+    <%= render component("ui/modal").new(title: t(".title.#{@type}")) do |modal| %>
+      <%= form_for @order, url: solidus_admin.send("order_#{@type}_address_path", @order), html: { id: form_id } do |form| %>
+        <div class="w-full flex flex-col mb-4">
+          <div class="flex justify-between items-center mb-4 relative">
+            <h2 class="text-sm font-semibold">
+              <%= t(".subtitle.#{@type}") %>
+            </h2>
 
-          <% if @addresses.present? %>
-            <%= render component('ui/dropdown').new(
-              text: t(".select_address"),
-              "data-#{stimulus_id}-target": "addresses",
-              class: "max-h-[26rem] overflow-y-auto"
-            ) do %>
-              <% @addresses.each do |address| %>
-                <%= tag.a(
-                  format_address(address),
-                  href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
-                  'data-turbo-frame': address_frame_id,
-                  'data-action': "#{component('ui/dropdown').stimulus_id}#close",
-                ) %>
+            <% if @addresses.present? %>
+              <%= render component('ui/dropdown').new(
+                text: t(".select_address"),
+                "data-#{stimulus_id}-target": "addresses",
+                class: "max-h-[26rem] overflow-y-auto"
+              ) do %>
+                <% @addresses.each do |address| %>
+                  <%= tag.a(
+                    format_address(address),
+                    href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
+                    'data-turbo-frame': address_frame_id,
+                    'data-action': "#{component('ui/dropdown').stimulus_id}#close",
+                  ) %>
+                <% end %>
               <% end %>
             <% end %>
-          <% end %>
-        </div>
+          </div>
 
-        <div class="w-full flex gap-4">
-          <%= turbo_frame_tag address_frame_id do %>
-            <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
-          <% end %>
-        </div>
+          <div class="w-full flex gap-4">
+            <%= turbo_frame_tag address_frame_id do %>
+              <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
+            <% end %>
+          </div>
 
-        <label class="flex gap-2 items-center">
-          <%= form.hidden_field use_attribute, value: '0', id: false %>
+          <label class="flex gap-2 items-center">
+            <%= form.hidden_field use_attribute, value: '0', id: false %>
 
-          <%= render component("ui/forms/checkbox").new(
-            name: "#{form.object_name}[#{use_attribute}]",
-            checked: @address == (@type == 'ship' ? @order.bill_address : @order.ship_address),
-            value: '1'
-          ) %>
+            <%= render component("ui/forms/checkbox").new(
+              name: "#{form.object_name}[#{use_attribute}]",
+              checked: @address == (@type == 'ship' ? @order.bill_address : @order.ship_address),
+              value: '1'
+            ) %>
 
-          <span class="font-normal text-xs">
-            <%= t(".use_this_address.#{@type}") %>
-          </span>
-        </label>
-      </div>
-    <% end %>
+            <span class="font-normal text-xs">
+              <%= t(".use_this_address.#{@type}") %>
+            </span>
+          </label>
+        </div>
+      <% end %>
 
-    <% modal.with_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        scheme: :secondary,
-        text: t(".cancel"),
-        href: solidus_admin.order_path(@order)
-      ) %>
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").new(
+            scheme: :secondary,
+            text: t(".cancel"),
+          ) %>
+        </form>
 
-      <%= render component("ui/button").new(
-        tag: :button,
-        text: t(".save"),
-        form: form_id
-      ) %>
+        <%= render component("ui/button").new(
+          tag: :button,
+          text: t(".save"),
+          form: form_id
+        ) %>
+      <% end %>
     <% end %>
   <% end %>
+
+  <%= render component("orders/show").new(order: @order) %>
 </div>

data/app/components/solidus_admin/orders/show/adjustments/index/adjustable/component.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::Component < SolidusAdmin::BaseComponent
+  attr_reader :adjustment, :adjustable, :model_name
+
+  def initialize(adjustment)
+    @adjustment = adjustment
+    @adjustable = adjustment.adjustable
+    @model_name = adjustable&.model_name&.human
+  end
+
+  def call
+    render component("ui/thumbnail_with_caption").new(caption: caption, detail: detail) do
+      thumbnail
+    end
+  end
+
+  def thumbnail
+    render(component("ui/thumbnail").for(adjustment.adjustable, class: "basis-10"))
+  end
+
+  def caption
+  end
+
+  def detail
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/adjustable/spree_line_item/component.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::SpreeLineItem::Component < SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::Component
+  delegate :variant, to: :adjustable
+
+  def caption
+    options_text = variant.options_text.presence
+    options_text || variant.sku
+  end
+
+  def detail
+    link_to(variant.product.name, solidus_admin.product_path(variant.product), class: "body-link")
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/adjustable/spree_order/component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::SpreeOrder::Component < SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::Component
+  def caption
+    "#{Spree::Order.model_name.human} ##{adjustable.number}"
+  end
+
+  def detail
+    adjustable.display_total
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/adjustable/spree_shipment/component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::SpreeShipment::Component < SolidusAdmin::Orders::Show::Adjustments::Index::Adjustable::Component
+  def caption
+    "#{t('spree.shipment')} ##{adjustable.number}"
+  end
+
+  def detail
+    link_to(
+      adjustable.shipping_method.name,
+      spree.edit_admin_shipping_method_path(adjustable.shipping_method),
+      class: "body-link"
+    )
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/component.rb

@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree::Adjustment
+  end
+
+  def back_url
+    solidus_admin.order_path(@order)
+  end
+
+  def title
+    t(".title", number: @order.number)
+  end
+
+  NBSP = "&nbsp;".html_safe
+
+  def initialize(order:, adjustments:)
+    @order = order
+    @adjustments = adjustments
+    @page = GearedPagination::Recordset.new(adjustments, per_page: adjustments.size).page(1)
+  end
+
+  def batch_actions
+    [
+      {
+        label: t(".actions.lock"),
+        action: solidus_admin.lock_order_adjustments_path(@order),
+        method: :put,
+        icon: "lock-line"
+      },
+      {
+        label: t(".actions.unlock"),
+        action: solidus_admin.unlock_order_adjustments_path(@order),
+        method: :put,
+        icon: "lock-unlock-line"
+      },
+      {
+        label: t(".actions.delete"),
+        action: spree.admin_order_adjustment_path(@order, '[]'),
+        method: :delete,
+        icon: "delete-bin-7-line"
+      },
+    ]
+  end
+
+  def search_key
+    :label_cont
+  end
+
+  def search_url
+    solidus_admin.order_adjustments_path(@order)
+  end
+
+  def columns
+    [
+      {
+        header: :state,
+        wrap: true,
+        col: { class: 'w-[calc(5rem+2rem+2.5rem+1px)]' },
+        data: ->(adjustment) {
+          if adjustment.finalized?
+            icon = 'lock-fill'
+            title = t(".state.locked")
+          else
+            icon = 'lock-unlock-line'
+            title = t(".state.unlocked")
+          end
+          icon_tag(icon, class: "w-5 h-5 align-middle") + tag.span(title)
+        }
+      },
+      {
+        header: :adjustable,
+        col: { class: 'w-56' },
+        data: ->(adjustment) {
+          render_thumbnail_with_caption(adjustment, :adjustable)
+        }
+      },
+      {
+        header: :source,
+        col: { class: "w-56" },
+        data: ->(adjustment) {
+          render_thumbnail_with_caption(adjustment, :source)
+        }
+      },
+      {
+        header: :amount,
+        col: { class: 'w-24' },
+        data: ->(adjustment) { tag.span adjustment.display_amount.to_html, class: "grow text-right whitespace-nowrap" }
+      },
+      {
+        header: tag.span(t(".actions.title"), class: 'sr-only'),
+        col: { class: 'w-24' },
+        wrap: false,
+        data: ->(adjustment) do
+          actions = []
+
+          unless adjustment.source
+            actions << link_to(
+              t(".actions.edit"),
+              spree.edit_admin_order_adjustment_path(@order, adjustment),
+              class: 'body-link',
+            )
+          end
+
+          if adjustment.finalized?
+            actions << link_to(
+              t(".actions.unlock"),
+              solidus_admin.unlock_order_adjustments_path(@order, id: adjustment),
+              "data-turbo-method": :put,
+              "data-turbo-confirm": t('.confirm'),
+              class: 'body-link',
+            )
+          else
+            actions << link_to(
+              t(".actions.lock"),
+              solidus_admin.lock_order_adjustments_path(@order, id: adjustment),
+              "data-turbo-method": :put,
+              "data-turbo-confirm": t('.confirm'),
+              class: 'body-link',
+            )
+            actions << link_to(
+              t(".actions.delete"),
+              spree.admin_order_adjustment_path(@order, adjustment),
+              "data-turbo-method": :delete,
+              "data-turbo-confirm": t('.confirm'),
+              class: 'body-link !text-red-500',
+            )
+          end
+
+          render component('ui/dropdown').new(
+            direction: :right,
+            class: 'relative w-fit m-auto',
+          ).with_content(safe_join(actions))
+        end
+      },
+    ]
+  end
+
+  private
+
+  def render_thumbnail_with_caption(adjustment, role)
+    component_name = adjustment.send(role).class.base_class.name.delete("::").underscore if adjustment.send(role)
+    component_key = ["orders/show/adjustments/index/#{role}", component_name].compact.join("/")
+    render component(component_key).new(adjustment)
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/component.yml

@@ -0,0 +1,21 @@
+en:
+  title: "Order %{number} / Adjustments"
+  save: "Save"
+  discard: "Discard"
+  none: "—"
+
+  actions:
+    title: "Actions"
+    delete: "Delete"
+    lock: "Lock"
+    unlock: "Unlock"
+    edit: "Edit"
+
+  state:
+    locked: "Locked"
+    unlocked: "Unlocked"
+  confirm: "Are you sure?"
+
+  totals:
+    adjustable: "Totals (by Adjustable)"
+    source: "Totals (by Source)"

data/app/components/solidus_admin/orders/show/adjustments/index/source/component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Source::Component < SolidusAdmin::BaseComponent
+  attr_reader :adjustment, :source, :model_name
+
+  def initialize(adjustment)
+    @adjustment = adjustment
+    @source = adjustment.source
+    @model_name = source&.model_name&.human
+  end
+
+  def call
+    render component("ui/thumbnail_with_caption").new(icon: icon, caption: caption, detail: detail)
+  end
+
+  def caption
+    adjustment.label
+  end
+
+  def detail
+  end
+
+  def icon
+    "question-line"
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/source/spree_tax_rate/component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Source::SpreeTaxRate::Component < SolidusAdmin::Orders::Show::Adjustments::Index::Source::Component
+  def icon
+    "percent-line"
+  end
+
+  def detail
+    link_to("#{model_name}: #{zone_name}", spree.edit_admin_tax_rate_path(adjustment.source_id), class: "body-link")
+  end
+
+  private
+
+  def zone_name
+    source.zone&.name || t("spree.all_zones")
+  end
+end

data/app/components/solidus_admin/orders/show/adjustments/index/source/spree_unit_cancel/component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Orders::Show::Adjustments::Index::Source::SpreeUnitCancel::Component < SolidusAdmin::Orders::Show::Adjustments::Index::Source::Component
+  def icon
+    "close-circle-line"
+  end
+end

data/app/components/solidus_admin/orders/show/component.html.erb

@@ -16,9 +16,9 @@
 
     <%= page_with_sidebar_aside do %>
       <%= render component('ui/panel').new do |panel| %>
-        <% panel.with_menu t(".edit_email"), solidus_admin.order_customer_path(@order) %>
-        <% panel.with_menu t(".edit_shipping"), solidus_admin.edit_order_ship_address_path(@order) %>
-        <% panel.with_menu t(".edit_billing"), solidus_admin.edit_order_bill_address_path(@order) %>
+        <% panel.with_menu t(".edit_email"), solidus_admin.order_customer_path(@order), data: { turbo_frame: :edit_order_email_modal } %>
+        <% panel.with_menu t(".edit_shipping"), solidus_admin.edit_order_ship_address_path(@order), data: { turbo_frame: :edit_order_ship_address_modal } %>
+        <% panel.with_menu t(".edit_billing"), solidus_admin.edit_order_bill_address_path(@order), data: { turbo_frame: :edit_order_bill_address_modal } %>
         <% panel.with_menu t(".remove_customer"), solidus_admin.order_customer_path(@order), method: :delete, class: "text-red-500" if @order.user %>
 
         <% panel.with_section(class: 'flex flex-col gap-6') do %>
@@ -73,4 +73,8 @@
 
     <% end %>
   <% end %>
+
+  <% turbo_frames.each do |frame| %>
+    <%= turbo_frame_tag frame %>
+  <% end %>
 <% end %>

data/app/components/solidus_admin/orders/show/component.rb

@@ -29,6 +29,14 @@ class SolidusAdmin::Orders::Show::Component < SolidusAdmin::BaseComponent
     ], " ")
   end
 
+  def turbo_frames
+    %w[
+      edit_order_email_modal
+      edit_order_bill_address_modal
+      edit_order_ship_address_modal
+    ]
+  end
+
   def customer_name(user)
     (
       user.default_user_bill_address ||