caboose-cms 0.7.49 → 0.7.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05df2133ce69c265c58154aae2612ddd8c018412
-  data.tar.gz: 65b19cc81afe0af3f2d617dd8c1cbdd33bf41f8b
+  metadata.gz: 9b58501d798ee6dd520475669eceb99c09f13e9c
+  data.tar.gz: 32fba4ffcbaabe2177813d854c5a08739f1d1f84
 SHA512:
-  metadata.gz: b386a475e9c3592bc02be0e4252cc2c2de1e40af93ba6c8371a08f1bfdbb5cf2669b173ad2bb0fcebb5fcfabb79a082a82138c8d2cf7c1b672d39771ba233696
-  data.tar.gz: 8e66d3a6e7b8a638b4fd4aa668302f0c1c090d4e74dde92f82675c1f91a6425718435587d063cb5db82f42bcda9f24efb8bf3446bff321a9776709af97754839
+  metadata.gz: 40f9f0f70d178446b26b74f0679ee9185b85afec6e2b71c215a0732ce750126791a1c11970d7d2535d3c6a0b05f58daca6e6893356c0504397c75b3b6012bc61
+  data.tar.gz: a6b9faefa91b639810c4f43215be8762d20d2c854a99b07ae3e0c0d80fcadea9dc424f9dbc38fb23addda78ba4e3703cd4f40ccf072b495dce207ab1c00f0888

data/app/controllers/caboose/orders_controller.rb

@@ -222,6 +222,17 @@ module Caboose
       render :json => { :success => true }
     end
     
+    # GET /admin/orders/city-report
+    def admin_city_report
+      return if !user_is_allowed('orders', 'view')
+
+      @d1 = params[:d1] ? DateTime.strptime("#{params[:d1]} 00:00:00", '%Y-%m-%d %H:%M:%S') : DateTime.strptime(DateTime.now.strftime("%Y-%m-01 00:00:00"), '%Y-%m-%d %H:%M:%S')
+      @d2 = params[:d2] ? DateTime.strptime("#{params[:d2]} 00:00:00", '%Y-%m-%d %H:%M:%S') : @d1 + 1.month      
+      @rows = OrderReporter.city_report(@site.id, @d1, @d2)
+      
+      render :layout => 'caboose/admin'    
+    end
+    
     # GET /admin/orders/summary-report
     def admin_summary_report
       return if !user_is_allowed('orders', 'view')

data/app/models/caboose/order_reporter.rb

@@ -62,5 +62,45 @@ module Caboose
       return days2            
     end
     
+    def OrderReporter.city_report(site_id, d1, d2)
+      q = ["select 
+        count(*),
+        sum(O.subtotal),
+        sum(O.tax),
+        sum(O.shipping),
+        sum(O.handling),
+        sum(O.discount),          
+        sum(O.total),
+        SA.city,
+        SA.state
+        from store_orders O
+        left join store_addresses SA on O.shipping_address_id = SA.id
+        where O.site_id = ?
+        and (O.financial_status = ? or O.financial_status = ?)
+        and O.date_authorized >= ?
+        and O.date_authorized < ?
+        group by concat(SA.city, ', ', SA.state), SA.state, SA.city
+        order by SA.state, SA.city",
+        site_id, 'authorized', 'captured', d1, d2]                        
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
+      
+      arr = []
+      rows.each do |row|        
+        arr << Caboose::StdClass.new(           
+          :count    => row[0].to_i,
+          :subtotal => row[1].to_f,
+          :tax      => row[2].to_f,
+          :shipping => row[3].to_f,
+          :handling => row[4].to_f,
+          :discount => row[5].to_f,
+          :total    => row[6].to_f,
+          :city     => row[7],
+          :state    => row[8]
+        )
+      end
+            
+      return arr            
+    end
+    
   end
 end

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

@@ -0,0 +1,49 @@
+
+<h1>City Report</h1>
+
+<form action='/admin/orders/city-report' method='get' id='search_form'>
+  <p>
+     <input type='text' id='d1' name='d1' value='<%= @d1.strftime('%Y-%m-%d') %>' /> -
+     <input type='text' id='d2' name='d2' value='<%= @d2.strftime('%Y-%m-%d') %>' />
+     <input type='submit' value='Change Date Range' />
+   </p>
+</form>
+
+<table class='data'>
+  <tr>
+    <th>City     </th>
+    <th>State    </th>
+    <th>Count    </th>
+    <th>Subtotal </th>
+    <th>Tax      </th>
+    <th>Shipping </th>
+    <th>Handling </th>
+    <th>Discount </th>
+    <th>Total    </th>    
+  </tr>
+  <% @rows.each do |row| %>
+    <tr>
+      <td><%= row.city  %></td>
+      <td><%= row.state %></td>
+      <td align='right'><%= row.count %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.subtotal ) %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.tax      ) %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.shipping ) %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.handling ) %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.discount ) %></td>
+      <td align='right'>$<%= sprintf('%.2f', row.total    ) %></td>      
+    </tr>
+  <% end %>
+</table>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %> 
+<script type='text/javascript'> 
+
+$(document).ready(function() {
+  $('#d1').datepicker({ dateFormat: 'yy-mm-dd' });
+  $('#d2').datepicker({ dateFormat: 'yy-mm-dd' });
+});
+
+</script>
+<% end %>

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

@@ -9,6 +9,7 @@
   <a class="caboose-btn" href='/admin/orders/new'>New Manual Order</a>
   <a class="caboose-btn" href='/admin/orders/print-pending' target='_blank'>Print Pending Orders</a>
   <a class="caboose-btn" href='/admin/orders/summary-report' target='_blank'>Summary Report</a>
+  <a class="caboose-btn" href='/admin/orders/city-report' target='_blank'>City Report</a>
 </p>
 <form action='/admin/orders' method='get' id='search_form' style='display: none;'>
   <p><input type='text' name='id'           placeholder='Order ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>

data/config/routes.rb

@@ -661,6 +661,7 @@ Caboose::Engine.routes.draw do
   # Orders
   #=============================================================================
   
+  get     "/admin/orders/city-report"                 => "orders#admin_city_report"
   get     "/admin/orders/summary-report"              => "orders#admin_summary_report"
   get     "/admin/orders/weird-test"                  => "orders#admin_weird_test"
   get     "/admin/orders"                             => "orders#admin_index"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.49'
+  VERSION = '0.7.50'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.49
+  version: 0.7.50
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1009,6 +1009,7 @@ files:
 - app/views/caboose/orders/_admin_footer.html.erb
 - app/views/caboose/orders/_admin_header.html.erb
 - app/views/caboose/orders/_quickbooks_order.html.erb
+- app/views/caboose/orders/admin_city_report.html.erb
 - app/views/caboose/orders/admin_delete_form.html.erb
 - app/views/caboose/orders/admin_edit.html.erb
 - app/views/caboose/orders/admin_index.html.erb