caboose-cms 0.5.119 → 0.5.120

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWM0NzQ5Njc3NjBlOTNmMDBhZjViMTA1Y2MyZDM0OTk3Mjg0ZGQ2NQ==
+    ZmU1MjAyN2Y0NGRhODA2ZTcyYTg2ZjBmYWY1NjkzOGVhNmFhNTQxYQ==
   data.tar.gz: !binary |-
-    Y2QxMzJkOWEzYzg0ZWFkYzVkNTc5MjhmYTdjZGRjOGQ1NmQxMWYxYw==
+    NTdkNTllYzUzNGQxZTg2YTE0N2FjYzI1Y2UxYWE2MzM4YmRkZjgxMQ==
 SHA512:
   metadata.gz: !binary |-
-    NWEwYjFjM2JjNWU3MjUyNTUzZDkxZjNiMTczMmMxZmJiZTFiZjhjNGYzNjk4
-    Yzk5M2ZjNGFkYjZhOGYwZjYzNzUxZjVhMDE4MDM3YTFlODBhOTVmNWM1YmFm
-    N2JkNWJlNWE2NmJjYzhkYjE1YjkyMmU2NGNlOGNhZDhjNDU0MDM=
+    MzQ1M2ZiNjQwNzljNDlkYmU1MjFiYjAwN2M0NmQ2MWY0ODdlOGY5Nzc5ZWI1
+    MjA1ZmMzNGZiZGFkNjQ1ZDY3ZWJjZDdhYmU0NzQyZjk2NDJmNmE5MTQ5M2M3
+    NDFiZjE3NGQ5Njk0NThhOWQwODgzYjliMzg3ZDYzMjU2OTZjOTQ=
   data.tar.gz: !binary |-
-    YTQ4ZGNjNTEzM2QwN2MyZmQ5MGQ2MTFkNTc4ODllNzc5MzdhYzVjNjliNWQw
-    NDU2N2VjYWYzNDE0NWM1NTI4NjRkMGU4Nzk5YjM4YjY4YzZjYjk5YjdlZDVm
-    Y2U5N2M3OGUyYWM4NGZlYTI0MDJmOTM2ZGEwYjI5ZTRlMjljM2U=
+    ZTU3ZWM0OTMxNzE1YWFjZmEzNzkyZDI5MmFlNDE5NmI5MmYyNjhjZjAyYzYx
+    ZGFkODIyYjZhNDA2MmE3Y2M1ZTQ2NTY3NTA2YTQyNTg2ODEzNzdkZTE4MjA0
+    MzUxNWMwNzlkMGFkMTNiZGQ0ZWVjZjlhMjQ3MmJkYjQwMzA0NTA=

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

@@ -89,7 +89,12 @@ function relay_handler(resp)
   console.log('RELAY');
   console.log(resp);
   if (resp.success == true)
-    window.location = '/checkout/thanks';
+  {
+    if (resp.redirect)
+      window.location = resp.redirect;
+    else
+      window.location = '/checkout/thanks';          
+  }
   else if (resp.error)  
     $('#message').html("<p class='note error'>" + resp.error + "</p>");
   else

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

@@ -72,10 +72,11 @@ body {
 #content h1 {
   margin: 0 0 20px -30px;
   padding: 40px 0 0 30px;
-  height: 80px;
+  height: 80px;  
   background: #e1e1e1;
   border-bottom: #aaa 1px solid;
   font-size: 36pt;
+  overflow: hidden;
 }
 
 #content h1.model_attribute_h1 {

data/app/controllers/caboose/checkout_controller.rb

@@ -36,6 +36,11 @@ module Caboose
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
                   
+      if !@order.has_shippable_items?
+        redirect_to '/checkout/gift-cards'
+        return
+      end
+      
       # Remove any order packages      
       LineItem.where(:order_id => @order.id).update_all(:order_package_id => nil)
       OrderPackage.where(:order_id => @order.id).destroy_all      
@@ -44,7 +49,8 @@ module Caboose
       OrderPackage.create_for_order(@order)
       
       # Now get the rates for those packages            
-      @rates = ShippingCalculator.rates(@order)      
+      @rates = ShippingCalculator.rates(@order)
+      
       #Caboose.log(@rates.inspect)
       @logged_in_user = logged_in_user      
     end
@@ -54,7 +60,7 @@ module Caboose
     def gift_cards
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
-      redirect_to '/checkout/shipping'  and return if @order.has_empty_shipping_methods?
+      redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
       @logged_in_user = logged_in_user
     end
     
@@ -63,7 +69,7 @@ module Caboose
     def payment
       redirect_to '/checkout'           and return if !logged_in?
       redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
-      redirect_to '/checkout/shipping'  and return if @order.has_empty_shipping_methods?      
+      redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?      
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -102,6 +108,10 @@ module Caboose
     # GET /checkout/thanks
     def thanks
       @logged_in_user = logged_in_user
