caboose-cms 0.7.85 → 0.8.1

data/app/controllers/caboose/line_items_controller.rb

@@ -1,27 +1,28 @@
 module Caboose
   class LineItemsController < Caboose::ApplicationController
     
-    # GET /admin/orders/:id/line-items/json
+    # @route GET /admin/invoices/:id/line-items/json
+    # @route GET /admin/invoices/:id/packages/json
     def admin_json
-      return if !user_is_allowed('orders', 'edit')    
-      order = Order.find(params[:id])
-      render :json => order.line_items.as_json(:include => :order_package)
+      return if !user_is_allowed('invoices', 'edit')    
+      invoice = Invoice.find(params[:id])
+      render :json => invoice.line_items.as_json(:include => :invoice_package)
     end
     
-    # GET /admin/orders/:order_id/line-items/new
+    # @route GET /admin/invoices/:invoice_id/line-items/new
     def admin_new
-      return if !user_is_allowed('orders', 'edit')      
+      return if !user_is_allowed('invoices', 'edit')      
       render :layout => 'caboose/modal'            
     end
     
-    # POST /admin/orders/:order_id/line-items
+    # @route POST /admin/invoices/:invoice_id/line-items
     def admin_add
-      return if !user_is_allowed('orders', 'edit')      
+      return if !user_is_allowed('invoices', 'edit')      
       
       resp = StdClass.new
       v = Variant.find(params[:variant_id])
       li = LineItem.new(
-        :order_id   => params[:order_id],
+        :invoice_id   => params[:invoice_id],
         :variant_id => params[:variant_id],
         :quantity   => 1,
         :unit_price => v.price,
@@ -32,9 +33,9 @@ module Caboose
       render :json => resp
     end
       
-    # PUT /admin/orders/:order_id/line-items/:id
+    # @route PUT /admin/invoices/:invoice_id/line-items/:id
     def admin_update
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
       
       resp = Caboose::StdClass.new({'attributes' => {}})
       li = LineItem.find(params[:id])    
@@ -43,8 +44,8 @@ module Caboose
       send_status_email = false
       params.each do |name,value|        
         case name
-          when 'order_id'         then li.order_id          = value
-          when 'order_package_id' then li.order_package_id  = value
+          when 'invoice_id'         then li.invoice_id          = value
+          when 'invoice_package_id' then li.invoice_package_id  = value
           when 'variant_id'       then li.variant_id        = value
           when 'parent_id'        then li.parent_id         = value          
           #when 'unit_price'       then li.unit_price        = value
@@ -60,16 +61,16 @@ module Caboose
             li.save
             
             
-            li.order.subtotal = li.order.calculate_subtotal
-            li.order.total = li.order.calculate_total
+            li.invoice.subtotal = li.invoice.calculate_subtotal
+            li.invoice.total = li.invoice.calculate_total
             
             # Recalculate everything
-            #r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
-            #li.order.shipping = r['negotiated_rate'] / 100
-            #li.order.handling = (r['negotiated_rate'] / 100) * 0.05
-            #li.order.tax = TaxCalculator.tax(li.order)            
-            #li.order.calculate_total
-            #li.order.save
+            #r = ShippingCalculator.rate(li.invoice, li.invoice.shipping_method_code)
+            #li.invoice.shipping = r['negotiated_rate'] / 100
+            #li.invoice.handling = (r['negotiated_rate'] / 100) * 0.05
+            #li.invoice.tax = TaxCalculator.tax(li.invoice)            
+            #li.invoice.calculate_total
+            #li.invoice.save
             
           when 'tracking_number'
             li.tracking_number = value
@@ -81,36 +82,36 @@ module Caboose
         end
       end
       if send_status_email       
-        OrdersMailer.configure_for_site(@site.id).customer_status_updated(li.order).deliver
+        InvoicesMailer.configure_for_site(@site.id).customer_status_updated(li.invoice).deliver
       end    
       resp.success = save && li.save
       render :json => resp
     end
         
-    # DELETE /admin/orders/:order_id/line-items/:id
+    # @route DELETE /admin/invoices/:invoice_id/line-items/:id
     def admin_delete
-      return if !user_is_allowed('orders', 'delete')
+      return if !user_is_allowed('invoices', 'delete')
       li = LineItem.find(params[:id])
-      order = li.order
+      invoice = li.invoice
       li.destroy
-      order.calculate_total
-      order.save                  
+      invoice.calculate_total
+      invoice.save                  
       render :json => Caboose::StdClass.new({
-        :redirect => '/admin/orders'
+        :redirect => '/admin/invoices'
       })
     end
     
-    # GET /admin/orders/:order_id/line-items/:id/highlight
+    # @route GET /admin/invoices/:invoice_id/line-items/:id/highlight
     def admin_highlight
-      return if !user_is_allowed('orders', 'view')
+      return if !user_is_allowed('invoices', 'view')
       li = LineItem.find(params[:id])
       v = li.variant
       redirect_to "/admin/products/#{v.product_id}/variants?highlight=#{v.id}"
     end
     
-    # GET /admin/orders/line-items/status-options
+    # @route GET /admin/invoices/line-items/status-options
     def admin_status_options
-      arr = ['pending', 'ready to ship', 'shipped', 'backordered', 'canceled']
+      arr = ['pending', 'ready to ship', 'shipped', 'backinvoiceed', 'canceled']
       options = []
       arr.each do |status|
         options << {
@@ -121,7 +122,7 @@ module Caboose
       render :json => options
     end
     
-    # GET /admin/line-items/product-stubs
+    # @route GET /admin/invoices/line-items/product-stubs
     def admin_product_stubs      
       title = params[:title].strip.downcase.split(' ')
       render :json => [] and return if title.length == 0
@@ -133,7 +134,7 @@ module Caboose
         vars << "%#{str}%"
       end      
       where = where.join(' and ')
-      query = ["select id, title, option1, option2, option3 from store_products where #{where} order by title limit 20"]
+      query = ["select id, title, option1, option2, option3 from store_products where #{where} invoice by title limit 20"]
       vars.each{ |v| query << v }
       
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))

