caboose-cms 0.5.64 → 0.5.66

data/app/controllers/caboose/pages_controller.rb

@@ -147,7 +147,8 @@ module Caboose
     
     # GET /admin/pages/:id/edit
     def admin_edit_general
-      return unless user_is_allowed('pages', 'edit')
+      return if !user_is_allowed('pages', 'edit')
+      #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
       @page = Page.find(params[:id])
       render :layout => 'caboose/admin'
     end

data/app/controllers/caboose/product_images_controller.rb

@@ -33,6 +33,17 @@ module Caboose
       img = var.product_images.first
       render :json => img
     end
+    
+    # PUT /admin/products/:product_id/images/sort-order
+    def admin_update_sort_order
+      return if !user_is_allowed('products', 'edit')
+            
+      ids = params[:product_image_ids]            
+      ids.each_with_index do |id, i|
+        ProductImage.find(id).update_attribute(:position, i)
+      end
+      render :json => { :success => true }
+    end
   
   end
 end

data/app/controllers/caboose/products_controller.rb

@@ -130,10 +130,19 @@ module Caboose
       params[:sort] = 'store_vendors.name' if params[:sort] == 'vendor'
       
       @gen = Caboose::PageBarGenerator.new(params, {
-        'site_id'      => @site.id,
-        'vendor_name'  => '',
-        'search_like'  => '', 
-        'price'        => params[:filters] && params[:filters][:missing_prices] ? 0 : ''
+        'site_id'        => @site.id,
+        'vendor_name'    => '',
+        'search_like'    => '', 
+        'category_id'    => '',
+        'category_name'  => '',
+        'vendor_id'      => '',
+        'vendor_name'    => '',
+        'vendor_status'  => '',
+        'price_gte'      => '',
+        'price_lte'      => '',
+        'price'          => '',
+        'variant_status' => '',          
+        'price'          => params[:filters] && params[:filters][:missing_prices] ? 0 : ''
       }, {
         'model'          => 'Caboose::Product',
         'sort'           => 'title',
@@ -146,9 +155,16 @@ module Caboose
           'search_like' => 'store_products.title_concat_vendor_name_like'
         },
         
-        'includes' => {
-          'vendor_name'  => [ 'vendor'         , 'name'  ],
-          'price'        => [ 'variants'       , 'price' ]
+        'includes' => {                           
+          'category_id'    => [ 'categories' , 'id'     ],
+          'category_name'  => [ 'categories' , 'name'   ],
+          'vendor_id'      => [ 'vendor'     , 'id'     ],
+          'vendor_name'    => [ 'vendor'     , 'name'   ],
+          'vendor_status'  => [ 'vendor'     , 'status' ],
+          'price_gte'      => [ 'variants'   , 'price'  ],
+          'price_lte'      => [ 'variants'   , 'price'  ],
+          'price'          => [ 'variants'   , 'price'  ],
+          'variant_status' => [ 'variants'   , 'status' ]
         }
       })
       
@@ -163,6 +179,7 @@ module Caboose
       
       # Get the correct page of the results
       @products = @all_products.limit(@gen.limit).offset(@gen.offset)
+      @category_options = Category.options(@site.id)
       
       render :layout => 'caboose/admin'
     end
@@ -337,7 +354,7 @@ module Caboose
                 resp.error = "Invalid date"
                 save = false
               end
-            end
+            end          
         end
       end
       resp.success = save && product.save

data/app/controllers/caboose/shipping_addresses_controller.rb

