caboose-cms 0.5.132 → 0.5.133

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmIwMjBmY2NmYzVkZGUzYzgwZmZkMzY5NTYzM2FkOTc0ZTYwZWYwZA==
+    OWFlOGY4NzlmM2I5NzkxYTQyZmRiMjYxZjJiMDFjZDE2ZTAxMTcxOA==
   data.tar.gz: !binary |-
-    MmU2ZjNjYjg0MTQ4NjIyMjRmNDlmZWE5ZWNjODYxNDAyNmJlNjJlZg==
+    YTRjYjA3N2IwMjdlMjM2MTkxMGNkYWZhYTY1OGMzNmNmMzAzNDdlNw==
 SHA512:
   metadata.gz: !binary |-
-    ZGI5OGU2ZjZlNTJjMmM0YjQwODkzNjI4NDc5OTMzMjgxY2Q4NmQ1MTJkNzcx
-    OGJlZWI0ZDM1MWExMDc3ZGE3NGNmMDVlYWNkMDliOTg5ZTU2Mzg4MTQyYWQy
-    ODkyNjZjNDhjMGU0Mjg0ZDI2MGExMWUxNDQzNDgxMmFiYjM0Yjk=
+    YTFjOWNiYmEwMjYxYTBhN2YwNjA1NjJjZDU0NjRmNmQyNjE4NzZlNjVlNmMy
+    M2EwMWQyZDA1MmY5NTkyNmI2ODc5YTgxZGViODRmOTg3ZWY5MDI2NTMyODU5
+    ZmU3ZTk5NDY0Y2FjZGI2NGE1M2ViZGM3ZTY0ZGVlOGM4ODRjMjM=
   data.tar.gz: !binary |-
-    ZjdhOTYyZjI0MDQ0OWNmNDAzMmQzNGFkY2ExYzViYzlmZmNhYTZjNzM2ZmEy
-    YWRhOWQ4ZWZkOTI4OTk1OGJjNTZiYzkyZjYwNTRmZjg0NjM5MzYwNGU5MTQ0
-    ZWUxYmNkNmYwZDc2ODViMjg3NmY2ZDMwMGMxODI5MzQwNWY0NWE=
+    M2RhOWQyZjFmOGQ0ZDJiZmViZjVkMmYyNzczNDdkYzUxNGMxM2FmZGJjNGUx
+    ZTFmZTI1OWMxN2MzMThhYTAwNGViNWFiMThiNzVlNDIyYWQ0MTE0Yjg1Zjk3
+    NzI0MjExZWNlYjMxYjA1ZjU0MzNmYmZiNjdmZDQ2ZDIxYzJlM2U=

data/app/assets/javascripts/caboose/cart.js

@@ -9,7 +9,9 @@ Cart.prototype = {
   show_total: true,
   show_shipping: true,
   show_tax: true,
+  show_gift_wrap: true,
   show_discounts: true,
+  show_gift_options: true,
     
   init: function(params) 
   {
@@ -58,6 +60,44 @@ Cart.prototype = {
       var item = $('<td/>').attr('valign', 'top').append(p.title + '<br/>' + v.title);
       if (that.allow_edit_line_items == true)
         item.append('<br/>').append($('<a/>').attr('href','#').html('Remove').click(function(e) { e.preventDefault(); that.remove_item(li.id); }));
+      if (that.show_gift_options)
+      {
+        if (this.allow_edit_line_items)
+        {
+          item
+            .append($('<div/>').addClass('gift_options_checkbox')
+              .append($('<table/>')
+                .append($('<tbody/>')
+                  .append($('<tr/>').append($('<td/>').addClass('checkbox').append($('<div/>').attr('id', 'lineitem_' + li.id + '_is_gift'  ))).append($('<td/>').append("This item is a gift")))              
+                )
+              )
+            )
+            .append($('<div/>').attr('id', 'gift_options_' + li.id).addClass('gift_options').css('display', li.is_gift ? 'block' : 'none')   
+              .append($('<table/>')
+                .append($('<tbody/>')
+                  .append($('<tr/>').append($('<td/>').addClass('checkbox').append($('<div/>').attr('id', 'lineitem_' + li.id + '_gift_wrap'  ))).append($('<td/>').append("Gift wrap ($" + parseFloat(li.variant.product.gift_wrap_price).toFixed(2) + ')')))
+                  .append($('<tr/>').append($('<td/>').addClass('checkbox').append($('<div/>').attr('id', 'lineitem_' + li.id + '_hide_prices'))).append($('<td/>').append("Hide prices in receipt")))
+                  .append($('<tr/>').append($('<td/>').attr('colspan', '2').append('Gift message<br/>').append($('<div/>').attr('id', 'lineitem_' + li.id + '_gift_message'))))
+                )
+              )
+            );
+        }
+        else
+        {
+          if (li.is_gift)
+          {
+            item.append($('<ul/>').addClass('gift_options')
+              .append($('<li/>').html("This item is a gift."))
+              .append($('<li/>').html("Gift wrap? " + (li.gift_wrap ? 'Yes' : 'No')))
+              .append($('<li/>').html("Hide prices? " + (li.hide_prices ? 'Yes' : 'No')))
+              .append($('<li/>').html("Gift message: " + (li.gift_message.length > 0 ? li.gift_message : '[Empty]')))
+            );
+          }
+          else 
+            item.append("This item is not a gift.")                              
+        }
+      }
+      
       var qty = $('<td/>').css('text-align', 'right');
       if (that.allow_edit_line_items == true)
         qty.append($('<div/>').attr('id', 'lineitem_' + li.id + '_quantity'));
@@ -83,6 +123,13 @@ Cart.prototype = {
         .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.shipping + that.order.handling).toFixed(2)))
       );
     }
