caboose-cms 0.5.56 → 0.5.57

data/app/controllers/caboose/sites_controller.rb

@@ -30,33 +30,33 @@ module Caboose
       @site = Site.new
     end
     
-    # GET /admin/sites/1/edit
+    # GET /admin/sites/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])      
     end
     
-    # GET /admin/sites/1/edit/store
+    # GET /admin/sites/:id/store
     def admin_edit_store_config
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])
       StoreConfig.create(:site_id => @site.id) if @site.store_config.nil?      
     end
     
-    # GET /admin/sites/1/edit/smtp
+    # GET /admin/sites/:id/smtp
     def admin_edit_smtp_config
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])      
       SmtpConfig.create(:site_id => @site.id)  if @site.smtp_config.nil?
     end
     
-    # GET /admin/sites/1/edit/block-types
+    # GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])      
     end
     
-    # GET /admin/sites/1/edit/delete
+    # GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])      
@@ -184,8 +184,9 @@ module Caboose
     # GET /admin/sites/payment-processor-options
     def payment_processor_options
       return if !user_is_allowed('sites', 'view')
-      options = [ 
-        { 'value' => 'stripe', 'text' => 'Stripe' }
+      options = [
+        { 'value' => 'authorize.net'  , 'text' => 'Authorize.net' },
+        { 'value' => 'stripe'         , 'text' => 'Stripe' }        
       ]
       render :json => options
     end

data/app/controllers/caboose/variants_controller.rb

@@ -28,7 +28,27 @@ module Caboose
     #=============================================================================
     # Admin actions
     #=============================================================================
-     
+    
+    # GET /admin/products/:id/variants
+    # GET /admin/products/:id/variants/:variant_id
+    def admin_index   
+      return if !user_is_allowed('products', 'edit')    
+      @product = Product.find(params[:product_id])
+      
+      if @product.variants.nil? || @product.variants.count == 0
+        v = Variant.new
+        v.option1 = @product.default1 if @product.option1
+        v.option2 = @product.default2 if @product.option2
+        v.option3 = @product.default3 if @product.option3
+        v.status  = 'Active'
+        @product.variants = [v]
+        @product.save
+      end
+      @variant = params[:variant_id] ? Variant.find(params[:variant_id]) : @product.variants[0]
+      @highlight_variant_id = params[:highlight] ? params[:highlight].to_i : nil
+      render :layout => 'caboose/admin'                
+    end
+    
     # GET /admin/products/:product_id/variants/json
     def admin_json
       return if !user_is_allowed('products', 'view')
@@ -48,44 +68,15 @@ module Caboose
         :models => pager.items
       }      
     end
-    
-    # GET /admin/variants/:variant_id/edit
-    # GET /admin/products/:product_id/variants/:variant_id/edit
+        
+    # GET /admin/products/:product_id/variants/:variant_id
     def admin_edit
       return if !user_is_allowed('variants', 'edit')    
-      @variant = Variant.find(params[:variant_id])
+      @variant = Variant.find(params[:id])
       @product = @variant.product
       render :layout => 'caboose/admin'            
     end
     
-    # GET /admin/products/:id/variants
-    # GET /admin/products/:id/variants/:variant_id
-    def admin_edit_variants   
-      return if !user_is_allowed('products', 'edit')    
-      @product = Product.find(params[:id])
-      
-      if @product.variants.nil? || @product.variants.count == 0
-        v = Variant.new
-        v.option1 = @product.default1 if @product.option1
-        v.option2 = @product.default2 if @product.option2
-        v.option3 = @product.default3 if @product.option3
-        v.status  = 'Active'
-        @product.variants = [v]
-        @product.save
-      end
-      @variant = params[:variant_id] ? Variant.find(params[:variant_id]) : @product.variants[0]
-      session['variant_cols'] = self.default_variant_cols if session['variant_cols'].nil?
-      @cols = session['variant_cols']
-      
-      @highlight_variant_id = params[:highlight] ? params[:highlight].to_i : nil        
-      
-      if @product.options.nil? || @product.options.count == 0
-        render 'caboose/products/admin_edit_variants_single', :layout => 'caboose/admin'  
-      else
-        render 'caboose/products/admin_edit_variants', :layout => 'caboose/admin'
-      end          
-    end
-    
     # PUT /admin/variants/:id
     def admin_update
       return if !user_is_allowed('variants', 'edit')
