caboose-cms 0.5.46 → 0.5.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMzMmM3NWIwMDRiYzJlOTM1NmI1Y2JiZGI1NmY3YjU4NDdlZDM2YQ==
+    NzBjMTkxZTAwZThkY2FjNDA1YTcxZWFjOWIyYWE1MWUzZTM0YjdiMg==
   data.tar.gz: !binary |-
-    YTBhYjk2NjYxMWQ2M2NhMGJhOGZmNjZiMWM3MjQ0ZDliM2M1NWNhMA==
+    NGNiMzEwYWJhZWZjZWVkNjg2MTY3YWFmNTg4ZTA0OWY0ZWZhZGEwZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ2OWE2NWMwYTk2MTYyMjU5MGE3OWQ1N2Q5OWNlYTI0ZGIxZjkxZGFlOWM5
-    YmU3OWQ1MzFlYzE0NjVmZGJiNDcyYjUzZjAzYWMzNjM5YzBkZDQxZTViYjcy
-    MzJmYmU4NjgzMzY0NzZjYjE1M2Q5NjdkZDkzNWJlZTFmYzczMmI=
+    OGRiZTFkYjgwZjRkYTI1YzRlNDE1MzAwOTA5MzM1YTIwN2VmZDFhMzQxYzI1
+    YWM3YjU3ZWNiNjNkYTBmZjNlNjRiODc0NjcwMGM4MmVhMTU4YWY5ZDkxMWZm
+    YjE4MTdhYzViZTY3OWU4OTQ3MWRiOTM0N2E4M2JkMWYzM2ExNWQ=
   data.tar.gz: !binary |-
-    Y2QzYzg5MGQwZDM3ZDJiNTQzYjU3YTNhNDJhN2NmZmYzNTJjYTAwMTYyYmJl
-    ODU0YTMwNTY1NzQxM2NjMDE2ZWNmNjEzMzE0NzMyOGMxNTJiMGFkY2E4MTUz
-    ZmIzODMwY2EzMWMxMzE3ZjY0MjIwZDA3NmMxOTRlNDQzYzhjOTc=
+    YjUzZjU4ZDgzMGI5NzEzYTJjYTk0ODE0YmY0ODYxYTJlYWJiNzc4ZTljMWEx
+    N2Q3MmM2MTlhNjMzNGViM2VkOGNmNmFjMmMwYzAzYzU0MzcwYTg0ZTNlYjVl
+    MWQ0MmZjMmE2NzFmOGY5ZjAyMDU5M2JiOGFhODU3NjNjNjc5ODk=

data/app/controllers/caboose/categories_controller.rb

@@ -8,43 +8,52 @@ module Caboose
     # GET /admin/categories
     def admin_index
       return unless user_is_allowed('categories', 'view')
-      render layout: 'caboose/admin'
+      render :layout => 'caboose/admin'
     end
     
     # GET /admin/categories/new
     def admin_new
       return unless user_is_allowed('categories', 'add')
-      render layout: 'caboose/admin'
+      render :layout => 'caboose/admin'
     end
     
     # POST /admin/categories
     def admin_add
       return unless user_is_allowed('categories', 'add')
       
-      if params[:parent_id].nil? or params[:parent_id].empty?
-        render :json => { :error => 'Please select a parent category.' }
-      elsif params[:name].nil? or params[:name].empty?
-        render :json => { :error => 'This title cannot be empty' }
-      else
-        category           = Category.new
-        category.parent_id = params[:parent_id]
-        category.name      = params[:name]
-        category.slug      = category.generate_slug
-        category.url       = "#{Category.find(params[:parent_id]).url}/#{category.slug}"
+      resp = Caboose::StdClass.new
+      
+      p = Category.where(:id => params[:parent_id]).first
+      
+      if params[:parent_id].nil? || params[:parent_id].empty? || p.nil?
+        resp.error = 'Please select a parent category.'
+      elsif params[:name].nil? || params[:name].empty?
+        resp.error = 'This title cannot be empty'
+      else        
+        cat = Category.new(
+          :site_id   => @site.id,
+          :parent_id => p.id,
+          :name      => params[:name],
+          :status    => 'Inactive'
+        )
+        cat.slug = cat.generate_slug
+        cat.url  = "#{p.url}/#{cat.slug}"
         
-        if category.save
-          render :json => { :success => true, :redirect => "/admin/categories/#{category.id}/edit" }
+        if cat.save
+          resp.redirect = "/admin/categories/#{cat.id}"
         else
-          render :json => { :error => 'There was an error saving the category.' }
+          resp.error = 'There was an error saving the category.'
         end
       end
+      
+      render :json => resp
     end
       
     # GET /admin/categories/:id/edit
     def admin_edit
       return unless user_is_allowed('categories', 'edit')    
       @category = Category.find(params[:id])
-      render layout: 'caboose/admin'
+      render :layout => 'caboose/admin'
     end        
     
     # PUT /admin/categories/:id
@@ -52,62 +61,64 @@ module Caboose
       return unless user_is_allowed('categories', 'edit')
       
       # Define category and initialize response
-      category = Category.find(params[:id])
-      response = { attributes: Hash.new }
+      cat = Category.find(params[:id])
+      resp = Caboose::StdClass.new({ :attributes => {} })
       
       # Iterate over params and update relevant attributes
       params.each do |key, value|
         case key
-        when 'name' then category.name = value
-        when 'slug' then category.slug = value
-        when 'status' then category.status = value
-        when 'image' then category.image = value
+          when 'site_id' then cat.name   = value
+          when 'name'    then cat.name   = value
+          when 'slug'    then cat.slug   = value
+          when 'status'  then cat.status = value
+          when 'image'   then cat.image  = value
         end
       end
       
       # Try and save category
-      response[:success] = category.save
+      resp.success = cat.save
       
       # If an image is passed, return the url
-      response[:attributes][:image] = { value: category.image.url(:medium) } if params[:image]
+      resp.attributes[:image] = { :value => cat.image.url(:medium) } if params[:image]
       
       # Respond to update request
-      render :json => response
+      render :json => resp
     end
     
     # DELETE /admin/categories/:id
     def admin_delete
       return unless user_is_allowed('categories', 'delete')
       
-      category = Category.find(params[:id])
+      resp = Caboose::StdClass.new
+      cat = Category.find(params[:id])
       
-      if category.products.any?
-        render :json => { :error => "Can't delete a category that has products in it." }
-      elsif category.children.any?
-        render :json => { :error => "You can't delete a category that has child categories." }
+      if cat.products.any?
+        resp.error = "Can't delete a category that has products in it."
+      elsif cat.children.any?
+        resp.error = "You can't delete a category that has child categories."
       else
-        render :json => { :success => category.destroy, :redirect => '/admin/categories' }
+        resp.success = cat.destroy
+        resp.redirect = '/admin/categories'
       end
+      render :json => resp
     end
-    
-    
-    # GET /admin/products/status-options
-    def admin_status_options
-      arr = ['Active', 'Inactive', 'Deleted']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text => status
-        }
-      end
-      render :json => options
+        
+    # GET /admin/categories/status-options
+    def admin_status_options      
+      render :json => [
+        { :value => 'Active'   , :text => 'Active'    },
+        { :value => 'Inactive' , :text => 'Inactive'  },
+        { :value => 'Deleted'  , :text => 'Deleted'   }
+      ]
     end
     
     # GET /admin/categories/options
     def admin_options      
       options = []
-      cat = Category.find(1)
+      cat = Category.where("site_id = ? and parent_id is null").first
+      if cat.nil?
+        cat = Category.create(:site_id => @site.id, :name => 'All Products', :url => '/')
+      end        
       cat.children.each do |c|
         admin_options_helper(options, c, '')
       end            

data/app/controllers/caboose/products_controller.rb

@@ -29,7 +29,7 @@ module Caboose
       url_without_params = request.fullpath.split('?').first
       
       # Find the category
-      category = Category.where(:url => url_without_params).first
+      category = Category.where(:site_id => @site.id, :url => url_without_params).first
       
       # Set category ID
       params['category_id'] = category.id
@@ -42,6 +42,7 @@ module Caboose
       
       # Otherwise looking at a category or search parameters
       @pager = Caboose::Pager.new(params, {
+        'site_id'        => @site.id,
         'category_id'    => '',
         'vendor_id'      => '',
         'vendor_name'    => '',
@@ -165,10 +166,10 @@ module Caboose
       @variants = products.collect { |product| product.variants }.flatten
       
       # Grab all categories; except for "all" and "uncategorized"
-      @categories = Category.where('parent_id IS NOT NULL AND name IS NOT NULL').order(:url)
+      @categories = Category.where('site_id = ? and parent_id IS NOT NULL AND name IS NOT NULL', @site.id).order(:url)
       
       # Grab all vendors
-      @vendors = Vendor.where('name IS NOT NULL').order(:name)
+      @vendors = Vendor.where('site_id = ? and name IS NOT NULL', @site.id).order(:name)
       
       render :layout => 'caboose/admin'
     end
@@ -265,6 +266,7 @@ 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 : ''
@@ -309,6 +311,7 @@ module Caboose
       params[:sort] = 'store_vendors.name' if params[:sort] == 'vendor'
       
       pager = Caboose::PageBarGenerator.new(params, {
+        'site_id'      => @site.id,
         'vendor_name'  => '',
         'search_like'  => '', 
         'price'        => params[:filters] && params[:filters][:missing_prices] ? 0 : ''
@@ -577,6 +580,7 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
+          when 'site_id'            then product.site_id            = value
           when 'alternate_id'       then product.alternate_id       = value          
           when 'title'              then product.title              = value
           when 'caption'            then product.caption            = value
@@ -642,12 +646,15 @@ module Caboose
         :redirect => nil
       )
       
-      title = params[:title]
+      name = params[:name]
       
-      if title.length == 0
+      if name.length == 0
         resp.error = "The title cannot be empty."
       else
-        p = Product.new(:title => title)
+        p = Product.new(
+          :site_id => @site.id,
+          :title => name
+        )
         p.save
         resp.redirect = "/admin/products/#{p.id}/general"
       end

data/app/controllers/caboose/vendors_controller.rb

@@ -1,39 +1,10 @@
 module Caboose
   class VendorsController < Caboose::ApplicationController
-    
-    # GET /admin/vendors/status-options
-    def status_options
-      options = Array.new
-      
-      ['Active', 'Inactive', 'Deleted'].each do |status|
-        options << {
-          :text  => status,
-          :value => status
-        }
-      end
-      
-      render :json => options
-    end
-    
-    # GET /admin/vendors/new
-    def admin_new
-      render :layout => 'caboose/admin'
-    end
-    
-    # POST /admin/vendors/create
-    def admin_create
-      render :json => { :success => false, :message => 'Must define a name' } and return if params[:name].nil? || params[:name].empty?
-      
-      vendor        = Vendor.new
-      vendor.name   = params[:name]
-      vendor.status = 'Inactive'
-      
-      render :json => { :success => vendor.save, :redirect => "/admin/vendors/#{vendor.id}/edit" }
-    end
-    
+        
     # GET /admin/vendors
     def admin_index
       @pager = Caboose::Pager.new(params, {
+        'site_id'   => @site.id,
         'name_like' => ''
       }, {
         'model'          => 'Caboose::Vendor',
@@ -49,7 +20,7 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/vendors/:id/edit
+    # GET /admin/vendors/:id
     def admin_edit
       @vendor = Vendor.find(params[:id])
       render :layout => 'caboose/admin'
@@ -61,13 +32,41 @@ module Caboose
       
       params.each do |name, value|
         case name
-          when 'name'   then vendor.name   = value
-          when 'status' then vendor.status = value
+          when 'site_id' then vendor.site_id = value
+          when 'name'    then vendor.name    = value
+          when 'status'  then vendor.status  = value
         end
       end
       
       render :json => { :success => vendor.save }
     end
+    
+    # GET /admin/vendors/new
+    def admin_new
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/vendors
+    def admin_add
+      render :json => { :success => false, :message => 'Must define a name' } and return if params[:name].nil? || params[:name].empty?
+      
+      vendor = Vendor.new(
+        :site_id => @site.id,
+        :name    => params[:name],
+        :status  => 'Inactive'
+      )      
+      render :json => { :success => vendor.save, :redirect => "/admin/vendors/#{vendor.id}" }
+    end
+    
+    # GET /admin/vendors/status-options
+    def status_options      
+      render :json => [
+        { :text => 'Active'   , :value => 'Active'   },
+        { :text => 'Inactive' , :value => 'Inactive' },
+        { :text => 'Deleted'  , :value => 'Deleted'  }
+      ]      
+    end    
+    
   end
 end
 

data/app/models/caboose/category.rb

@@ -7,7 +7,8 @@
 module Caboose
   class Category < ActiveRecord::Base
     self.table_name = 'store_categories'
-    
+
+    belongs_to :site    
     belongs_to :parent, :class_name => 'Category', :foreign_key => 'parent_id'
     has_many :children, :class_name => 'Category', :foreign_key => 'parent_id', :order => 'name'
     has_many :products, :through => :category_memberships, :order => 'title'
@@ -27,6 +28,7 @@ module Caboose
     validates_attachment_content_type :image, :content_type => %w(image/jpeg image/jpg image/png)
     
     attr_accessible :id,
+      :site_id,
       :parent_id,
       :name,
       :url,

data/app/models/caboose/discount.rb

@@ -3,7 +3,10 @@ module Caboose
     self.table_name  = 'store_discounts'
     self.primary_key = 'id'
     
+    belongs_to :site
+    
     attr_accessible :id,
+      :site_id,
       :name,              # The name of this discount
       :code,              # The code the customer has to input to apply for this discount
       :amount_current,

data/app/models/caboose/order.rb

@@ -6,7 +6,8 @@ module Caboose
   class Order < ActiveRecord::Base
     self.table_name  = 'store_orders'
     self.primary_key = 'id'
-    
+
+    belongs_to :site    
     belongs_to :customer, :class_name => 'Caboose::User'
     belongs_to :shipping_address, :class_name => 'Address'
     belongs_to :billing_address, :class_name => 'Address'
@@ -16,6 +17,7 @@ module Caboose
     has_many :packages, :class_name => 'Caboose::OrderPackage'
     
     attr_accessible :id,
+      :site_id,
       :order_number,
       :subtotal,
       :tax,      

data/app/models/caboose/product.rb

@@ -2,7 +2,8 @@ module Caboose
   class Product < ActiveRecord::Base
     self.table_name = 'store_products'
     self.primary_key = 'id'
-    
+
+    belongs_to :site    
     belongs_to :stackable_group, :class_name => 'Caboose::StackableGroup'
     belongs_to :vendor, :class_name => 'Caboose::Vendor'
     has_many :customizations, :class_name => 'Caboose::Product', :through => :customization_memberships
@@ -17,6 +18,7 @@ module Caboose
     #default_scope order('store_products.sort_order')
     
     attr_accessible :id,
+      :site_id,
       :alternate_id,
       :title,
       :description,

data/app/models/caboose/schema.rb

@@ -55,7 +55,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :repeat_end        
       ],
       #Caboose::PageCache => [:block],
-      Caboose::Variant => [:quantity]
+      Caboose::Variant => [:quantity],
+      Caboose::Vendor => [:vendor]
     }
   end
 
@@ -196,7 +197,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :repeat_count , :integer  ],
         [ :date_end     , :date     ]
       ],
-      Caboose::Category => [        
+      Caboose::Category => [
+        [ :site_id               , :integer   ],
         [ :parent_id             , :integer   ],
         [ :name                  , :string    ],
         [ :url                   , :string    ],
@@ -226,6 +228,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :updated_at  , :datetime , :null => true  ]
       ],
       Caboose::Discount => [
+        [ :site_id               , :integer  ],
         [ :name                  , :string   ],
         [ :code                  , :string   ],
         [ :amount_current        , :numeric  ],
@@ -273,6 +276,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :file              , :attachment ]
       ],
       Caboose::Order => [
+        [ :site_id               , :integer  ],
         [ :email                 , :string   ],
         [ :order_number          , :string   ],
         [ :subtotal              , :numeric   , :default => 0 ],
@@ -389,6 +393,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :post_category_id , :integer ]
       ],
       Caboose::Product => [
+        [ :site_id               , :integer   ],
         [ :alternate_id          , :string    ],
         [ :title                 , :string    ],
         [ :caption               , :string    ],
@@ -460,8 +465,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :prices                , :text     ] 
       ],
       Caboose::Setting => [
-        [ :name  , :string ],
-        [ :value , :text   ]
+        [ :site_id  , :integer ],
+        [ :name     , :string  ],
+        [ :value    , :text    ]
       ],
       Caboose::ShippingPackage => [
         [ :carrier      , :string  ],
@@ -521,6 +527,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :handling_percentage    , :string  ]
       ],
       Caboose::User => [
+        [ :site_id              , :integer    ],
         [ :first_name           , :string     ],
         [ :last_name            , :string     ],
         [ :username             , :string     ],
@@ -542,6 +549,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :is_guest             , :boolean    , { :default => false }]
       ],
       Caboose::Variant => [
+        [ :product_id            , :integer  ],
+        [ :alternate_id          , :string   ],
         [ :sku                   , :string   ],
         [ :barcode               , :string   ],
         [ :price                 , :numeric   , :default => 0 ],
@@ -559,10 +568,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :option2               , :string   ],
         [ :option3               , :string   ],
         [ :requires_shipping     , :boolean  ],
-        [ :taxable               , :boolean  ],
-        [ :product_id            , :integer  ],
-        [ :shipping_unit_value   , :numeric  ],
-        [ :alternate_id          , :string   ],
+        [ :taxable               , :boolean  ],        
+        [ :shipping_unit_value   , :numeric  ],        
         [ :status                , :string   ],
         [ :option1_sort_order    , :integer  , { :defult => 0 }],
         [ :option2_sort_order    , :integer  , { :defult => 0 }],
@@ -570,8 +577,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :sort_order            , :integer  , { :defult => 0 }]
       ],
       Caboose::Vendor => [
-        [ :name   , :string ],
-        [ :status , :string, { default: 'Active' } ]
+        [ :site_id , :integer ],
+        [ :name    , :string  ],
+        [ :status  , :string, { default: 'Active' } ]
       ]
     }
 

data/app/models/caboose/vendor.rb

@@ -2,9 +2,14 @@
 module Caboose
   class Vendor < ActiveRecord::Base
     self.table_name = 'store_vendors'
-    
+
+    belongs_to :site    
     has_many :products
-    attr_accessible :id, :name, :status, :sort_order
+    attr_accessible :id,
+      :site_id,
+      :name, 
+      :status,
+      :sort_order
     after_save :clear_filters
     
     def self.active

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

@@ -1,9 +1,9 @@
 <h1>New Vendor</h1>
 
-<form id="new-vendor" action="/admin/vendors/create" method="post">
+<form id="new-vendor" action="/admin/vendors" method="post">
   <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>" />
   <input id="name" name="name" type="text" placeholder="Vendor Name" style="width: 400px" />
-  
+  <div id='message'></div>  
   <p>
     <input type="button" value="< Back" onclick="window.location='/admin/products'" />
     <input type="submit" value="Add Vendor" />
@@ -11,24 +11,24 @@
 </form>
 
 <% content_for :caboose_js do %>
-  <script>
-    $(document).ready(function() {
-      $('#new-vendor').on('submit', function(event) {
-        event.preventDefault();
-        
-        $.ajax({
-          url: '/admin/vendors/create',
-          type: 'post',
-          data: $(event.delegateTarget).serialize(),
-          success: function(response) {
-            if (response.success) {
-              window.location = response.redirect;
-            } else {
-              alert(response.message);
-            }
-          }
-        });
-      });
+<script>
+$(document).ready(function() {
+  $('#new-vendor').on('submit', function(event) {
+    $('#message').html("<p class='loading'>Adding vendor...</p>");
+    event.preventDefault();
+    
+    $.ajax({
+      url: '/admin/vendors',
+      type: 'post',
+      data: $('#new-vendor').serialize(),
+      success: function(resp) {
+        if (resp.error)
+          $('#message').html("<p class='note error'>" + resp.error + "</p>");
+        else if (resp.redirect)
+          window.location = resp.redirect;
+      }
     });
-  </script>
+  });
+});
+</script>
 <% end %>

data/config/routes.rb

@@ -358,10 +358,10 @@ Caboose::Engine.routes.draw do
 
   get     "/admin/categories"                         => "categories#admin_index"
   get     "/admin/categories/new"                     => "categories#admin_new"
-  get     "/admin/categories/options"                 => "categories#admin_options"  
+  get     "/admin/categories/options"                 => "categories#admin_options"
+  get     '/admin/categories/status-options'          => 'categories#admin_status_options'  
   get     "/admin/categories/:id"                     => "categories#admin_edit"  
-  put     "/admin/categories/:id"                     => "categories#admin_update"  
-  get     '/admin/categories/status-options'          => 'categories#admin_status_options'
+  put     "/admin/categories/:id"                     => "categories#admin_update"    
   post    "/admin/categories/:id"                     => "categories#admin_update"  
   post    "/admin/categories"                         => "categories#admin_add"
   delete  "/admin/categories/:id"                     => "categories#admin_delete"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.46'
+  VERSION = '0.5.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.46
+  version: 0.5.47
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -509,7 +509,6 @@ files:
 - app/helpers/caboose/products_helper.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
-- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb

data/app/models/caboose/#Untitled-1#

@@ -1,16 +0,0 @@
-caboosecms.com
-swe
-sweethomefoodbar.com
-tuscaloosaorthopedics.com
-tuscaloosarivermarket.com
-sweethomefoodbaral.com
-westerveltenergy.com
-nine.is
-parkertowing.com
-arc.caboosecms.com
-tuscortho.com
-ninelite.com
-alabamarealtorsvote.com	TRUE	TRUE
-birminghamcorporatechallenge.com	FALSE	FALSE
-lockerroom.caboosecms.com	FALSE	FALSE
-groves.caboosecms.com	TRUE	FALSE