data/app/controllers/caboose/login_controller.rb

@@ -2,7 +2,7 @@ module Caboose
   class LoginController < Caboose::ApplicationController
     #layout 'caboose/modal'
     
-    # GET /login
+    # @route GET /login
     def index
       if params[:logout]
         logout_user
@@ -15,7 +15,7 @@ module Caboose
       render :layout => Caboose::login_layout
     end
     
-    # POST /login
+    # @route POST /login
     def login      
       resp = StdClass.new('error' => '', 'redirect' => '')
       return_url = params[:return_url].nil? ? "/" : params[:return_url]
@@ -47,7 +47,7 @@ module Caboose
       render :json => resp      
     end
     
-    # GET /login/forgot-password
+    # @route GET /login/forgot-password
     def forgot_password_form
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       @modal = params[:modal].nil? ? false : params[:modal]
@@ -55,7 +55,7 @@ module Caboose
       render :layout => Caboose::login_layout
     end
         
-    # POST /login/forgot-password
+    # @route POST /login/forgot-password
     def send_reset_email
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       redirect_to @return_url if logged_in?
@@ -89,17 +89,17 @@ module Caboose
 		  render :json => resp
 		end
 	
-		# GET /login/reset-password/:reset_id
+		# @route GET /login/reset-password/:reset_id
 		def reset_password_form
 		  @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       redirect_to @return_url if logged_in?
-            
+      return
       @reset_id = params[:reset_id]      
       @user = Caboose::User.user_for_reset_id(@reset_id)
       render :layout => Caboose::login_layout
     end
     
-    # POST /login/reset-password
+    # @route POST /login/reset-password
     def reset_password
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       redirect_to @return_url if logged_in?

data/app/controllers/caboose/login_logs_controller.rb

