caboose-cms 0.5.144 → 0.5.145

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBkNjY5NmJkMWRmNjljM2I1NjU2NTFkNDZlN2IyZGIzZDg1YTgyNg==
+    Zjk4OTU1YWUyMzU5YmFiOWNjYzc3NTMyYThkOWFjMDcxYzNjYjBlOQ==
   data.tar.gz: !binary |-
-    NDEwNmU1MjUwNjkxYTQ5NGYzOWUzYWE4YzNlZjliNjI2YjViODAxMw==
+    YWI0OTVkODQyOTY5Yjc0NmQzOGQyMzBlMTRlNGJiYTgzNTRjYWM5Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZDM3YWY0MGNjMmJhYThiMmRlNTlkZDAyOTk3ZTZkODdhODRjNzg3NTljNzli
-    OWE0ODk5NzYyOTU3NTA4YzFlZTQyYTg1NDk4ODdhN2JjMzgyMjJhMzI2NWVm
-    Mzg3OWFmOTY4MzllYmRhYTdiNTJkMDU3MDk5ODFlOTlkNjdlZTE=
+    YTE1OTI2ZGQ5MzIyMmIwOTBiNGRmMDJkZjdkMjBhZjUwMDczYmFjYTcwYjJl
+    MjMwMWRiY2Y1OGYzZTM4MjQ0MThlYTg0NGIyMTM0NjI1YmQ2ZjI1NTk2ZDU5
+    OTEyYTg2ZmQzOGE3OTRmYWVjMjU5ODMzOTU5MGVhN2QxMmY5ODc=
   data.tar.gz: !binary |-
-    NjI1MWEwNDRmOTU2NDYwYTg0YWJjYzJmMTBmNmU2NWM2NzM3MzJhNWUzNjRh
-    NWMyMTM5NGI3YTA5MTBjMDMyNmJhNmUzYWJkNzYzMGU1OGQzNjVkZmMxYTE2
-    YTVlZDBjMjQ0NjM1OTU4ZjQ0YjU0YTZjNTVlZDc0Zjk2MjE1OWM=
+    MmQwZjQ1MTA2YTQ4ZGFmOWI0MjFjZDZlMTA0NGUyYTcwMWNmYjI4NWVkYjg4
+    NTIyNmYxYjNkMjBkNTBmMzJkYWRmZjhhNzlkOWQ4NzBlOTU4MjI0ZWJmZGMx
+    MTc1YTk5YzI3ZTE1NTljOGJiOWZlNmVjMjAxODQ5MzcxMjhkYTI=

data/app/controllers/caboose/orders_controller.rb

@@ -62,10 +62,10 @@ module Caboose
     def capture_funds
       return if !user_is_allowed('orders', 'edit')
       
-      response = Caboose::StdClass.new
+      resp = Caboose::StdClass.new
       order = Order.find(params[:id])
       t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
-      
+            
       if order.financial_status == Order::FINANCIAL_STATUS_CAPTURED
         resp.error = "Funds for this order have already been captured."    
       elsif order.total > t.amount
@@ -87,6 +87,20 @@ module Caboose
             )                
             order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
             resp.success = 'Captured funds successfully'
+            
+            Caboose.log(response.inspect)
+            
+            ot = Caboose::OrderTransaction.new(
+              :order_id => order.id,
+              :date_processed => DateTime.now.utc,
+              :transaction_type => Caboose::OrderTransaction::TYPE_CAPTURE
+            )
+            ot.success        = response.success?
+            ot.transaction_id = response.transaction_id                          
+            ot.response_code  = response.response_code
+            ot.amount         = order.total
+            ot.save
+      
           when 'payscape'
             # TODO: Implement capture funds for payscape
 

data/app/models/caboose/pending_orders_pdf.rb

@@ -3,81 +3,240 @@ require 'prawn'
 module Caboose
   class PendingOrdersPdf < Prawn::Document
     
-    attr_accessor :orders
-    attr_accessor :order
+    attr_accessor :orders, :card_type, :card_number
     
     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      
+      
+      # Get the type of card and last four digits
+
+      orders.each_with_index do |o,index|
+        get_card_details(o)
+        font_size 9
+        move_down 10
+        order_info(o)
+        move_down 15
+        order_table(o)
+        move_down 15
+        customer_info(o)
+        move_down 15
+        payment_info(o)
+        if index + 1 < orders.count then start_new_page end
+      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")}"
+    def formatted_phone(str)
+      return '' if str.nil?
+      str = str.gsub(/[^0-9]/i, '')
+      return "#{str[0]} (#{str[1..3]}) #{str[4..6]}-#{str[7..10]}" if str.length == 11
+      return "(#{str[0..2]}) #{str[3..5]}-#{str[6..9]}"            if str.length == 10
+      return "#{str[0..2]}-#{str[3..6]}"                           if str.length == 7
+      return str
+    end
+    
+    def get_card_details(order)      
+      sc = order.site.store_config
+      ot = order.order_transactions.where(:transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
+      case sc.pp_name
+        when 'authorize.net'
+          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.upcase
+          self.card_number = t2.payment_method.card_number.gsub('X', '')
       end
+    end
+
+    def order_info(order)
+      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)
+      c = order.customer
+      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}
+      ]
       
