caboose-cms 0.7.22 → 0.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e182d08ac2a4fca718512f594b68708314e0112
-  data.tar.gz: 3e5e26f3e94a5a89a962d08ce1b2779c31998b2c
+  metadata.gz: c8810565edf656b06963523a73967f29337b972e
+  data.tar.gz: eba8b83636c10406bf936a241647987e8c3c0e13
 SHA512:
-  metadata.gz: f997c33c5c238784ac84c5890a0059ab126f054eccb46243850ca756ccff3f97187d36d85af8382cf877542ddc72d5e1368a1523cd9fe1e0246f2ffb0c1761c6
-  data.tar.gz: 39b5dd79ba6253c421ba0a3ea0f334625a6c1f8c24e349cf31ee002d475d74d27ae2e7b778fd00d11cb20a14fed34a6b3411b8d612e0ea605e646c88f6923103
+  metadata.gz: 02e65e232cc93d3b7e3251e7f2e10adabe6322df9d97b14228896e862595009f41a7de74d454ee42b4ae0a48c4e4e5aec03af828c84505b972c1c995683bb2f2
+  data.tar.gz: 079facdd0116807c2b3d6be50bbef2ad8d157bff7f9f576b66a10e1fba1cd32894eaa5e49458fa94381560f7ebfcc02590a52f7d4bf2d8396e26785e6e421f79

data/app/assets/templates/caboose/checkout/forms/register.jst.ejs

@@ -1,11 +1,11 @@
 <div class="wrapper">  
   <form action="/register" method="post">
-    <input name="first_name" type="text" placeholder="First Name" />
-    <input name="last_name" type="text" placeholder="Last Name" />
-    <input name="email" type="text" placeholder="Email" />
-    <input name="phone" type="text" placeholder="Phone" />
-    <input name="pass1" type="password" placeholder="Password" />
-    <input name="pass2" type="password" placeholder="Confirm Password" />
+    <input name="first_name" type="text"     placeholder="First Name" />
+    <input name="last_name"  type="text"     placeholder="Last Name" />
+    <input name="email"      type="text"     placeholder="Email" />
+    <input name="phone"      type="text"     placeholder="Phone" />
+    <input name="pass1"      type="password" placeholder="Password" />
+    <input name="pass2"      type="password" placeholder="Confirm Password" />
     <input type="submit" value="Submit" />
   </form>
 </div>

data/app/controllers/caboose/order_reports_controller.rb

