caboose-cms 0.5.158 → 0.5.159

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YwM2I5ZDUwYzdhZTQyZGRjZTFjMmI1MjFlNGRmYTk1ZDkxZjAwYw==
+    NGRlMTBkOTUzOWM0NzkxZGQ0NGVlMDdlY2E3MzQ3ZDMxYjAzZjg5Mg==
   data.tar.gz: !binary |-
-    MDE0NWMxY2IzNjZiZTJiODliMDY5NTlhZTU1NDlkMzY3Mjk1OGMyZQ==
+    MGQxNDcyYWIzNzBlOGJhZjNmYzY4OGNhZjRmMDQ4YTc2MzA1MDc3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWU2N2NjYjE0MWVjNzY1Y2Y2YjQyNWZmMTNhZmE3Y2NmMTdmOTJkMDlkMzdj
-    MjNjY2M1M2FkNzBjMjAzMTNmZWIyYjkyOTc1MTZlZGRiNjEwNmQyMzQ3OWE1
-    YzE1ZmFjNTcyMzA4MGVmYTQ1MWY1YTM3MzA5NTRhNDhiOTRlYmE=
+    ZjEzN2NlM2M3YzEwMzA2MDBiMWUzYTczMjFmZWFiOTIyYTQ3NWY2ZTM2YjY1
+    ZWFhOWMwNWMxYTJlNmU5MzBmZWEwNzAzNWFjZDZiOTk3ZDE1ZTdjMWVlOWMz
+    NTE5Y2RjZDk1NjM0YTNlNTAyZTAzYTQ2ODQxMWI3MDgxMzk5OTg=
   data.tar.gz: !binary |-
-    NGI0ODI2ZWVjYWMyNzM1MWNhNjM5YmQwMzQyNjFjOTA5ZjAzNzJjM2EwYzIx
-    YzA3YTg3YmE0MTJhYmRlYjAyZTFlMGRhMzk1NTlmMWQyMjdjM2I5MWU0NTQ3
-    MGQyYTBmOWYyOWI3YTI4Yzk0ZjE2NmZiOTdmYjY4MzM0NjcyNTM=
+    ZjkwYmVjNjE3MDU4ZGEzYmRiNmVhYmE2MTM5NjI4NjViYzRlMGVjZjI2Mzgz
+    ZDE3YTFlM2Y5N2E4OTA0OTg3NThlOGQyMzYzMWJjNDAyMzU2NmU4MGFjYmI1
+    NTliODNmZmFmMWQyMDE5MGNmYWZmMzAyODEyYzk2NDE1MzZhNDc=

data/app/assets/stylesheets/caboose/my_account.css

@@ -0,0 +1,2 @@
+
+#my_account p { margin-bottom: 10px; }

data/app/controllers/caboose/checkout_controller.rb

@@ -325,7 +325,7 @@ module Caboose
         OrdersMailer.configure_for_site(@site.id).fulfillment_new_order(order).deliver        
         
         # Emit order event
-        Caboose.plugin_hook('order_authorized', order)
+        Caboose.plugin_hook('order_authorized', order)        
       else
         order.financial_status = 'unauthorized'        
         error = "There was a problem processing your payment."
@@ -348,6 +348,16 @@ module Caboose
       @resp.success = true if params[:success]
       @resp.error = params[:error] if params[:error]
       
+      # Go ahead and capture funds if the order only contained downloadable items
+      @order = Order.find(params[:order_id])
+      if !@order.has_shippable_items?
+        capture_resp = @order.capture_funds
+        if capture_resp.error
+          @resp.success = false
+          @resp.error = capture_resp.error
+        end        
+      end
+      
       if @resp.success        
         session[:cart_id] = nil
         init_cart

data/app/models/caboose/order.rb

@@ -235,6 +235,64 @@ module Caboose
       return false
     end
     
