raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13297 from filipefurtad0/fix_#13264_BOM

Browse Source 
Fixes bad display from Producer name on BOM page
This commit is contained in:
Konrad
2025-05-23 18:56:36 +02:00
committed by GitHub
parent 60914ac8cc 074d7194d9
commit d7c39fcab7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -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' }

5
spec/system/admin/bulk_order_management_spec.rb
View File

@@ -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 " \