-      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}"
-  
+      sa = order.shipping_address
+      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
     
-    def order_table
+    def order_table(order)
       
       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.all.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.unit_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, :align => :right, :font_style => :bold }, { :content => "$"     + sprintf("%.2f", order.total                           ) , :align => :right, :font_style => :bold }]
       
-      table tbl
+      table tbl , :position => 7, :width => 530
+    end
+
+    def payment_info(order)
+
+      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/orders_mailer/customer_new_order.html.erb

@@ -2,11 +2,11 @@
 
 <h1>Thank you for your order!</h1>
 
-<p>Order #<%= @order.order_number %></p>
-
 <h2>Order Details</h2>
 
-<table>
+<p>Order #<%= @order.order_number %></p>
+
+<table border='1' style='border-collapse: collapse;'>
   <tr>
     <th>Package</th>
     <th>Line Item</th>
@@ -55,21 +55,21 @@
       <td align='right'><%= number_to_currency(li.subtotal) %></td>
     </tr>  
   <% end %>
-  <tr><td colspan="4">Subtotal:               </td><td><%= number_to_currency(@order.subtotal) %></td></tr>
-  <tr><td colspan="4">Tax:                    </td><td><%= number_to_currency(@order.tax)      %></td></tr>
-  <tr><td colspan="4">Shipping and Handling:  </td><td><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
+  <tr><td colspan="4" align='right'>Subtotal:               </td><td align='right'><%= number_to_currency(@order.subtotal) %></td></tr>
+  <tr><td colspan="4" align='right'>Tax:                    </td><td align='right'><%= number_to_currency(@order.tax)      %></td></tr>
+  <tr><td colspan="4" align='right'>Shipping and Handling:  </td><td align='right'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
   <% if @order.gift_wrap && @order.gift_wrap > 0 %>  
-    <tr><td colspan="4">Gift wrap:            </td><td><%= number_to_currency(@order.gift_wrap) %></td></tr>
+    <tr><td colspan="4" align='right'>Gift wrap:            </td><td align='right'><%= number_to_currency(@order.gift_wrap) %></td></tr>
   <% end %>
   <% if @order.discounts %>
     <% @order.discounts.each do |d| %>
-      <tr><td colspan="4">"<%= d.gift_card.code %>" gift card: </td><td><%= number_to_currency(d.amount) %></td></tr>
+      <tr><td colspan="4" align='right'>"<%= d.gift_card.code %>" gift card: </td><td align='right'><%= number_to_currency(d.amount) %></td></tr>
     <% end %>
   <% end %>
   <% if @order.custom_discount %>
-    <tr><td colspan="4">Discount: </td><td><%= number_to_currency(@order.custom_discount) %></td></tr>
+    <tr><td colspan="4" align='right'>Discount: </td><td align='right'><%= number_to_currency(@order.custom_discount) %></td></tr>
   <% end %>      
-  <tr><td colspan="4">Total:     </td><td><%= number_to_currency(@order.total) %></td></tr>
+  <tr><td colspan="4" align='right'>Total:     </td><td align='right'><%= number_to_currency(@order.total) %></td></tr>
 </table>
 
 <% if @order.shipping_address %>
@@ -78,7 +78,7 @@
   <p>
     <%= sa.first_name %> <%= sa.last_name %><br />
     <%= sa.address1 %><br />
-    <% if sa.address2 %><%= sa.address2 %><br /><% end %>
+    <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
     <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
   </p>
 <% end %>
@@ -89,7 +89,7 @@
   <p>
     <%= ba.first_name %> <%= ba.last_name %><br />
     <%= ba.address1 %><br />
-    <% if ba.address2 %><%= ba.address2 %><br /><% end %>
+    <% if ba.address2 && ba.address2.strip.length > 0 %><%= ba.address2 %><br /><% end %>
     <%= ba.city %>, <%= ba.state %> <%= ba.zip %>
   </p>
 <% end %>

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

@@ -1 +1,96 @@
-<h1>Your order has been udpated</h1>
+<p><img src='<%= @order.site.logo.url(:thumb) %>' /></p>
+
+<h1>Your order has been updated</h1>
+
+<h2>Order Details</h2>
+
+<p>Order #<%= @order.order_number %></p>
+
+<table border='1' style='border-collapse: collapse;'>
+  <tr>
+    <th>Package</th>
+    <th>Line Item</th>
+    <th>Unit Price</th>
+    <th>Quantity</th>
+    <th>Subtotal</th>
+  </tr>
+  <% @order.order_packages.each do |op| %>
+    <% op.line_items.each_with_index do |li, i| %>
+      <% v = li.variant %>
+      <% p = v.product %>
+      <tr>
+        <% if i == 0 %>
+          <td rowspan="<%= op.line_items.count %>">
+            <div><%= op.shipping_method.service_name %></div>
+            <div><%= op.status %></div>
+            <% if op.tracking_number %><div><%= op.tracking_number %></div><% end %>
+          </td>
+        <% end %>
+        <td>
+          <%= p.title %>
+          <% if li.is_gift %>
+            <p>This item is a gift.</p>
+            <ul>
+              <li><% if li.gift_wrap %>Gift wrap (<%= number_to_currency(p.gift_wrap_price) %>)<% else %>Do not gift wrap<% end %></li>
+              <li><% if li.include_gift_message %>Gift message: <%= li.gift_message %><% else %>No gift message<% end %></li>
+              <li><% if li.hide_prices %>Hide all prices<% else %>Show all prices<% end %></li>
+            </ul>
+          <% end %>
+        </td>
+        <td align='right'><%= number_to_currency(li.unit_price) %></td>
+        <td align='right'><%= li.quantity %></td>
+        <td align='right'><%= number_to_currency(li.subtotal) %></td>
+      </tr>
+    <% end %>
+  <% end %>  
+  <% @order.line_items.each do |li| %>
+    <% next if li.order_package_id %>
+    <% v = li.variant %>
+    <% p = v.product %>
+    <tr>
+      <td>Not assigned to a package</td>                
+      <td><%= p.title %></td></td>
+      <td align='right'><%= number_to_currency(li.unit_price) %></td>
+      <td align='right'><%= li.quantity %></td>
+      <td align='right'><%= number_to_currency(li.subtotal) %></td>
+    </tr>  
+  <% end %>
+  <tr><td colspan="4" align='right'>Subtotal:               </td><td align='right'><%= number_to_currency(@order.subtotal) %></td></tr>
+  <tr><td colspan="4" align='right'>Tax:                    </td><td align='right'><%= number_to_currency(@order.tax)      %></td></tr>
+  <tr><td colspan="4" align='right'>Shipping and Handling:  </td><td align='right'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
+  <% if @order.gift_wrap && @order.gift_wrap > 0 %>  
+    <tr><td colspan="4" align='right'>Gift wrap:            </td><td align='right'><%= number_to_currency(@order.gift_wrap) %></td></tr>
+  <% end %>
+  <% if @order.discounts %>
+    <% @order.discounts.each do |d| %>
+      <tr><td colspan="4" align='right'>"<%= d.gift_card.code %>" gift card: </td><td align='right'><%= number_to_currency(d.amount) %></td></tr>
+    <% end %>
+  <% end %>
+  <% if @order.custom_discount %>
+    <tr><td colspan="4" align='right'>Discount: </td><td align='right'><%= number_to_currency(@order.custom_discount) %></td></tr>
+  <% end %>      
+  <tr><td colspan="4" align='right'>Total:     </td><td align='right'><%= number_to_currency(@order.total) %></td></tr>
+</table>
+
+<% if @order.shipping_address %>
+  <% sa = @order.shipping_address %>
+  <h2>Shipping Address</h2>
+  <p>
+    <%= sa.first_name %> <%= sa.last_name %><br />
+    <%= sa.address1 %><br />
+    <% if sa.address2 && sa.address2.strip.length > 0 %><%= sa.address2 %><br /><% end %>
+    <%= sa.city %>, <%= sa.state %> <%= sa.zip %>
+  </p>
+<% end %>
+
+<% if @order.billing_address %>
+  <% ba = @order.billing_address %>
+  <h2>Billing Address</h2>
+  <p>
+    <%= ba.first_name %> <%= ba.last_name %><br />
+    <%= ba.address1 %><br />
+    <% if ba.address2 && ba.address2.strip.length > 0 %><%= ba.address2 %><br /><% end %>
+    <%= ba.city %>, <%= ba.state %> <%= ba.zip %>
+  </p>
+<% end %>
+

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.144'
+  VERSION = '0.5.145'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.144
+  version: 0.5.145
 platform: ruby
 authors:
 - William Barry