diff --git a/app/helpers/checkout_helper.rb b/app/helpers/checkout_helper.rb
index 4c8a2ea53e..f3b0ddeb54 100644
--- a/app/helpers/checkout_helper.rb
+++ b/app/helpers/checkout_helper.rb
@@ -11,6 +11,7 @@ module CheckoutHelper
 
   def checkout_adjustments_for(order, opts = {})
     exclude = opts[:exclude] || {}
+    reject_zero_amount = opts.fetch(:reject_zero_amount, true)
 
     adjustments = order.all_adjustments.eligible.to_a
 
@@ -32,6 +33,10 @@ module CheckoutHelper
       }
     end
 
+    if reject_zero_amount
+      adjustments.reject! { |a| a.amount == 0 }
+    end
+
     adjustments
   end
 
diff --git a/app/views/checkout/_summary.html.haml b/app/views/checkout/_summary.html.haml
index fa3bd6f4ed..64103efd47 100644
--- a/app/views/checkout/_summary.html.haml
+++ b/app/views/checkout/_summary.html.haml
@@ -9,7 +9,7 @@
             = t :checkout_cart_total
           %td.cart-total.text-right= display_checkout_subtotal(@order)
 
-        - checkout_adjustments_for(current_order, exclude: [:shipping, :payment, :line_item]).reject{ |a| a.amount == 0 }.each do |adjustment|
+        - checkout_adjustments_for(current_order, exclude: [:shipping, :payment, :line_item]).each do |adjustment|
           %tr.adjustment
             %th= adjustment.label
             %td.text-right= adjustment.display_amount.to_html
diff --git a/app/views/split_checkout/_summary.html.haml b/app/views/split_checkout/_summary.html.haml
index 78d3189fa8..48de1f1235 100644
--- a/app/views/split_checkout/_summary.html.haml
+++ b/app/views/split_checkout/_summary.html.haml
@@ -78,7 +78,7 @@
     .summary-right-line-label= t :order_produce
     .summary-right-line-value= display_checkout_subtotal(@order)
 
-  - checkout_adjustments_for(@order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+  - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
     .summary-right-line
       .summary-right-line-label= adjustment.label
       .summary-right-line-value= adjustment.display_amount.to_html
diff --git a/app/views/spree/admin/orders/_invoice_table.html.haml b/app/views/spree/admin/orders/_invoice_table.html.haml
index 4b90522915..b824616b49 100644
--- a/app/views/spree/admin/orders/_invoice_table.html.haml
+++ b/app/views/spree/admin/orders/_invoice_table.html.haml
@@ -24,7 +24,7 @@
         %td{:align => "right"}
           = item.display_amount_with_adjustments
       
-    - checkout_adjustments_for(@order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+    - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
       - taxable = adjustment.adjustable_type == "Spree::Shipment" ? adjustment.adjustable : adjustment
       %tr
         %td
diff --git a/app/views/spree/admin/orders/_invoice_table2.html.haml b/app/views/spree/admin/orders/_invoice_table2.html.haml
index c9a19b7956..ff24582867 100644
--- a/app/views/spree/admin/orders/_invoice_table2.html.haml
+++ b/app/views/spree/admin/orders/_invoice_table2.html.haml
@@ -30,7 +30,7 @@
           %td{:align => "right"}
             = display_line_item_tax_rates(item)
 
-    - checkout_adjustments_for(@order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+    - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
       %tr
         %td
           %strong= "#{raw(adjustment.label)}"
diff --git a/app/views/spree/admin/orders/ticket.html.haml b/app/views/spree/admin/orders/ticket.html.haml
index d86ba0d1b6..ae5c375aa8 100644
--- a/app/views/spree/admin/orders/ticket.html.haml
+++ b/app/views/spree/admin/orders/ticket.html.haml
@@ -43,7 +43,7 @@
       j(line_item.display_amount_with_adjustments.format(symbol: false, with_currency: false))] }
       .join('" + \'\x0A\' + "')}",
       '\x0A',
-      "#{checkout_adjustments_for(@order, exclude: [:line_item])
+      "#{checkout_adjustments_for(@order, exclude: [:line_item], reject_zero_amount: false)
       .reject{ |a| a.amount == 0 }
       .reverse.map { |adjustment| '%5s %-27.27s%8.8s' %
       ["",
diff --git a/app/views/spree/order_mailer/_order_summary.html.haml b/app/views/spree/order_mailer/_order_summary.html.haml
index d3bcabfa76..af0ba5433a 100644
--- a/app/views/spree/order_mailer/_order_summary.html.haml
+++ b/app/views/spree/order_mailer/_order_summary.html.haml
@@ -40,7 +40,7 @@
         = t :email_order_summary_subtotal
       %td{align: "right"}
         = display_checkout_subtotal(@order)
-    - checkout_adjustments_for(@order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+    - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
       %tr
         %td{align: "right", colspan: "3"}
           = "#{raw(adjustment.label)}:"
diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index 877d700dc4..e4465b9d4c 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -31,7 +31,7 @@
             %span.order-total.item-total= display_checkout_subtotal(@order)
           %td
 
-        - checkout_adjustments_for(@order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+        - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
           %tr.order-adjustment
             %td.text-right{:colspan => "3"}
               = adjustment.label
diff --git a/app/views/spree/orders/_summary.html.haml b/app/views/spree/orders/_summary.html.haml
index d828a989f1..b6e6c9c5df 100644
--- a/app/views/spree/orders/_summary.html.haml
+++ b/app/views/spree/orders/_summary.html.haml
@@ -39,7 +39,7 @@
             %span= display_checkout_subtotal(order)
 
       #order-charges{"data-hook" => "order_details_adjustments"}
-        - checkout_adjustments_for(order, exclude: [:line_item]).reject{ |a| a.amount == 0 }.reverse_each do |adjustment|
+        - checkout_adjustments_for(order, exclude: [:line_item]).reverse_each do |adjustment|
           %tr.total
             %td.text-right{:colspan => "3"}
               %strong