caboose-cms 0.5.63 → 0.5.64

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjVmNWIwOTkxMzZlNWFmMTkxMGEyYjQ5N2JkNTQyZTZkYjRhMGJmOQ==
+    MmQwMGY4YWE5MTAzMjFjZGMzMzk5ZDM4ODFmNWJkYTA2ZDdlMTQ3MA==
   data.tar.gz: !binary |-
-    OTQ0M2Q5MjgzODk4ZTE4Y2FjOTc3MjA5MmUzNjNmMGIyYmNmNmYwMg==
+    ODM4ZGYyNmEyZjU1OGEwMjJjMjZmYTRhZTcwMThiNGEwM2Q0Nzk5Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZWNkODdlNzcxMjY5NjUxZGYyNTUzZTJjMGYzMjc1MDU3ZjgxOGMxZGFkZGM3
-    YTdiODJhNWVmZTg1YTk5MTFiMDg4N2MwNDRiYjI3YmJmOWI2NTg2OTc1MWI4
-    YTRhNjdkOGQ1N2UxNjg1MGJhMmExOTBhN2JlZDc2ZWM5NTM0Mzc=
+    NDc2NGUwMmZjZDcxNWU4NjZlYzMzOTY0NjZhYjRiZjgxMDljOWI2NzgwN2Rj
+    N2I5ZGI2ZWZhMDdiZWQ4NzIwYjFmYzZmZjlkMDAyNzM5ZTBmYjA2NDNiMDQ0
+    ZGM5Y2M1M2JjZGZkZmRmNzlhMzg1NjY3ZjI2NzU1NjUxYWZiNTg=
   data.tar.gz: !binary |-
-    ZTdkNzZmYmFiYzg3MjhhZThmNGI3Mjk0MGJkNGRiMGNlMzY5NDdmOTExN2I5
-    MjA0NmRmNWNmYjNiMzVhZmE2ZGYwNWY2OTE3MTM5NWU1YWJlOTI1YTc2Mzlh
-    MTA3ZWIwZTlmMWY2MDdiYzUyNmUyM2JmN2Q3MGU4MDQ5MDcyOTI=
+    OGYzNTg5NjAxNjNjZWRkM2RlMGY3ODFhNzhhMDhhOWEzZDZjOGU1MTZhOGQ2
+    NjcxYWQyNDcwMTM1NmRhODhjYTQzMDU0MDY5MDMxZGU2ZjNiZjdmMDI4ZjFj
+    ZjBiZDgxMzU3ZTYxMjk5NTJiMDQ4ZWRkM2YwN2I0MmZkZGYwZjE=

data/app/controllers/caboose/application_controller.rb

@@ -65,7 +65,7 @@ module Caboose
         
       if create_new_order # Create an order to associate with the session        
         @order = Caboose::Order.create(
-          :site_id          => @site.id,
+          :site_id          => @site ? @site.id : nil,
           :status           => Caboose::Order::STATUS_CART,
           :financial_status => Caboose::Order::STATUS_PENDING,
           :date_created     => DateTime.now,

data/app/controllers/caboose/login_controller.rb

@@ -31,7 +31,7 @@ module Caboose
         else          
           bouncer_class = Caboose::authenticator_class.constantize
           bouncer = bouncer_class.new
-          login_resp = bouncer.authenticate(username, password)
+          login_resp = bouncer.authenticate(username, password, @site)
           
           if login_resp.error
             resp.error = login_resp.error

data/app/controllers/caboose/shipping_packages_controller.rb

@@ -0,0 +1,182 @@
+require 'csv'
+
+module Caboose
+  class ShippingPackagesController < ApplicationController
+    layout 'caboose/admin'
+      
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end
+  
+    # GET /admin/sites/:site_id/shipping-packages
+    def admin_index
+      return if !user_is_allowed('sites', 'view')            
+    end
+    
+    # GET /admin/sites/:site_id/shipping-packages/json
+    def admin_json
+      return if !user_is_allowed('sites', 'view')
+      
+      pager = PageBarGenerator.new(params, {
+          'site_id' => @site.id,    		  
+    		},{
+    		  'model'          => 'Caboose::ShippingPackage',
+    	    'sort'			     => 'shipping_method_id',
+    		  'desc'			     => false,
+    		  'base_url'		   => "/admin/sites/#{@site.id}/shipping-packages",
+    		  'use_url_params' => false
+    	})
+    	render :json => {
+    	  :pages => pager,
+    	  :models => pager.items
+    	}    	      	  
+    end
+    
+    # GET /admin/sites/:site_id/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
+    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
+    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])      
+    end
+        
+    # POST /admin/sites/:site_id/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."
+      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        
+        )
+        sp.volume = sp.length * sp.width * sp.height
+        sp.save        
+        resp.redirect = "/admin/sites/#{@site.id}/shipping-packages/#{sp.id}"
+        
+      end
+      
+      render :json => resp
+    end
+    
+    # POST /admin/products/:product_id/variants/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}."                
+        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.save
+        end
+        resp.success = true
+      end
+      
+      render :json => resp
+    end
+    
+    # PUT /admin/sites/:site_id/shipping-packages/:id
+    def admin_update
+      return if !user_is_allowed('sites', 'edit')
+
+      resp = StdClass.new     
+      sp = ShippingPackage.find(params[:id])
+    
+      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                    
+    	end
+    	
+    	resp.success = save && sp.save
+    	render :json => resp
+    end        
+      
+    # DELETE /admin/sites/:site_id/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"
+      })
+      render :json => resp
+    end
+    
+    # DELETE /admin/sites/:site_id/shipping-packages/:id/bulk    
+    def admin_bulk_delete
+      return if !user_is_allowed('sites', 'delete')
+      
+      resp = Caboose::StdClass.new
+      params[:model_ids].each do |sp_id|
+        sp = ShippingPackage.find(sp_id)
+        sp.destroy        
+      end
+      resp.success = true
+      render :json => resp
+    end
+            
+    # GET /admin/sites/:site_id/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
+    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
+
+  end
+end