+    def capture_funds
+      
+      resp = StdClass.new      
+      t = OrderTransaction.where(:order_id => self.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
+            
+      if self.financial_status == Order::FINANCIAL_STATUS_CAPTURED
+        resp.error = "Funds for this order have already been captured."    
+      elsif order.total > t.amount
+        resp.error = "The order total exceeds the authorized amount."
+      elsif t.nil?
+        resp.error = "This order doesn't seem to be authorized."
+      else
+                        
+        sc = self.site.store_config
+        case sc.pp_name
+          when 'authorize.net'
+            transaction = AuthorizeNet::AIM::Transaction.new(sc.pp_username, sc.pp_password)
+            response = transaction.prior_auth_capture(t.transaction_id, self.total)
+                        
+            self.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
+            resp.success = 'Captured funds successfully'
+
+            ot = Caboose::OrderTransaction.new(
+              :order_id => self.id,
+              :date_processed => DateTime.now.utc,
+              :transaction_type => OrderTransaction::TYPE_CAPTURE
+            )
+            ot.success        = response.response_code && response.response_code == '1'            
+            ot.transaction_id = response.transaction_id
+            ot.auth_code      = response.authorization_code
+            ot.response_code  = response.response_code
+            ot.amount         = self.total
+            ot.save
+      
+          when 'payscape'
+            # TODO: Implement capture funds for payscape
+
+        end
+          
+        #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
+        #  order.financial_status = 'captured'
+        #  order.save
+        #  
+        #  if order.discounts.any?
+        #    order.update_attribute(:amount_discounted, order.discounts.first.amount_current)
+        #    order.update_gift_cards
+        #  end
+        #  
+        #  response.success = "Captured funds successfully"
+        #else
+        #  response.error = "Error capturing funds."
+        #end
+        
+      end
+      
+      return resp
+    end
+    
   end
 end
 

data/app/models/caboose/order_package.rb

@@ -55,6 +55,7 @@ module Caboose
       # Make sure all the items in the order have attributes set
       order.line_items.each do |li|              
         v = li.variant
+        next if v.downloadable
         Caboose.log("Error: variant #{v.id} has a zero weight") and return false if v.weight.nil? || v.weight == 0
         next if v.volume && v.volume > 0
         Caboose.log("Error: variant #{v.id} has a zero length") and return false if v.length.nil? || v.length == 0
@@ -64,19 +65,14 @@ module Caboose
         v.save
       end
             
-      # Reorder the items in the order by volume            
-      h = {}
-      order.line_items.each do |li|
-        (1..li.quantity).each do |i|        
-          v = li.variant          
-          h[v.volume] = li          
-        end
-      end      
-      line_items = h.sort_by{ |k,v| k }.collect{ |x| x[1] }      
+      # Reorder the items in the order by volume
+      line_items = order.line_items.sort_by{ |li| li.quantity * (li.variant.volume ? li.variant.volume : 0.00) * -1 }
+                      
+      # Get all the packages we're going to use      
       all_packages = ShippingPackage.where(:site_id => order.site_id).reorder(:flat_rate_price).all      
       
-      # Now go through each variant and fit it in a new or existing package
-      line_items.each do |li|
+      # Now go through each variant and fit it in a new or existing package            
+      line_items.each do |li|        
         next if li.variant.downloadable
         
         # See if the item will fit in any of the existing packages

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

@@ -1,17 +1,17 @@
 
-<h1>My Account</h1>
-
-<p><div id='user_<%= @user.id %>_first_name' ></div></p>
-<p><div id='user_<%= @user.id %>_last_name'  ></div></p>
-<p><div id='user_<%= @user.id %>_email'      ></div></p>
-<p><div id='user_<%= @user.id %>_phone'      ></div></p>
-<div id='message'></div>
-
-<p>
-<% if @site.use_store %>
-  <input type='button' value='Order History' class='btn' onclick="window.location='/my-account/orders';" />
-<% end %>
-</p>
+<div id='my_account'>
+  <h1>My Account</h1>
+  <p><div id='user_<%= @user.id %>_first_name' ></div></p>
+  <p><div id='user_<%= @user.id %>_last_name'  ></div></p>
+  <p><div id='user_<%= @user.id %>_email'      ></div></p>
+  <p><div id='user_<%= @user.id %>_phone'      ></div></p>
+  <div id='message'></div>
+  <p>
+  <% if @site.use_store %>
+    <input type='button' value='Order History' class='btn' onclick="window.location='/my-account/orders';" />
+  <% end %>
+  </p>
+</div>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
@@ -29,12 +29,17 @@ $(document).ready(function() {
       { name: 'email'      , nice_name: 'Email'        , type: 'text', value: <%= raw Caboose.json(@user.email)      %>, width: 400 },
       { name: 'phone'      , nice_name: 'Phone Number' , type: 'text', value: <%= raw Caboose.json(@user.phone)      %>, width: 400 }
     ],
-    on_load: function() { modal.autosize(); }
+    on_load: function() {
+      $('#user_<%= @user.id %>_first_name').css('width', '400px');
+      $('#user_<%= @user.id %>_last_name' ).css('width', '400px');
+      $('#user_<%= @user.id %>_email'     ).css('width', '400px');
+      $('#user_<%= @user.id %>_phone'     ).css('width', '400px');    
+    }
   });  
 });
 
 </script>
 <% end %>
 <%= content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/my-account", :media => "all" %>
+<%= stylesheet_link_tag "caboose/my_account", :media => "all" %>
 <% end %>

data/app/views/caboose/my_account_orders/edit.html.erb

@@ -1,5 +1,9 @@
 <%
 captured = @order.financial_status == 'captured'
+ba = @order.billing_address  
+sa = @order.shipping_address
+ba = nil if ba.first_name.nil? || ba.last_name.nil?
+sa = nil if sa.first_name.nil? || sa.last_name.nil?
 %>
 <input type='hidden' name='order_id'    id='order_id'     value='<%= @order.id %>' />
 
@@ -7,14 +11,14 @@ captured = @order.financial_status == 'captured'
 
 <table class='order'>
 <tr>