+    if (that.show_gift_wrap)
+    {
+      tbody.append($('<tr/>')        
+        .append($('<td/>').css('text-align', 'right').attr('colspan', 4).html('Gift Wrapping'))
+        .append($('<td/>').css('text-align', 'right').html('$' + parseFloat(that.order.gift_wrap).toFixed(2)))
+      );
+    }
     if (that.show_tax)
     {
       tbody.append($('<tr/>')        
@@ -120,21 +167,40 @@ Cart.prototype = {
       );            
     }            
     $('#cart').empty().append($('<table/>').append(tbody));
-          
-    if (that.allow_edit_line_items)
+     
+    // Make anything editable that needs to be
+    if (this.allow_edit_line_items)
     {
-      $.each(this.order.line_items, function(i, li) {      
+      $.each(this.order.line_items, function(i, li) {
+        var p = li.variant.product;
+        var attribs = [];
+        if (that.allow_edit_line_items)
+          attribs.push({ name: 'quantity', nice_name: 'Qty', type: 'text', value: li.quantity, width: 50, fixed_placeholder: false, after_update: function() { that.refresh(); } });
+        if (that.show_gift_options)
+        {
+          attribs.push({ name: 'is_gift'      , nice_name: 'This item is a gift'  , type: 'checkbox' , value: li.is_gift      , width: 40 ,               fixed_placeholder: false, after_update: function() { that.toggle_gift_options(this.li_id); }, li_id: li.id });
+          attribs.push({ name: 'hide_prices'  , nice_name: 'Hide prices'          , type: 'checkbox' , value: li.hide_prices  , width: 40 ,               fixed_placeholder: false, after_update: function() { } });        
+          attribs.push({ name: 'gift_wrap'    , nice_name: 'Gift wrap'            , type: 'checkbox' , value: li.gift_wrap    , width: 40 ,               fixed_placeholder: false, after_update: function() { that.refresh(); } });        
+          attribs.push({ name: 'gift_message' , nice_name: 'Gift message'         , type: 'textarea' , value: li.gift_message , width: 400 , height: 75 , fixed_placeholder: false, after_update: function() { } });                        
+        }                  
         m = new ModelBinder({
           name: 'LineItem',
           id: li.id,
           update_url: '/cart/' + li.id,
           authenticity_token: that.form_authenticity_token,    
-          attributes: [
-            { name: 'quantity', nice_name: 'Qty', type: 'text', value: li.quantity, width: 50, fixed_placeholder: false, after_update: function() { that.refresh(); } }                
-          ]
-        }); 
+          attributes: attribs
+        });
       });
-    }        
+    }
+  },
+  
+  toggle_gift_options: function(li_id)
+  {
+    var el = $('#gift_options_' + li_id);
+    if (el.is(':visible'))
+      el.slideUp();
+    else
+      el.slideDown();    
   },
   
   remove_item: function(li_id)

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