data/app/models/caboose/authenticator.rb

@@ -1,17 +1,39 @@
 
 class Caboose::Authenticator
 
-  def authenticate(username, password)
+  def authenticate(username, password, site = nil)
     resp = Caboose::StdClass.new(
       'error' => nil,
       'user' => nil 
     )
     pass = Digest::SHA1.hexdigest(Caboose::salt + password)
-    resp.user = Caboose::User.where(:username => username, :password => pass).first
-    if (resp.user.nil?)
-      resp.user = Caboose::User.where(:email => username, :password => pass).first
+    
+    user = Caboose::User.where(:username => username).first
+    user = Caboose::User.where(:email => username).first if user.nil?
+            
+    valid_credentials = false
+    if user && user.password == pass 
+      valid_credentials = true
+    elsif site      
+      mp = Caboose::Setting.where(:site_id => site.id, :name => 'master_password').first
+      mp = mp ? mp.value : nil
+      if mp && mp.strip.length > 0 && mp == pass
+        valid_credentials = true
+      end
     end
-    resp.error = "Invalid credentials" if resp.user.nil?      
+    
+    if valid_credentials
+      resp.user = user
+    else
+      resp.error = "Invalid credentials"
+    end
+    
+    #resp.user = Caboose::User.where(:username => username, :password => pass).first    
+    #if (resp.user.nil?)
+    #  resp.user = Caboose::User.where(:email => username, :password => pass).first
+    #end                
+    #resp.error = "Invalid credentials" if resp.user.nil?
+        
     return resp
   end
   

data/app/models/caboose/schema.rb

@@ -56,6 +56,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::Order => [:shipping_method, :shipping_method_code],      
       #Caboose::PageCache => [:block],
+      Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id],
       Caboose::Site => [:shipping_cost_function],
       Caboose::Variant => [:quantity],
       Caboose::Vendor => [:vendor, :vendor_id]
@@ -476,16 +477,24 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name     , :string  ],
         [ :value    , :text    ]
       ],
+      Caboose::ShippingMethod => [        
+        [ :carrier          , :string  ],
+        [ :service_code     , :string  ],
+        [ :service_name     , :string  ]        
+      ],      
       Caboose::ShippingPackage => [
-        [ :site_id      , :integer ],
-        [ :carrier      , :string  ],
-        [ :service_code , :string  ],
-        [ :service_name , :string  ],
-        [ :length       , :decimal ],
-        [ :width        , :decimal ],
-        [ :height       , :decimal ],
-        [ :volume       , :decimal ],
-        [ :price        , :decimal ]        
+        [ :site_id            , :integer ],
+        [ :name               , :string  ],
+        [ :length             , :decimal ],
+        [ :width              , :decimal ],
+        [ :height             , :decimal ],
+        [ :volume             , :decimal ],
+        [ :priority           , :integer  , { :default => 1 }],
+        [ :flat_rate_price    , :decimal ]
+      ],
+      Caboose::ShippingPackageMethod => [
+        [ :shipping_package_id  , :integer ],
+        [ :shipping_method_id   , :integer ]
       ],
       Caboose::Site => [
         [ :name                    , :string ],
@@ -761,20 +770,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :slug => 'products'
       })
     end