@@ -0,0 +1,46 @@
+module Caboose
+  class ShippingAddressesController < Caboose::ApplicationController
+            
+    # GET /admin/orders/:order_id/shipping-address/json
+    def admin_json
+      return if !user_is_allowed('orders', 'edit')    
+      order = Order.find(params[:order_id])      
+      render :json => order.shipping_address      
+    end
+      
+    # PUT /admin/orders/:order_id/shipping-address
+    def admin_update
+      return if !user_is_allowed('orders', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      order = Order.find(params[:order_id])    
+      sa = order.shipping_address
+      Caboose.log(sa.first_name)
+      save = true    
+      params.each do |name, value|
+        case name          
+          when 'name'           then sa.name          = value          
+          when 'first_name'     then sa.first_name    = value
+          when 'last_name'      then sa.last_name     = value
+          when 'street'         then sa.street        = value
+          when 'address1'       then sa.address1      = value
+          when 'address2'       then sa.address2      = value
+          when 'company'        then sa.company       = value
+          when 'city'           then sa.city          = value
+          when 'state'          then sa.state         = value
+          when 'province'       then sa.province      = value
+          when 'province_code'  then sa.province_code = value
+          when 'zip'            then sa.zip           = value
+          when 'country'        then sa.country       = value
+          when 'country_code'   then sa.country_code  = value
+          when 'phone'          then sa.phone         = value
+        end
+      end          
+      Caboose.log(sa.first_name)
+      resp.success = save && sa.save
+      Caboose.log(sa.first_name)
+      render :json => resp
+    end
+        
+  end
+end

data/app/controllers/caboose/shipping_packages_controller.rb

@@ -8,12 +8,12 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
   
-    # GET /admin/sites/:site_id/shipping-packages
+    # GET /admin/shipping-packages
     def admin_index
       return if !user_is_allowed('sites', 'view')            
     end
     
-    # GET /admin/sites/:site_id/shipping-packages/json
+    # GET /admin/shipping-packages/json
     def admin_json
       return if !user_is_allowed('sites', 'view')
       
@@ -21,62 +21,61 @@ module Caboose
           'site_id' => @site.id,    		  
     		},{
     		  'model'          => 'Caboose::ShippingPackage',
-    	    'sort'			     => 'shipping_method_id',
+    	    'sort'			     => 'name',
     		  'desc'			     => false,
-    		  'base_url'		   => "/admin/sites/#{@site.id}/shipping-packages",
+    		  'base_url'		   => "/admin/shipping-packages",
     		  'use_url_params' => false
     	})
     	render :json => {
     	  :pages => pager,
-    	  :models => pager.items
+    	  :models => pager.items.as_json(:include => :shipping_methods)
     	}    	      	  
     end
     
-    # GET /admin/sites/:site_id/shipping-packages/new
+    # GET /admin/shipping-packages/new
     def admin_new
       return if !user_is_allowed('sites', 'add')
       @shipping_package = ShippingPackage.new      
     end
     
-    # GET /admin/sites/:site_id/shipping-packages/:id
+    # GET /admin/shipping-packages/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
       @shipping_package = ShippingPackage.find(params[:id])      
     end
     
-    # GET /admin/sites/:site_id/shipping-packages/:id/json
+    # GET /admin/shipping-packages/:id/json
     def admin_json_single
       return if !user_is_allowed('sites', 'edit')
       sp = ShippingPackage.find(params[:id])
-      render :json => sp      
-    end
-    
-    # GET /admin/sites/:site_id/shipping-packages/:id/delete
-    def admin_delete_form
-      return if !user_is_allowed('sites', 'edit')
-      @shipping_package = ShippingPackage.find(params[:id])      
+      render :json => sp.as_json(:include => :shipping_methods)
     end
         
-    # POST /admin/sites/:site_id/shipping-packages
+    # POST /admin/shipping-packages
     def admin_add
       return if !user_is_allowed('sites', 'add')
       
       resp = StdClass.new
-                  
-      if    params[:shipping_method_id].strip.length == 0 then resp.error = "Please select a shipping method."      
-      elsif params[:length].strip.length             == 0 then resp.error = "Please enter a valid length."
-      elsif params[:width ].strip.length             == 0 then resp.error = "Please enter a valid width."
-      elsif params[:height].strip.length             == 0 then resp.error = "Please enter a valid height."
+                              
+      if    params[:inside_length].strip.length  == 0 then resp.error = "Please enter a valid inside length."
+      elsif params[:inside_width ].strip.length  == 0 then resp.error = "Please enter a valid inside width."
+      elsif params[:inside_height].strip.length  == 0 then resp.error = "Please enter a valid inside height."
+      elsif params[:outside_length].strip.length == 0 then resp.error = "Please enter a valid outside length."
+      elsif params[:outside_width ].strip.length == 0 then resp.error = "Please enter a valid outside width."
+      elsif params[:outside_height].strip.length == 0 then resp.error = "Please enter a valid outside height."
       else
 
         sp = ShippingPackage.new(
-          :site_id            => @site.id,
-          :shipping_method_id => params[:shipping_method_id],          
-          :length             => params[:length].to_f,
-          :width              => params[:width ].to_f,
-          :height             => params[:height].to_f        
+          :site_id         => @site.id,
+          :name            => params[:name].strip,
+          :inside_length   => params[:inside_length].to_f,
+          :inside_width    => params[:inside_width ].to_f,
+          :inside_height   => params[:inside_height].to_f,
+          :outside_length  => params[:outside_length].to_f,
+          :outside_width   => params[:outside_width ].to_f,
+          :outside_height  => params[:outside_height].to_f
         )