@@ -7,14 +7,14 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
-    # GET /admin/login-logs
+    # @route GET /admin/login-logs
     def admin_index
       return if !user_is_allowed_to 'view', 'loginlogs'
       @pager = self.login_logs_pager    
       render :layout => 'caboose/admin'    
     end
     
-    # GET /admin/login-logs/json
+    # @route GET /admin/login-logs/json
     def admin_json
       return if !user_is_allowed_to 'view', 'loginlogs'
       pager = self.login_logs_pager        
@@ -43,14 +43,14 @@ module Caboose
     	})    	
     end
     
-    # GET /admin/login-logs/:id/json
+    # @route GET /admin/login-logs/:id/json
     def admin_json_single
       return if !user_is_allowed_to 'view', 'loginlogs'
       login_log = LoginLog.find(params[:id])      
       render :json => login_log
     end
     
-    # GET /admin/login-logs/:id
+    # @route GET /admin/login-logs/:id
     def admin_edit
       return if !user_is_allowed_to 'edit', 'loginlogs'
       @login_log = LoginLog.find(params[:id])

data/app/controllers/caboose/logout_controller.rb

@@ -1,6 +1,7 @@
 module Caboose
   class LogoutController < ApplicationController
-    # GET /logout
+    
+    # @route GET /logout
     def index
       Caboose.plugin_hook('before_logout')
       
@@ -9,5 +10,6 @@ module Caboose
       login_user(elo)      
       redirect_to params[:return_url] ? params[:return_url] : "/"    
     end
+    
   end
 end

data/app/controllers/caboose/media_categories_controller.rb

@@ -2,14 +2,14 @@
 module Caboose
   class MediaCategoriesController < ApplicationController
     
-    # GET /admin/media-categories/json
+    # @route GET /admin/media-categories/json
     def admin_json
       return unless user_is_allowed('mediacategories', 'view')       
       tree = Caboose::MediaCategory.flat_tree(@site.id)
       render :json => tree
     end
     
-    # GET /admin/media-categories/flat-tree
+    # @route GET /admin/media-categories/flat-tree
     def admin_flat_tree
       return unless user_is_allowed('mediacategories', 'view')
       prefix = params[:prefix] ? params[:prefix] : '-&nbsp;&nbsp;'
@@ -17,7 +17,7 @@ module Caboose
       render :json => tree
     end
             
-    # GET /admin/media-categories/options
+    # @route GET /admin/media-categories/options
     def admin_options
       return unless user_is_allowed('mediacategories', 'view')
       prefix = params[:prefix] ? params[:prefix] : '-&nbsp;&nbsp;'
@@ -26,13 +26,13 @@ module Caboose
       render :json => options
     end
     
-    # GET /admin/media-categories/tree
+    # @route GET /admin/media-categories/tree
     def admin_tree
       return unless user_is_allowed('mediacategories', 'view')      
       render :json => Caboose::MediaCategory.tree_hash(@site.id)
     end
 
-    # PUT /admin/media-categories/:id/sort-order
+    # @route PUT /admin/media-categories/:id/sort-order
     def admin_update_sort_order
       return unless user_is_allowed('mediacategories', 'edit')     
       resp = Caboose::StdClass.new 
@@ -47,7 +47,7 @@ module Caboose
       render :json => resp
     end
 
-    # POST /admin/media-categories
+    # @route POST /admin/media-categories
     def admin_add
       return unless user_is_allowed('mediacategories', 'add')
 
@@ -68,7 +68,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/media-categories/:id
+    # @route PUT /admin/media-categories/:id
     def admin_update
       return unless user_is_allowed('mediacategories', 'edit')
       
@@ -94,7 +94,7 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/media-categories/:id
+    # @route DELETE /admin/media-categories/:id
     def admin_delete
       return unless user_is_allowed('mediacategories', 'delete')
       cat = MediaCategory.find(params[:id])
@@ -103,7 +103,7 @@ module Caboose
       render :json => { :success => true }
     end
     
-    # POST /admin/media-categories/:id/attach
+    # @route POST /admin/media-categories/:id/attach
     def admin_attach
       return unless user_is_allowed('mediacategories', 'view')
       