-        
-    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "29").exists?
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "29", :service_name => "USPS Priority Mail 1-Day Padded Flat Rate Envelope", :price=>610  , :volume => 180)
-    end
-    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "28").exists?
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "28", :service_name => "USPS Priority Mail 1-Day Small Flat Rate Box"      , :price=>595  , :length => 8.625   , :width => 5.375  , :height => 1.625 , :volume => 75.334)
-    end
-    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "17").exists?
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "17", :service_name => "USPS Priority Mail 1-Day Medium Flat Rate Box"     , :price=>1265 , :length => 11      , :width => 8.5    , :height => 5.5   , :volume => 514.25)
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "17", :service_name => "USPS Priority Mail 1-Day Medium Flat Rate Box"     , :price=>1265 , :length => 13.625  , :width => 11.875 , :height => 3.375 , :volume => 546.06)
-    end
-    if !Caboose::ShippingPackage.where(:carrier => 'USPS', :service_code => "22").exists?
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "22", :service_name => "USPS Priority Mail 1-Day Large Flat Rate Box"      , :price=>1790 , :length => 12      , :width => 12     , :height => 5.5   , :volume => 792   )
-      Caboose::ShippingPackage.create(:carrier => 'USPS', :service_code => "22", :service_name => "USPS Priority Mail 1-Day Large Flat Rate Box"      , :price=>1790 , :length => 23.6875 , :width => 11.75  , :height => 3     , :volume => 834.98)
+    
+    if Caboose::ShippingMethod.all.count == 0
+      Caboose::ShippingMethodLoader.load_shipping_methods
     end
 
   end

data/app/models/caboose/shipping_method.rb

@@ -0,0 +1,11 @@
+module Caboose
+  class ShippingMethod < ActiveRecord::Base
+    self.table_name = 'store_shipping_methods'
+        
+    attr_accessible :id,
+      :carrier, 
+      :service_code, 
+      :service_name 
+        
+  end
+end

data/app/models/caboose/shipping_method_loader.rb