+      
+      # Find the last order for the user
+      @last_order = Order.where(:customer_id => @logged_in_user.id).order("id desc").limit(1).first
+            
     end
     
     #===========================================================================
@@ -120,19 +130,23 @@ module Caboose
       # Grab or create addresses
       shipping_address = if @order.shipping_address then @order.shipping_address else Address.new end
       billing_address  = if @order.billing_address  then @order.billing_address  else Address.new end
-      
+            
+      has_shippable_items = @order.has_shippable_items?
+        
       # Shipping address
-      shipping_address.first_name = params[:shipping][:first_name]
-      shipping_address.last_name  = params[:shipping][:last_name]
-      shipping_address.company    = params[:shipping][:company]
-      shipping_address.address1   = params[:shipping][:address1]
-      shipping_address.address2   = params[:shipping][:address2]
-      shipping_address.city       = params[:shipping][:city]
-      shipping_address.state      = params[:shipping][:state]
-      shipping_address.zip        = params[:shipping][:zip]
+      if has_shippable_items
+        shipping_address.first_name = params[:shipping][:first_name]
+        shipping_address.last_name  = params[:shipping][:last_name]
+        shipping_address.company    = params[:shipping][:company]
+        shipping_address.address1   = params[:shipping][:address1]
+        shipping_address.address2   = params[:shipping][:address2]
+        shipping_address.city       = params[:shipping][:city]
+        shipping_address.state      = params[:shipping][:state]
+        shipping_address.zip        = params[:shipping][:zip]
+      end
       
       # Billing address
-      if params[:use_as_billing]
+      if has_shippable_items && params[:use_as_billing]
         billing_address.update_attributes(shipping_address.attributes)
       else
         billing_address.first_name = params[:billing][:first_name]
@@ -146,7 +160,7 @@ module Caboose
       end
       
       # Save address info; generate ids
-      render :json => { :success => false, :errors => shipping_address.errors.full_messages, :address => 'shipping' } and return if !shipping_address.save
+      render :json => { :success => false, :errors => shipping_address.errors.full_messages, :address => 'shipping' } and return if has_shippable_items && !shipping_address.save
       render :json => { :success => false, :errors => billing_address.errors.full_messages, :address => 'billing' } and return if !billing_address.save
       
       # Associate address info with order

data/app/controllers/caboose/my_account_line_items_controller.rb

@@ -0,0 +1,56 @@
+module Caboose
+  class MyAccountLineItemsController < Caboose::ApplicationController
+            
+    # GET /my-account/orders/:order_id/line-items
+    def index
+      return if !logged_in?      
+      @order = Order.find(params[:order_id])
+      if @order.customer_id != logged_in_user.id
+        @error = "The given order does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end
+    end
+      
+    # GET /my-account/orders/:order_id/line-items/:id
+    def edit
+      return if !logged_in?
+      
+      @order = Order.find(params[:order_id])
+      @line_item = LineItem.find(params[:id])
+      if @order.customer_id != logged_in_user.id
+        @error = "The given order does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end      
+    end
+    
+    # GET /my-account/orders/:order_id/line-items/:id/download
+    def download
+      return if !logged_in?
+      
+      order = Order.find(params[:order_id])      
+      if order.customer_id != logged_in_user.id
+        @error = "The given order does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end
+
+      li = LineItem.find(params[:id])
+      if !li.variant.downloadable
+        render :text => "Not a downloadable file."
+        return
+      end
+      
+      # Generate the download URL and redirect to it
+      sc = @site.store_config
+      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
+
+      redirect_to url
+    end
+             
+  end
+end

data/app/controllers/caboose/my_account_orders_controller.rb

@@ -0,0 +1,35 @@
+module Caboose
+  class MyAccountOrdersController < Caboose::ApplicationController
+            
+    # GET /my-account/orders
+    def index
+      return if !logged_in?
+      
+      @pager = Caboose::PageBarGenerator.new(params, {
+        'customer_id'          => @logged_in_user_id.id,         
+        'status'               => '',        
+        'id'                   => ''
+      }, {
+        'model'          => 'Caboose::Order',
+        'sort'           => 'id',
+        'desc'           => 1,
+        'base_url'       => '/my-account/orders',
+        'use_url_params' => false
+      })      
+      @orders = @pager.items                  
+    end
+      
+    # GET /my-account/orders/:id
+    def edit
+      return if !logged_in?
+      
+      @order = Order.find(params[:id])
+      if @order.customer_id != logged_in_user.id
+        @error = "The given order does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end      
+    end
+             
+  end
+end

data/app/controllers/caboose/store_controller.rb