@@ -182,7 +173,7 @@ module Caboose
       render :json => true
     end
   
-    # DELETE /admin/variants/:id
+    # DELETE /admin/products/:product_id/variants/:id
     def admin_delete
       return if !user_is_allowed('variants', 'delete')
       v = Variant.find(params[:id])
@@ -193,6 +184,20 @@ module Caboose
       })
     end
     
+    # DELETE /admin/products/:product_id/variants/bulk
+    def admin_bulk_delete
+      return if !user_is_allowed('variants', 'delete')
+      
+      resp = Caboose::StdClass.new
+      params[:model_ids].each do |variant_id|
+        v = Variant.find(variant_id)
+        v.status = 'Deleted'
+        v.save
+      end
+      resp.success = true
+      render :json => resp
+    end
+    
     # GET /admin/products/:product_id/variants/sort-order  
     def admin_edit_sort_order
       return if !user_is_allowed('products', 'edit')    
@@ -238,7 +243,7 @@ module Caboose
       return if !user_is_allowed('variants', 'edit')
       
       joins  = []
-      where  = ''
+      where  = []
       values = []
       
       if params[:category_ids]
@@ -258,21 +263,98 @@ module Caboose
         values << "%#{params[:title].downcase}%"
       end
       
-      # Query for all relevant products
-      products = values.any? ? Caboose::Product.joins(joins).where([where].concat(values)) : []
+      # Query for all relevant products      
+      products = values.any? ? Caboose::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 = Caboose::Category.where('parent_id IS NOT NULL')
+      # 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 = Caboose::Vendor.all
+      # 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/:product_id/variants/add
+    def admin_add
+      
+      resp = Caboose::StdClass.new
+      p = Caboose::Product.find(params[:product_id])
+      
+      v = Caboose::Variant.where(:alternate_id => params[:alternate_id]).first
+      v = Caboose::Variant.new(:product_id => p.id) if v.nil?
+      
+      v.product_id        = p.id
+      v.alternate_id      = params[:alternate_id].strip
+      v.quantity_in_stock = params[:quantity_in_stock].strip.to_i
+      v.price             = '%.2f' % params[:price].strip.to_f
+      v.option1 = params[:option1] if p.option1
+      v.option2 = params[:option2] if p.option2
+      v.option3 = params[:option3] if p.option3      
+      v.save
+      
+      resp.success = true      
+      render :json => resp
+    end
+    
+    # POST /admin/products/:product_id/variants/bulk
+    def admin_bulk_add
+      product = Product.find(params[:product_id])
+      
+      resp = Caboose::StdClass.new
+      p = Caboose::Product.find(params[:product_id])
+      
+      # Check for data integrity first
+      CSV.parse(params[:csv_data]).each do |row|
+        if    row[1].nil? then resp.error = "Quantity is not defined for variant: #{row[0].strip}" and break          
+        elsif row[2].nil? then resp.error = "Price is not defined for variant: #{row[0].strip}" and break
+        elsif p.option1 && row[3].nil? then resp.error = "#{p.option1} is not defined for variant: #{row[0].strip}" and break
+        elsif p.option2 && row[4].nil? then resp.error = "#{p.option2} is not defined for variant: #{row[0].strip}" and break
+        elsif p.option3 && row[5].nil? then resp.error = "#{p.option3} is not defined for variant: #{row[0].strip}" and break
+        end
+      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?
+      
+          v.product_id        = p.id
+          v.alternate_id      = row[0].strip
+          v.quantity_in_stock = row[1].strip.to_i
+          v.price             = '%.2f' % row[2].strip.to_f
+          v.option1 = row[3] if p.option1
+          v.option2 = row[4] if p.option2
+          v.option3 = row[5] if p.option3      
+          v.save
+        end
+        resp.success = true
+      end
+      
+      render :json => resp
+    end
+    
+    # POST /admin/products/:product_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
+    
+    #===========================================================================
+    # Option methods
+    #===========================================================================
+    
     # GET /admin/variants/status-options
     def admin_status_options
       arr = ['Active', 'Inactive', 'Deleted']