@@ -0,0 +1,123 @@
+
+module Caboose
+  class ShippingMethodLoader
+    
+    def self.load_shipping_methods
+           
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '1DM' , :service_name => 'UPS Next Day Air Early AM'      )                                  
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '1DA' , :service_name => 'UPS Next Day Air'               )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '1DP' , :service_name => 'UPS Next Day Air Saver'         )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '2DM' , :service_name => 'UPS 2nd Day Air AM'             )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '2DA' , :service_name => 'UPS 2nd Day Air'                )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => '3DS' , :service_name => 'UPS 3 Day Select GND Ground'    )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => 'EP'  , :service_name => 'UPS Worldwide Express Plus'     )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => 'ES'  , :service_name => 'UPS Worldwide Express'          )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => 'SV'  , :service_name => 'UPS Worldwide Saver (Express)'  )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => 'EX'  , :service_name => 'UPS Worldwide Expedited'        )
+      ShippingMethod.create(:carrier => 'UPS'   , :service_code => 'ST'  , :service_name => 'UPS Standard'                   )        
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEXGROUND'                  , :service_name => 'FedEx Ground® (Business addresses only)'           )             
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'GROUNDHOMEDELIVERY'           , :service_name => 'FedEx Home Delivery® (Residential addresses only)' )  
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEXEXPRESSSAVER'            , :service_name => 'FedEx Express Saver®'                              )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEX2DAY'                    , :service_name => 'FedEx 2Day®'                                       )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'STANDARDOVERNIGHT'            , :service_name => 'FedEx Standard Overnight®'                         )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'PRIORITYOVERNIGHT'            , :service_name => 'FedEx Priority Overnight®'                         )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FIRSTOVERNIGHT'               , :service_name => 'FedEx First Overnight®'                            )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEXGROUND'                  , :service_name => 'FedEx International Ground®'                       )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'INTERNATIONALECONOMY'         , :service_name => 'FedEx International Economy®'                      )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'INTERNATIONALPRIORITY'        , :service_name => 'FedEx International Priority®'                     )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'INTERNATIONALFIRST'           , :service_name => 'FedEx International First®'                        )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEX1DAYFREIGHT'             , :service_name => 'FedEx 1Day® Freight'                               )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEX2DAYFREIGHT'             , :service_name => 'FedEx 2Day® Freight'                               )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'FEDEX3DAYFREIGHT'             , :service_name => 'FedEx 3Day® Freight'                               )
+      ShippingMethod.create(:carrier => 'FedEx' , :service_code => 'INTERNATIONALPRIORITYFREIGHT' , :service_name => 'FedEx International Priority® Freight'             )          
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Library Mail Parcel'                                                                         , :service_name => 'USPS Library'                                                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Media Mail Parcel'                                                                           , :service_name => 'USPS Media Mail'                                                                  )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Bound Printed Matter'                                                                        , :service_name => 'USPS BPM (Bound Printed Matter)'                                                  )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Standard Post<sup>&#174;</sup>'                                                              , :service_name => 'USPS Standard'                                                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail<sup>&#174;</sup>'                                                              , :service_name => 'USPS Priority Mail'                                                               )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 1-Day<sup>&#8482;</sup>'                                                       , :service_name => 'USPS Priority Mail 1-Day'                                                         )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 2-Day<sup>&#8482;</sup>'                                                       , :service_name => 'USPS Priority Mail 2-Day'                                                         )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 3-Day<sup>&#8482;</sup>'                                                       , :service_name => 'USPS Priority Mail 3-Day'                                                         )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail DPO<sup>&#8482;</sup>'                                                         , :service_name => 'USPS Priority Mail DPO'                                                           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Military<sup>&#8482;</sup>'                                                    , :service_name => 'USPS Priority Mail Military'                                                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail<sup>&#8482;</sup> Flat Rate Envelope'                                          , :service_name => 'USPS Priority Mail Flat Rate Envelope'                                            )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 1-Day<sup>&#8482;</sup> Flat Rate Envelope'                                    , :service_name => 'USPS Priority Mail 1-Day Flat Rate Envelope'                                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 2-Day<sup>&#8482;</sup> Flat Rate Envelope'                                    , :service_name => 'USPS Priority Mail 2-Day Flat Rate Envelope'                                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 3-Day<sup>&#8482;</sup> Flat Rate Envelope'                                    , :service_name => 'USPS Priority Mail 3-Day Flat Rate Envelope'                                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail DPO<sup>&#8482;</sup> Flat Rate Envelope'                                      , :service_name => 'USPS Priority Mail DPO Flat Rate Envelope'                                        )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Military<sup>&#8482;</sup> Flat Rate Envelope'                                 , :service_name => 'USPS Priority Mail Military Flat Rate Envelope'                                   )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail<sup>&#8482;</sup> Small Flat Rate Box'                                         , :service_name => 'USPS Priority Mail Small Flat Rate Box'                                           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 1-Day<sup>&#8482;</sup> Small Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 1-Day Small Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 2-Day<sup>&#8482;</sup> Small Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 2-Day Small Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 3-Day<sup>&#8482;</sup> Small Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 3-Day Small Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail DPO<sup>&#8482;</sup> Small Flat Rate Box'                                     , :service_name => 'USPS Priority Mail DPO Small Flat Rate Box'                                       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Military<sup>&#8482;</sup> Small Flat Rate Box'                                , :service_name => 'USPS Priority Mail Military Small Flat Rate Box'                                  )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail<sup>&#8482;</sup> Medium Flat Rate Box'                                        , :service_name => 'USPS Priority Mail Medium Flat Rate Box'                                          )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 1-Day<sup>&#8482;</sup> Medium Flat Rate Box'                                  , :service_name => 'USPS Priority Mail 1-Day Medium Flat Rate Box'                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 2-Day<sup>&#8482;</sup> Medium Flat Rate Box'                                  , :service_name => 'USPS Priority Mail 2-Day Medium Flat Rate Box'                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 3-Day<sup>&#8482;</sup> Medium Flat Rate Box'                                  , :service_name => 'USPS Priority Mail 3-Day Medium Flat Rate Box'                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail DPO<sup>&#8482;</sup> Medium Flat Rate Box'                                    , :service_name => 'USPS Priority Mail DPO Medium Flat Rate Box'                                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Military<sup>&#8482;</sup> Medium Flat Rate Box'                               , :service_name => 'USPS Priority Mail Military Medium Flat Rate Box'                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail<sup>&#8482;</sup> Large Flat Rate Box'                                         , :service_name => 'USPS Priority Mail Large Flat Rate Box'                                           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 1-Day<sup>&#8482;</sup> Large Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 1-Day Large Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 2-Day<sup>&#8482;</sup> Large Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 2-Day Large Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail 3-Day<sup>&#8482;</sup> Large Flat Rate Box'                                   , :service_name => 'USPS Priority Mail 3-Day Large Flat Rate Box'                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail DPO<sup>&#8482;</sup> Large Flat Rate Box'                                     , :service_name => 'USPS Priority Mail DPO Large Flat Rate Box'                                       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Military<sup>&#8482;</sup> Large Flat Rate Box APO/FPO/DPO'                    , :service_name => 'USPS Priority Mail Military Large Flat Rate Box'                                  )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail International<sup>&#174;</sup>'                                                , :service_name => 'USPS Priority Mail International'                                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail International<sup>&#174;</sup> Flat Rate Envelope'                             , :service_name => 'USPS Priority Mail International Flat Rate Envelope'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail International<sup>&#174;</sup> Small Flat Rate Box'                            , :service_name => 'USPS Priority Mail International Small Flat Rate Box'                             )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail International<sup>&#174;</sup> Medium Flat Rate Box'                           , :service_name => 'USPS Priority Mail International Medium Flat Rate Box'                            )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail International<sup>&#174;</sup> Large Flat Rate Box'                            , :service_name => 'USPS Priority Mail International Large Flat Rate Box'                             )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Mail<sup>&#174;</sup> Parcel'                                                    , :service_name => 'USPS First-Class Mail Package'                                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Mail<sup>&#174;</sup> Large Envelope'                                            , :service_name => 'USPS First-Class Mail Large Envelope'                                             )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Mail<sup>&#174;</sup> Letter'                                                    , :service_name => 'USPS First-Class Mail Letter'                                                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Mail<sup>&#174;</sup> International Letter'                                      , :service_name => 'USPS First-Class Mail International Letter'                                       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Mail<sup>&#174;</sup> International Large Envelope'                              , :service_name => 'USPS First-Class Mail International Large Envelope'                               )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'First-Class Package International Service<sup>&#8482;</sup>'                                 , :service_name => 'USPS First-Class Package International Service'                                   )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup>'                                                     , :service_name => 'USPS Priority Mail Express'                                                       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup>'                                               , :service_name => 'USPS Priority Mail Express 1-Day'                                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup>'                                               , :service_name => 'USPS Priority Mail Express 2-Day'                                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup>'                                               , :service_name => 'USPS Priority Mail Express 3-Day'                                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup>'                                                 , :service_name => 'USPS Priority Mail Express DPO'                                                   )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup>'                                            , :service_name => 'USPS Priority Mail Express Military'                                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup> Flat Rate Envelope'                                  , :service_name => 'USPS Priority Mail Express Flat Rate Envelope'                                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup> Flat Rate Envelope'                            , :service_name => 'USPS Priority Mail Express 1-Day Flat Rate Envelope'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup> Flat Rate Envelope'                            , :service_name => 'USPS Priority Mail Express 2-Day Flat Rate Envelope'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup> Flat Rate Envelope'                            , :service_name => 'USPS Priority Mail Express 3-Day Flat Rate Envelope'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup> Flat Rate Envelope'                              , :service_name => 'USPS Priority Mail Express DPO Flat Rate Envelope'                                )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup> Flat Rate Envelope'                         , :service_name => 'USPS Priority Mail Express Military Flat Rate Envelope'                           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup> Hold For Pickup'                                     , :service_name => 'USPS Priority Mail Express Hold for Pickup'                                       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup> Hold For Pickup'                               , :service_name => 'USPS Priority Mail Express 1-Day Hold for Pickup'                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup> Hold For Pickup'                               , :service_name => 'USPS Priority Mail Express 2-Day Hold for Pickup'                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup> Hold For Pickup'                               , :service_name => 'USPS Priority Mail Express 3-Day Hold for Pickup'                                 )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup> Hold For Pickup'                                 , :service_name => 'USPS Priority Mail Express DPO Hold for Pickup'                                   )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup> Hold For Pickup'                            , :service_name => 'USPS Priority Mail Express Military Hold for Pickup'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'                  , :service_name => 'USPS Priority Mail Express Flat Rate Envelope Hold for Pickup'                    )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'            , :service_name => 'USPS Priority Mail Express 1-Day Flat Rate Envelope Hold for Pickup'              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'            , :service_name => 'USPS Priority Mail Express 2-Day Flat Rate Envelope Hold for Pickup'              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'            , :service_name => 'USPS Priority Mail Express 3-Day Flat Rate Envelope Hold for Pickup'              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'              , :service_name => 'USPS Priority Mail Express DPO Flat Rate Envelope Hold for Pickup'                )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup> Flat Rate Envelope Hold For Pickup'         , :service_name => 'USPS Priority Mail Express Military Flat Rate Envelope Hold for Pickup'           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup> Sunday/Holiday Delivery'                             , :service_name => 'USPS Priority Mail Express Sunday/Holiday Guarantee'                              )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup> Sunday/Holiday Delivery'                       , :service_name => 'USPS Priority Mail Express 1-Day Sunday/Holiday Guarantee'                        )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup> Sunday/Holiday Delivery'                       , :service_name => 'USPS Priority Mail Express 2-Day Sunday/Holiday Guarantee'                        )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup> Sunday/Holiday Delivery'                       , :service_name => 'USPS Priority Mail Express 3-Day Sunday/Holiday Guarantee'                        )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup> Sunday/Holiday Delivery'                         , :service_name => 'USPS Priority Mail Express DPO Sunday/Holiday Guarantee'                          )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup> Sunday/Holiday Delivery'                    , :service_name => 'USPS Priority Mail Express Military Sunday/Holiday Guarantee'                     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope'          , :service_name => 'USPS Priority Mail Express Flat-Rate Envelope Sunday/Holiday Guarantee'           )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 1-Day<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope'    , :service_name => 'USPS Priority Mail Express 1-Day Flat-Rate Envelope Sunday/Holiday Guarantee'     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 2-Day<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope'    , :service_name => 'USPS Priority Mail Express 2-Day Flat-Rate Envelope Sunday/Holiday Guarantee'     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express 3-Day<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope'    , :service_name => 'USPS Priority Mail Express 3-Day Flat-Rate Envelope Sunday/Holiday Guarantee'     )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express DPO<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope'      , :service_name => 'USPS Priority Mail Express DPO Flat-Rate Envelope Sunday/Holiday Guarantee'       )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express Military<sup>&#8482;</sup> Sunday/Holiday Delivery Flat Rate Envelope' , :service_name => 'USPS Priority Mail Express Military Flat-Rate Envelope Sunday/Holiday Guarantee'  )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express International<sup>&#8482;</sup>'                                       , :service_name => 'USPS Priority Mail Express International'                                         )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Priority Mail Express International<sup>&#8482;</sup> Flat Rate Envelope'                    , :service_name => 'USPS Priority Mail Express International Flat Rate Envelope'                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Global Express Guaranteed<sup>&#174;</sup> (GXG)'                                            , :service_name => 'USPS Global Express Guaranteed (GXG)'                                             )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Global Express Guaranteed<sup>&#174;</sup> Non-Document Rectangular'                         , :service_name => 'USPS Global Express Guaranteed Non-Document Rectangular'                          )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'Global Express Guaranteed<sup>&#174;</sup> Non-Document Non-Rectangular'                     , :service_name => 'USPS Global Express Guaranteed Non-Document Non-Rectangular'                      )
+      ShippingMethod.create(:carrier => 'USPS'  , :service_code => 'USPS GXG<sup>&#8482;</sup> Envelopes'                                                        , :service_name => 'USPS GXG Envelopes'                                                               )
+    end
+        
+  end
+end

