caboose-cms 0.5.68 → 0.5.69

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdiMzBlZWU2NWJmMGY0NGE4YjA2MDE5NDQ0NWRjYWMxNTI1N2IxYQ==
+    MTIzZWY3YjU1ZjI3NWUxNDU1ZjllNmY5OWYxOTllYzdjMGRhYWFlMw==
   data.tar.gz: !binary |-
-    ZTU0N2YyMWZhYzY2ZmZmYzkxMjg2ODE1YjYwYTA4NWY3OThkOTM2ZQ==
+    OTdiNzNmMzBmN2QzM2Q5ZmY5ZTcwYjU0NTg3ZmYzYTVkNTRiYTBjZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWVlODIxMTE2ZTE2ZDFhYWJmZjRlYWM2MTIwZTA3MTI5ODhmNDg2YjU2OGJm
-    OWEyMzM0ZTUzYzdkYjk4MjZkMGQzZDc5NzkzNTU1OTkyNDY4YTNhZjcxMmI0
-    M2RlMDEzNzQxMjc4NTRiYWNiNGE3MzYxN2RhMTgyYjQ1ODRjNzQ=
+    OTllMjU1YzUwZTFmYzIyMWI2YTJlNjk5OTZmZGRhODBhZTI3MzZjMjYyNWE3
+    MDQ3NWIyMGZjOTJlYWI2MTcwYWY5NTNhMmQ1ZTJhMzAyY2JmNjM0ZDhhODRi
+    ZTE0ZGMwYThhMjFjMWM4MDI3MzZiOGQzY2FiNjViYmViNWVlMmY=
   data.tar.gz: !binary |-
-    MTVlY2M1ZTAyMWMxMGI2NzU4YTY5OWU3ODIxZWE2MzYzYWVhN2FjZmNhMDkz
-    Yzg3ZTM2MWMzZjUwNTJlYmE0MzY0MTMxMmE3OGYyMGMyZGJlMjhjM2Y4M2E2
-    OTIxMTc3NmMyNGVhNjljMzRiNDJhNTBiOTkyOTc3MjQ1Y2U3MjY=
+    NTE0Y2U1NzE2NmIwYmY0ZjZjNGU3MDgwY2U1Mjk4MzZmNzI2MjJhZGYyODA2
+    MTk4MzNmN2M1NjM4ODNlZDJiMzZiZjFmMjM3YjVjYTg2ZjBlOGM2MDU0M2Uz
+    NWZhOGMzNjI0ZGFhNDRiZjIxMmQxMmI5NDMzNmNhMGJmN2FlM2I=

data/app/assets/javascripts/caboose/model/index_table.js

@@ -25,6 +25,7 @@ IndexTable.prototype = {
   
   // Where to post new models
   add_url: false,
+  after_add: 'refresh', // or 'redirect'
   
   // Array of fields you want to show in the table (given as model binder attributes with additional text and value functions)
   // [{ 
@@ -818,10 +819,12 @@ IndexTable.prototype = {
       data: $('#new_form').serialize(),
       success: function(resp) {
         if (resp.error) $('#' + that.container + '_new_message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.redirect || resp.refresh || resp.success) 
-        {
+        if (resp.redirect && that.after_add == 'redirect')          
+          window.location = resp.redirect;
+        else if (resp.redirect || resp.refresh || resp.success)           
+        {                      
           that.hide_message();
-          that.refresh();
+          that.refresh();          
         }
       }
     });

data/app/controllers/caboose/orders_controller.rb

@@ -186,14 +186,20 @@ module Caboose
   
     # GET /admin/orders/:id/print
     def admin_print
-      return if !user_is_allowed('orders', 'edit')    
-       
+      return if !user_is_allowed('orders', 'edit')           
+      
       pdf = OrderPdf.new
       pdf.order = Order.find(params[:id])             
-      send_data pdf.to_pdf, :filename => "order_#{pdf.order.id}.pdf", :type => "application/pdf", :disposition => "inline"
+      send_data pdf.to_pdf, :filename => "order_#{pdf.order.id}.pdf", :type => "application/pdf", :disposition => "inline"                        
+    end
+    
+    # GET /admin/orders/print-pending
+    def admin_print_pending
+      return if !user_is_allowed('orders', 'edit')    
       
-      #@order = Order.find(params[:id])
-      #render :layout => 'caboose/admin'
+      pdf = PendingOrdersPdf.new
+      pdf.orders = Order.where(:status => 'pending').all      
+      send_data pdf.to_pdf, :filename => "pending_orders.pdf", :type => "application/pdf", :disposition => "inline"            
     end
       
     # PUT /admin/orders/:id

data/app/controllers/caboose/products_controller.rb

@@ -169,7 +169,7 @@ module Caboose
       })
       
       # Make a copy of all the items; so it can be filtered more
