caboose-cms 0.7.85 → 0.8.1

data/app/controllers/caboose/domains_controller.rb

@@ -8,7 +8,7 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
-    # POST /admin/sites/:site_id/domains
+    # @route POST /admin/sites/:site_id/domains
     def admin_add
       return if !user_is_allowed('domains', 'edit')
       
@@ -27,7 +27,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/sites/:site_id/domains/:id
+    # @route PUT /admin/sites/:site_id/domains/:id
     def admin_update
       return if !user_is_allowed('domains', 'edit')
 
@@ -55,20 +55,20 @@ module Caboose
     	render :json => resp
     end        
       
-    # DELETE /admin/sites/:site_id/domains/:id
+    # @route DELETE /admin/sites/:site_id/domains/:id
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
       Domain.find(params[:id]).destroy
       render :json => { 'refresh' => "/admin/sites/#{params[:site_id]}" }
     end
 
-    # PUT /admin/sites/:site_id/domains/:id/set-primary
+    # @route PUT /admin/sites/:site_id/domains/:id/set-primary
     def admin_set_primary
       return if !user_is_allowed('domains', 'edit')
       resp = StdClass.new     
       d = Domain.find(params[:id])
       save = true
-    #  d.primary = value
+      #d.primary = value
       Domain.where(:site_id => params[:site_id]).all.each do |d2|
         d2.primary = d2.id == d.id ? true : false
         d2.save

data/app/controllers/caboose/event_groups_controller.rb

@@ -4,7 +4,7 @@ module Caboose
     
     helper :application
     
-    # PUT /admin/calendars/:calendar_id/event-groups/:id
+    # @route PUT /admin/calendars/:calendar_id/event-groups/:id
     def admin_update
       return unless user_is_allowed('calendars', 'edit')
       
@@ -36,7 +36,7 @@ module Caboose
       render :json => resp
     end
      
-    # GET /admin/event-groups/period-options
+    # @route GET /admin/event-groups/period-options
     def admin_period_options
       render :json => [
         { 'value' => CalendarEventGroup::PERIOD_DAY   , 'text' => CalendarEventGroup::PERIOD_DAY   },
@@ -46,19 +46,41 @@ module Caboose
       ]
     end
     
-    # GET /admin/event-groups/frequency-options
+    # @route GET /admin/event-groups/frequency-options
     def admin_frequency_options
       arr = (1..30).collect{ |i| { 'value' => i, 'text' => i }}
       render :json => arr        
     end
     
-    # GET /admin/event-groups/repeat-by-options
+    # @route GET /admin/event-groups/repeat-by-options
     def admin_repeat_by_options
       render :json => [        
         { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_MONTH , 'text' => 'same day of the month' },
         { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_WEEK  , 'text' => 'same day of the week' },        
       ]
     end
+
+    # @route GET /admin/event-groups/:field-options
+    def admin_options
+      options = []
+      case params[:field]
+        when 'period'
+          options = [
+            { 'value' => CalendarEventGroup::PERIOD_DAY   , 'text' => CalendarEventGroup::PERIOD_DAY   },
+            { 'value' => CalendarEventGroup::PERIOD_WEEK  , 'text' => CalendarEventGroup::PERIOD_WEEK  },
+            { 'value' => CalendarEventGroup::PERIOD_MONTH , 'text' => CalendarEventGroup::PERIOD_MONTH },
+            { 'value' => CalendarEventGroup::PERIOD_YEAR  , 'text' => CalendarEventGroup::PERIOD_YEAR  },
+          ]
+        when 'frequency'
+          options = (1..30).collect{ |i| { 'value' => i, 'text' => i }}
+        when 'repeat-by'
+          options = [
+            { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_MONTH , 'text' => 'same day of the month' },
+            { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_WEEK  , 'text' => 'same day of the week' },        
+          ]
+      end      
+      render :json => options
+    end
     
   end
 end

data/app/controllers/caboose/events_controller.rb

@@ -4,7 +4,7 @@ module Caboose
     
     helper :application
     
-    # GET /admin/calendars/:calendar_id/events/:id
+    # @route GET /admin/calendars/:calendar_id/events/:id
     def admin_edit
       return unless user_is_allowed('calendars', 'edit')
       @event = CalendarEvent.find(params[:id])
@@ -16,7 +16,8 @@ module Caboose
       render :layout => 'caboose/modal'
     end
     
-    # GET /admin/calendars/:calendar_id/events/new
+    # @route_priority 1
+    # @route GET /admin/calendars/:calendar_id/events/new
     def admin_new
       return unless user_is_allowed('calendars', 'edit')
       @calendar = Calendar.find(params[:calendar_id])