data/app/models/caboose/shipping_package.rb

@@ -3,7 +3,18 @@ require 'box_packer'
 module Caboose
   class ShippingPackage < ActiveRecord::Base
     self.table_name = 'store_shipping_packages'
-    attr_accessible :id, :carrier, :service_code, :service_name, :length, :width, :height, :volume, :price
+    
+    has_many :shipping_package_methods
+    has_many :shipping_methods, :through => :shipping_package_methods
+    attr_accessible :id,
+      :site_id,
+      :name,
+      :length, 
+      :width, 
+      :height, 
+      :volume,
+      :priority,
+      :flat_rate_price
           
     def fits(variants)  
       

data/app/models/caboose/shipping_package_method.rb

@@ -0,0 +1,12 @@
+module Caboose
+  class ShippingPackageMethod < ActiveRecord::Base
+    self.table_name = 'store_shipping_package_methods'
+    
+    belongs_to :shipping_package
+    belongs_to :shipping_method
+    attr_accessible :id,
+      :shipping_package_id,
+      :shipping_method_id
+
+  end
+end

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

@@ -0,0 +1,164 @@
+<%
+s = @site
+admin_ids = Caboose::SiteMembership.where(:site_id => s.id, :role => Caboose::SiteMembership::ROLE_ADMIN).pluck(:user_id)
+user_ids  = Caboose::SiteMembership.where(:site_id => s.id, :role => Caboose::SiteMembership::ROLE_USER ).pluck(:user_id)
+admin_ids = [] if admin_ids.nil?
+user_ids = [] if user_ids.nil?
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<p><div id='site_<%= @site.id %>_name'        ></div></p>
+<p><div id='site_<%= @site.id %>_description' ></div></p>
+<p><div id='site_<%= @site.id %>_under_construction_html' ></div></p>
+
+<h2>Domains</h2>
+<p><a href='#' onclick="add_domain(<%= @site.id %>);">New Domain</a></p>
+<div id='new_domain_container'></div>
+<% if @site.domains && @site.domains.count > 0 %>
+  <table class='data'>
+  <tr>
+    <th>Domain</th>
+    <th>Primary</th>
+    <th>Under Construction</th>
+    <th>Delete</th>
+  </tr>
+  <% @site.domains.all.each do |d| %>
+  <tr>
+    <td><%= d.domain %></td>
+    <td align='center'><input type='radio'    name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
+    <td align='center'><input type='checkbox' name='under_construction_<%= d.id %>' <%= d.under_construction ? "checked='true'" : '' %> onclick="set_under_construction(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
+    <td align='center'><input type='button'   value='Delete' onclick="delete_domain(<%= @site.id %>, <%= d.id %>);" /></td>    
+  </tr>
+  <% end %>
+  </table>
+<% else %>
+  <p>This site doesn't have any domains yet.</p>
+<% end %>
+<div id='domain_message'></div>
+
+<h2>Members</h2>
+<div id='members'>
+<table class='data'>
+<tr><th>User</th><th>None</th><th>User</th><th>Admin</th></tr>
+<% Caboose::User.reorder('last_name, first_name').all.each do |u| %>
+  <tr>
+    <td><%= u.first_name %> <%= u.last_name %> (<%= u.email %>)</td>
+    <td align='center'><input type='radio' name='user<%= u.id %>' <%= !admin_ids.include?(u.id) && !user_ids.include?(u.id) ? "checked='true'" : '' %> onclick="remove_site_membership(<%= s.id %>, <%= u.id %>);" /></td>
+    <td align='center'><input type='radio' name='user<%= u.id %>' <%= user_ids.include?(u.id)  ? "checked='true'" : ''                             %> onclick="add_site_membership(<%= s.id %>, <%= u.id %>, 'User');" /></td>
+    <td align='center'><input type='radio' name='user<%= u.id %>' <%= admin_ids.include?(u.id) ? "checked='true'" : ''                             %> onclick="add_site_membership(<%= s.id %>, <%= u.id %>, 'Admin');" /></td>    
+  </tr>
+<% end %>
+</table>
+</div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Site',
+    id: <%= @site.id %>,
+    update_url: '/admin/sites/<%= @site.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'                    , nice_name: 'Name'                     , type: 'text'     , value: <%= raw Caboose.json(@site.name)                    %>, width: 400 },
+      { name: 'description'             , nice_name: 'Description'              , type: 'textarea' , value: <%= raw Caboose.json(@site.description)             %>, width: 600, height: 75 },
+      { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html) %>, width: 600, height: 75 }      
+    ]    
+  });       
+});
+
+function set_under_construction(site_id, domain_id, checked)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id,
+    type: 'put',
+    data: { under_construction: checked ? 1 : 0 }
+  });
+}
+
+function add_site_membership(site_id, user_id, role)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id +'/members',
+    type: 'post',
+    data: {
+      user_id: user_id,
+      role: role 
+    },
+    succes: function(resp) {}
+  });
+}
+
+function remove_site_membership(site_id, user_id)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id +'/members/' + user_id,
+    type: 'delete',    
+    succes: function(resp) {}
+  });
+}
+
+function add_domain(site_id, domain)
+{
+  if (!domain)
+  {    
+    var div = $('<div/>')
+      .append($('<p/>')
+        .addClass('note warning')
+        .append("What domain would you like to add?<br />")
+        .append($('<input/>').attr('type','text').attr('id','new_domain').css('width', '200px')).append(' ')
+        .append($('<input/>').attr('type','button').val('Add').click(function() { add_domain(site_id, $('#new_domain').val()); })).append(' ')
+        .append($('<input/>').attr('type','button').val('Cancel').click(function() { $('#new_domain_container').empty(); }))
+      )
+      .append($('<div/>').attr('id', 'new_domain_message'));      
+    $('#new_domain_container').empty().append(div);
+    return;      
+  }
+  $('#new_domain_message').empty().html("<p class='loading'>Adding domain...</p>");
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains',
+    type: 'post',
+    data: { domain: domain },
+    success: function(resp) {
+      if (resp.error) $('#new_domain_message').html("<p class='note error'>" + resp.error + "<br /></p>");
+      if (resp.refresh) window.location.reload(true);
+    }
+  });
+}
+
+function delete_domain(site_id, domain_id, confirm)
+{        
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the domain? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_domain(site_id, domain_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#domain_message').empty(); }));
+    $('#domain_message').empty().append(p);
+    return;
+  }
+  $('#domain_message').html("<p class='loading'>Deleting domain...</p>");
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.refresh) window.location.reload(true);
+    }
+  });
+}
+
+function set_primary_domain(site_id, domain_id)
+{    
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id + '/set-primary',
+    type: 'put',    
+    success: function(resp) {}
+  });
+}
+
+</script>
+<% end %>

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