data/app/controllers/caboose/media_controller.rb

@@ -8,7 +8,7 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end    
     
-    # GET /admin/media
+    # @route GET /admin/media
     def admin_index
       return if !user_is_allowed('media', 'view')
       render :file => 'caboose/extras/error_invalid_site' and return if @site.nil?
@@ -40,7 +40,7 @@ module Caboose
       render :layout => 'caboose/admin'      
     end
     
-    # GET /admin/media/json
+    # @route GET /admin/media/json
     def admin_json
       return if !user_is_allowed('media', 'view')
       render :json => false and return if @site.nil?
@@ -49,7 +49,7 @@ module Caboose
       render :json => cat.api_hash
     end
     
-    # GET /admin/media/last-upload-processed
+    # @route GET /admin/media/last-upload-processed
     def admin_last_upload_processed
       return if !user_is_allowed('media', 'view')
       render :json => false and return if @site.nil?
@@ -59,28 +59,28 @@ module Caboose
       render :json => { :last_upload_processed => s.value }
     end
 
-    # GET /admin/media/new
+    # @route GET /admin/media/new
     def admin_new
       return unless user_is_allowed('media', 'add')
       @media_category_id = params[:media_category_id]             
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/media/:id
-    def admin_edit
+    # @route GET /admin/media/:id/description
+    def admin_edit_description
       return unless user_is_allowed('media', 'edit')
       @media = Media.find(params[:id])
-      render :layout => 'caboose/admin'
+      render :layout => 'caboose/modal'
     end
     
-    # GET /admin/media/:id/description
-    def admin_edit_description
+    # @route GET /admin/media/:id
+    def admin_edit
       return unless user_is_allowed('media', 'edit')
       @media = Media.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
-            
-    # PUT /admin/media/:id
+                    
+    # @route PUT /admin/media/:id
     def admin_update
       return unless user_is_allowed('media', 'edit')
       
@@ -104,23 +104,7 @@ module Caboose
       render :json => resp
     end
 
-    # POST /admin/media/edit-image
-    #def admin_edit_image
-    #  new_url = params[:new_url]
-    #  media_id = params[:media_id]
-    #  resp = StdClass.new({'attributes' => {}})
-    #  if !new_url.blank? && !media_id.blank?
-    #    m = Media.find(media_id.gsub("image-",""))
-    #    m.image = new_url
-    #    m.save
-    #    resp.success = "Saved image!"
-    #  else
-    #    resp.error = "Couldn't save image"
-    #  end
-    #  render :json => resp
-    #end
-    
-    # POST /admin/media/:id/image
+    # @route POST /admin/media/:id/image
     def admin_update_image
       return unless user_is_allowed('media', 'edit')
       
@@ -140,28 +124,19 @@ module Caboose
       render :json => resp
     end
     
-    # DELETE /admin/media/:id
+    # @route DELETE /admin/media/:id
     def admin_delete
       return unless user_is_allowed('media', 'delete')
-      Media.find(params[:id]).destroy
-      ProductImage.where(:media_id => params[:id]).destroy_all
-      render :json => { :success => true }
-    end
-    
-    # DELETE /admin/media/bulk
-    def admin_bulk_delete
-      return unless user_is_allowed('media', 'delete')      
-      ids = params[:ids]
-      if ids
-        ids.each do |id|                
-          Media.where(:id => id).destroy_all
-          ProductImage.where(:media_id => id).destroy_all
-        end
-      end
+      
+      model_ids = params[:id] == 'bulk' ? params[:ids] : [params[:id]]             
+      model_ids.each do |media_id|
+        ProductImage.where(:media_id => media_id).destroy_all
+        Media.where(:id => media_id).destroy_all
+      end                  
       render :json => { :success => true }
     end
     
-    # POST /admin/media/pre-upload
+    # @route POST /admin/media/pre-upload
     def admin_pre_upload
       return unless user_is_allowed('media', 'view')
       media_category_id = params[:media_category_id]