data/app/models/caboose/order.rb

@@ -21,8 +21,8 @@ module Caboose
       :order_number,
       :subtotal,
       :tax,      
-      :shipping_method,
-      :shipping_method_code,
+      :shipping_carrier,
+      :shipping_service_code,
       :shipping,
       :handling,
       :discount,
@@ -56,19 +56,25 @@ module Caboose
       :transaction_service,
       :transaction_id
     
+    STATUS_CART      = 'cart'
+    STATUS_PENDING   = 'pending'    
+    STATUS_CANCELED  = 'canceled'
+    STATUS_SHIPPED   = 'shipped'
+    STATUS_TESTING   = 'testing'
+    
     #
     # Scopes
     #
     
-    scope :test, where('status = ?', 'testing')
-    scope :cancelled, where('status = ?', 'cancelled')
-    scope :pending, where('status = ?', 'pending')
+    scope :test       , where('status = ?', 'testing')
+    scope :cancelled  , where('status = ?', 'cancelled')
+    scope :pending    , where('status = ?', 'pending')
     #TODO scope :fulfilled
     #TODO scope :unfulfilled
-    scope :authorized, where('financial_status = ?', 'authorized')
-    scope :captured, where('financial_status = ?', 'captured')
-    scope :refunded, where('financial_status = ?', 'refunded')
-    scope :voided, where('financial_status = ?', 'voided')
+    scope :authorized , where('financial_status = ?', 'authorized')
+    scope :captured   , where('financial_status = ?', 'captured')
+    scope :refunded   , where('financial_status = ?', 'refunded')
+    scope :voided     , where('financial_status = ?', 'voided')        
     
     #
     # Validations
@@ -157,7 +163,7 @@ module Caboose
     def calculate
       self.update_column(:subtotal, (self.calculate_subtotal * 100).ceil / 100.00)
       self.update_column(:tax, (self.calculate_tax * 100).ceil / 100.00)
-      self.update_column(:shipping, (self.calculate_shipping * 100).ceil / 100.00)
+      #self.update_column(:shipping, (self.calculate_shipping * 100).ceil / 100.00)
       self.update_column(:handling, (self.calculate_handling * 100).ceil / 100.00)
       self.update_column(:total, (self.calculate_total * 100).ceil / 100.00)
     end
@@ -173,13 +179,14 @@ module Caboose
     end
     
     def calculate_shipping
-      return 0 if !self.shipping_address || !self.shipping_method_code
-      ShippingCalculator.rate(self)[:total_price]
+      return 0 if !self.shipping_address || !self.shipping_service_code      
+      return 0.0
+      #ShippingCalculator.rates(self)
     end
     
     def calculate_handling
       return 0 if !Caboose::store_handling_percentage
-      self.shipping * Caboose::store_handling_percentage
+      self.shipping * Caboose::store_handling_percentage.to_f
     end
     
     def calculate_total

data/app/models/caboose/order_package.rb

@@ -17,6 +17,9 @@ module Caboose
     # Calculates the shipping packages required for all the items in the order
     def self.create_for_order(order)
 
+      store_config = order.site.store_config
+      return if !store_config.calculate_packages
+      
       # Make sure all the line items in the order have a quantity of 1
       extra_line_items = []
       order.line_items.each do |li|        

data/app/models/caboose/schema.rb

@@ -54,7 +54,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_start  , 
         :repeat_end        
       ],
+      Caboose::Order => [:shipping_method, :shipping_method_code],      
       #Caboose::PageCache => [:block],
+      Caboose::Site => [:shipping_cost_function],
       Caboose::Variant => [:quantity],
       Caboose::Vendor => [:vendor, :vendor_id]
     }
