More brackets make everything even better

Brackets make everything better
2026-01-14 18:56:49 +00:00 · 2012-11-11 15:30:01 +11:00 · 2012-11-10 12:53:03 +11:00
1 changed files with 12 additions and 12 deletions
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -116,10 +116,10 @@ Spree::Admin::ReportsController.class_eval do
          proc { |lis| lis.first.variant.product.group_buy_unit_size || 0.0 },
          proc { |lis| "" },
          proc { |lis| "" },
-          proc { |lis| lis.sum { |li| li.quantity * li.variant.weight || 0 } },
-          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * li.variant.weight || 0 } },
-          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor },
-          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max) * li.variant.weight || 0 } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
+          proc { |lis| lis.sum { |li| (li.quantity || 0) * (li.variant.weight || 0) } },
+          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * (li.variant.weight || 0) } },
+          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor },
+          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max) * (li.variant.weight || 0) } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
        { group_by: proc { |li| li.variant },
        sort_by: proc { |variant| variant.options_text } } ]

@@ -144,10 +144,10 @@ Spree::Admin::ReportsController.class_eval do
          proc { |lis| lis.first.variant.product.group_buy_unit_size || 0.0 },
          proc { |lis| "" },
          proc { |lis| "" },
-          proc { |lis| lis.sum { |li| li.quantity * li.variant.weight || 0 } },
-          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * li.variant.weight || 0 } },
-          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) },
-          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
+          proc { |lis| lis.sum { |li| li.quantity * (li.variant.weight || 0) } },
+          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * (li.variant.weight || 0) } },
+          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) },
+          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
        { group_by: proc { |li| li.variant },
        sort_by: proc { |variant| variant.options_text } },
        { group_by: proc { |li| li.order },
@@ -205,10 +205,10 @@ Spree::Admin::ReportsController.class_eval do
          proc { |lis| lis.first.variant.product.group_buy_unit_size || 0.0 },
          proc { |lis| "" },
          proc { |lis| "" },
-          proc { |lis| lis.sum { |li| li.quantity * li.variant.weight || 0 } },
-          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * li.variant.weight || 0 } },
-          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor },
-          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * li.variant.weight || 0 } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
+          proc { |lis| lis.sum { |li| li.quantity * (li.variant.weight || 0) } },
+          proc { |lis| lis.sum { |li| (li.max_quantity || 0) * (li.variant.weight || 0) } },
+          proc { |lis| ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor },
+          proc { |lis| lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } - ( ( (lis.first.variant.product.group_buy_unit_size || 0).zero? ? 0 : ( lis.sum { |li| ( [li.max_quantity || 0, li.quantity || 0].max ) * (li.variant.weight || 0) } / lis.first.variant.product.group_buy_unit_size ) ).floor * (lis.first.variant.product.group_buy_unit_size || 0) ) } ] },
        { group_by: proc { |li| li.variant },
        sort_by: proc { |variant| variant.options_text } } ]
Author	SHA1	Message	Date
Rob H	9cb5ac95ff	More brackets make everything even better	2012-11-11 15:30:01 +11:00
Rohan Mitchell	076c64f7b0	Brackets make everything better	2012-11-10 12:53:03 +11:00