@@ -24,7 +25,7 @@ module Caboose
       render :layout => 'caboose/modal'
     end
     
-    # POST /admin/calendars/:calendar_id/events
+    # @route POST /admin/calendars/:calendar_id/events
     def admin_add
       return unless user_is_allowed('calendars', 'edit')
       
@@ -45,7 +46,7 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/calendars/:calendar_id/events/:id
+    # @route PUT /admin/calendars/:calendar_id/events/:id
     def admin_update
       return unless user_is_allowed('calendars', 'edit')
       
@@ -87,13 +88,13 @@ module Caboose
       render :json => resp
     end        
     
-    # DELETE /admin/calendars/:calendar_id/events/:id
+    # @route DELETE /admin/calendars/:calendar_id/events/:id
     def admin_delete
       return unless user_is_allowed('calendars', 'delete')
       CalendarEvent.find(params[:id]).destroy      
       resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
       render :json => resp
-    end       
+    end
 		
   end
 end

data/app/controllers/caboose/fonts_controller.rb

@@ -2,7 +2,7 @@ module Caboose
   class FontsController < ApplicationController
     layout 'caboose/admin'
     
-    # GET /admin/fonts
+    # @route GET /admin/fonts
     def admin_index
       @hf = Font.where(:site_id => @site.id, :name => "heading-font").last
       if !@hf then @hf = Font.create(:site_id => @site.id, :name => "heading-font", :family => "Open Sans", :variant => "600", :url => "http://fonts.gstatic.com/s/opensans/v13/MTP_ySUJH_bn48VBG8sNSi3USBnSvpkopQaUR-2r7iU.ttf") end
@@ -18,7 +18,7 @@ module Caboose
       if !@btn then @btn = Font.create(:site_id => @site.id, :name => "button-font", :family => "Open Sans", :variant => "regular", :url => "http://fonts.gstatic.com/s/opensans/v13/IgZJs4-7SA1XX_edsoXWog.ttf") end
     end
 
-    # PUT /admin/fonts
+    # @route PUT /admin/fonts
     def admin_update
       resp = StdClass.new
       family = params[:family]

data/app/controllers/caboose/gift_cards_controller.rb

@@ -1,32 +1,32 @@
 module Caboose
   class GiftCardsController < Caboose::ApplicationController
     
-    # GET /admin/gift-cards
+    # @route GET /admin/gift-cards
     def admin_index
       return if !user_is_allowed('giftcards', 'view')      
       render :layout => 'caboose/admin'
     end
     