@@ -49,7 +49,8 @@ module Caboose
           when 'calculate_packages'       then sc.calculate_packages      = value
           when 'shipping_rates_function'  then sc.shipping_rates_function = value
           when 'length_unit'              then sc.length_unit             = value
-          when 'weight_unit'              then sc.weight_unit             = value                      
+          when 'weight_unit'              then sc.weight_unit             = value
+          when 'download_url_expires_in'  then sc.download_url_expires_in = value
     	  end
     	end
     	

data/app/controllers/caboose/variants_controller.rb

@@ -68,6 +68,14 @@ module Caboose
         :models => pager.items
       }      
     end
+    
+    # GET /admin/products/:product_id/variants/:id/json
+    def admin_json_single
+      return if !user_is_allowed('products', 'view')
+      
+      v = Variant.find(params[:id])      
+      render :json => v      
+    end
         
     # GET /admin/products/:product_id/variants/:variant_id
     def admin_edit
@@ -77,6 +85,27 @@ module Caboose
       render :layout => 'caboose/admin'            
     end
     
+    # GET /admin/producst/:product_id/variants/:id/download-url
+    def admin_download_url
+      return if !user_is_allowed('variants', 'edit')
+      
+      resp = StdClass.new
+      v = Variant.find(params[:id])
+      expires_in = params[:expires_in].to_i
+      
+      if !v.downloadable
+        resp.error = "This variant is not downloadable."
+      else
+        config = YAML.load_file("#{::Rails.root}/config/aws.yml")        
+        bucket = AWS::S3::Bucket.new(config[Rails.env]['bucket'])
+        s3object = AWS::S3::S3Object.new(bucket, v.download_path)
+        resp.url = s3object.url_for(:read, :expires => expires_in.minutes).to_s
+        resp.success = true
+      end
+
+      render :json => resp
+    end
+    
     # PUT /admin/variants/:id
     def admin_update
       return if !user_is_allowed('variants', 'edit')
@@ -104,6 +133,8 @@ module Caboose
           when 'option3'            then v.option3            = value
           when 'requires_shipping'  then v.requires_shipping  = value
           when 'taxable'            then v.taxable            = value
+          when 'downloadable'       then v.downloadable       = value
+          when 'download_path'      then v.download_path      = value
         end
       end
       resp.success = save && v.save
@@ -319,10 +350,15 @@ module Caboose
       end
       
       if resp.error.nil?
-        CSV.parse(params[:csv_data]).each do |row|                    
-          v = Caboose::Variant.where(:alternate_id => row[0]).first
-          v = Caboose::Variant.new(:product_id => p.id) if v.nil?
-      
+        CSV.parse(params[:csv_data]).each do |row|
+          v = nil
+          if row[0].strip.length == 0
+            v = Caboose::Variant.new(:product_id => p.id)
+          else
+            v = Caboose::Variant.where(:alternate_id => row[0]).first
+            v = Caboose::Variant.new(:product_id => p.id) if v.nil?
+          end
+
           v.product_id        = p.id
           v.alternate_id      = row[0].strip
           v.quantity_in_stock = row[1].strip.to_i
@@ -365,7 +401,9 @@ module Caboose
           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 }                      
+          when 'taxable'            then variants.each { |v| v.taxable            = value }
+          when 'downloadable'       then variants.each { |v| v.downloadable       = value }
+          when 'download_path'      then variants.each { |v| v.download_path      = value }
         end        
       end
       variants.each{ |v| v.save }

data/app/models/caboose/order.rb

@@ -205,6 +205,20 @@ module Caboose
       return false
     end
     
+    def has_downloadable_items?
+      self.line_items.each do |li|
+        return true if li.variant.downloadable
+      end
+      return false
+    end
+    
+    def has_shippable_items?
+      self.line_items.each do |li|
+        return true if !li.variant.downloadable
+      end
+      return false
+    end
+    
   end
 end
 

data/app/models/caboose/schema.rb

@@ -617,7 +617,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :order_packages_function , :text    ],
         [ :shipping_rates_function , :text    ],
         [ :length_unit             , :string  , { :default => 'in' }],
-        [ :weight_unit             , :string  , { :default => 'oz' }]
+        [ :weight_unit             , :string  , { :default => 'oz' }],
+        [ :download_url_expires_in , :string  , { :default => 5 }]
       ],
       Caboose::User => [
         [ :site_id              , :integer    ],
@@ -672,7 +673,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :option1_sort_order    , :integer  , { :default => 0 }],
         [ :option2_sort_order    , :integer  , { :default => 0 }],
         [ :option3_sort_order    , :integer  , { :default => 0 }],
-        [ :sort_order            , :integer  , { :default => 0 }]
+        [ :sort_order            , :integer  , { :default => 0 }],
+        [ :downloadable          , :boolean  , { :default => false }],
+        [ :download_path         , :string   ]
       ],
       Caboose::Vendor => [
         [ :site_id      , :integer    ],

data/app/models/caboose/shipping_calculator.rb

@@ -30,9 +30,9 @@ module Caboose
         :postal_code => order.shipping_address.zip
       )
       carriers = {}      