-      @all_products = @gen.all_records
+      @all_products = @gen.all_records      
       
       # Apply any extra filters
       if params[:filters]
@@ -177,6 +177,7 @@ module Caboose
         @all_products = @all_products.where('vendor_id IS NULL') if params[:filters][:no_vendor]
       end
       
+      
       # Get the correct page of the results
       @products = @all_products.limit(@gen.limit).offset(@gen.offset)
       @category_options = Category.options(@site.id)
@@ -194,7 +195,8 @@ module Caboose
       pager = Caboose::PageBarGenerator.new(params, {
         'site_id'      => @site.id,
         'vendor_name'  => '',
-        'search_like'  => '', 
+        'search_like'  => '',
+        'category_id'  => '',
         'price'        => params[:filters] && params[:filters][:missing_prices] ? 0 : ''
       }, {
         'model'          => 'Caboose::Product',
@@ -207,8 +209,9 @@ module Caboose
           'search_like' => 'store_products.title_concat_vendor_name_like'
         },        
         'includes' => {
-          'vendor_name'  => [ 'vendor'   , 'name'  ],
-          'price'        => [ 'variants' , 'price' ]
+          'category_id'  => [ 'categories' , 'id'    ],
+          'vendor_name'  => [ 'vendor'     , 'name'  ],
+          'price'        => [ 'variants'   , 'price' ]
         }
       })
       render :json => {

data/app/controllers/caboose/variants_controller.rb

@@ -293,7 +293,8 @@ module Caboose
       v.price             = '%.2f' % params[:price].strip.to_f
       v.option1 = params[:option1] if p.option1
       v.option2 = params[:option2] if p.option2
-      v.option3 = params[:option3] if p.option3      
+      v.option3 = params[:option3] if p.option3
+      v.status = 'Active'      
       v.save
       
       resp.success = true      
@@ -328,7 +329,8 @@ module Caboose
           v.price             = '%.2f' % row[2].strip.to_f
           v.option1 = row[3] if p.option1
           v.option2 = row[4] if p.option2
-          v.option3 = row[5] if p.option3      
+          v.option3 = row[5] if p.option3
+          v.status = 'Active'
           v.save
         end
         resp.success = true
@@ -337,6 +339,41 @@ module Caboose
       render :json => resp
     end
     
+    # PUT /admin/products/:product_id/variants/bulk
+    def admin_bulk_update
+      return unless user_is_allowed_to 'edit', 'sites'
+    
+      resp = Caboose::StdClass.new    
+      variants = params[:model_ids].collect{ |variant_id| Variant.find(variant_id) }
+    
+      save = true
+      params.each do |k,value|
+        case k
+          when 'alternate_id'       then variants.each { |v| v.alternate_id       = value }
+          when 'sku'                then variants.each { |v| v.sku                = value }
+          when 'barcode'            then variants.each { |v| v.barcode            = value }
+          when 'price'              then variants.each { |v| v.price              = value }
+          when 'quantity_in_stock'  then variants.each { |v| v.quantity_in_stock  = value }
+          when 'ignore_quantity'    then variants.each { |v| v.ignore_quantity    = value }
+          when 'allow_backorder'    then variants.each { |v| v.allow_backorder    = value }
+          when 'status'             then variants.each { |v| v.status             = value }
+          when 'weight'             then variants.each { |v| v.weight             = value }
+          when 'length'             then variants.each { |v| v.length             = value }
+          when 'width'              then variants.each { |v| v.width              = value }
+          when 'height'             then variants.each { |v| v.height             = value }
+          when 'option1'            then variants.each { |v| v.option1            = value }
+          when 'option2'            then variants.each { |v| v.option2            = value }
+          when 'option3'            then variants.each { |v| v.option3            = value }
+          when 'requires_shipping'  then variants.each { |v| v.requires_shipping  = value }
+          when 'taxable'            then variants.each { |v| v.taxable            = value }                      
+        end        
+      end
+      variants.each{ |v| v.save }
+    
+      resp.success = true
+      render :json => resp
+    end
+    
     # POST /admin/products/:product_id/variants/remove
     def admin_remove_variants
       params[:variant_ids].each do |variant_id|

data/app/models/caboose/order_pdf.rb

@@ -6,7 +6,7 @@ module Caboose
     attr_accessor :order
     
     def to_pdf
-      image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
+      #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
       text " "
       customer_info
       text " "
@@ -68,7 +68,7 @@ module Caboose
       end            
       tbl << [{ :content => "Subtotal"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.subtotal                        ) , :align => :right }]
       tbl << [{ :content => "Tax"                                           , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
-      tbl << [{ :content => "#{order.shipping_method} Shipping & Handling"  , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
+      #tbl << [{ :content => "#{order.shipping_method} Shipping & Handling"  , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
       tbl << [{ :content => "Discount"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
       tbl << [{ :content => "Total"                                         , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.total                           ) , :align => :right }]
       

data/app/models/caboose/pending_orders_pdf.rb

@@ -0,0 +1,83 @@
+require 'prawn'
+
+module Caboose
+  class PendingOrdersPdf < Prawn::Document
+    
+    attr_accessor :orders
+    attr_accessor :order
+    
+    def to_pdf
+      #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
+      text " "
+      self.orders.each_with_index do |o, i|
+        start_new_page if i > 0
+        self.order = o        
+        customer_info
+        text " "
+        order_table
+      end      
+      render
+    end
+    
+    def customer_info
+      
+      order_info = "Order ##{self.order.id}\n"
+      order_info << "Status: #{self.order.status.capitalize}\n"
+      order_info << "Received: #{self.order.date_created ? self.order.date_created.strftime("%m/%d/%Y") : ''}\n"
+      if order.status == 'shipped' && self.order.date_shipped
+        order_info << "Shipped: #{self.order.date_shipped.strftime("%m/%d/%Y")}"
+      end
+      
+      c = self.order.customer
+      billed_to = c ? "#{c.first_name} #{c.last_name}\n#{c.email}\n#{c.phone}" : ''
+      
+      sa = self.order.shipping_address
+      shipped_to = "#{sa.name}\n#{sa.address1}\n"
+      shipped_to << "#{sa.address2}\n" if sa.address2 && sa.address2.strip.length > 0
+      shipped_to << "#{sa.city}, #{sa.state} #{sa.zip}"
+  
+      tbl = []
+      tbl << [
+        { :content => "Order Info" , :align => :center, :valign => :bottom, :width => 180 },
+        { :content => "Billed To"  , :align => :center, :valign => :bottom, :width => 180 },
+        { :content => "Shipped To" , :align => :center, :valign => :bottom, :width => 180 }
+      ]    
+      tbl << [
+        { :content => order_info, :valign => :top, :height => 75 },
+        { :content => billed_to , :valign => :top, :height => 75 },
+        { :content => shipped_to, :valign => :top, :height => 75 }
+      ]    
+      table tbl
+      
+    end
+    
+    def order_table
+      
+      tbl = []
+      tbl << [
+        { :content => "Item"            , :align => :center, :valign => :bottom },
+        { :content => "Tracking Number" , :align => :center, :valign => :bottom },
+        { :content => "Unit Price"      , :align => :center, :valign => :bottom },
+        { :content => "Quantity"        , :align => :center, :valign => :bottom },                
+        { :content => "Subtotal"        , :align => :center, :valign => :bottom, :width => 60 }
+      ]
+      
+      order.line_items.each do |li|
+        tbl << [        
+          "#{li.variant.product.title}\n#{li.variant.sku}\n#{li.variant.title}",
+          { :content => li.tracking_number },
+          { :content => sprintf("%.2f", li.variant.price) , :align => :right },
+          { :content => "#{li.quantity}"                  , :align => :right },          
+          { :content => sprintf("%.2f", li.subtotal)      , :align => :right }
+        ]
+      end            
+      tbl << [{ :content => "Subtotal"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.subtotal                        ) , :align => :right }]
+      tbl << [{ :content => "Tax"                                           , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
+      #tbl << [{ :content => "#{order.shipping_method} Shipping & Handling"  , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
+      tbl << [{ :content => "Discount"                                      , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
+      tbl << [{ :content => "Total"                                         , :colspan => 4, :align => :right }, { :content => sprintf("%.2f", order.total                           ) , :align => :right }]
+      
+      table tbl
+    end
+  end
+end

data/app/models/caboose/product.rb

@@ -87,6 +87,11 @@ module Caboose
       self.variants.where('price > ? AND status != ?', 0, 'Deleted').order('price ASC').first
     end
     
+    def first_tiny_image_url
+    	return '' if self.product_images.count == 0
+    	return self.product_images.first.image.url(:tiny)
+    end
+    
     def featured_image
     	self.product_images.reject{|p| p.nil?}.first
     end

data/app/views/caboose/checkout/step_one.html.erb

@@ -29,6 +29,7 @@
             <p><input name="phone"      type="text"     placeholder="Phone"      /></p>
             <p><input name="pass1"      type="password" placeholder="Password"   /></p>
             <p><input name="pass2"      type="password" placeholder="Confirm Password" /></p>
+            <p><input name='newsletter' id='newsletter' type='checkbox' value='1' /> <label for='newsletter'>Send me updates on new products and special deals</label></p> 
             <p><input type="submit" value="Continue" /></p>
           </form>
         </div>      

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

@@ -18,7 +18,7 @@
 <% end %>
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
 <input type='button' value='Add Item' onclick="controller.add_variant();" />
-<input type='button' value='Print Order' onclick="print_order(<%= @order.id %>);" />
+<input type='button' value='Print Order' onclick="controller.print_order(<%= @order.id %>);" />
 
 <% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
 <% if str %><%= raw str %><% end %>

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

@@ -6,7 +6,8 @@
 
 <p>
   <a href='#' onclick="$('#search_form').toggle(400, function() { modal.autosize(); });">Show/hide search form</a> | 
-  <a href='/admin/orders/new'>New Manual Order</a>
+  <a href='/admin/orders/new'>New Manual Order</a> |
+  <a href='/admin/orders/print-pending' target='_blank'>Print Pending Orders</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/app/views/caboose/posts/index.html.erb

@@ -3,16 +3,27 @@
   <% if @posts && @posts.count > 0 %>
     <ul>
       <% @posts.each do |p| %>
-  	    <li>
-  	      <figure><a href="/posts/<%= p.id %>"><img src="<%= p.image.url(:thumb) %>" /></a></figure>
-  	      <h5><strong><%= raw a[:title] %></strong></h5>
-  	  		<p class="h-space-mvt"><%= a[:created_at].strftime("%m/%d/%Y")  %></p>
-  	  		<p class="h-space-mbt"><%= truncate(strip_tags(a[:body]), :length => 175) %></p>
-  	  		<a class="m-btn-red h-space-mts" href="/news/<%= a.id %>">Read More</a>  	  		
+  	    <li class='clearfix'>  	        	      
+  	      <% if p.image && !p.image.url.include?('placehold.it') %>
+  	        <figure><a href="/posts/<%= p.id %>"><img src="<%= p.image.url(:thumb) %>" /></a></figure>
+  	      <% end %>
+  	      <h5><strong><%= raw p[:title] %></strong></h5>
+  	  		<p class="h-space-mvt"><%= p[:created_at].strftime("%m/%d/%Y")  %></p>
+  	  		<p class="h-space-mbt"><%= raw Caboose.teaser_text(p[:body], 200) %></p>
+  	  		<a class="m-btn-red h-space-mts" href="/posts/<%= p.id %>">Read More</a>  	  		
   	  	</li>
   	  <% end %>
   	</ul>
   <% else %>
     <p>There are no posts right now.</p>
   <% end %>
-</div>
+</div>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+.posts li { min-height: 200px; }
+.posts li figure { float: right; margin: 0 0 20px 10px; }
+
+</style>
+<% end %>

data/app/views/caboose/products/admin_edit_categories.html.erb

@@ -9,12 +9,9 @@ p = @product
 
 <% content_for :caboose_css do %>
 <style type='text/css'>
-#categories input[type='checkbox'] { position: relative; }
-#categories ul { list-style: none; margin: 0; padding: 0; }
-#categories ul ul ul { margin-left: 20px; }
-#categories li { list-style: none; }
-#categories h3 { margin: 0; padding: 0; font-weight: bold; display: inline; }
-#categories td { padding: 10px; }
+#content table.data input[type='checkbox'] { position: relative; margin: 0; padding: 0; }
+#content table.data td { padding: 0 10px !important; }
+label span.prefix { display: inline-block; margin: 0 8px; }
 </style>
 <% end %>
 <% content_for :caboose_js do %>
@@ -33,11 +30,18 @@ $(document).ready(function() {
         nice_name: 'Categories',
         type: 'checkbox-multiple',        
         options_url: '/admin/categories/options',
-        value: <%= raw Caboose.json(p.categories.collect{ |cat| cat.id }) %>,
+        value: <%= raw Caboose.json(p.categories.collect{ |cat| cat.id }) %>,        
         fixed_placeholder: false,
-        width: 400
-      }      
-    ]
+        width: 400        
+      }
+    ],
+    on_load: function() {
+      setTimeout(function() {
+        $('label').each(function(i, el) {
+          $(el).html($(el).html().replace(/-/g, "<span class='prefix'>-</span>"));
+        });      
+      }, 400);          
+    }    
   });  
 });
 

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

@@ -8,9 +8,9 @@
 
 <form action="/admin/products" method="get" id="search_form" style="margin: 0 0 12px">
 	<p><input type="text" name="search_like" placeholder="Title or Vendor Name" value="<%= params[:search_like] %>" style="width: 350px" /></p>
-	<p><select type="text" name="category_id" placeholder="Category" value="<%= params[:search_like] %>" style="width: 350px">
+	<p><select type="text" name="category_id" placeholder="Category" style="width: 350px">
 	  <option value=''>-- Category --</option>
-	  <% @category_options.each do |cat| %><option value="<%= cat[:value] %>"<% if cat[:value] == params[:category_id] %> selected='true'<% end %>><%= cat[:text] %></option><% end %>
+	  <% @category_options.each do |cat| %><option value="<%= cat[:value] %>"<% if cat[:value].to_i == params[:category_id].to_i %> selected='true'<% end %>><%= cat[:text] %></option><% end %>
 	</select></p>
 	<p>
 	  <input type="submit" value="Search" />
@@ -24,6 +24,12 @@
 <%= javascript_include_tag 'caboose/model/all' %>
 <script type='text/javascript'>
 
+function tiny_product_image(p) {
+  if (p.images.length == 0) return '';
+  if (p.images[0].urls.length == 0) return '';
+  return "<img src='" + p.images[0].urls['tiny'] + "' />";     
+}
+
 $(document).ready(function() {
   var that = this;
   var table = new IndexTable({    
@@ -34,8 +40,10 @@ $(document).ready(function() {
     allow_bulk_delete: true,
     allow_duplicate: false,
     allow_advanced_edit: true,
-    fields: [
+    after_add: 'redirect',
+    fields: [    
       { show: true , name: 'id'                 , nice_name: 'ID'                   , sort: 'id'                  , type: 'text'               , value: function(p) { return p.id                 }, width: 500, editable: false },
+      { show: true , name: 'image'              , nice_name: 'Image'                , sort: 'id'                  , type: 'image'              , value: tiny_product_image, width: 500, editable: false },
       { show: true , name: 'title'              , nice_name: 'Title'                , sort: 'title'               , type: 'text'               , value: function(p) { return p.title              }, width: 200 },
       { show: true , name: 'caption'            , nice_name: 'Caption'              , sort: 'caption'             , type: 'text'               , value: function(p) { return p.caption            }, width: 200 },   
       { show: true , name: 'status'             , nice_name: 'Status'               , sort: 'status'              , type: 'select'             , value: function(p) { return p.status             }, width: 200, options_url: '/admin/products/status-options' },

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

@@ -60,28 +60,28 @@ $(document).ready(function() {
     form_authenticity_token: '<%= form_authenticity_token %>',
     container: 'variants',
     base_url: '/admin/products/<%= p.id %>/variants',
-    allow_bulk_edit: false,
+    allow_bulk_edit: true,
     allow_bulk_delete: true,
     allow_duplicate: false,
     allow_advanced_edit: true,
     fields: [
-      <% if p.option1 %>{ show: true , name: 'option1' , nice_name: <%= raw Caboose.json(p.option1) %> , sort: 'option1'           , type: 'text'     , value: function(v) { return v.option1             }, width: 75, align: 'left'   },<% end %>
-      <% if p.option2 %>{ show: true , name: 'option2' , nice_name: <%= raw Caboose.json(p.option2) %> , sort: 'option2'           , type: 'text'     , value: function(v) { return v.option2             }, width: 75, align: 'left'   },<% end %>
-      <% if p.option3 %>{ show: true , name: 'option3' , nice_name: <%= raw Caboose.json(p.option3) %> , sort: 'option3'           , type: 'text'     , value: function(v) { return v.option3             }, width: 75, align: 'left'   },<% end %>
-      { show: true  , name: 'status'                    , nice_name: 'Status'                           , sort: 'status'            , type: 'text'     , value: function(v) { return v.status              }, width: 75, align: 'left'   },
-      { show: true  , name: 'alternate_id'              , nice_name: 'Alternate ID'                     , sort: 'alternate_id'      , type: 'text'     , value: function(v) { return v.alternate_id        }, width: 75, align: 'left'   },
-      { show: true  , name: 'sku'                       , nice_name: 'SKU'                              , sort: 'sku'               , type: 'text'     , value: function(v) { return v.sku                 }, width: 75, align: 'left'   },                         
-      { show: false , name: 'barcode'                   , nice_name: 'Barcode'                          , sort: 'barcode'           , type: 'text'     , value: function(v) { return v.barcode             }, width: 75, align: 'left'   }, 
-      { show: true  , name: 'price'                     , nice_name: 'Price'                            , sort: 'price'             , type: 'text'     , value: function(v) { return v.price               }, width: 75, align: 'right'  }, 
-      { show: true  , name: 'quantity_in_stock'         , nice_name: 'Quantity'                         , sort: 'quantity_in_stock' , type: 'text'     , value: function(v) { return v.quantity_in_stock   }, width: 50, align: 'right'  }, 
-      { show: false , name: 'weight'                    , nice_name: 'Weight (grams)'                   , sort: 'weight'            , type: 'text'     , value: function(v) { return v.weight              }, width: 50, align: 'right'  }, 
-      { show: false , name: 'length'                    , nice_name: 'Length (in)'                      , sort: 'length'            , type: 'text'     , value: function(v) { return v.length              }, width: 50, align: 'right'  }, 
-      { show: false , name: 'width'                     , nice_name: 'Width (in)'                       , sort: 'width'             , type: 'text'     , value: function(v) { return v.width               }, width: 50, align: 'right'  }, 
-      { show: false , name: 'height'                    , nice_name: 'Height (in)'                      , sort: 'height'            , type: 'text'     , value: function(v) { return v.height              }, width: 50, align: 'right'  }, 
-      { show: false , name: 'cylinder'                  , nice_name: 'Cylinder'                         , sort: 'cylinder'          , type: 'checkbox' , value: function(v) { return v.cylinder            }, width: 50, align: 'center' }, 
-      { show: false , name: 'requires_shipping'         , nice_name: 'Requires shipping'                , sort: 'requires_shipping' , type: 'checkbox' , value: function(v) { return v.requires_shipping   }, width: 50, align: 'center' }, 
-      { show: false , name: 'taxable'                   , nice_name: 'Taxable'                          , sort: 'taxable'           , type: 'checkbox' , value: function(v) { return v.taxable             }, width: 50, align: 'center' },
-      { show: false , name: 'allow_backorder'           , nice_name: 'Allow backorder'                  , sort: 'allow_backorder'   , type: 'checkbox' , value: function(v) { return v.allow_backorder     }, width: 50, align: 'center' }             
+      <% if p.option1 %>{ show: true , name: 'option1'  , nice_name: <%= raw Caboose.json(p.option1) %> , sort: 'option1'           , type: 'text'     , value: function(v) { return v.option1             }, width: 75, align: 'left'   , bulk_edit: true },<% end %>
+      <% if p.option2 %>{ show: true , name: 'option2'  , nice_name: <%= raw Caboose.json(p.option2) %> , sort: 'option2'           , type: 'text'     , value: function(v) { return v.option2             }, width: 75, align: 'left'   , bulk_edit: true },<% end %>
+      <% if p.option3 %>{ show: true , name: 'option3'  , nice_name: <%= raw Caboose.json(p.option3) %> , sort: 'option3'           , type: 'text'     , value: function(v) { return v.option3             }, width: 75, align: 'left'   , bulk_edit: true },<% end %>
+      { show: true  , name: 'status'                    , nice_name: 'Status'                           , sort: 'status'            , type: 'text'     , value: function(v) { return v.status              }, width: 75, align: 'left'   , bulk_edit: true },
+      { show: true  , name: 'alternate_id'              , nice_name: 'Alternate ID'                     , sort: 'alternate_id'      , type: 'text'     , value: function(v) { return v.alternate_id        }, width: 75, align: 'left'   , bulk_edit: true },
+      { show: true  , name: 'sku'                       , nice_name: 'SKU'                              , sort: 'sku'               , type: 'text'     , value: function(v) { return v.sku                 }, width: 75, align: 'left'   , bulk_edit: true },                         
+      { show: false , name: 'barcode'                   , nice_name: 'Barcode'                          , sort: 'barcode'           , type: 'text'     , value: function(v) { return v.barcode             }, width: 75, align: 'left'   , bulk_edit: true }, 
+      { show: true  , name: 'price'                     , nice_name: 'Price'                            , sort: 'price'             , type: 'text'     , value: function(v) { return v.price               }, width: 75, align: 'right'  , bulk_edit: true }, 
+      { show: true  , name: 'quantity_in_stock'         , nice_name: 'Quantity'                         , sort: 'quantity_in_stock' , type: 'text'     , value: function(v) { return v.quantity_in_stock   }, width: 50, align: 'right'  , bulk_edit: true }, 
+      { show: false , name: 'weight'                    , nice_name: 'Weight (grams)'                   , sort: 'weight'            , type: 'text'     , value: function(v) { return v.weight              }, width: 50, align: 'right'  , bulk_edit: true }, 
+      { show: false , name: 'length'                    , nice_name: 'Length (in)'                      , sort: 'length'            , type: 'text'     , value: function(v) { return v.length              }, width: 50, align: 'right'  , bulk_edit: true }, 
+      { show: false , name: 'width'                     , nice_name: 'Width (in)'                       , sort: 'width'             , type: 'text'     , value: function(v) { return v.width               }, width: 50, align: 'right'  , bulk_edit: true }, 
+      { show: false , name: 'height'                    , nice_name: 'Height (in)'                      , sort: 'height'            , type: 'text'     , value: function(v) { return v.height              }, width: 50, align: 'right'  , bulk_edit: true }, 
+      { show: false , name: 'cylinder'                  , nice_name: 'Cylinder'                         , sort: 'cylinder'          , type: 'checkbox' , value: function(v) { return v.cylinder            }, width: 50, align: 'center' , bulk_edit: true }, 
+      { show: false , name: 'requires_shipping'         , nice_name: 'Requires shipping'                , sort: 'requires_shipping' , type: 'checkbox' , value: function(v) { return v.requires_shipping   }, width: 50, align: 'center' , bulk_edit: true }, 
+      { show: false , name: 'taxable'                   , nice_name: 'Taxable'                          , sort: 'taxable'           , type: 'checkbox' , value: function(v) { return v.taxable             }, width: 50, align: 'center' , bulk_edit: true },
+      { show: false , name: 'allow_backorder'           , nice_name: 'Allow backorder'                  , sort: 'allow_backorder'   , type: 'checkbox' , value: function(v) { return v.allow_backorder     }, width: 50, align: 'center' , bulk_edit: true }             
     ],
     new_model_text: 'New Variant',
     new_model_fields: [

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

@@ -8,20 +8,24 @@
 </form>
 
 <% if @vendors.count > 0 %>
-  <table class="data" style="width: 350px">
+  <table class="data">
     <tr>
       <%= raw @pager.sortable_table_headings({
-        'id'     => 'ID',
-        'name'   => 'Name',
-        'status' => 'Status'
+        'id'       => 'ID',
+        'id,name'  => 'Image',
+        'name'     => 'Name',
+        'status'   => 'Status',
+        'featured' => 'Featured',
       }) %>
     </tr>
     
     <% @vendors.each do |vendor| %>
       <tr onclick="window.location='/admin/vendors/<%= vendor.id %>';">
         <td style="text-align: center"><%= raw vendor.id %></td>
+        <td><% if vendor.image %><img src='<%= raw vendor.image.url(:tiny) %>' /><% else %>&nbsp;<% end %></td>
         <td><%= raw vendor.name %></td>
         <td><%= raw vendor.status %></td>
+        <td><%= vendor.featured ? 'Yes' : 'No' %></td>
       </tr>
     <% end %>
   </table>

data/config/routes.rb

@@ -403,10 +403,11 @@ Caboose::Engine.routes.draw do
   put     "/admin/products/:product_id/variants/:id/attach-to-image"     => "variants#admin_attach_to_image"
   put     "/admin/products/:product_id/variants/:id/unattach-from-image" => "variants#admin_unattach_from_image"
   get     "/admin/products/:product_id/variants/:id"                     => "variants#admin_edit"
+  put     '/admin/products/:product_id/variants/bulk'                    => 'variants#admin_bulk_update'
   put     "/admin/products/:product_id/variants/:id"                     => "variants#admin_update"  
   get     "/admin/products/:product_id/variants/new"                     => "variants#admin_new"
   post    '/admin/products/:product_id/variants/bulk'                    => 'variants#admin_bulk_add'  
-  post    "/admin/products/:product_id/variants"                         => "variants#admin_add"  
+  post    "/admin/products/:product_id/variants"                         => "variants#admin_add"    
   delete  '/admin/products/:product_id/variants/bulk'                    => 'variants#admin_bulk_delete'
   delete  "/admin/products/:product_id/variants/:id"                     => "variants#admin_delete"  
   get     "/admin/variants/status-options"                               => "variants#admin_status_options"
@@ -467,6 +468,7 @@ Caboose::Engine.routes.draw do
   get     "/admin/orders/test-gmail"                  => "orders#admin_mail_test_gmail"  
   get     "/admin/orders/status-options"              => "orders#admin_status_options"
   get     "/admin/orders/new"                         => "orders#admin_new"
+  get     "/admin/orders/print-pending"               => "orders#admin_print_pending"
   get     "/admin/orders/:id/capture"                 => "orders#capture_funds"  
   get     "/admin/orders/:id/json"                    => "orders#admin_json"
   get     "/admin/orders/:id/print"                   => "orders#admin_print"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.68'
+  VERSION = '0.5.69'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.68
+  version: 0.5.69
 platform: ruby
 authors:
 - William Barry
@@ -586,6 +586,7 @@ files:
 - app/models/caboose/payment_processors/authorizenet.rb
 - app/models/caboose/payment_processors/base.rb
 - app/models/caboose/payment_processors/payscape.rb
+- app/models/caboose/pending_orders_pdf.rb
 - app/models/caboose/permanent_redirect.rb
 - app/models/caboose/permission.rb
 - app/models/caboose/post.rb