caboose-cms 0.5.56 → 0.5.57

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

@@ -0,0 +1,31 @@
+//
+// Product Images
+//
+
+#product-images {
+  width: 40%;
+  float: left;
+}
+
+#product-images figure {
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  cursor: pointer;
+  height: 100%;
+  width: 100%;
+}
+
+#product-images > figure { height: 350px }
+
+#product-images ul {
+  overflow: hidden;
+  padding: 6px 0 24px;
+}
+#product-images ul li {
+  float: left;
+  height: 115px;
+  margin: 0 6px 6px 0;
+  width: 115px;
+}
+

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

@@ -0,0 +1,34 @@
+//
+// Product Options
+//
+
+#product-options { margin: 0 0 24px }
+
+#product-options h1, 
+#product-options h2, 
+#product-options h3, 
+#product-options h4, 
+#product-options h5, 
+#product-options h6 { line-height: 60px }
+
+#product-options ul { overflow: hidden }
+
+#product-options ul li {
+  background: #d0d0d0;
+  cursor: pointer;
+  display: block;
+  float: left;
+  font-family: 'Avenir';
+  padding: 6px 12px;
+  margin: 0 6px 6px 0;
+  &.selected {
+    background: #981919;
+    color: #fff;
+  }
+  &.unavailable {
+    background: lighten(#d0d0d0, 6%);
+    color: darken(#d0d0d0, 12%);
+    text-decoration: line-through;
+  }
+}
+

data/app/assets/templates/caboose/cart/add_to_cart.jst.ejs

@@ -1,7 +1,6 @@
 <form action="/cart" method="post">
   <input type="hidden" name="variant_id" />
-  <label for="quantity">Qty:</label>
-  <input type="text" name="quantity" value="1" />
+  <input type="hidden" name="quantity" value="1" />  
   <input type="submit" value="Add To Cart" />
 </form>
 

data/app/assets/templates/caboose/product/images.jst.ejs

@@ -1,8 +1,7 @@
 <figure></figure>
 
 <ul>
-  <% _.each(images, function(image) { %>
+  <% _.each(images, function(image) { %>    
     <li data-id="<%= image.id %>"><figure style="background-image: url(<%= image.urls.thumb %>)" data-url-large="<%= image.urls.large %>"></figure></li>
   <% }); %>
 </ul>
-

data/app/assets/templates/caboose/product/images_old.jst.ejs

@@ -0,0 +1,7 @@
+<figure></figure>
+
+<ul>
+  <% _.each(images, function(image) { %>    
+    <li data-id="<%= image.id %>"><figure style="background-image: url(<%= image.urls.thumb %>)" data-url-large="<%= image.urls.large %>"></figure></li>
+  <% }); %>
+</ul>

data/app/assets/templates/caboose/product/options.jst.ejs

@@ -1,13 +1,3 @@
-<!--<% _.each(options, function(option, index) { %>
-  <select id="<%= 'option' + (index + 1) %>" name="<%= option.name %>">
-    <option value="">Choose an Option</option>
-    
-    <% _.each(option.values, function(value) { %>
-      <option value="<%= value %>"><%= value %></option>
-    <% }); %>
-  </select>
-<% }); %>-->
-
 <% _.each(options, function(option, index) { %>
   <h3><%= option.name %></h3>
   <ul id="<%= 'option' + (index + 1) %>" data-name="<%= option.name %>">

data/app/controllers/caboose/application_controller.rb

@@ -47,7 +47,7 @@ module Caboose
       @logged_in_user = logged_in_user  
       
       # Initialize the card
-      init_cart if Caboose::use_store
+      init_cart #if Caboose::use_store
       
       before_action
     end
@@ -55,25 +55,25 @@ module Caboose
     # Initialize the cart in the session
     def init_cart            
       # Check if the cart ID is defined and that it exists in the database
-      if !session[:cart_id] || !Order.exists?(session[:cart_id])
+      if !session[:cart_id] || !Caboose::Order.exists?(session[:cart_id])
         
         # Create an order to associate with the session
-        order = Order.create(
-          :status => 'cart',
-          :financial_status => 'pending',
-          :date_created => DateTime.now,
-          :referring_site => request.env['HTTP_REFERER'],
-          :landing_page => request.fullpath,
+        order = Caboose::Order.create(
+          :site_id          => @site.id,
+          :status           => Caboose::Order::STATUS_CART,
+          :financial_status => Caboose::Order::STATUS_PENDING,
+          :date_created     => DateTime.now,
+          :referring_site   => request.env['HTTP_REFERER'],
+          :landing_page     => request.fullpath,
           :landing_page_ref => params[:ref] || nil
-        )        
-        order.update_attribute(:shipping_method_code, Caboose::store_shipping[:default_shipping_method_code]) if Caboose::store_shipping[:default_shipping_method_code]
-        
+        )
+
         # Define the cart ID
         session[:cart_id] = order.id
       end
       
       # Log the order and set an instance variable up
-      @order = Order.find(session[:cart_id])      
+      @order = Caboose::Order.find(session[:cart_id])
     end
     
     # Parses any parameters in the URL and adds them to the params

data/app/controllers/caboose/checkout_controller.rb

@@ -1,7 +1,33 @@
+#def calc_shipping_rates(order)
+#  weight = 0.0
+#  order.line_items.each do |li|
+#    w = li.variant.weight ? li.variant.weight : 0.0    
+#    weight = weight + (w * li.quantity)
+#  end
+#           
+#  shipping = 0.0
+#  shipping = 8.00  if weight >= 0.010  && weight <= 3.000      
+#  shipping = 10.00 if weight >= 3.001  && weight <= 6.000      
+#  shipping = 12.00 if weight >= 6.001  && weight <= 8.000      
+#  shipping = 15.00 if weight >= 8.001  && weight <= 12.000     
+#  shipping = order.total * 0.05 if weight > 12.000
+#             
+#  rates = [
+#    { :carrier => 'UPS'  , :service_code => 'GND'                  , :service_name => 'Ground'             , :total_price => shipping + (order.total > 49 ? 0.00 : 7.95) },           
+#    { :carrier => 'UPS'  , :service_code => '3DS'                  , :service_name => 'UPS 3 Day Air'      , :total_price => shipping + 12.95 },  
+#    { :carrier => 'UPS'  , :service_code => '2DA'                  , :service_name => 'UPS 2 Day Air'      , :total_price => shipping + 19.95 },  
+#    { :carrier => 'UPS'  , :service_code => '1DA'                  , :service_name => 'UPS Next Day Air'   , :total_price => shipping + 32.95 },
+#    { :carrier => 'USPS' , :service_code => 'Priority Mail 3-Day'  , :service_name => 'USPS Priority Mail' , :total_price => shipping + 12.95 },  
+#    { :carrier => 'USPS' , :service_code => 'Priority Mail 2-Day'  , :service_name => 'USPS Express Mail'  , :total_price => shipping + 24.95 }
+#  ]
+#      
+#  return [rates]
+#end
+
 module Caboose
   class CheckoutController < Caboose::ApplicationController
     
-    #helper :authorize_net
+    helper :authorize_net
     before_filter :ensure_line_items, :only => [:step_one, :step_two]
     protect_from_forgery :except => :relay
     
@@ -36,17 +62,17 @@ module Caboose
     def step_three
       redirect_to '/checkout/step-one' and return if !logged_in?
       redirect_to '/checkout/step-two' and return if @order.shipping_address.nil? || @order.billing_address.nil?
-            
+
       # Remove any order packages      
       LineItem.where(:order_id => @order.id).update_all(:order_package_id => nil)
       OrderPackage.where(:order_id => @order.id).destroy_all      
       
-      # Calculate what shipping packages we'll need      
+      # Calculate what shipping packages we'll need            
       OrderPackage.create_for_order(@order)
       
       # Now get the rates for those packages
       Caboose.log("Getting rates...")      
-      @rates = ShippingCalculator.rates(@order)
+      @rates = ShippingCalculator.rates(@order)      
       Caboose.log(@rates.inspect)      
     end
     
@@ -54,7 +80,7 @@ module Caboose
     def step_four
       redirect_to '/checkout/step-one'   and return if !logged_in?
       redirect_to '/checkout/step-two'   and return if @order.shipping_address.nil? || @order.billing_address.nil?
-      redirect_to '/checkout/step-three' and return if @order.shipping_method_code.nil?
+      redirect_to '/checkout/step-three' and return if @order.shipping_service_code.nil?
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -65,11 +91,12 @@ module Caboose
         end
       end
       
-      case Caboose::payment_processor
+      store_config = @site.store_config
+      case store_config.pp_name
         when 'authorize.net'
           @sim_transaction = AuthorizeNet::SIM::Transaction.new(
-            Caboose::authorize_net_login_id,
-            Caboose::authorize_net_transaction_key,
+            store_config.pp_username,
+            store_config.pp_password,
             @order.total,
             :relay_url => "#{Caboose::store_url}/checkout/relay/#{@order.id}",
             :transaction_type => 'AUTH_ONLY',
@@ -180,9 +207,24 @@ module Caboose
     #end
     
     # PUT /checkout/shipping
-    def update_shipping      
-      @order.shipping_method      = params[:shipping_method]
-      @order.shipping_method_code = params[:shipping_method_code]                 
+    def update_shipping
+
+      rates = ShippingCalculator.rates(@order)
+        
+      if @site.store_config.calculate_packages
+        # TODO: Add the separate shipping costs for each package
+      else
+        @order.shipping_carrier      = params[:carrier]
+        @order.shipping_service_code = params[:service_code]
+        @order.shipping_service_name = params[:service_name]
+        
+        rates[0][:rates].each do |rate|
+          if rate[:carrier] == params[:carrier] && rate[:service_code] == params[:service_code]
+            @order.shipping = rate[:total_price]
+            break
+          end
+        end                 
+      end                       
       render :json => { 
         :success => @order.save, 
         :errors => @order.errors.full_messages 

data/app/controllers/caboose/products_controller.rb

@@ -111,150 +111,10 @@ module Caboose
       }
     end
     
-    #=============================================================================
-    # API actions
-    #=============================================================================
-    
-    # GET /api/products
-    def api_index
-      render :json => Product.where(:status => 'Active')
-    end
-    
-    # GET /api/products/:id
-    def api_details
-      p = Product.where(:id => params[:id]).first
-      render :json => p ? p : { :error => 'Invalid product ID' }
-    end
-    
-    # GET /api/products/:id/variants
-    def api_variants
-      p = Product.where(:id => params[:id]).first
-      render :json => p ? p.variants : { :error => 'Invalid product ID' }
-    end
-    
     #=============================================================================
     # Admin actions
     #=============================================================================
     
-    # GET /admin/products/:id/variants/group
-    def admin_group_variants
-      @product = Product.find(params[:id])
-      
-      return if !user_is_allowed('variants', 'edit')
-      
-      joins  = []
-      where  = []
-      values = []
-      
-      if params[:category_ids]
-        joins  << [:category_memberships]
-        where  << 'store_category_memberships.category_id IN (?)'
-        values << params[:category_ids]
-      end
-      
-      if params[:vendor_ids]
-        joins  << [:vendor]
-        where  << 'store_vendors.id IN (?)'
-        values << params[:vendor_ids]
-      end
-      
-      if params[:title]
-        where  << 'LOWER(store_products.title) LIKE ?'
-        values << "%#{params[:title].downcase}%"
-      end
-      
-      # Query for all relevant products
-      products = values.any? ? Product.joins(joins).where([where.join(' AND ')].concat(values)) : []
-      
-      # Grab variants for each product
-      @variants = products.collect { |product| product.variants }.flatten
-      
-      # Grab all categories; except for "all" and "uncategorized"
-      @categories = Category.where('site_id = ? and parent_id IS NOT NULL AND name IS NOT NULL', @site.id).order(:url)
-      
-      # Grab all vendors
-      @vendors = Vendor.where('site_id = ? and name IS NOT NULL', @site.id).order(:name)
-      
-      render :layout => 'caboose/admin'
-    end
-    
-    # POST /admin/products/:id/variants/add
-    def admin_add_variants
-      params[:variant_ids].each do |variant_id|
-        variant = Variant.find(variant_id)
-        
-        # Delete current variant product if this is the last variant
-        # variant.product.update_attribute(:status, 'deleted') if variant.product.variants.where('status != ?', 'deleted').count == 0
-        
-        # Add reference to new product
-        # varant.product_id = params[:id]
-      end
-      
-      # Iterate over variants and add them to the product
-        # Remove product that the variants are associated with; UNLESS it's the current product
-      
-      redirect_to "/admin/products/#{params[:id]}/variants"
-    end
-    
-    # POST /admin/products/:id/varaints/add-multiple
-    def admin_add_multiple_variants
-      product = Product.find(params[:id])
-      
-      params[:variants_csv].split("\r\n").each do |variant|
-        row = variant.split(',')
-        
-        render :json => { :success => false, :error => "Quantity is not defined for variant: #{row[0].strip}" } and return if row[1].nil?
-        render :json => { :success => false, :error => "Price is not defined for variant: #{row[0].strip}" } and return if row[2].nil?
-        
-        attributes = {
-          :alternate_id => row[0].strip,
-          :quantity_in_stock => row[1].strip.to_i,
-          :price => '%.2f' % row[2].strip.to_f,
-          :status => 'Active'
-        }
-        
-        if product.option1 && row[3].nil?
-          render :json => { :success => false, :error => "#{product.option1} not defined for variant: #{attributes[:alternate_id]}" } and return
-        elsif product.option1
-          attributes[:option1] = row[3].strip
-        end
-        
-        if product.option2 && row[4].nil?
-          render :json => { :success => false, :error => "#{product.option2} not defined for variant: #{attributes[:alternate_id]}" } and return
-        elsif product.option2
-          attributes[:option2] = row[4].strip
-        end
-        
-        if product.option3 && row[5].nil?
-          render :json => { :success => false, :error => "#{product.option3} not defined for variant: #{attributes[:alternate_id]}" } and return
-        elsif product.option3
-          attributes[:option3] = row[5].strip
-        end
-        
-        if product.variants.find_by_alternate_id(attributes[:alternate_id])
-          product.variants.find_by_alternate_id(attributes[:alternate_id]).update_attributes(attributes)
-        else
-          Variant.create(attributes.merge(:product_id => product.id))
-        end
-      end
-      
-      render :json => { :success => true }
-    end
-    
-    # POST /admin//products/:id/variants/remove
-    def admin_remove_variants
-      params[:variant_ids].each do |variant_id|
-        variant = Variant.find(variant_id)
-        # variant.update_attribute(:status, 'deleted')
-        # variant.product.update_attribute(:status, 'deleted') if variant.product.variants.where('status != ?', 'deleted').count == 0
-      end
-      
-      # Remove passed variants
-      # redirect_to "/admin/products/#{params[:id]}/variants/group"
-            
-      render :json => true
-    end
-    
     # GET /admin/products/update-vendor-status/:id
     def admin_update_vendor_status
       vendor = Vendor.find(params[:id])
@@ -340,24 +200,6 @@ module Caboose
       }      
     end
     
-    # GET /admin/products/add-upcs - TODO remove this; it's a temporary thing for woods-n-water
-    def admin_add_upcs
-      params[:vendor_id] if params[:vendor_id] and params[:vendor_id].empty?
-      
-      conditions = if params[:vendor_id]
-        "store_variants.alternate_id IS NULL and store_vendors.id = #{params[:vendor_id]}"
-      else
-        "store_variants.alternate_id IS NULL"
-      end
-      
-      @products = Product.all(
-        :include => [:variants, :vendor],
-        :conditions => conditions
-      )
-      
-      render :layout => 'caboose/admin'
-    end
-    
     # GET /admin/products/:id/json
     def admin_json_single
       p = Product.find(params[:id])
@@ -378,73 +220,6 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/products/:id/variant-cols  
-    def admin_edit_variant_columns
-      return if !user_is_allowed('products', 'edit')    
-      @product = Product.find(params[:id])
-      session['variant_cols'] = self.default_variant_cols if session['variant_cols'].nil?
-      @cols = session['variant_cols']
-      render :layout => 'caboose/admin'
-    end
-    
-    # PUT /admin/products/:id/variant-cols
-    def admin_update_variant_columns    
-      return if !user_is_allowed('products', 'edit')
-      session['variant_cols'] = self.default_variant_cols if session['variant_cols'].nil?
-      
-      resp = Caboose::StdClass.new({'attributes' => {}})
-      product = Product.find(params[:id])    
-      
-      save = true    
-      params.each do |name,value|
-        value = ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
-        case name
-          when 'option1'        ,
-            'option2'           ,
-            'option3'           ,
-            'status'            ,
-            'alternate_id'      ,
-            'sku'               ,                        
-            'barcode'           , 
-            'price'             ,
-            'quantity_in_stock' ,
-            'weight'            , 
-            'length'            , 
-            'width'             , 
-            'height'            , 
-            'cylinder'          , 
-            'requires_shipping' ,
-            'allow_backorder'   ,
-            'taxable'      
-            session['variant_cols'][name] = value
-        end
-      end
-      resp.success = save && product.save
-      render :json => resp
-    end
-    
-    def default_variant_cols
-      return {    
-        'option1'           => true,
-        'option2'           => true,
-        'option3'           => true,
-        'status'            => true,
-        'alternate_id'      => true,
-        'sku'               => true,                         
-        'barcode'           => false, 
-        'price'             => true, 
-        'quantity' => true, 
-        'weight'            => false, 
-        'length'            => false, 
-        'width'             => false, 
-        'height'            => false, 
-        'cylinder'          => false, 
-        'requires_shipping' => false,
-        'allow_backorder'   => false,
-        'taxable'           => false
-      }
-    end
-    
     # GET /admin/products/:id/options
     def admin_edit_options
       return if !user_is_allowed('products', 'edit')    
@@ -461,30 +236,6 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # POST /admin/products/:id/categories
-    def admin_add_to_category
-      return if !user_is_allowed('products', 'edit')
-      cat_id = params[:category_id]
-      product_id = params[:id]
-      
-      if !CategoryMembership.exists?(:category_id => cat_id, :product_id => product_id)
-        CategoryMembership.create(:category_id => cat_id, :product_id => product_id)
-      end    
-      render :json => true
-    end
-    
-    # DELETE /admin/products/:id/categories/:category_id
-    def admin_remove_from_category
-      return if !user_is_allowed('products', 'edit')
-      cat_id = params[:category_id]
-      product_id = params[:id]
-      
-      if CategoryMembership.exists?(:category_id => cat_id, :product_id => product_id)
-        CategoryMembership.where(:category_id => cat_id, :product_id => product_id).destroy_all
-      end        
-      render :json => true
-    end
-    
     # GET /admin/products/:id/images
     def admin_edit_images    
       return if !user_is_allowed('products', 'edit')    
@@ -603,20 +354,13 @@ module Caboose
     def admin_add
       return if !user_is_allowed('products', 'add')
       
-      resp = Caboose::StdClass.new(
-        :error => nil,
-        :redirect => nil
-      )
-      
+      resp = Caboose::StdClass.new
       name = params[:name]
       
       if name.length == 0
         resp.error = "The title cannot be empty."
       else
-        p = Product.new(
-          :site_id => @site.id,
-          :title => name
-        )
+        p = Product.new(:site_id => @site.id, :title => name)
         p.save
         resp.redirect = "/admin/products/#{p.id}/general"
       end
@@ -626,7 +370,7 @@ module Caboose
     # DELETE /admin/products/:id
     def admin_delete
       return if !user_is_allowed('products', 'delete')
-      p = Product.find(params[:id]).destroy
+      p = Product.find(params[:id])
       p.status = 'Deleted'
       p.save
       render :json => Caboose::StdClass.new({
@@ -636,28 +380,14 @@ module Caboose
     
     # GET /products/status-options
     def admin_status_options
-      arr = ['Active', 'Inactive', 'Deleted']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text => status
-        }
-      end
-      render :json => options
+      arr = ['Active', 'Inactive', 'Deleted']      
+      render :json => arr.collect{ |status| { :value => status, :text => status }}
     end
     
     # GET /products/stackable-group-options
     def admin_stackable_group_options
       arr = ['Active', 'Inactive', 'Deleted']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text => status
-        }
-      end
-      render :json => options
+      render :json => arr.collect{ |status| { :value => status, :text => status }}      
     end
     
     # GET /admin/products/combine
@@ -691,11 +421,6 @@ module Caboose
       end
     end
     
-    # PUT /admin/products/:id/update-vendor
-    def admin_update_vendor
-      render :json => { :success => Product.find(params[:id]).update_attribute(:vendor_id, params[:vendor_id]) }
-    end
-    
     # GET /admin/products/sort
     def admin_sort
       @products   = Product.active
@@ -712,6 +437,27 @@ module Caboose
       end      
       render :json => { :success => true }
     end
+    
+    #=============================================================================
+    # API actions
+    #=============================================================================
+    
+    # GET /api/products
+    def api_index
+      render :json => Product.where(:status => 'Active')
+    end
+    
+    # GET /api/products/:id
+    def api_details
+      p = Product.where(:id => params[:id]).first
+      render :json => p ? p : { :error => 'Invalid product ID' }
+    end
+    
+    # GET /api/products/:id/variants
+    def api_variants
+      p = Product.where(:id => params[:id]).first
+      render :json => p ? p.variants : { :error => 'Invalid product ID' }
+    end
         
   end
 end