-      carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username.strip.length   > 0 
-      carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username.strip.length  > 0
-      carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username.strip.length > 0
+      carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username   && sc.ups_username.strip.length   > 0 
+      carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username  && sc.usps_username.strip.length  > 0
+      carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username && sc.fedex_username.strip.length > 0
 
       all_rates = []
       order.packages.each do |op|

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

@@ -17,21 +17,23 @@ end
   <% else %>    
     <form action="/checkout/addresses" method="put" id='address_form'>
       <section id="checkout-address">  
-        <div class="wrapper">          
-          <section>
-            <fieldset id="shipping">
-              <h3>Shipping Address</h3>
-              <label><span>First Name </span> <input name="shipping[first_name]" type="text" value="<%= sa ? sa.first_name : "" %>" /></label>
-              <label><span>Last Name  </span> <input name="shipping[last_name]"  type="text" value="<%= sa ? sa.last_name  : "" %>" /></label>
-              <label><span>Company    </span> <input name="shipping[company]"    type="text" value="<%= sa ? sa.company    : "" %>" /></label>
-              <label><span>Address 1  </span> <input name="shipping[address1]"   type="text" value="<%= sa ? sa.address1   : "" %>" /></label>
-              <label><span>Address 2  </span> <input name="shipping[address2]"   type="text" value="<%= sa ? sa.address2   : "" %>" /></label>
-              <label><span>City       </span> <input name="shipping[city]"       type="text" value="<%= sa ? sa.city       : "" %>" /></label>        
-              <label><span>State      </span> <select name="shipping[state]"><% Caboose::States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= sa && sa.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>        
-              <label><span>Zip        </span> <input name="shipping[zip]"       type="text"  value="<%= sa ? sa.zip        : "" %>" /></label>
-              <label><input name="use_as_billing" type="checkbox" value="false" /> Use as billing address</label>
-            </fieldset>
-          </section>    
+        <div class="wrapper">
+          <% if @order.has_shippable_items? %>
+            <section>
+              <fieldset id="shipping">
+                <h3>Shipping Address</h3>
+                <label><span>First Name </span> <input name="shipping[first_name]" type="text" value="<%= sa ? sa.first_name : "" %>" /></label>
+                <label><span>Last Name  </span> <input name="shipping[last_name]"  type="text" value="<%= sa ? sa.last_name  : "" %>" /></label>
+                <label><span>Company    </span> <input name="shipping[company]"    type="text" value="<%= sa ? sa.company    : "" %>" /></label>
+                <label><span>Address 1  </span> <input name="shipping[address1]"   type="text" value="<%= sa ? sa.address1   : "" %>" /></label>
+                <label><span>Address 2  </span> <input name="shipping[address2]"   type="text" value="<%= sa ? sa.address2   : "" %>" /></label>
+                <label><span>City       </span> <input name="shipping[city]"       type="text" value="<%= sa ? sa.city       : "" %>" /></label>        
+                <label><span>State      </span> <select name="shipping[state]"><% Caboose::States.all.each do |abbr, state| %><option value="<%= abbr %>" <%= sa && sa.state == abbr ? 'selected' : "" %>><%= state %></option><% end %></select></label>        
+                <label><span>Zip        </span> <input name="shipping[zip]"       type="text"  value="<%= sa ? sa.zip        : "" %>" /></label>
+                <label><input name="use_as_billing" type="checkbox" value="false" /> Use as billing address</label>
+              </fieldset>
+            </section>
+          <% end %>
           <section>
             <fieldset id="billing">
               <h3>Billing Address</h3>

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

@@ -65,17 +65,19 @@ store_config = @site.store_config
     <% end %>
   </section>
   <section id='checkout-confirm'>
-    <section id='shipping_address'>
-      <h3>Shipping Address</h3>
-      <% sa = @order.shipping_address %>        
-      <address>
-        <%= "#{sa.first_name} #{sa.last_name}" %><br />
-        <%= sa.address1 %><br />
-        <%= "#{sa.address2}<br />" if sa.address2 and not sa.address2.empty? %>
-        <%= "#{sa.city}, #{sa.state} #{sa.zip}" %>
-      </address>        
-      <p><a href="/checkout/addresses">Edit</a></p>
-    </section>
+    <% if @order.has_shippable_items? %>
+      <section id='shipping_address'>
+        <h3>Shipping Address</h3>
+        <% sa = @order.shipping_address %>        
+        <address>
+          <%= "#{sa.first_name} #{sa.last_name}" %><br />
+          <%= sa.address1 %><br />
+          <%= "#{sa.address2}<br />" if sa.address2 and not sa.address2.empty? %>
+          <%= "#{sa.city}, #{sa.state} #{sa.zip}" %>
+        </address>        
+        <p><a href="/checkout/addresses">Edit</a></p>
+      </section>
+    <% end %>
     <section id='billing_address'>        
       <h3>Billing Address</h3>
       <% ba = @order.billing_address %>        