-        sp.volume = sp.length * sp.width * sp.height
+        sp.volume = sp.inside_length * sp.inside_width * sp.inside_height
         sp.save        
         resp.redirect = "/admin/sites/#{@site.id}/shipping-packages/#{sp.id}"
         
@@ -85,31 +84,37 @@ module Caboose
       render :json => resp
     end
     
-    # POST /admin/products/:product_id/variants/bulk
+    # POST /admin/shipping-packages/bulk
     def admin_bulk_add
       return if !user_is_allowed('sites', 'add')
       
       resp = Caboose::StdClass.new
 
       i = 0
-      CSV.parse(params[:csv_data].strip).each do |row|        
-        if    row[0].nil? || row[0].strip.length == 0 then resp.error = "Shipping method not defined on row #{i+1}."        
-        elsif row[3].nil? || row[1].strip.length == 0 then resp.error = "Length       not defined on row #{i+1}."
-        elsif row[4].nil? || row[2].strip.length == 0 then resp.error = "Width        not defined on row #{i+1}."
-        elsif row[5].nil? || row[3].strip.length == 0 then resp.error = "Height       not defined on row #{i+1}."                
+      CSV.parse(params[:csv_data].strip).each do |row|
+           if row[1].nil? || row[0].strip.length == 0 then resp.error = "Inside Length  not defined on row #{i+1}."
+        elsif row[2].nil? || row[1].strip.length == 0 then resp.error = "Inside Width   not defined on row #{i+1}."
+        elsif row[3].nil? || row[2].strip.length == 0 then resp.error = "Inside Height  not defined on row #{i+1}."
+        elsif row[4].nil? || row[3].strip.length == 0 then resp.error = "Outside Length  not defined on row #{i+1}."
+        elsif row[5].nil? || row[4].strip.length == 0 then resp.error = "Outside Width   not defined on row #{i+1}."
+        elsif row[6].nil? || row[5].strip.length == 0 then resp.error = "Outside Height  not defined on row #{i+1}."
         end
         i = i + 1
       end
       
       if resp.error.nil?
         CSV.parse(params[:csv_data]).each do |row|
-          sp = Caboose::Variant.new(
-            :site_id            => @site.id,
-            :shipping_method_id => row[0],            
-            :length             => row[1].to_f,
-            :width              => row[2].to_f,
-            :height             => row[3].to_f
+          sp = Caboose::ShippingPackage.new(
+            :site_id  => @site.id,
+            :name => row[0].strip,            
+            :inside_length   => row[1].to_f,
+            :inside_width    => row[2].to_f,
+            :inside_height   => row[3].to_f,
+            :outside_length  => row[4].to_f,
+            :outside_width   => row[5].to_f,
+            :outside_height  => row[6].to_f            
           )                      
+          sp.volume = sp.inside_length * sp.inside_width * sp.inside_height
           sp.save
         end
         resp.success = true
@@ -118,7 +123,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/sites/:site_id/shipping-packages/:id
+    # PUT /admin/shipping-packages/:id
     def admin_update
       return if !user_is_allowed('sites', 'edit')
 
@@ -128,31 +133,70 @@ module Caboose
       save = true
       params.each do |name,value|
         case name
-          when 'site_id'            then sp.site_id             = value
-          when 'shipping_method_id' then sp.shipping_method_id  = value          
-          when 'length'             then sp.length              = value.to_f
-          when 'width'              then sp.width               = value.to_f
-          when 'height'             then sp.height              = value.to_f
-        end                    
+          when 'site_id'            then sp.site_id             = value  
+          when 'name'               then sp.name                = value
+          when 'inside_length'      then sp.inside_length       = value.to_f
+          when 'inside_width'       then sp.inside_width        = value.to_f
+          when 'inside_height'      then sp.inside_height       = value.to_f
+          when 'outside_length'     then sp.outside_length      = value.to_f
+          when 'outside_width'      then sp.outside_width       = value.to_f
+          when 'outside_height'     then sp.outside_height      = value.to_f
+          when 'volume'             then sp.height              = value.to_f
+          when 'empty_weight'       then sp.empty_weight        = value.to_f
+          when 'cylinder'           then sp.cylinder            = value.to_i
+          when 'flat_rate_price'    then sp.flat_rate_price     = value.to_f
+          when 'priority'           then sp.priority            = value.to_i
+          when 'shipping_method_id' then sp.toggle_shipping_method(value[0], value[1])          
+        end
     	end
     	
     	resp.success = save && sp.save
     	render :json => resp
-    end        
+    end    
+
+    # PUT /admin/:shipping-packages/bulk
+    def admin_bulk_update
+      return unless user_is_allowed_to 'edit', 'sites'
+    
+      resp = Caboose::StdClass.new    
+      shipping_packages = params[:model_ids].collect{ |sp_id| ShippingPackage.find(sp_id) }
+    
+      save = true
+      params.each do |k,v|
+        case k
+          when 'site_id'            then shipping_packages.each{ |sp| sp.site_id             = v            }          
+          when 'name'               then shipping_packages.each{ |sp| sp.name                = v            }
+          when 'inside_length'      then shipping_packages.each{ |sp| sp.inside_length       = v.to_f       }
+          when 'inside_width'       then shipping_packages.each{ |sp| sp.inside_width        = v.to_f       }
+          when 'inside_height'      then shipping_packages.each{ |sp| sp.inside_height       = v.to_f       }
+          when 'outside_length'     then shipping_packages.each{ |sp| sp.outside_length      = v.to_f       }
+          when 'outside_width'      then shipping_packages.each{ |sp| sp.outside_width       = v.to_f       }
+          when 'outside_height'     then shipping_packages.each{ |sp| sp.outside_height      = v.to_f       }
+          when 'volume'             then shipping_packages.each{ |sp| sp.height              = v.to_f       }
+          when 'empty_weight'       then shipping_packages.each{ |sp| sp.empty_weight        = v.to_f       }
+          when 'cylinder'           then shipping_packages.each{ |sp| sp.cylinder            = v.to_i       }
+          when 'flat_rate_price'    then shipping_packages.each{ |sp| sp.flat_rate_price     = v.to_f       }
+          when 'priority'           then shipping_packages.each{ |sp| sp.priority            = v.to_i       }
+          when 'shipping_method_id' then shipping_packages.each{ |sp| sp.toggle_shipping_method(v[0], v[1]) }
+        end        
+      end
+      shipping_packages.each{ |sp| sp.save }
+    
+      resp.success = true
+      render :json => resp
+    end    
       
-    # DELETE /admin/sites/:site_id/shipping-packages/:id
+    # DELETE /admin/shipping-packages/:id
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
       sp = ShippingPackage.find(params[:id])
       sp.destroy
       
-      resp = StdClass.new({
-        'redirect' => "/admin/sites/#{@site.id}/shipping-packages"
-      })
+      resp = StdClass.new({ 'redirect' => "/admin/shipping-packages" })
       render :json => resp
     end
     
-    # DELETE /admin/sites/:site_id/shipping-packages/:id/bulk    
+    # DELETE /admin/shipping-packages/:id/bulk    
     def admin_bulk_delete
       return if !user_is_allowed('sites', 'delete')
       
@@ -165,18 +209,45 @@ module Caboose
       render :json => resp
     end
             
-    # GET /admin/sites/:site_id/shipping-packages/options
+    # GET /admin/shipping-packages/options
     def options
       return if !user_is_allowed('sites', 'view')
       options = ShippingPackage.where(:site_id => @site.id).reorder('service_name').all.collect { |sp| { 'value' => sp.id, 'text' => sp.service_name }}
       render :json => options
     end
     
-    # GET /admin/sites/:site_id/shipping-packages/shipping-method-options
+    # GET /admin/shipping-methods/options
+    # GET /admin/shipping-packages/shipping-method-options
     def admin_shipping_method_options
       options = ShippingMethod.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
       render :json => options              
     end
+    
+    # GET /admin/shipping-methods/options
+    # GET /admin/shipping-packages/:id/shipping-method-options
+    def admin_shipping_method_options
+      options = nil
+      if params[:id]
+        sp = ShippingPackage.find(params[:id])
+        options = sp.shipping_methods.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
+      else
+        options = ShippingMethod.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
+      end
+      render :json => options              
+    end
+    
+    # GET /admin/shipping-packages/package-method-options
+    def admin_package_method_options      
+      return if !user_is_allowed('sites', 'view')
+      options = []
+      ShippingPackage.where(:site_id => @site.id).reorder('name').all.each do |sp|
+        prefix = sp.name ? sp.name : "#{sp.outside_length}x#{sp.outside_width}x#{sp.outside_height}"
+        sp.shipping_methods.each do |sm|
+          options << { 'value' => "#{sp.id}_#{sm.id}", 'text' => "#{prefix} - #{sm.carrier} - #{sm.service_name}" }
+        end
+      end
+      render :json => options
+    end
 
   end
 end

data/app/controllers/caboose/sites_controller.rb

@@ -36,20 +36,6 @@ module Caboose
       @site = Site.find(params[:id])      
     end
     
-    # 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/: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/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
@@ -95,6 +81,7 @@ module Caboose
           when 'name'                     then site.name                    = value
           when 'description'              then site.description             = value
           when 'under_construction_html'  then site.under_construction_html = value
+          when 'use_store'                then site.use_store               = value
     	  end
     	end
     	
@@ -102,7 +89,7 @@ module Caboose
     	render :json => resp
     end        
       
-    # DELETE /admin/sites/1
+    # DELETE /admin/sites/:id
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
       site = Site.find(params[:id])
@@ -131,49 +118,6 @@ module Caboose
       render :json => true
     end
     
-    # POST /admin/sites/:id/domains
-    #def admin_add_domain
-    #  return if !user_is_allowed('sites', 'edit')
-    #  
-    #  resp = Caboose::StdClass.new      
-    #  d = Domain.where(:domain => params[:domain]).first
-    #        
-    #  if d && d.site_id != params[:id]
-    #    resp.error = "That domain is already associated with another site."
-    #  elsif d && d.site_id == params[:id]
-    #    resp.refresh = true
-    #  elsif d.nil?
-    #    primary = Domain.where(:site_id => params[:id]).count == 0        
-    #    d = Domain.create(:site_id => params[:id], :domain => params[:domain], :primary => primary)
-    #    resp.refresh = true
-    #  end
-    #  render :json => resp
-    #end
-    
-    # PUT /admin/sites/:id/domains/:domain_id/set-primary
-    #def admin_set_primary_domain
-    #  return if !user_is_allowed('sites', 'edit')
-    #  
-    #  domain_id = params[:domain_id].to_i
-    #  Domain.where(:site_id => params[:id]).all.each do |d|
-    #    d.primary = d.id == domain_id ? true : false
-    #    d.save
-    #  end       
-    #  render :json => true
-    #end
-    
-    # DELETE /admin/sites/:id/domains/:domain_id
-    #def admin_remove_domain
-    #  return if !user_is_allowed('sites', 'edit')
-    #  Domain.find(params[:domain_id]).destroy
-    #  if Domain.where(:site_id => params[:id]).count == 1
-    #    d = Domain.where(:site_id => params[:id]).first
-    #    d.primary = true
-    #    d.save
-    #  end
-    #  render :json => { 'refresh' => true }
-    #end        
-    
     # GET /admin/sites/options
     def options
       return if !user_is_allowed('sites', 'view')
@@ -181,26 +125,5 @@ module Caboose
       render :json => options
     end
     
-    # GET /admin/sites/payment-processor-options
-    def payment_processor_options
-      return if !user_is_allowed('sites', 'view')
-      options = [
-        { 'value' => 'authorize.net'  , 'text' => 'Authorize.net' },
-        { 'value' => 'stripe'         , 'text' => 'Stripe' }        
-      ]
-      render :json => options
-    end
-    
-    # GET /admin/sites/smtp-auth-options
-    def smtp_auth_options
-      return if !user_is_allowed('sites', 'view')
-      options = [
-        { 'value' => SmtpConfig::AUTH_PLAIN , 'text' => SmtpConfig::AUTH_PLAIN },
-        { 'value' => SmtpConfig::AUTH_LOGIN , 'text' => SmtpConfig::AUTH_LOGIN },
-        { 'value' => SmtpConfig::AUTH_MD5   , 'text' => SmtpConfig::AUTH_MD5   }                  
-      ]
-      render :json => options
-    end
-    
   end
 end