@@ -0,0 +1,42 @@
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<h2>Shipping Packages</h2>
+<div id='shipping_packages'></div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'shipping_packages',
+    base_url: '/admin/sites/<%= @site.id %>/shipping-packages',
+    allow_bulk_edit: false,
+    allow_bulk_delete: true,
+    allow_duplicate: false,
+    allow_advanced_edit: false,
+    fields: [      
+      { show: true , name: 'name'               , nice_name: 'Shipping Method'         , sort: 'shipping_method_id' , type: 'select' , value: function(sp) { return sp.shipping_method_id }, width: 75, align: 'left'   },                                           
+      { show: true , name: 'length'             , nice_name: 'Length (in)'             , sort: 'length'             , type: 'text'   , value: function(sp) { return sp.length             }, width: 50, align: 'right'  }, 
+      { show: true , name: 'width'              , nice_name: 'Width (in)'              , sort: 'width'              , type: 'text'   , value: function(sp) { return sp.width              }, width: 50, align: 'right'  }, 
+      { show: true , name: 'height'             , nice_name: 'Height (in)'             , sort: 'height'             , type: 'text'   , value: function(sp) { return sp.height             }, width: 50, align: 'right'  }, 
+      { show: true , name: 'volume'             , nice_name: 'Volume (in<sup>3</sup>)' , sort: 'volume'             , type: 'text'   , value: function(sp) { return sp.volume             }, width: 50, align: 'right'  },
+      { show: true , name: 'flat_rate_price'    , nice_name: 'Flat Rate Price'         , sort: 'flat_rate_price'    , type: 'text'   , value: function(sp) { return sp.flat_rate_price    }, width: 50, align: 'right'  },
+      { show: true , name: 'priority'           , nice_name: 'Priority'                , sort: 'priority'           , type: 'text'   , value: function(sp) { return sp.priority           }, width: 50, align: 'right'  }
+    ],
+    new_model_text: 'New Shipping Package',
+    new_model_fields: [                                                 
+      { name: 'length'             , nice_name: 'Length (in)'     , type: 'text'   , width: 50  }, 
+      { name: 'width'              , nice_name: 'Width (in)'      , type: 'text'   , width: 50  }, 
+      { name: 'height'             , nice_name: 'Height (in)'     , type: 'text'   , width: 50  }                        
+    ],
+    bulk_import_fields: ['shipping_method_id', 'length', 'width', 'height'],
+    bulk_import_url: '/admin/sites/<%= @site.id %>/shipping-packages/bulk'
+  });        
+});
+
+</script>
+<% end %>

data/app/views/caboose/shipping_packages/admin_new.html.erb

@@ -0,0 +1,33 @@
+
+<h1>New Site</h1>
+
+<form action='/admin/sites' method='post' id='new_site_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' /> 
+<p><input type='text' name='name' id='name' placeholder='Name' value='' style='width: 400px;' /></p>
+<div id='message'></div>
+<p><input type='submit' value='Add Site' /></p>
+</form>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  $('#new_site_form').submit(function() { add_site(); return false; });
+});
+
+function add_site()
+{
+  $('#message').html("<p class='loading'>Adding site...</p>");
+  $.ajax({
+    url: '/admin/sites',
+    type: 'post',
+    data: $('#new_site_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;    
+    }
+  });
+}
+
+</script>
+<% end %>

data/config/routes.rb

@@ -405,6 +405,20 @@ Caboose::Engine.routes.draw do
   post    "/admin/stackable-groups"           => "stackable_groups#admin_add"
   delete  "/admin/stackable-groups/bulk"      => "stackable_groups#admin_bulk_delete"
   delete  "/admin/stackable-groups/:id"       => "stackable_groups#admin_delete"
+  
+  #=============================================================================
+  # Shipping Packages
+  #=============================================================================
+  
+  get     "/admin/sites/:site_id/shipping-packages/options"                   => "shipping_packages#admin_options"
+  get     "/admin/sites/:site_id/shipping-packages/shipping-method-options"   => "shipping_packages#admin_shipping_method_options"  
+  get     "/admin/sites/:site_id/shipping-packages/json"                      => "shipping_packages#admin_json"
+  get     "/admin/sites/:site_id/shipping-packages/:id/json"                  => "shipping_packages#admin_json_single"
+  get     "/admin/sites/:site_id/shipping-packages"                           => "shipping_packages#admin_index"
+  put     "/admin/sites/:site_id/shipping-packages/:id"                       => "shipping_packages#admin_update"
+  post    "/admin/sites/:site_id/shipping-packages"                           => "shipping_packages#admin_add"
+  delete  "/admin/sites/:site_id/shipping-packages/bulk"                      => "shipping_packages#admin_bulk_delete"
+  delete  "/admin/sites/:site_id/shipping-packages/:id"                       => "shipping_packages#admin_delete"
 
   #=============================================================================
   # Categories

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.63'
+  VERSION = '0.5.64'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.63
+  version: 0.5.64
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -499,6 +499,7 @@ files:
 - app/controllers/caboose/reviews_controller.rb
 - app/controllers/caboose/roles_controller.rb
 - app/controllers/caboose/settings_controller.rb
+- app/controllers/caboose/shipping_packages_controller.rb
 - app/controllers/caboose/sites_controller.rb
 - app/controllers/caboose/stackable_groups_controller.rb
 - app/controllers/caboose/station_controller.rb
@@ -581,7 +582,10 @@ files:
 - app/models/caboose/search_filter.rb
 - app/models/caboose/setting.rb
 - app/models/caboose/shipping_calculator.rb
+- app/models/caboose/shipping_method.rb
+- app/models/caboose/shipping_method_loader.rb
 - app/models/caboose/shipping_package.rb
+- app/models/caboose/shipping_package_method.rb
 - app/models/caboose/site.rb
 - app/models/caboose/site_membership.rb
 - app/models/caboose/smtp_config.rb
@@ -781,6 +785,9 @@ files:
 - app/views/caboose/settings/edit.html.erb
 - app/views/caboose/settings/index.html.erb
 - app/views/caboose/settings/new.html.erb
+- app/views/caboose/shipping_packages/admin_edit.html.erb
+- app/views/caboose/shipping_packages/admin_index.html.erb
+- app/views/caboose/shipping_packages/admin_new.html.erb
 - app/views/caboose/sites/_admin_footer.html.erb
 - app/views/caboose/sites/_admin_header.html.erb
 - app/views/caboose/sites/admin_delete_form.html.erb