@@ -87,15 +89,17 @@ store_config = @site.store_config
       </address>
       <p><a href="/checkout/addresses">Edit</a></p>
     </section>
-    <section id='shipping_method'>
-      <h3>Shipping</h3>
-      <% @order.order_packages.each do |op| %>        
-        <p><%= op.shipping_method.service_name %> - <%= number_to_currency(op.total) %></p>
-      <% end %>
-      <p><a href="/checkout/shipping">Edit</a></p>
-    </section>
+    <% if @order.has_shippable_items? %>
+      <section id='shipping_method'>
+        <h3>Shipping</h3>
+        <% @order.order_packages.each do |op| %>        
+          <p><%= op.shipping_method.service_name %> - <%= number_to_currency(op.total) %></p>
+        <% end %>
+        <p><a href="/checkout/shipping">Edit</a></p>
+      </section>
+    <% end %>
     <section id='payment_method'>
-      <h3>Payment</h3>      
+      <h3>Payment Method</h3>      
       <div id='confirm_card'>
         <p id='confirm_card_number'></p>
         <p><a href="#" id='edit_payment'>Edit</a></p>

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

@@ -1,5 +1,16 @@
 <h3>All Finished!</h3>
 <p>Thank you for your order! Your order has been submitted.</p>
 <p>Please allow up to 48 hours for your order to be processed.  Orders are processed during normal business hours Monday through Friday.</p>
-<p><a href="/">Continue Shopping</a></p>
 
+<% if @last_order.has_downloadable_items? %>
+  <p>Your order contained downloadable items. Download your items with the links below:</p>
+  <ul>
+    <% @last_order.line_items.each do |li| %>
+      <% if li.variant.downloadable %>
+        <li><a href='/my-account/orders/<%= @last_order.id %>/line-items/<%= li.id %>/download' target="_blank"><%= li.variant.product.title %></a></li>
+      <% end %>
+    <% end %>
+  </ul>
+<% end %>
+
+<p><a href="/">Continue Shopping</a></p>

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

@@ -41,6 +41,7 @@ sc = @store_config
 
 <h2>Other</h2>
 <p><div id='storeconfig_<%= sc.id %>_handling_percentage'     ></div></p>
+<p><div id='storeconfig_<%= sc.id %>_download_url_expires_in' ></div></p>
 
 <div id='message'></div>
 