@@ -63,6 +65,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
   # Any column indexes that need to exist in the database
   def self.indexes
     {
+      Caboose::Block                  => [:parent_id],
+      Caboose::BlockType              => [:parent_id],
       Caboose::RoleMembership         => [ :role_id    , :user_id          ],
       Caboose::RolePermission         => [ :role_id    , :permission_id    ],
       Caboose::PostCategoryMembership => [ :post_id    , :post_category_id ]
@@ -300,9 +304,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :date_cancelled        , :datetime ],
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
-        [ :landing_page_ref      , :string   ],
-        [ :shipping_method       , :string   ],
-        [ :shipping_method_code  , :string   ],
+        [ :landing_page_ref      , :string   ],        
+        [ :shipping_carrier      , :string   ],
+        [ :shipping_service_code , :string   ],
+        [ :shipping_service_name , :string   ],        
         [ :transaction_id        , :string   ],
         [ :auth_code             , :string   ],
         [ :alternate_id          , :integer  ],
@@ -472,6 +477,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :value    , :text    ]
       ],
       Caboose::ShippingPackage => [
+        [ :site_id      , :integer ],
         [ :carrier      , :string  ],
         [ :service_code , :string  ],
         [ :service_name , :string  ],
@@ -482,9 +488,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :price        , :decimal ]        
       ],
       Caboose::Site => [
-        [ :name                     , :string ],
-        [ :description              , :text   ],
-        [ :under_construction_html  , :text   ]
+        [ :name                    , :string ],
+        [ :description             , :text   ],
+        [ :under_construction_html , :text   ]        
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -511,22 +517,24 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :max_height     , :decimal ]
       ],
       Caboose::StoreConfig => [
-        [ :site_id                , :integer ],     
-        [ :pp_name                , :string  ],
-        [ :pp_username            , :string  ],
-        [ :pp_password            , :string  ],
-        [ :use_usps               , :boolean , { :default => false } ],
-        [ :usps_secret_key        , :string  ],
-        [ :usps_publishable_key   , :string  ],
-        [ :allowed_shipping_codes , :string  ],
-        [ :default_shipping_code  , :string  ],    
-        [ :origin_country         , :string  ],
-        [ :origin_state           , :string  ],
-        [ :origin_city            , :string  ],
-        [ :origin_zip             , :string  ],
-        [ :fulfillment_email      , :string  ],
-        [ :shipping_email         , :string  ],
-        [ :handling_percentage    , :string  ]
+        [ :site_id                 , :integer ],     
+        [ :pp_name                 , :string  ],
+        [ :pp_username             , :string  ],
+        [ :pp_password             , :string  ],
+        [ :use_usps                , :boolean , { :default => false } ],
+        [ :usps_secret_key         , :string  ],
+        [ :usps_publishable_key    , :string  ],
+        [ :allowed_shipping_codes  , :string  ],
+        [ :default_shipping_code   , :string  ],    
+        [ :origin_country          , :string  ],
+        [ :origin_state            , :string  ],
+        [ :origin_city             , :string  ],
+        [ :origin_zip              , :string  ],
+        [ :fulfillment_email       , :string  ],
+        [ :shipping_email          , :string  ],
+        [ :handling_percentage     , :string  ],
+        [ :calculate_packages      , :boolean , { :default => true }],
+        [ :shipping_rates_function , :text    ]
       ],
       Caboose::User => [
         [ :site_id              , :integer    ],

data/app/models/caboose/shipping_calculator.rb

@@ -4,9 +4,19 @@ include ActiveMerchant::Shipping
 module Caboose
   class ShippingCalculator
     
+    def self.custom_rates(store_config, order)          
+      return eval(store_config.shipping_rates_function)    
+    end
+    
     def self.rates(order)
       return [] if Caboose::store_shipping.nil?
-      
+            
+      store_config = order.site.store_config
+      if store_config        
+        rates = self.custom_rates(store_config, order)
+        return rates        
+      end
+            
       ss = Caboose::store_shipping
       origin = Location.new(
         :country => ss[:origin][:country],
@@ -42,14 +52,14 @@ module Caboose
             rates << { :carrier => 'USPS', :service_code => rate.service_code, :service_name => rate.service_name, :total_price  => rate.total_price.to_d / 100 }
           end
         end
-        all_rates << [op, rates]
+        all_rates << { :order_package => op, :rates => rates }
       end            
       return all_rates
     end
     
     def self.rate(order)
-      return nil if !order.shipping_method_code
-      self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_method_code }
+      return nil if !order.shipping_service_code
+      self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_service_code }
       return nil
     end