From 174c7205b5945b21e1e846e0135a1833130d4d73 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 22 May 2023 14:07:08 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20`Marketplace`:=20Fix=20label=20o?= =?UTF-8?q?n=20link=20to=20Order=20History?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/1331 --- app/furniture/marketplace/breadcrumbs.rb | 2 +- app/furniture/marketplace/locales/en.yml | 3 ++- .../marketplace/management_component.html.erb | 2 +- .../marketplace/management_component_spec.rb | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 spec/furniture/marketplace/management_component_spec.rb diff --git a/app/furniture/marketplace/breadcrumbs.rb b/app/furniture/marketplace/breadcrumbs.rb index 76f27d76b..d5472a309 100644 --- a/app/furniture/marketplace/breadcrumbs.rb +++ b/app/furniture/marketplace/breadcrumbs.rb @@ -24,7 +24,7 @@ crumb :marketplace_orders do |marketplace| parent :marketplace, marketplace - link t("marketplace.order.index"), marketplace.location(child: :orders) + link t("marketplace.orders.index.link_to"), marketplace.location(child: :orders) end crumb :marketplace_products do |marketplace| diff --git a/app/furniture/marketplace/locales/en.yml b/app/furniture/marketplace/locales/en.yml index d471c37a2..1e73284cf 100644 --- a/app/furniture/marketplace/locales/en.yml +++ b/app/furniture/marketplace/locales/en.yml @@ -50,7 +50,6 @@ en: success: "Marketplace updated successfully!" failure: "Marketplace could not be updated." order: - index: "Order History" placed_mailer: notification: subject: "Order Placed at %{marketplace_name}!" @@ -60,6 +59,8 @@ en: subject: "Order Received for %{marketplace_name}: %{order_id}" placed_at: "Received At %{placed_at}" orders: + index: + link_to: "Order History" show: link_to: "Order %{order_id}" products: diff --git a/app/furniture/marketplace/management_component.html.erb b/app/furniture/marketplace/management_component.html.erb index 79665b188..fac21c4a6 100644 --- a/app/furniture/marketplace/management_component.html.erb +++ b/app/furniture/marketplace/management_component.html.erb @@ -40,7 +40,7 @@ ) if policy(marketplace.bazaar.tax_rates.new(marketplace: marketplace)).create? %> <%= render ButtonComponent.new( - label: t('marketplace.tax_rates.index.link_to'), + label: t('marketplace.orders.index.link_to'), icon: :cart, href: marketplace.location(child: :orders), turbo_stream: false, method: :get, scheme: :secondary diff --git a/spec/furniture/marketplace/management_component_spec.rb b/spec/furniture/marketplace/management_component_spec.rb new file mode 100644 index 000000000..6d7a56644 --- /dev/null +++ b/spec/furniture/marketplace/management_component_spec.rb @@ -0,0 +1,18 @@ +require "rails_helper" + +RSpec.describe Marketplace::ManagementComponent, type: :component do + subject(:output) { render_inline(component) } + + let(:operator) { create(:person, operator: true) } + + let(:component) { described_class.new(marketplace: marketplace, current_person: operator) } + let(:marketplace) { create(:marketplace) } + + it { is_expected.to have_selector("a[href='#{polymorphic_path(marketplace.location(child: :products))}']", text: I18n.t("marketplace.products.index.link_to")) } + + it { is_expected.to have_selector("a[href='#{polymorphic_path(marketplace.location(child: :delivery_areas))}']", text: I18n.t("marketplace.delivery_areas.index.link_to")) } + + it { is_expected.to have_selector("a[href='#{polymorphic_path(marketplace.location(child: :tax_rates))}']", text: I18n.t("marketplace.tax_rates.index.link_to")) } + + it { is_expected.to have_selector("a[href='#{polymorphic_path(marketplace.location(child: :orders))}']", text: I18n.t("marketplace.orders.index.link_to")) } +end