@@ -66,31 +67,32 @@ $(document).ready(function() {
     update_url: '/admin/store',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'pp_name'              , nice_name: 'Type'                 , type: 'select'   , value: <%= raw Caboose.json(sc.pp_name                ) %>, width: 400 , options_url: '/admin/store/payment-processor-options' },
-      { name: 'pp_username'          , nice_name: 'Username'             , type: 'text'     , value: <%= raw Caboose.json(sc.pp_username            ) %>, width: 400 },
-      { name: 'pp_password'          , nice_name: 'Password'             , type: 'text'     , value: <%= raw Caboose.json(sc.pp_password            ) %>, width: 400 },
-      { name: 'pp_relay_domain'      , nice_name: 'Relay Domain'         , type: 'text'     , value: <%= raw Caboose.json(sc.pp_relay_domain        ) %>, width: 400 },
-      { name: 'pp_testing'           , nice_name: 'Test Mode'            , type: 'checkbox' , value: <%= raw Caboose.json(sc.pp_testing ? 1 : 0     ) %>, width: 400 },      
-      { name: 'fulfillment_email'    , nice_name: 'Fulfillment Email'    , type: 'text'     , value: <%= raw Caboose.json(sc.fulfillment_email      ) %>, width: 400 },
-      { name: 'shipping_email'       , nice_name: 'Shipping Email'       , type: 'text'     , value: <%= raw Caboose.json(sc.shipping_email         ) %>, width: 400 },
-      { name: 'handling_percentage'  , nice_name: 'Handling Percentage'  , type: 'text'     , value: <%= raw Caboose.json(sc.handling_percentage    ) %>, width: 400 },
-      { name: 'length_unit'          , nice_name: 'Length'               , type: 'select'   , value: <%= raw Caboose.json(sc.length_unit            ) %>, width: 400 , options_url: '/admin/store/length-unit-options' },
-      { name: 'weight_unit'          , nice_name: 'Weight'               , type: 'select'   , value: <%= raw Caboose.json(sc.weight_unit            ) %>, width: 400 , options_url: '/admin/store/weight-unit-options' },
-      { name: 'ups_username'         , nice_name: 'UPS Username'         , type: 'text'     , value: <%= raw Caboose.json(sc.ups_username           ) %>, width: 400 },
-      { name: 'ups_password'         , nice_name: 'UPS Password'         , type: 'text'     , value: <%= raw Caboose.json(sc.ups_password           ) %>, width: 400 },
-      { name: 'ups_key'              , nice_name: 'UPS Key'              , type: 'text'     , value: <%= raw Caboose.json(sc.ups_key                ) %>, width: 400 },
-      { name: 'ups_origin_account'   , nice_name: 'UPS Origin Account'   , type: 'text'     , value: <%= raw Caboose.json(sc.ups_origin_account     ) %>, width: 400 },
-      { name: 'usps_username'        , nice_name: 'USPS Username'        , type: 'text'     , value: <%= raw Caboose.json(sc.usps_username          ) %>, width: 400 },
-      { name: 'usps_secret_key'      , nice_name: 'USPS Secret Key'      , type: 'text'     , value: <%= raw Caboose.json(sc.usps_secret_key        ) %>, width: 400 },
-      { name: 'usps_publishable_key' , nice_name: 'USPS Publishable Key' , type: 'text'     , value: <%= raw Caboose.json(sc.usps_publishable_key   ) %>, width: 400 },
-      { name: 'fedex_username'       , nice_name: 'FedEx Username'       , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_username         ) %>, width: 400 },
-      { name: 'fedex_password'       , nice_name: 'FedEx Password'       , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_password         ) %>, width: 400 },
-      { name: 'fedex_key'            , nice_name: 'FedEx Key'            , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_key              ) %>, width: 400 },
-      { name: 'fedex_account'        , nice_name: 'FedEx Account'        , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_account          ) %>, width: 400 },
-      { name: 'origin_country'       , nice_name: 'Country'              , type: 'text'     , value: <%= raw Caboose.json(sc.origin_country         ) %>, width: 400 },
-      { name: 'origin_state'         , nice_name: 'State'                , type: 'text'     , value: <%= raw Caboose.json(sc.origin_state           ) %>, width: 400 },
-      { name: 'origin_city'          , nice_name: 'City'                 , type: 'text'     , value: <%= raw Caboose.json(sc.origin_city            ) %>, width: 400 },
-      { name: 'origin_zip'           , nice_name: 'Zip'                  , type: 'text'     , value: <%= raw Caboose.json(sc.origin_zip             ) %>, width: 400 }        
+      { name: 'pp_name'                 , nice_name: 'Type'                              , type: 'select'   , value: <%= raw Caboose.json(sc.pp_name                 ) %>, width: 400 , options_url: '/admin/store/payment-processor-options' },
+      { name: 'pp_username'             , nice_name: 'Username'                          , type: 'text'     , value: <%= raw Caboose.json(sc.pp_username             ) %>, width: 400 },
+      { name: 'pp_password'             , nice_name: 'Password'                          , type: 'text'     , value: <%= raw Caboose.json(sc.pp_password             ) %>, width: 400 },
+      { name: 'pp_relay_domain'         , nice_name: 'Relay Domain'                      , type: 'text'     , value: <%= raw Caboose.json(sc.pp_relay_domain         ) %>, width: 400 },
+      { name: 'pp_testing'              , nice_name: 'Test Mode'                         , type: 'checkbox' , value: <%= raw Caboose.json(sc.pp_testing ? 1 : 0      ) %>, width: 400 },      
+      { name: 'fulfillment_email'       , nice_name: 'Fulfillment Email'                 , type: 'text'     , value: <%= raw Caboose.json(sc.fulfillment_email       ) %>, width: 400 },
+      { name: 'shipping_email'          , nice_name: 'Shipping Email'                    , type: 'text'     , value: <%= raw Caboose.json(sc.shipping_email          ) %>, width: 400 },
+      { name: 'handling_percentage'     , nice_name: 'Handling Percentage'               , type: 'text'     , value: <%= raw Caboose.json(sc.handling_percentage     ) %>, width: 400 },
+      { name: 'length_unit'             , nice_name: 'Length'                            , type: 'select'   , value: <%= raw Caboose.json(sc.length_unit             ) %>, width: 400 , options_url: '/admin/store/length-unit-options' },
+      { name: 'weight_unit'             , nice_name: 'Weight'                            , type: 'select'   , value: <%= raw Caboose.json(sc.weight_unit             ) %>, width: 400 , options_url: '/admin/store/weight-unit-options' },
+      { name: 'ups_username'            , nice_name: 'UPS Username'                      , type: 'text'     , value: <%= raw Caboose.json(sc.ups_username            ) %>, width: 400 },
+      { name: 'ups_password'            , nice_name: 'UPS Password'                      , type: 'text'     , value: <%= raw Caboose.json(sc.ups_password            ) %>, width: 400 },
+      { name: 'ups_key'                 , nice_name: 'UPS Key'                           , type: 'text'     , value: <%= raw Caboose.json(sc.ups_key                 ) %>, width: 400 },
+      { name: 'ups_origin_account'      , nice_name: 'UPS Origin Account'                , type: 'text'     , value: <%= raw Caboose.json(sc.ups_origin_account      ) %>, width: 400 },
+      { name: 'usps_username'           , nice_name: 'USPS Username'                     , type: 'text'     , value: <%= raw Caboose.json(sc.usps_username           ) %>, width: 400 },
+      { name: 'usps_secret_key'         , nice_name: 'USPS Secret Key'                   , type: 'text'     , value: <%= raw Caboose.json(sc.usps_secret_key         ) %>, width: 400 },
+      { name: 'usps_publishable_key'    , nice_name: 'USPS Publishable Key'              , type: 'text'     , value: <%= raw Caboose.json(sc.usps_publishable_key    ) %>, width: 400 },
+      { name: 'fedex_username'          , nice_name: 'FedEx Username'                    , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_username          ) %>, width: 400 },
+      { name: 'fedex_password'          , nice_name: 'FedEx Password'                    , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_password          ) %>, width: 400 },
+      { name: 'fedex_key'               , nice_name: 'FedEx Key'                         , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_key               ) %>, width: 400 },
+      { name: 'fedex_account'           , nice_name: 'FedEx Account'                     , type: 'text'     , value: <%= raw Caboose.json(sc.fedex_account           ) %>, width: 400 },
+      { name: 'origin_country'          , nice_name: 'Country'                           , type: 'text'     , value: <%= raw Caboose.json(sc.origin_country          ) %>, width: 400 },
+      { name: 'origin_state'            , nice_name: 'State'                             , type: 'text'     , value: <%= raw Caboose.json(sc.origin_state            ) %>, width: 400 },
+      { name: 'origin_city'             , nice_name: 'City'                              , type: 'text'     , value: <%= raw Caboose.json(sc.origin_city             ) %>, width: 400 },
+      { name: 'origin_zip'              , nice_name: 'Zip'                               , type: 'text'     , value: <%= raw Caboose.json(sc.origin_zip              ) %>, width: 400 },
+      { name: 'download_url_expires_in' , nice_name: 'Download URL Expires In (minutes)' , type: 'text'     , value: <%= raw Caboose.json(sc.download_url_expires_in ) %>, width: 400 }
     ]    
   });
         

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