-  <th>Billing Address</th>
-  <th>Shipping Address</th>  
+  <% if ba %><th>Billing Address</th><% end %>
+  <% if sa %><th>Shipping Address</th><% end %>  
   <th>Order Status</th>
   <th>Payment Status</th>  
 </tr>
 <tr>
-  <td valign='top'><%= raw @order.billing_address.name_and_address %></td>
-  <td valign='top'><%= raw @order.shipping_address.name_and_address %></td>    
+  <% if ba %><td valign='top'><%= raw ba.name_and_address %></td><% end %>
+  <% if sa %><td valign='top'><%= raw sa.name_and_address %></td><% end %>    
   <td valign='top'><%= @order.status.capitalize %></td>    
   <td valign='top'><%= @order.financial_status.capitalize %></td>
 </tr>
@@ -50,19 +54,33 @@ captured = @order.financial_status == 'captured'
     </tr>
   <% end %>
 <% end %>
+<% if @order.has_downloadable_items? %>
+  <tr>  
+    <th>Item</th>
+    <th>Status</th>    
+    <th>Unit Price</th>
+    <th>Quantity</th>
+    <th>Subtotal</th>
+  </tr>
+<% end %>
 <% @order.line_items.each do |li| %>   
-  <% next if li.order_package_id %>  
-  <tr><td colspan='5'>Unpackaged Items</td></tr>
-  <% img = li.variant.product_image %>
+  <% next if li.order_package_id %>
+  <% v = li.variant %>  
+  <% if !v.downloadable %><tr><td colspan='5'>Unpackaged Items</td></tr><% end %>
+  <% img = v.product_image %>  
   <tr>            
     <td>
       <% if img %><img src='<%= img.url(:tiny) %>' /><% end %>
-      <% if li.variant.nil? || li.variant.product.nil? %>
-        <% if li.variant.nil? %>Unknown variant<% else %><%= li.variant.sku %><% end %>
+      <% if v.nil? || v.product.nil? %>
+        <% if v.nil? %>Unknown variant<% else %><%= v.sku %><% end %>
       <% else %>
-        <a href='/admin/products/<%= li.variant.product.id %>'><%= li.variant.product.title  %></a><br />
-        <% if li.variant.sku && li.variant.sku.strip.length > 0 %><%= li.variant.sku %><br /><% end %>
-        <%= li.variant.title %>
+        <p><a href='/admin/products/<%= v.product.id %>'><%= v.product.title  %></a><br />
+        <% if v.sku && v.sku.strip.length > 0 %><%= v.sku %><br /><% end %>
+        <%= v.title %></p>
+      <% end %>
+      <% if v.downloadable %>
+        <% sc = @order.site.store_config %>        
+        <p><a href='<%= raw sc.pp_relay_domain %>/my-account/orders/<%= @order.id %>/line-items/<%= li.id %>/download' target="_blank">Download</a></p>
       <% end %>
     </td>    
     <td><%= li.status.capitalize %></td>    
@@ -94,6 +112,8 @@ table.order td img { float: left; margin-right: 10px; }
 table.order td.package_header { font-weight: bold; text-align: center; border: 0; }
 table.order td.totals_header { font-weight: bold; text-align: center; border: 0; }
 
+p { margin-bottom: 10px; }
+
 </style>
 <% end %>
 

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

@@ -11,7 +11,7 @@
     </tr>
     <% @orders.each do |order| %>
       <tr onclick="window.location='/my-account/orders/<%= order.id %>';">
-        <td><%= order.date_created.strftime('%m/%d/%Y') %></td>
+        <td><%= order.date_created ? order.date_created.strftime('%m/%d/%Y') : '' %></td>
         <td><%= order.order_number %></td>
         <td><%= number_to_currency(order.total) %></td>
         <td><%= order.status.capitalize %></td>

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

@@ -27,7 +27,7 @@
           </td>
         <% end %>
         <td>
-          <%= p.title %>
+          <p><%= p.title %></p>
           <% if li.is_gift %>
             <p>This item is a gift.</p>
             <ul>
@@ -35,6 +35,9 @@
               <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 %>          
+          <% if li.variant.downloadable %>
+            <p><a href='<%= @order.site.store_config.pp_relay_domain %>/my-account/orders/<%= @order.id %>/line-items/<%= li.id %>/download' target="_blank">Download</a></li>
           <% end %>
         </td>
         <td align='right'><%= number_to_currency(li.unit_price) %></td>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.158'
+  VERSION = '0.5.159'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.158
+  version: 0.5.159
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -483,6 +483,7 @@ files:
 - app/assets/stylesheets/caboose/message_boxes.css.scss
 - app/assets/stylesheets/caboose/modal.css
 - app/assets/stylesheets/caboose/model_binder.css
+- app/assets/stylesheets/caboose/my_account.css
 - app/assets/stylesheets/caboose/page_bar_generator.css
 - app/assets/stylesheets/caboose/print.css
 - app/assets/stylesheets/caboose/product_images.css.scss