@@ -21,7 +21,8 @@ BoundTextarea = BoundControl.extend({
     );
     $('#'+this.el+'_container').empty();
     $('#'+this.el+'_container').append($('<textarea/>').attr('id', this.el).attr('placeholder', 'empty').val(this.attribute.value));
-    $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('mb_placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
+    if (this.attribute.fixed_placeholder)
+      $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('mb_placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
     if (this.attribute.width)  $('#'+this.el).css('width'  , this.attribute.width);
     if (this.attribute.height) $('#'+this.el).css('height' , this.attribute.height);
     var h = $('#'+this.el+'_placeholder').outerHeight();

data/app/assets/stylesheets/caboose/cart.css.scss

@@ -5,6 +5,18 @@
   table { border-collapse: collapse; width: 100%; }
   table th { font-weight: bold; text-align: center; }
   table td { border: #ccc 1px solid; padding: 10px; }
+  .gift_options {
+    table td { border: 0; }
+    table td.checkbox { margin: 0; padding: 0; width: 20px; }
+    .mb_checkbox_background { display: none; }      
+    .mb_container input[type="checkbox"] { position: relative; margin-left: -10px; width: auto; top: 0; }
+  }
+  .gift_options_checkbox {    
+    table td { border: 0; }
+    table td.checkbox { margin: 0; padding: 0; width: 20px; }
+    .mb_checkbox_background { display: none; }      
+    .mb_container input[type="checkbox"] { position: relative; margin-left: -10px; width: auto; top: 0; }
+  }
   
   input[type="text"] {    
     border-color: #b9b9b9;

data/app/controllers/caboose/cart_controller.rb

@@ -65,14 +65,33 @@ module Caboose
     end
     
     # PUT /cart/:line_item_id
-    def update
+    def update            
+      resp = Caboose::StdClass.new
       li = LineItem.find(params[:line_item_id])
-      li.quantity = params[:quantity].to_i
-      li.subtotal = li.unit_price * li.quantity
+
+      save = true    
+      params.each do |name,value|
+        case name
+          when 'quantity'    then 
+            li.quantity = value.to_i
+            if li.quantity == 0
+              li.destroy
+            else            
+              li.subtotal = li.unit_price * li.quantity
+              li.save
+              li.order.calculate
+            end
+          when 'is_gift'               then li.is_gift              = value
+          when 'include_gift_message'  then li.include_gift_message = value
+          when 'gift_message'          then li.gift_message         = value
+          when 'gift_wrap'             then li.gift_wrap            = value
+          when 'hide_prices'           then li.hide_prices          = value                                  
+        end
+      end
       li.save
-      li.destroy if li.quantity == 0
-      @order.calculate_subtotal
-      render :json => { :success => true }
+      li.order.calculate
+      resp.success = true
+      render :json => resp                                    
     end
     
     # DELETE /cart/:line_item_id

data/app/controllers/caboose/my_account_line_items_controller.rb

@@ -47,7 +47,7 @@ module Caboose
       config = YAML.load_file("#{::Rails.root}/config/aws.yml")        
       bucket = AWS::S3::Bucket.new(config[Rails.env]['bucket'])
       s3object = AWS::S3::S3Object.new(bucket, li.variant.download_path)
-      url = s3object.url_for(:read, :expires => sc.download_url_expires_in.minutes).to_s
+      url = s3object.url_for(:read, :expires => sc.download_url_expires_in.to_i.minutes).to_s
 
       redirect_to url
     end

data/app/controllers/caboose/orders_controller.rb

@@ -53,6 +53,7 @@ module Caboose
     def admin_edit
       return if !user_is_allowed('orders', 'edit')
       @order = Order.find(params[:id])
+      @order.calculate
       render :layout => 'caboose/admin'
     end
     
@@ -200,13 +201,13 @@ module Caboose
       ])
     end
   
-    # GET /admin/orders/:id/print
+    # GET /admin/orders/:id/print.pdf
     def admin_print
       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

data/app/models/caboose/order.rb

@@ -179,8 +179,8 @@ module Caboose
       x = 0.0
       self.line_items.each do |li|
         next if !li.gift_wrap
-        next if !li.product.allow_gift_wrap
-        x = x + li.product.gift_wrap_price * li.quantity
+        next if !li.variant.product.allow_gift_wrap
+        x = x + li.variant.product.gift_wrap_price * li.quantity
       end
       return x
     end

data/app/models/caboose/order_package.rb

@@ -73,7 +73,7 @@ module Caboose
         end
       end      
       line_items = h.sort_by{ |k,v| k }.collect{ |x| x[1] }      
-      all_packages = ShippingPackage.reorder(:price).all      
+      all_packages = ShippingPackage.reorder(:flat_rate_price).all      
       
       # Now go through each variant and fit it in a new or existing package
       line_items.each do |li|

data/app/models/caboose/order_pdf.rb

@@ -9,12 +9,21 @@ module Caboose
       
       # Get the type of card and last four digits
       get_card_details
-      
+
+      font_size 9
+
+      img = open("http://cabooseit.s3.amazonaws.com/uploads/template.jpg")
+   #   image img, :width => 610, :at => [-30, 755]
+
       #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
-      text " "
-      customer_info
-      text " "
+      move_down 10
+      order_info
+      move_down 15
       order_table
+      move_down 15
+      customer_info
+      move_down 15
+      payment_info
       render
     end
     
@@ -38,42 +47,81 @@ module Caboose
           t = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
           resp = t.get_transaction_details(ot.transaction_id)
           t2 = resp.transaction
-          self.card_type = t2.payment_method.card_type
+          self.card_type = t2.payment_method.card_type.upcase
           self.card_number = t2.payment_method.card_number.gsub('X', '')
         
       end
             
     end
+
+    def order_info
+
+      order_info = "Order Number: #{order.id}\n"
+      order_info << "Order Date: #{order.date_created.strftime('%d %b %Y %H:%M:%S %p')}\n"
+      order_info << "Status: #{order.status.capitalize}\n"
+      tbl = []
+      tbl << [
+        { :content => order_info }
+      ]
+      move_down 4
+      table tbl, :position => 7, :width => 530
+    end
+
     
     def customer_info
-      
-      order_info = "Order ##{order.id}\n"
-      order_info << "Status: #{order.status.capitalize}\n"
-      order_info << "Received: #{order.date_created.strftime("%m/%d/%Y")}\n"
-      if order.status == 'shipped' && order.date_shipped
-        order_info << "Shipped: #{order.date_shipped.strftime("%m/%d/%Y")}"
-      end
-      
+
       c = order.customer
-      billed_to = "#{c.first_name} #{c.last_name}\n#{c.email}\n#{self.formatted_phone(c.phone)}\n#{self.card_type} ending in #{self.card_number}"
+
+      # #{self.card_type} ending in #{self.card_number
+      ba = order.billing_address
+      billed_to = []
+      billed_to << [
+        { :content => "Name", :border_width => 0 },
+        { :content => "#{ba.first_name} #{ba.last_name}", :border_width => 0}
+      ]
+      billed_to << [
+        { :content => "Address", :border_width => 0 },
+        { :content => "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}", :border_width => 0}
+      ]
+      billed_to << [
+        { :content => "Email", :border_width => 0 },
+        { :content => "#{c.email}", :border_width => 0}
+      ]
+      billed_to << [
+        { :content => "Phone", :border_width => 0 },
+        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+      ]
       
       sa = order.shipping_address
-      shipped_to = "#{sa.name}\n#{sa.address1}\n"
-      shipped_to << "#{sa.address2}\n" if sa.address2.strip.length > 0
-      shipped_to << "#{sa.city}, #{sa.state} #{sa.zip}"
-  
+      shipped_to = []
+      shipped_to << [
+        { :content => "Name", :border_width => 0 },
+        { :content => "#{sa.first_name} #{sa.last_name}", :border_width => 0}
+      ]
+      shipped_to << [
+        { :content => "Address", :border_width => 0 },
+        { :content => "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}", :border_width => 0}
+      ]
+      shipped_to << [
+        { :content => "Email", :border_width => 0 },
+        { :content => "#{c.email}", :border_width => 0}
+      ]
+      shipped_to << [
+        { :content => "Phone", :border_width => 0 },
+        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+      ]
+
       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 }
+        { :content => "Shipping Information" , :align => :left, :width => 255, :font_style => :bold },
+        { :content => "Billing Information"  , :align => :left, :width => 255, :font_style => :bold }
       ]    
       tbl << [
-        { :content => order_info, :valign => :top, :height => 75 },
-        { :content => billed_to , :valign => :top, :height => 75 },
-        { :content => shipped_to, :valign => :top, :height => 75 }
-      ]    
-      table tbl
+        { :content => shipped_to },
+        { :content => billed_to  }
+      ]
+      move_down 4
+      table tbl, :position => 7, :width => 530
       
     end
     