-    # GET /admin/gift-cards/json
+    # @route GET /admin/gift-cards/json
     def admin_json
       return if !user_is_allowed('giftcards', 'view')
       
       pager = PageBarGenerator.new(params, {
-          'site_id'             => @site.id,          
-          'name'                => '',
-          'code'                => '',      
-          'card_type'           => '',
-          'total_lte'           => '',
-          'total_gte'           => '',
-          'balance_lte'         => '',
-          'balance_gte'         => '',
-          'min_order_total_lte' => '',
-          'min_order_total_gte' => '',
-          'date_available_lte'  => '',
-          'date_available_gte'  => '',
-          'date_expires_lte'    => '',
-          'date_expires_gte'    => '',
-          'status'              => ''
+          'site_id'               => @site.id,          
+          'name'                  => '',
+          'code'                  => '',      
+          'card_type'             => '',
+          'total_lte'             => '',
+          'total_gte'             => '',
+          'balance_lte'           => '',
+          'balance_gte'           => '',
+          'min_invoice_total_lte' => '',
+          'min_invoice_total_gte' => '',
+          'date_available_lte'    => '',
+          'date_available_gte'    => '',
+          'date_expires_lte'      => '',
+          'date_expires_gte'      => '',
+          'status'                => ''
     		},{
     		  'model'          => 'Caboose::GiftCard',
     	    'sort'			     => 'code',
@@ -39,46 +39,81 @@ module Caboose
     	  :models => pager.items
     	}
     end
-    
-    # GET /admin/gift-cards/:id/json
+
+    # @route GET /admin/gift-cards/new
+    def admin_new
+      return if !user_is_allowed('giftcards', 'add')      
+      render :layout => 'caboose/admin'
+    end
+
+    # @route GET /admin/gift-cards/status-options
+    def admin_status_options
+      return if !user_is_allowed('categories', 'view')
+      statuses = [      
+        GiftCard::STATUS_INACTIVE,
+        GiftCard::STATUS_ACTIVE,
+        GiftCard::STATUS_EXPIRED
+      ]        
+      options = statuses.collect{ |s| { 'text' => s, 'value' => s }}       
+      render :json => options
+    end
+
+    # @route GET /admin/gift-cards/card-type-options
+    def admin_card_type_options
+      return if !user_is_allowed('categories', 'view')
+      types = [
+        GiftCard::CARD_TYPE_AMOUNT,
+        GiftCard::CARD_TYPE_PERCENTAGE,
+        GiftCard::CARD_TYPE_NO_SHIPPING,
+        GiftCard::CARD_TYPE_NO_TAX,
+      ]        
+      options = types.collect{ |s| { 'text' => s, 'value' => s }}       
+      render :json => options            
+    end
+
+    # @route GET /admin/gift-cards/:id/json
     def admin_json_single
       return if !user_is_allowed('giftcards', 'view')    
       gc = GiftCard.find(params[:id])      
       render :json => gc
     end
-    
-    # GET /admin/gift-cards/new
-    def admin_new
-      return if !user_is_allowed('giftcards', 'add')      
+
+    # @route GET /admin/gift-cards/:id
+    def admin_edit
+      return if !user_is_allowed('giftcards', 'edit')
+      @gift_card = GiftCard.find(params[:id])
       render :layout => 'caboose/admin'
     end
+
+    # @route PUT /admin/gift-cards/:id
+    def admin_update
+      return unless user_is_allowed_to 'edit', 'sites'
     
-    # POST /admin/gift-cards
-    def admin_add
-      return if !user_is_allowed('giftcards', 'add')
-      
-      resp = StdClass.new
-      code = params[:code].strip
-      
-      if code.length == 0
-        resp.error = "A valid code is required."
-      elsif GiftCard.where(:code => code).exists?
-        resp.error = "A gift card with that code already exists."
-      else
-        gc = GiftCard.new(
-          :site_id => @site.id,
-          :code    => code,
-          :status  => GiftCard::STATUS_INACTIVE              
-        )
-        resp.success = gc.save
-        resp.new_id = gc.id
-        resp.redirect = "/admin/gift-cards/#{gc.id}"
+      resp = Caboose::StdClass.new    
+      gift_cards = params[:id] == 'bulk' ? params[:model_ids].collect{ |gc_id| GiftCard.find(gc_id) } : [GiftCard.find(params[:id])]
+    
+      save = true
+      params.each do |k,v|
+        case k
+          when 'site_id'           then gift_cards.each{ |gc| gc.site_id           = v }                 
+          when 'name'              then gift_cards.each{ |gc| gc.name              = v }
+          when 'code'              then gift_cards.each{ |gc| gc.code              = v }
+          when 'card_type'         then gift_cards.each{ |gc| gc.card_type         = v }
+          when 'total'             then gift_cards.each{ |gc| gc.total             = v }
+          when 'balance'           then gift_cards.each{ |gc| gc.balance           = v }
+          when 'min_invoice_total' then gift_cards.each{ |gc| gc.min_invoice_total = v }            
+          when 'date_available'    then gift_cards.each{ |gc| gc.date_available    = DateTime.strptime(v, '%m/%d/%Y') }
+          when 'date_expires'      then gift_cards.each{ |gc| gc.date_expires      = DateTime.strptime(v, '%m/%d/%Y') }
+          when 'status'            then gift_cards.each{ |gc| gc.status            = v }                      
+        end        
       end
-      
-      render :json => resp        
-    end
+      gift_cards.each{ |gc| gc.save }
     
-    # POST /admin/gift-cards/bulk
+      resp.success = true
+      render :json => resp
+    end
+
+    # @route POST /admin/gift-cards/bulk
     def admin_bulk_add
       return if !user_is_allowed('sites', 'add')
       
@@ -104,78 +139,33 @@ module Caboose
       
       render :json => resp
     end
-  
-    # GET /admin/gift-cards/:id
-    def admin_edit
-      return if !user_is_allowed('giftcards', 'edit')
-      @gift_card = GiftCard.find(params[:id])
-      render :layout => 'caboose/admin'
-    end
 
-    # PUT /admin/gift-cards/:id
-    def admin_update
-      return if !user_is_allowed('giftcards', 'edit')
+    # @route POST /admin/gift-cards
+    def admin_add
+      return if !user_is_allowed('giftcards', 'add')
       
-      resp = Caboose::StdClass.new
-      gc = GiftCard.find(params[:id])    
+      resp = StdClass.new
+      code = params[:code].strip
       
-      save = true    
-      params.each do |name,value|
-        case name
-          when 'site_id'         then gc.site_id         = value                 
-          when 'name'            then gc.name            = value
-          when 'code'            then gc.code            = value
-          when 'card_type'       then gc.card_type       = value
-          when 'total'           then gc.total           = value
-          when 'balance'         then gc.balance         = value
-          when 'min_order_total' then gc.min_order_total = value
-          when 'date_available'  then gc.date_available  = DateTime.strptime(value, '%m/%d/%Y')
-          when 'date_expires'    then gc.date_expires    = DateTime.strptime(value, '%m/%d/%Y')
-          when 'status'          then gc.status          = value                            
-        end
-      end          
-      resp.success = save && gc.save
-      render :json => resp
-    end
-    
-    # PUT /admin/gift-cards/bulk
-    def admin_bulk_update
-      return unless user_is_allowed_to 'edit', 'sites'
-    
-      resp = Caboose::StdClass.new    
-      gift_cards = params[:model_ids].collect{ |gc_id| GiftCard.find(gc_id) }
-    
-      save = true
-      params.each do |k,v|
-        case k
-          when 'site_id'         then gift_cards.each{ |gc| gc.site_id         = v }                 
-          when 'name'            then gift_cards.each{ |gc| gc.name            = v }
-          when 'code'            then gift_cards.each{ |gc| gc.code            = v }
-          when 'card_type'       then gift_cards.each{ |gc| gc.card_type       = v }
-          when 'total'           then gift_cards.each{ |gc| gc.total           = v }
-          when 'balance'         then gift_cards.each{ |gc| gc.balance         = v }
-          when 'min_order_total' then gift_cards.each{ |gc| gc.min_order_total = v }            
-          when 'date_available'  then gift_cards.each{ |gc| gc.date_available  = DateTime.strptime(v, '%m/%d/%Y') }
-          when 'date_expires'    then gift_cards.each{ |gc| gc.date_expires    = DateTime.strptime(v, '%m/%d/%Y') }
-          when 'status'          then gift_cards.each{ |gc| gc.status          = v }                      
-        end        
+      if code.length == 0
+        resp.error = "A valid code is required."
+      elsif GiftCard.where(:code => code).exists?
+        resp.error = "A gift card with that code already exists."
+      else
+        gc = GiftCard.new(
+          :site_id => @site.id,
+          :code    => code,
+          :status  => GiftCard::STATUS_INACTIVE              
+        )
+        resp.success = gc.save
+        resp.new_id = gc.id
+        resp.redirect = "/admin/gift-cards/#{gc.id}"
       end
-      gift_cards.each{ |gc| gc.save }
-    
-      resp.success = true
-      render :json => resp
-    end
-    
-    # DELETE /admin/gift-cards/:id
-    def admin_delete
-      return if !user_is_allowed('giftcards', 'delete')
-      GiftCard.find(params[:id]).destroy
-      render :json => Caboose::StdClass.new({
-        :redirect => '/admin/gift-cards'
-      })
+      
+      render :json => resp        
     end
-    
-    # DELETE /admin/gift-cards/:id/bulk    
+
+    # @route DELETE /admin/gift-cards/:id/bulk    
     def admin_bulk_delete
       return if !user_is_allowed('sites', 'delete')
       
@@ -186,31 +176,15 @@ module Caboose
       resp.success = true
       render :json => resp
     end
-        
-    # GET /admin/gift-cards/status-options
-    def admin_status_options
-      return if !user_is_allowed('categories', 'view')
-      statuses = [      
-        GiftCard::STATUS_INACTIVE,
-        GiftCard::STATUS_ACTIVE,
-        GiftCard::STATUS_EXPIRED
-      ]        
-      options = statuses.collect{ |s| { 'text' => s, 'value' => s }}       
-      render :json => options
-    end
-    
-    # GET /admin/gift-cards/card-type-options
-    def admin_card_type_options
-      return if !user_is_allowed('categories', 'view')
-      types = [
-        GiftCard::CARD_TYPE_AMOUNT,
-        GiftCard::CARD_TYPE_PERCENTAGE,
-        GiftCard::CARD_TYPE_NO_SHIPPING,
-        GiftCard::CARD_TYPE_NO_TAX,
-      ]        
-      options = types.collect{ |s| { 'text' => s, 'value' => s }}       
-      render :json => options            
+
+    # @route DELETE /admin/gift-cards/:id
+    def admin_delete
+      return if !user_is_allowed('giftcards', 'delete')
+      GiftCard.find(params[:id]).destroy
+      render :json => Caboose::StdClass.new({
+        :redirect => '/admin/gift-cards'
+      })
     end
-    
+
   end
 end