@@ -3,7 +3,7 @@ p = @product
 v = @variant
 %>
 <h1>Edit Variant</h1>
-
+<p><strong>Product:</strong> <%= p.title %></p>
 <table>
   <tr>
     <td valign='top'>
@@ -15,6 +15,7 @@ v = @variant
 <div id='variant_<%= v.id %>_requires_shipping'  ></div>
 <div id='variant_<%= v.id %>_allow_backorder'    ></div>
 <div id='variant_<%= v.id %>_taxable'            ></div>
+<div id='variant_<%= v.id %>_downloadable'       ></div>
     </td><td valign='top'>
 <h2>Inventory</h2>
 <div id='variant_<%= v.id %>_alternate_id'       ></div>
@@ -33,9 +34,11 @@ v = @variant
     </td>
   </tr>
 </table>
+<div id='variant_<%= v.id %>_download_path'      ></div>
 <div id='message'></div>
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/products/<%= p.id %>/variants';" />
+<input type='button' value='Generate Download URL' onclick="download_url();" />
 <input type='button' value='Delete Variant' onclick="delete_variant(<%= v.id %>);" />
 </p>
 
@@ -68,15 +71,38 @@ $(document).ready(function() {
       { name: 'requires_shipping'         , nice_name: 'Requires shipping'                , type: 'checkbox' , align: 'right' , value: <%= raw Caboose.json(v.requires_shipping      ) %>, width: 250 }, 
       { name: 'taxable'                   , nice_name: 'Taxable'                          , type: 'checkbox' , align: 'right' , value: <%= raw Caboose.json(v.taxable                ) %>, width: 250 },
       { name: 'allow_backorder'           , nice_name: 'Allow backorder'                  , type: 'checkbox' , align: 'right' , value: <%= raw Caboose.json(v.allow_backorder        ) %>, width: 250 }, 
-      { name: 'status'                    , nice_name: 'Status'                           , type: 'select'   , align: 'right' , value: <%= raw Caboose.json(v.status) %>, text: <%= raw Caboose.json(v.status) %>, width: 250, options_url: '/admin/variants/status-options' }      
+      { name: 'status'                    , nice_name: 'Status'                           , type: 'select'   , align: 'right' , value: <%= raw Caboose.json(v.status                 ) %>, width: 250, options_url: '/admin/variants/status-options' },
+      { name: 'downloadable'              , nice_name: 'Downloadable'                     , type: 'checkbox' , align: 'right' , value: <%= raw Caboose.json(v.downloadable           ) %>, width: 250 },
+      { name: 'download_path'             , nice_name: 'Download path'                    , type: 'text'     , align: 'right' , value: <%= raw Caboose.json(v.download_path          ) %>, width: 800 }      
     ]
   });
 });
 
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal(800);
-});
+function download_url(expires_in)
+{
+  if (!expires_in)
+  {
+    var p = $('<p/>').addClass('note')
+      .append("For how many minutes do you want the download link to be valid?<br />")
+      .append($('<input/>').attr('type', 'text').attr('id', 'expires_in').css('width', '50px').val('5'))
+      .append(' minutes<br/>')
+      .append($('<input/>').attr('type', 'button').val('Generate Download URL').click(function() {
+        download_url($('#expires_in').val());
+      }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Generating download URL...</p>");
+  $.ajax({
+    url: '/admin/products/<%= v.product_id %>/variants/<%= v.id %>/download-url',
+    type: 'get',
+    data: { expires_in: expires_in },
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) $('#message').html("<p class='note success'>The URL has been generated successfully:<br/><br/>" + resp.url + "</p>");
+    }
+  });
+}
 
 </script>
 <% end %>

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

@@ -78,10 +78,12 @@ $(document).ready(function() {
       { 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 }             
+      { show: false , name: 'cylinder'                  , nice_name: 'Cylinder'                         , sort: 'cylinder'          , type: 'checkbox' , value: function(v) { return v.cylinder            }, text: function(v) { return v.cylinder          ? 'Yes' : 'No' }, 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   }, text: function(v) { return v.requires_shipping ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true }, 
+      { show: false , name: 'taxable'                   , nice_name: 'Taxable'                          , sort: 'taxable'           , type: 'checkbox' , value: function(v) { return v.taxable             }, text: function(v) { return v.taxable           ? 'Yes' : 'No' }, 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     }, text: function(v) { return v.allow_backorder   ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true },
+      { show: false , name: 'downloadable'              , nice_name: 'Downloadable'                     , sort: 'downloadable'      , type: 'checkbox' , value: function(v) { return v.downloadable        }, text: function(v) { return v.downloadable      ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true },
+      { show: false , name: 'download_path'             , nice_name: 'Download path'                    , sort: 'download_path'     , type: 'text'     , value: function(v) { return v.download_path       }, width: 50, align: 'left'   , bulk_edit: true }
     ],
     new_model_text: 'New Variant',
     new_model_fields: [

data/config/routes.rb

@@ -19,9 +19,21 @@ Caboose::Engine.routes.draw do
   get  "logout"                          => "logout#index"
   get  "register"                        => "register#index"
   post "register"                        => "register#register"
-  get  "my-account"                      => "users#my_account"
-  put  "my-account"                      => "users#update_my_account"
   
+  #=============================================================================
+  # My Account
+  #=============================================================================
+  
+  get "my-account" => "users#my_account"
+  put "my-account" => "users#update_my_account"
+    
+  get "my-account/orders/:order_id/line-items/:id/download"  => "my_account_line_items#download"
+  get "my-account/orders/:order_id/line-items/:id"           => "my_account_line_items#edit"
+  get "my-account/orders/:order_id/line-items"               => "my_account_line_items#index"
+    
+  get "my-account/orders/:id"  => "my_account_orders#edit"
+  get "my-account/orders"      => "my_account_orders#index"
+    
   #=============================================================================
   # Sites
   #=============================================================================  
@@ -413,7 +425,9 @@ Caboose::Engine.routes.draw do
   put     '/admin/products/:product_id/variants/option3-sort-order'      => 'variants#admin_update_option3_sort_order'      
   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"
+  get     "/admin/products/:product_id/variants/:id/download-url"        => "variants#admin_download_url"
+  get     "/admin/products/:product_id/variants/:id/json"                => "variants#admin_json_single"
+  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"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.119'
+  VERSION = '0.5.120'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.119
+  version: 0.5.120
 platform: ruby
 authors:
 - William Barry
@@ -512,6 +512,8 @@ files:
 - app/controllers/caboose/logout_controller.rb
 - app/controllers/caboose/media_categories_controller.rb
 - app/controllers/caboose/modal_controller.rb
+- app/controllers/caboose/my_account_line_items_controller.rb
+- app/controllers/caboose/my_account_orders_controller.rb
 - app/controllers/caboose/order_packages_controller.rb
 - app/controllers/caboose/orders_controller.rb
 - app/controllers/caboose/page_permissions_controller.rb