@@ -81,29 +129,124 @@ module Caboose
       
       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 }
+        { :content => "Package"            , :align => :left, :valign => :bottom },
+        { :content => "Product"            , :align => :left, :valign => :bottom, :colspan => 2 },
+        { :content => "Attributes" , :align => :left, :valign => :bottom },
+         { :content => "Quantity"        , :align => :right, :valign => :bottom },        
+        { :content => "Price"      , :align => :right, :valign => :bottom },
+        { :content => "Amount"        , :align => :right, :valign => :bottom }
       ]
+
+      order.calculate
       
-      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.unit_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 }]
+      order.order_packages.each do |pk|
+
+        carrier = pk.shipping_method.carrier
+        service = pk.shipping_method.service_name
+        package = pk.shipping_package.name
+
+        pk.line_items.each_with_index do |li, index|
+          options = ''
+          if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
+          if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
+          if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
+          if li.variant.product.product_images.count > 0 
+            image = open("#{li.variant.product.product_images.first.url(:tiny)}")
+          else
+            image = ""
+          end
+          arr = []
+          if index == 0
+            arr << { :content => package + "\n" + carrier + "\n" + service, :width => 115, :rowspan => (index == 0 ? pk.line_items.count : 1) }
+          end
+         
+          arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+          arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+          arr << { :content => options }
+          arr << { :content => "#{li.quantity}"               , :align => :right }
+          arr << { :content => "$" + sprintf("%.2f", li.price) , :align => :right }
+          arr << { :content => "$" + sprintf("%.2f", li.subtotal)   , :align => :right }
+
+          tbl << arr
+          
+        end
+      end
+
+      unassigned = order.line_items.where("order_package_id IS NULL OR order_package_id = ?",-1)
+      unassigned.each_with_index do |li, index|
+        options = ''
+        if li.variant.product.option1 && li.variant.option1 then options += li.variant.product.option1 + ": " + li.variant.option1 + "\n" end
+        if li.variant.product.option2 && li.variant.option2 then options += li.variant.product.option2 + ": " + li.variant.option2 + "\n" end
+        if li.variant.product.option3 && li.variant.option3 then options += li.variant.product.option3 + ": " + li.variant.option3 + "\n" end
+        if li.variant.product.product_images.count > 0 
+          image = open("#{li.variant.product.product_images.first.url(:tiny)}")
+        else
+          image = ""
+        end
+        arr = []
+        if index == 0
+          arr << { :content => "Unassigned", :width => 115, :rowspan => (index == 0 ? unassigned.count : 1) }
+        end
+        arr << { :image => image, :fit => [40, 40], :borders => [:top, :bottom, :left], :width => 50 }
+        arr << { :content => "#{li.variant.product.title}\n#{li.variant.sku}", :borders => [:top, :right, :bottom], :width => 100 }
+        arr << { :content => options }
+        arr << { :content => "#{li.quantity}"               , :align => :right }
+        arr << { :content => "$" + sprintf("%.2f", li.price) , :align => :right }
+        arr << { :content => "$" + sprintf("%.2f", li.subtotal)   , :align => :right }
+        tbl << arr
+      end
+
+      tbl << [{ :content => "Subtotal"                                      , :colspan => 6, :align => :right }, { :content => "$" + sprintf("%.2f", order.subtotal                        ) , :align => :right }]
+      tbl << [{ :content => "Discount"                                      , :colspan => 6, :align => :right }, { :content => "(-) $" + sprintf("%.2f", order.discount ? order.discount : 0.0 ) , :align => :right }]
+      tbl << [{ :content => "Shipping and Handling Charges"  , :colspan => 6, :align => :right }, { :content => "(+) $" + sprintf("%.2f", order.shipping_and_handling           ) , :align => :right }]    
+      tbl << [{ :content => "Sales Tax"                                           , :colspan => 6, :align => :right }, { :content => "(+) $" + sprintf("%.2f", order.tax ? order.tax : 0.0           ) , :align => :right }]
+      tbl << [{ :content => "Grand Total"                                         , :colspan => 6, :font_style => :bold, :align => :right }, { :content => "$" + sprintf("%.2f", order.total                           ) , :align => :right, :font_style => :bold }]
       
