From dafbefe8e38344469788db4784997f05c3d48913 Mon Sep 17 00:00:00 2001
From: Mohamed ABDELLANI <abdellani@gmail.com>
Date: Wed, 23 Nov 2022 09:50:34 +0100
Subject: [PATCH 1/2] add sku to OCST report as hidden by default column

---
 lib/reporting/reports/orders_and_fulfillment/base.rb       | 4 ++++
 .../orders_and_fulfillment/order_cycle_supplier_totals.rb  | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/reporting/reports/orders_and_fulfillment/base.rb b/lib/reporting/reports/orders_and_fulfillment/base.rb
index 887a39c5a1..d4e269184b 100644
--- a/lib/reporting/reports/orders_and_fulfillment/base.rb
+++ b/lib/reporting/reports/orders_and_fulfillment/base.rb
@@ -43,6 +43,10 @@ module Reporting
           proc { |line_items| line_items.first.variant.full_name }
         end
 
+        def variant_sku
+          proc { |line_items| line_items.first.variant.sku }
+        end
+
         def supplier_name
           proc { |line_items| line_items.first.variant.product.supplier.name }
         end
diff --git a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb
index 3b242225df..7646c4ceae 100644
--- a/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb
+++ b/lib/reporting/reports/orders_and_fulfillment/order_cycle_supplier_totals.rb
@@ -12,7 +12,8 @@ module Reporting
             quantity: proc { |line_items| line_items.sum(&:quantity) },
             total_units: proc { |line_items| total_units(line_items) },
             curr_cost_per_unit: proc { |line_items| line_items.first.price },
-            total_cost: proc { |line_items| line_items.sum(&:amount) }
+            total_cost: proc { |line_items| line_items.sum(&:amount) },
+            sku: variant_sku
           }
         end
 
@@ -41,6 +42,10 @@ module Reporting
             [e.variant_id, e.price]
           }.values
         end
+
+        def default_params
+          super.merge({ fields_to_hide: ["sku"] })
+        end
       end
     end
   end

From d15708d4e36f3ad90d59eb4a879cfcba3686af77 Mon Sep 17 00:00:00 2001
From: Mohamed ABDELLANI <abdellani@gmail.com>
Date: Wed, 23 Nov 2022 09:51:26 +0100
Subject: [PATCH 2/2] test if OCST report includes variant's sku

---
 .../orders_cycle_supplier_totals_report_spec.rb     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb b/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
index 2c2c7047d7..6f68c7f8dc 100644
--- a/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
+++ b/spec/lib/reports/orders_and_fulfillment/orders_cycle_supplier_totals_report_spec.rb
@@ -18,6 +18,10 @@ module Reporting
           OrderCycleSupplierTotals.new(current_user, params)
         end
 
+        let(:table_headers) do
+          report.table_headers
+        end
+
         let(:report_table) do
           report.table_rows
         end
@@ -31,6 +35,15 @@ module Reporting
           supplier_name_field = report_table.first[0]
           expect(supplier_name_field).to eq supplier.name
         end
+
+        it "includes sku column" do
+          variant_sku = order.line_items.first.variant.sku
+          last_column_title = table_headers.last
+          first_row_last_column_value = report_table.first.last
+
+          expect(last_column_title).to eq "SKU"
+          expect(first_row_last_column_value).to eq variant_sku
+        end
       end
     end
   end