From 44e02b76f912645e87b60cf3dc90fa71a7ffeead Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Sat, 3 May 2025 16:42:37 +0100 Subject: [PATCH 1/2] Adds the ng-bind html parameter to the producer column --- app/views/spree/admin/orders/bulk_management.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 6ba7728ab8..85777a8761 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -177,7 +177,7 @@ %td.email{ 'ng-show' => 'columns.email.visible' } {{ line_item.order.email }} %td.phone{ 'ng-show' => 'columns.phone.visible' } {{ line_item.order.phone }} %td.date{ 'ng-show' => 'columns.order_date.visible' } {{ line_item.order.completed_at }} - %td.producer{ 'ng-show' => 'columns.producer.visible' } {{ line_item.supplier.name }} + %td.producer{ 'ng-show' => 'columns.producer.visible', "ng-bind-html": 'line_item.supplier.name' } %td.order_cycle{ 'ng-show' => 'columns.order_cycle.visible' } {{ line_item.order.order_cycle.name }} %td.hub{ 'ng-show' => 'columns.hub.visible' } {{ line_item.order.distributor.name }} %td.variant{ 'ng-show' => 'columns.variant.visible' } From 074d7194d9fe4f8ebdde8d83b31a400d074d8a26 Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Sun, 4 May 2025 20:49:48 +0100 Subject: [PATCH 2/2] Adapts existing spec to check for unusual characters on the supplier name --- spec/system/admin/bulk_order_management_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/system/admin/bulk_order_management_spec.rb b/spec/system/admin/bulk_order_management_spec.rb index 95af4bac5b..069c4c191d 100644 --- a/spec/system/admin/bulk_order_management_spec.rb +++ b/spec/system/admin/bulk_order_management_spec.rb @@ -305,6 +305,8 @@ RSpec.describe ' let!(:li2) { create(:line_item_with_shipment, order: o2, product: create(:product) ) } + # sets supplier name to contain unusual characters + let!(:supplier) { li1.supplier.update_attribute(:name, "Sûppliẽr Näme") } before :each do visit_bulk_order_management @@ -327,8 +329,7 @@ RSpec.describe ' it "displays a column for producer" do expect(page).to have_selector "th.producer", text: "Producer" - expect(page).to have_selector "td.producer", text: li1.supplier.name - expect(page).to have_selector "td.producer", text: li2.supplier.name + expect(page).to have_selector "td.producer", text: "Sûppliẽr Näme", count: 2 end it "displays a column for variant description, which shows only product name " \