caboose-cms 0.7.39 → 0.7.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc985f9f45e66ffdbec6af1cfd5bb2f70add4c4
-  data.tar.gz: 5183c3b06b9b0a3311ff6543464d515caab7ad12
+  metadata.gz: 38b087573b26f119de90d1c3cce36ea525f99cff
+  data.tar.gz: 8f017e560ca2a6d1642820d0ee329754f78dea07
 SHA512:
-  metadata.gz: fba1f06f6f63a9af56e63c5c741a774201cfaf834f2876098ceb34ef263d95316c2514dd3e9cd66fe5b760d8c47887e23f2197de938b3318f31b1a33219a9610
-  data.tar.gz: 6c1e3ee1ab228696a2849febb268bee7456e0796b2735f19a36d083e2d94df8c12ffe4ef2b947eb0ea321cac812ba85eda7b6842d6ac46418cd9476d073bc4b6
+  metadata.gz: 3d36a79446a3bacd8e04fc142261f98f2d516feb85d0ee478ad4685a11a7c452b04f7ae51e248c2645bfba266f9ad612d1638a8b4eba901be022805608a5c633
+  data.tar.gz: 88c9eb9cf672333f02067b61e923d9d247c983e58c80d610fc4e2963b4e7259b3aef23e16b11b5c81dfc6be2f759c15d3ab9b4c5d00b4bae5a6bb6c06eb8c92e

data/app/controllers/caboose/orders_controller.rb

@@ -161,6 +161,9 @@ module Caboose
       return if !user_is_allowed('orders', 'edit')    
       
       pdf = PendingOrdersPdf.new
+      if params[:print_card_details]
+        pdf.print_card_details = params[:print_card_details].to_i == 1
+      end
       pdf.orders = Order.where(:site_id => @site.id, :status => Order::STATUS_PENDING).all      
       send_data pdf.to_pdf, :filename => "pending_orders.pdf", :type => "application/pdf", :disposition => "inline"            
     end

data/app/models/caboose/pending_orders_pdf.rb

@@ -4,7 +4,7 @@ require 'prawn/table'
 module Caboose
   class PendingOrdersPdf < Prawn::Document
     
-    attr_accessor :orders, :card_type, :card_number
+    attr_accessor :orders, :card_type, :card_number, :print_card_details
     
     def to_pdf
       
@@ -36,7 +36,8 @@ module Caboose
       return str
     end
     
-    def get_card_details(order)      
+    def get_card_details(order)
+      return if self.print_card_details && self.print_card_details == false                  
       sc = order.site.store_config
       ot = order.order_transactions.where(:transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
       return if ot.nil?        

data/app/views/caboose/pages/admin_edit_permissions.html.erb

@@ -5,8 +5,9 @@
 
 <table class='data' id='viewers'>
 <tr><th>Role</th><th>View</th><th>Edit</th></tr>
+<% admin_role = Caboose::Role.admin_role(@site.id) %>
 <% Caboose::Role.flat_tree(@site.id, ' - ').each do |r| %>
-  <% next if r.id == 1 %>
+  <% next if r.id == admin_role.id %>
   <% may_view = Caboose::PagePermission.where(:role_id => r.id, :page_id => @page.id, :action => 'view').exists? %>
   <% may_edit = Caboose::PagePermission.where(:role_id => r.id, :page_id => @page.id, :action => 'edit').exists? %>
   <tr>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.39'
+  VERSION = '0.7.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.39
+  version: 0.7.40
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg