caboose-cms 0.7.85 → 0.8.1

data/app/controllers/caboose/blocks_controller.rb

@@ -67,14 +67,6 @@ module Caboose
       render :layout => 'caboose/modal'                
     end
     
-    # @route GET /admin/pages/:page_id/blocks/:id
-    # @route GET /admin/posts/:post_id/blocks/:id
-    def admin_show
-      return unless user_is_allowed('pages', 'edit')      
-      block = Block.find(params[:id])
-      render :json => block      
-    end
-    
     # @route GET /admin/pages/:page_id/blocks/tree
     # @route GET /admin/pages/:page_id/blocks/:id/tree
     # @route GET /admin/posts/:post_id/blocks/tree
@@ -226,8 +218,8 @@ module Caboose
       end
     end
     
-    # GET /admin/pages/:page_id/blocks/:id/advanced
-    # GET /admin/posts/:post_id/blocks/:id/advanced
+    # @route GET /admin/pages/:page_id/blocks/:id/advanced
+    # @route GET /admin/posts/:post_id/blocks/:id/advanced
     def admin_edit_advanced
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:page_id]) if params[:page_id]
@@ -237,10 +229,18 @@ module Caboose
       render :layout => 'caboose/modal'      
     end
     
-    # POST /admin/pages/:page_id/blocks
-    # POST /admin/pages/:page_id/blocks/:id
-    # POST /admin/posts/:post_id/blocks
-    # POST /admin/posts/:post_id/blocks/:id
+    # @route GET /admin/pages/:page_id/blocks/:id
+    # @route GET /admin/posts/:post_id/blocks/:id
+    def admin_show
+      return unless user_is_allowed('pages', 'edit')      
+      block = Block.find(params[:id])
+      render :json => block      
+    end
+    
+    # @route POST /admin/pages/:page_id/blocks
+    # @route POST /admin/pages/:page_id/blocks/:id
+    # @route POST /admin/posts/:post_id/blocks
+    # @route POST /admin/posts/:post_id/blocks/:id
     def admin_create
       return unless user_is_allowed('pages', 'add')
 
@@ -315,8 +315,8 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/pages/:page_id/blocks/:id
-    # PUT /admin/posts/:post_id/blocks/:id
+    # @route PUT /admin/pages/:page_id/blocks/:id
+    # @route PUT /admin/posts/:post_id/blocks/:id
     def admin_update
       return unless user_is_allowed('pages', 'edit')
       
@@ -376,8 +376,8 @@ module Caboose
       render :json => resp      
     end
     
-    # POST /admin/pages/:page_id/blocks/:id/image
-    # POST /admin/posts/:post_id/blocks/:id/image
+    # @route POST /admin/pages/:page_id/blocks/:id/image
+    # @route POST /admin/posts/:post_id/blocks/:id/image
     def admin_update_image
       return unless user_is_allowed('pages', 'edit')
       
@@ -398,8 +398,8 @@ module Caboose
       render :json => resp
     end
     
-    # POST /admin/pages/:page_id/blocks/:id/file
-    # POST /admin/posts/:post_id/blocks/:id/file
+    # @route POST /admin/pages/:page_id/blocks/:id/file
+    # @route POST /admin/posts/:post_id/blocks/:id/file
     def admin_update_file
       return unless user_is_allowed('pages', 'edit')
       
@@ -420,8 +420,8 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/pages/:page_id/blocks/:id
-    # DELETE /admin/posts/:post_id/blocks/:id
+    # @route DELETE /admin/pages/:page_id/blocks/:id
+    # @route DELETE /admin/posts/:post_id/blocks/:id
     def admin_delete
       return unless user_is_allowed('pages', 'delete')
       
@@ -451,8 +451,8 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/pages/:page_id/blocks/:id/move-up
-    # PUT /admin/posts/:post_id/blocks/:id/move-up
+    # @route PUT /admin/pages/:page_id/blocks/:id/move-up
+    # @route PUT /admin/posts/:post_id/blocks/:id/move-up
     def admin_move_up
       return unless user_is_allowed('pages', 'delete')
       
@@ -467,8 +467,8 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/pages/:page_id/blocks/:id/move-down
-    # PUT /admin/posts/:post_id/blocks/:id/move-down
+    # @route PUT /admin/pages/:page_id/blocks/:id/move-down
+    # @route PUT /admin/posts/:post_id/blocks/:id/move-down
     def admin_move_down
       return unless user_is_allowed('pages', 'delete')
       

data/app/controllers/caboose/calendars_controller.rb

@@ -8,7 +8,7 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end    
     
-    # GET /admin/calendars
+    # @route GET /admin/calendars
     def admin_index
       return if !user_is_allowed('calendars', 'view')
       render :file => 'caboose/extras/error_invalid_site' and return if @site.nil?
@@ -17,7 +17,7 @@ module Caboose
       render :layout => 'caboose/admin'      
     end
 
-    # GET /admin/calendars/:id
+    # @route GET /admin/calendars/:id
     def admin_edit
       return unless user_is_allowed('calendars', 'edit')
       @calendar = Calendar.find(params[:id])
@@ -28,7 +28,7 @@ module Caboose
       render :layout => 'caboose/admin'
     end
             
-    # PUT /admin/calendars/:id
+    # @route PUT /admin/calendars/:id
     def admin_update
       return unless user_is_allowed('calendars', 'edit')
       
@@ -48,7 +48,7 @@ module Caboose
       render :json => resp
     end
     
-    # POST /admin/calendars
+    # @route POST /admin/calendars
     def admin_add
       return unless user_is_allowed('calendars', 'edit')
       
@@ -66,7 +66,7 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/calendars/:id
+    # @route DELETE /admin/calendars/:id
     def admin_delete
       return unless user_is_allowed('calendars', 'delete')
       Calendar.find(params[:id]).destroy      

data/app/controllers/caboose/cart_controller.rb

@@ -1,13 +1,13 @@
 module Caboose
   class CartController < Caboose::ApplicationController
     
-    # GET /cart
+    # @route GET /cart
     def index
     end
     
-    # GET /cart/items
+    # @route GET /cart/items
     def list
-      render :json => @order.as_json(
+      render :json => @invoice.as_json(
         :include => [        
           { 
             :line_items => { 
@@ -22,34 +22,34 @@ module Caboose
               }
             }
           },
-          { :order_packages => { :include => [:shipping_package, :shipping_method] }},
+          { :invoice_packages => { :include => [:shipping_package, :shipping_method] }},
           :customer,
           :shipping_address,
           :billing_address,
-          :order_transactions,
+          :invoice_transactions,
           { :discounts => { :include => :gift_card }}
         ]        
       )
     end
     
-    # GET /cart/item-count
+    # @route GET /cart/item-count
     def item_count
-      render :json => { :item_count => @order.item_count }            
+      render :json => { :item_count => @invoice.item_count }            
     end
     
-    # POST /cart
+    # @route POST /cart
     def add      
       v = Variant.find(params[:variant_id])
       qty = params[:quantity] ? params[:quantity].to_i : 1
       
-      if @order.line_items.exists?(:variant_id => v.id)
-        li = @order.line_items.find_by_variant_id(v.id)
+      if @invoice.line_items.exists?(:variant_id => v.id)
+        li = @invoice.line_items.find_by_variant_id(v.id)
         li.quantity += qty
         li.subtotal = li.unit_price * li.quantity
       else
         unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
         li = LineItem.new(
-          :order_id   => @order.id,
+          :invoice_id   => @invoice.id,
           :variant_id => v.id,
           :quantity   => qty,
           :unit_price => unit_price,
@@ -61,11 +61,11 @@ module Caboose
       render :json => { 
         :success => li.save, 
         :errors => li.errors.full_messages,
-        :item_count => @order.item_count 
+        :item_count => @invoice.item_count 
       }      
     end
     
-    # PUT /cart/:line_item_id
+    # @route PUT /cart/:line_item_id
     def update            
       resp = Caboose::StdClass.new
       li = LineItem.find(params[:line_item_id])
@@ -73,14 +73,27 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
-          when 'quantity'    then 
+          when 'quantity'    then
+            if value.to_i != li.quantity
+              op = li.invoice_package
+              if op
+                op.shipping_method_id = nil
+                op.total = nil
+                op.save
+              end
+              if li.invoice
+                li.invoice.shipping = 0.00
+                li.invoice.save
+                li.invoice.calculate        
+              end
+            end
             li.quantity = value.to_i
             if li.quantity == 0
               li.destroy
             else            
               li.subtotal = li.unit_price * li.quantity
               li.save
-              li.order.calculate
+              li.invoice.calculate
             end
           when 'is_gift'               then li.is_gift              = value
           when 'include_gift_message'  then li.include_gift_message = value
@@ -90,18 +103,29 @@ module Caboose
         end
       end
       li.save
-      li.order.calculate
+      li.invoice.calculate
       resp.success = true
       render :json => resp                                    
     end
     
-    # DELETE /cart/:line_item_id
-    def remove
-      li = LineItem.find(params[:line_item_id]).destroy
-      render :json => { :success => true, :item_count => @order.line_items.count }
+    # @route DELETE /cart/:line_item_id
+    def remove                  
+      li = LineItem.find(params[:line_item_id]).destroy      
+      op = li.invoice_package
+      if op
+        op.shipping_method_id = nil
+        op.total = nil
+        op.save                
+      end
+      if li.invoice
+        li.invoice.shipping = 0.00
+        li.invoice.save
+        li.invoice.calculate        
+      end
+      render :json => { :success => true, :item_count => @invoice.line_items.count }
     end
     
-    # POST /cart/gift-cards
+    # @route POST /cart/gift-cards
     def add_gift_card      
       resp = StdClass.new
       code = params[:code].strip
@@ -112,30 +136,25 @@ module Caboose
       elsif gc.date_available && DateTime.now.utc < gc.date_available           then resp.error = "That gift card is not active yet."         
       elsif gc.date_expires && DateTime.now.utc > gc.date_expires               then resp.error = "That gift card is expired."
       elsif gc.card_type == GiftCard::CARD_TYPE_AMOUNT && gc.balance <= 0       then resp.error = "That gift card has a zero balance." 
-      elsif gc.min_order_total && @order.total < gc.min_order_total             then resp.error = "Your order must be at least $#{sprintf('%.2f',gc.min_order_total)} to use this gift card." 
-      elsif Discount.where(:order_id => @order.id, :gift_card_id => gc.id).exists? then resp.error = "That gift card has already been applied to this order."
+      elsif gc.min_invoice_total && @invoice.total < gc.min_invoice_total             then resp.error = "Your invoice must be at least $#{sprintf('%.2f',gc.min_invoice_total)} to use this gift card." 
+      elsif Discount.where(:invoice_id => @invoice.id, :gift_card_id => gc.id).exists? then resp.error = "That gift card has already been applied to this invoice."
       else
-        # Determine how much the discount will be
-        d = Discount.new(:order_id => @order.id, :gift_card_id => gc.id, :amount => 0.0)        
-        case gc.card_type
-          when GiftCard::CARD_TYPE_AMOUNT      then d.amount = (@order.total >= gc.balance ? gc.balance : @order.total)
-          when GiftCard::CARD_TYPE_PERCENTAGE  then d.amount = @order.subtotal * gc.total
-          when GiftCard::CARD_TYPE_NO_SHIPPING then d.amount = @order.shipping
-          when GiftCard::CARD_TYPE_NO_TAX      then d.amount = @order.tax
-        end
-        d.save
-        @order.calculate
+        # Create the discount and recalculate the invoice
+        d = Discount.create(:invoice_id => @invoice.id, :gift_card_id => gc.id, :amount => 0.0)
+        d.calculate_amount                
+        @invoice.calculate  
+        
         resp.success = true
-        resp.order_total = @order.total
+        resp.invoice_total = @invoice.total
         GA.delay.event(@site.id, 'giftcard', 'add', "Giftcard #{gc.id}")
       end
       render :json => resp
     end
     
-    # DELETE /cart/discounts/:discount_id
+    # @route DELETE /cart/discounts/:discount_id
     def remove_discount
       Discount.find(params[:discount_id]).destroy
-      @order.calculate
+      @invoice.calculate
       render :json => { :success => true }
     end
   end

data/app/controllers/caboose/categories_controller.rb

@@ -5,7 +5,7 @@ module Caboose
     # Admin actions
     #=============================================================================
     
-    # GET /admin/categories
+    # @route GET /admin/categories
     def admin_index
       return unless user_is_allowed('categories', 'view')
       
@@ -16,59 +16,40 @@ module Caboose
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/categories/new
+    # @route GET /admin/categories/new
     def admin_new
       return unless user_is_allowed('categories', 'add')
       render :layout => 'caboose/admin'
     end
-    
-    # POST /admin/categories
-    def admin_add
-      return unless user_is_allowed('categories', 'add')
-      
-      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    => 'Active'
-        )
-        cat.slug = cat.generate_slug
-        cat.url  = "#{p.url}/#{cat.slug}"
-        
-        if cat.save
-          resp.redirect = "/admin/categories/#{cat.id}"
-        else
-          resp.error = 'There was an error saving the category.'
-        end
+
+    # @route GET /admin/categories/options
+    def admin_options
+      @options = []
+      cat = Category.where("site_id = ? and parent_id is null", @site.id).first      
+      if cat.nil?
+        cat = Category.create(:site_id => @site.id, :name => 'All Products', :url => '/')
       end
-      
-      render :json => resp
+      admin_options_helper(cat, '')
+      render :json => @options
     end
-      
-    # GET /admin/categories/:id
-    def admin_edit
-      return unless user_is_allowed('categories', 'edit')    
-      @category = Category.find(params[:id])
-      render :layout => 'caboose/admin'
+
+    # @route 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/:id/sort-children
+
+    # @route GET /admin/categories/:id/sort-children
     def admin_sort_children
       return unless user_is_allowed('categories', 'edit')    
       @category = Category.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # PUT /admin/categories/:id/children/sort-order
+    # @route PUT /admin/categories/:id/children/sort-order
     def admin_update_sort_order
       return unless user_is_allowed('categories', 'edit')            
       params[:category_ids].each_with_index do |cat_id, i|
@@ -78,8 +59,27 @@ module Caboose
       end      
       render :json => { :success => true }
     end
-    
-    # PUT /admin/categories/:id
+
+    # @route GET /admin/categories/:category_id/products/json
+    def admin_category_products
+      query = ["select P.id, P.title from store_category_memberships CM
+        left join store_products P on P.id = CM.product_id
+        where CM.category_id = ? AND P.status = 'Active'
+        order by CM.sort_order, P.title", params[:id]]             
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
+      render :json => arr
+    end
+
+    # @route GET /admin/categories/:id
+    def admin_edit
+      return unless user_is_allowed('categories', 'edit')    
+      @category = Category.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # @route PUT  /admin/categories/:id
+    # @route POST /admin/categories/:id
     def admin_update
       return unless user_is_allowed('categories', 'edit')
       
@@ -95,6 +95,7 @@ module Caboose
           when 'slug'    then cat.slug   = value
           when 'status'  then cat.status = value
           when 'image'   then cat.image  = value
+          when 'parent_id' then cat.parent_id = value
         end
       end
       
@@ -107,8 +108,40 @@ module Caboose
       # Respond to update request
       render :json => resp
     end
-    
-    # DELETE /admin/categories/:id
+
+    # @route POST /admin/categories
+    def admin_add
+      return unless user_is_allowed('categories', 'add')
+      
+      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    => 'Active'
+        )
+        cat.slug = cat.generate_slug
+        cat.url  = "#{p.url}/#{cat.slug}"
+        
+        if cat.save
+          resp.redirect = "/admin/categories/#{cat.id}"
+        else
+          resp.error = 'There was an error saving the category.'
+        end
+      end
+      
+      render :json => resp
+    end
+
+    # @route DELETE /admin/categories/:id
     def admin_delete
       return unless user_is_allowed('categories', 'delete')
       
@@ -125,26 +158,6 @@ module Caboose
       end
       render :json => resp
     end
-        
-    # 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.where("site_id = ? and parent_id is null", @site.id).first      
-      if cat.nil?
-        cat = Category.create(:site_id => @site.id, :name => 'All Products', :url => '/')
-      end
-      admin_options_helper(cat, '')
-      render :json => @options
-    end
 
     def admin_options_helper(cat, prefix)
       @options << { :value => cat.id, :text => "#{prefix}#{cat.name}" }      
@@ -153,17 +166,6 @@ module Caboose
       end      
     end
 
-    # GET /admin/categories/:category_id/products/json
-    def admin_category_products
-      query = ["select P.id, P.title from store_category_memberships CM
-        left join store_products P on P.id = CM.product_id
-        where CM.category_id = ? AND P.status = 'Active'
-        order by CM.sort_order, P.title", params[:id]]             
-      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
-      arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
-      render :json => arr
-    end
-
   end
 end