-      table tbl
+      table tbl , :position => 7, :width => 530
     end
+
+    def payment_info
+
+      trans = order.order_transactions.where(:transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
+      tbl = []
+      tbl2 = []
+      tbl3 = []
+
+      tbl2 << [
+        { :content => "Card Type", :width => 127, :border_width => 0 },
+        { :content => self.card_type, :width => 128, :border_width => 0 }
+      ]
+      tbl2 << [
+        { :content => "Transaction ID", :width => 127, :border_width => 0 },
+        { :content => trans.transaction_id.to_s, :width => 128, :border_width => 0 }
+      ]
+      tbl2 << [
+        { :content => "Gateway Response", :width => 127, :border_width => 0},
+        { :content => trans.response_code.to_s, :width => 128, :border_width => 0  }
+      ]
+      tbl3 << [
+        { :content => "Card Number", :width => 127, :border_width => 0},
+        { :content => "XXXX XXXX XXXX " + self.card_number, :width => 128, :border_width => 0 }
+      ]
+      tbl3 << [
+        { :content => "Transaction Time", :width => 127, :border_width => 0},
+        { :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p"), :width => 128, :border_width => 0  }
+      ]
+      tbl3 << [
+        { :content => "Payment Process", :width => 127, :border_width => 0},
+        { :content => trans.success ? "Successful" : "Failed", :width => 128, :border_width => 0  }
+      ]
+      tbl << [
+        { :content => "Authorization Details", :colspan => 2, :font_style => :bold }
+      ]
+      tbl << [
+        { :content => tbl2, :width => 255 },
+        { :content => tbl3, :width => 255 }
+      ]
+
+      table tbl, :position => 7, :width => 530
+
+    end
+
   end
 end

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

@@ -15,9 +15,7 @@ store_config = @site.store_config
         <input type="hidden" id="x_city"        name="x_city"        value="<%= raw @order.billing_address.city       %>" />
         <input type="hidden" id="x_state"       name="x_state"       value="<%= raw @order.billing_address.state      %>" />
         <input type="hidden" id="x_zip"         name="x_zip"         value="<%= raw @order.billing_address.zip        %>" />
-        
-
-        
+                
         <div class="field" id="credit-card">
           <span class="field-text">Credit Card</span>
           <div class="icons">

data/app/views/caboose/orders_mailer/customer_new_order.html.erb

@@ -1 +1,3 @@
 <h1>Thank you for your order!</h1>
+
+

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

@@ -55,6 +55,8 @@ $(document).ready(function() {
       { show: false, name: 'featured'           , nice_name: 'Featured'             , sort: 'featured'            , type: 'checkbox'           , value: function(p) { return p.featured           }, width: 200 },
       { show: false, name: 'category_id'        , nice_name: 'Categories'           , sort: 'categories.name'     , type: 'checkbox-multiple'  , value: function(p) { return p.categories ? p.categories.map(function(c) { return c.id }) : []; }, text: function(p) { return p.categories ? p.categories.map(function(c) { return c.name }).join(', ') : ''; }, width: 200, height: 200, options_url: '/admin/categories/options' },
       { show: true , name: 'stackable_group_id' , nice_name: 'Stackable Group'      , sort: 'stackable_group_id'  , type: 'select'             , value: function(p) { return p.stackable_group_id }, width: 200, options_url: '/admin/stackable-groups/options' },
+      { show: false, name: 'allow_gift_wrap'    , nice_name: 'Allow Gift Wrap'      , sort: 'allow_gift_wrap'     , type: 'checkbox'           , value: function(p) { return p.allow_gift_wrap ? 'Yes' : 'No' }, width: 500 },
+      { show: false, name: 'gift_wrap_price'    , nice_name: 'Gift Wrap Price'      , sort: 'gift_wrap_price'     , type: 'text'               , value: function(p) { return p.gift_wrap_price.length > 0 ? '$' + parseFloat(p.gift_wrap_price).toFixed(2) : '' }, width: 500 }
     ],
     new_model_text: 'New Product',
     new_model_fields: [

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.132'
+  VERSION = '0.5.133'
 end

data/lib/tasks/caboose.rake

@@ -80,6 +80,20 @@ namespace :caboose do
       end
     end
   end
+  
+  desc "Remove invalid variant images"
+  task :remove_invalid_variant_images => :environment do
+    
+    Caboose::Product.reorder(:id).all.each do |p|
+      ids = p.product_images.collect{ |img| img.id }
+      p.variants.each do |v|
+        v.product_image_variants.all.each do |piv|
+          piv.destroy if !ids.include?(piv.product_image_id)
+        end
+      end
+    end
+    
+  end
 
   #=============================================================================
   

metadata

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