@@ -18,18 +18,18 @@ module Caboose
         order by concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized))",
         @site.id, 'authorized', 'captured', @d1, @d2]
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
-    return rows.collect { |row|
-      {
-        'user_id'          => row[0],
-        'facility_id'      => row[1],
-        'amount'           => row[2],
-        'first_name'       => row[3],
-        'last_name'        => row[4],
-        'facility_name'    => row[5],
-        'vendor_type_name' => row[6],
-        'anniversary_date' => row[7]        
+      return rows.collect { |row|
+        {
+          'user_id'          => row[0],
+          'facility_id'      => row[1],
+          'amount'           => row[2],
+          'first_name'       => row[3],
+          'last_name'        => row[4],
+          'facility_name'    => row[5],
+          'vendor_type_name' => row[6],
+          'anniversary_date' => row[7]        
+        }
       }
-    }
       
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,

data/app/models/caboose/order_reporter.rb

@@ -1,11 +1,15 @@
-
 module Caboose
   class OrderReporter
             
     def OrderReporter.summary_report(site_id, d1, d2)
       q = ["select 
           concat(date_part('year', date_authorized), '-', date_part('month', date_authorized), '-', date_part('day', date_authorized)),
-          count(*), 
+          count(*),
+          sum(subtotal),
+          sum(tax),
+          sum(shipping),
+          sum(handling),
+          sum(discount),          
           sum(total)
         from store_orders
         where site_id = ?
@@ -21,9 +25,14 @@ module Caboose
       rows.each do |row|
         arr = row[0].split('-')
         days << Caboose::StdClass.new(
-          :date => Date.new(arr[0].to_i, arr[1].to_i, arr[2].to_i), 
-          :count => row[1],
-          :total => row[2]
+          :date     => Date.new(arr[0].to_i, arr[1].to_i, arr[2].to_i), 
+          :count    => row[1].to_i,
+          :subtotal => row[2].to_f,
+          :tax      => row[3].to_f,
+          :shipping => row[4].to_f,
+          :handling => row[5].to_f,
+          :discount => row[6].to_f,
+          :total    => row[7].to_f
         )
       end      
       days.sort_by!{ |h| h.date }
@@ -32,26 +41,26 @@ module Caboose
       days2 = []
       days.each do |h|
         while (h.date - last_day) > 1          
-          days2 << Caboose::StdClass.new(:date => last_day + 1.day, :count => 0, :total => 0.0)
+          days2 << Caboose::StdClass.new(
+            :date     => last_day + 1.day, 
+            :count    => 0,
+            :subtotal => 0.0,
+            :tax      => 0.0,
+            :shipping => 0.0,
+            :handling => 0.0,
+            :discount => 0.0,
+            :total    => 0.0
+          )
           last_day = last_day + 1.day
         end
         days2 << h
         last_day = h.date        
       end
-      days2.each do |h|
-        puts "#{h.date} #{h.count} #{h.total}"
-      end
-      return days2
-      
-      #return rows.collect { |row|
-      #  arr = row[0].split('-')
-      #  Caboose::StdClass.new(
-      #    :date => Date.new(arr[0].to_i, arr[1].to_i, arr[2].to_i), 
-      #    :count => row[1],
-      #    :total => row[2]
-      #  )        
-      #}
+      #days2.each do |h|
+      #  puts "#{h.date} #{h.count} #{h.total}"
+      #end
+      return days2            
     end
     
   end
-end
+end

data/app/views/caboose/orders/admin_summary_report.html.erb

@@ -1,3 +1,23 @@
+<%
+count    = 0
+subtotal = 0.0
+tax      = 0.0
+shipping = 0.0
+handling = 0.0
+discount = 0.0
+total    = 0.0
+@rows.each do |row|  
+  count    = count    + row.count    
+  subtotal = subtotal + row.subtotal 
+  tax      = tax      + row.tax      
+  shipping = shipping + row.shipping 
+  handling = handling + row.handling 
+  discount = discount + row.discount 
+  total    = total    + row.total
+end
+day_count = @rows.count
+%>
+
 <h1>Order Summary Report</h1>
 
 <form action='/admin/orders/summary-report' method='get' id='search_form'>
@@ -8,6 +28,17 @@
    </p>
 </form>
 
+<table class='data'>
+  <tr><th>&nbsp;</th><th>Total</th><th>Daily Average</th></tr>  
+  <tr><td>Count     </td><td align='right'><%= count                       %></td><td align='right'><%= sprintf('%.1f', count.to_f / day_count) %></td></tr>     
+  <tr><td>Subtotal  </td><td align='right'>$<%= sprintf('%.2f', subtotal ) %></td><td align='right'>$<%= sprintf('%.2f', subtotal   / day_count) %></td></tr>
+  <tr><td>Tax       </td><td align='right'>$<%= sprintf('%.2f', tax      ) %></td><td align='right'>$<%= sprintf('%.2f', tax        / day_count) %></td></tr>
+  <tr><td>Shipping  </td><td align='right'>$<%= sprintf('%.2f', shipping ) %></td><td align='right'>$<%= sprintf('%.2f', shipping   / day_count) %></td></tr>
+  <tr><td>Handling  </td><td align='right'>$<%= sprintf('%.2f', handling ) %></td><td align='right'>$<%= sprintf('%.2f', handling   / day_count) %></td></tr>
+  <tr><td>Discount  </td><td align='right'>$<%= sprintf('%.2f', discount ) %></td><td align='right'>$<%= sprintf('%.2f', discount   / day_count) %></td></tr>
+  <tr><td>Total     </td><td align='right'>$<%= sprintf('%.2f', total    ) %></td><td align='right'>$<%= sprintf('%.2f', total      / day_count) %></td></tr>
+</table><br />
+
 <div id='counts_chart'></div>
 <div id='totals_chart'></div>
 <p></p>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.22'
+  VERSION = '0.7.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.22
+  version: 0.7.23
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg