caboose-cms 0.5.110 → 0.5.111

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU2ZDE0NjkyYTRkNmYyNjViNGE3N2FlMmVhZGNlYzIwY2JkZjM1Yw==
+    N2E3NTQ0YTk2ZTM3YmEzMjllYzk0N2U3Y2FlMzBkYWE5MGQ2YTVlZQ==
   data.tar.gz: !binary |-
-    YjI5ZDRiYWJmYmYwMDBmOWIxMDY0ZmNhM2NiMWM1NDcyZjg4MmNjYQ==
+    ZjViMjY5YWU2MTE3MGE4MzdiMDM1MzM4ODZhOTM5YzBiOTlhYWQ3Zg==
 SHA512:
   metadata.gz: !binary |-
-    Zjg3MmYwZDUwYzNlZjg1YmQ2OWJiYzNlYTBkMWNmYmE5NTYxMDE3ZTMzMjE2
-    M2FmMDM2NWM0YTlkOWM1NTkxNzM3MTVhMjA3YWZiOWIyZWQyNGIzYTA0ZmMz
-    Mjk3YWE5OGFiN2I2ZDQzMTBlYWZiZTM4YjI4YzJlMTllODcwNjE=
+    MjI4OGM4ODFkYTU3Y2U5MGU4ZjJjZDNiMWY5ZjUzZGIzNWMzMDljM2Y2MTMy
+    ZjRjNjMwNDc1YTYzMDk0OWRjMWE5Y2NmNzE2NTMwMDlmZDBkYjI5NjU3MWM1
+    YTRjNmM3ODJjYTIwMTZhOTkwYWE3NGJhNjFmYzEyNjAzODNkY2E=
   data.tar.gz: !binary |-
-    YjY3NzQxNWNjNGZhMmVkNjg1YTBjZmZlODQ1OWUxNWE2NDFlYmJkYjY2Mjgz
-    NWZhMDNlNDQ0MTAwOTMyODIwMDE5MThlYjE4ZmJkMmRmMzk3YzhkMTBmNzI4
-    Mjk0MTdmYTk5NTExNzI2N2Y0YzYyYWY2YzI3ZmIzOTQzOGYyODk=
+    OWEyOTMwMmJkZmQxMTUzN2VhYzhjYTA4ODU1YTk0MDA5MGUzZDk3NzEyN2Iw
+    NTliZDAxYTQyMDIwYWJhMjBkMjIxYjE3NTAwNWFiNjQ3NTkyMzkxYTUzOTg1
+    ZWU3NWI3OWJiMThiOTk2NDg5MjA3NTA0MDZhOGE2Zjg0YmVjNzE=

data/app/models/caboose/order_pdf.rb

@@ -3,9 +3,13 @@ require 'prawn'
 module Caboose
   class OrderPdf < Prawn::Document
     
-    attr_accessor :order
+    attr_accessor :order, :card_type, :card_number
     
     def to_pdf
+      
+      # Get the type of card and last four digits
+      get_card_details
+      
       #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
       text " "
       customer_info
@@ -14,6 +18,33 @@ module Caboose
       render
     end
     
+    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
+            
+      sc = self.order.site.store_config
+      ot = self.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
+          self.card_number = t2.payment_method.card_number.gsub('X', '')
+        
+      end
+            
+    end
+    
     def customer_info
       
       order_info = "Order ##{order.id}\n"
@@ -24,7 +55,7 @@ module Caboose
       end
       
       c = order.customer
-      billed_to = "#{c.first_name} #{c.last_name}\n#{c.email}\n#{c.phone}"
+      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}"
       
       sa = order.shipping_address
       shipped_to = "#{sa.name}\n#{sa.address1}\n"

data/app/views/caboose/blocks/admin_new.html.erb

@@ -27,7 +27,7 @@ b = @block
     <%
     #kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all
     arr = ["parent_id is null and block_type_category_id = ? and block_type_site_memberships.site_id = ?", cat.id, @site.id]     
-    kids = Caboose::BlockType.includes(:block_type_site_memberships).where(arr).reorder(:name).all
+    kids = Caboose::BlockType.includes(:block_type_site_memberships).where(arr).reorder(:description).all
     %>
     <% if kids && kids.count > 0 %>
       <h2 onclick="$('#cat<%= cat.id %>_container').slideToggle();"><%= cat.name %></h3>

data/app/views/caboose/cart/index.html.erb

@@ -1,8 +1,8 @@
 <div class="constrain">
   <div id='cart'></div>
-  <p class='controls'>
-    <input type='button' value='Continue Shopping' onclick="window.location='/products';" />
-    <input type='button' value='Checkout' onclick="window.location='/checkout';" />
+  <p class='controls' style="text-align:right;margin-top:15px;">
+    <input class="btn" type='button' value='Continue Shopping' onclick="window.location='/products';" />
+    <input class="btn" type='button' value='Checkout' onclick="window.location='/checkout';" />
   </p>
 </div> 
 

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

@@ -17,7 +17,8 @@
         <div class="constrain" id='signin_form_container'>  
           <form action="/login" method="post" id='signin_form'>
             <p><input name="username" type="text"     placeholder="Email"    /></p>
-            <p><input name="password" type="password" placeholder="Password" /></p>
+            <label class="small">Password:</label>
+            <p><input name="password" type="password" /></p>
             <p><input type="submit" value="Continue" /></p>
           </form>
         </div>      
@@ -27,8 +28,10 @@
             <p><input name="last_name"  type="text"     placeholder="Last Name"  /></p>
             <p><input name="email"      type="text"     placeholder="Email"      /></p>
             <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>
+            <label class="small">Password:</label>
+            <p><input name="pass1"      type="password"    /></p>
+            <label class="small">Confirm Password:</label>
+            <p><input name="pass2"      type="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>
@@ -51,4 +54,12 @@
 <%= content_for :caboose_css do %>
 <%= stylesheet_link_tag 'caboose/message_boxes' %>
 <%= stylesheet_link_tag 'caboose/checkout' %>
+<style>
+label.small {
+  font-size: 14px;
+  margin: 0 0 3px 0;
+  padding-left: 5px;
+  color: rgb(79, 79, 79);
+}
+</style>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.110'
+  VERSION = '0.5.111'
 end

metadata

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