caboose-cms 0.7.85 → 0.8.1

data/app/assets/javascripts/caboose/united_states.js

@@ -0,0 +1,65 @@
+
+function united_states()
+{
+  return {
+    "AL": "Alabama",
+    "AK": "Alaska",
+    "AS": "American Samoa",
+    "AZ": "Arizona",
+    "AR": "Arkansas",
+    "CA": "California",
+    "CO": "Colorado",
+    "CT": "Connecticut",
+    "DE": "Delaware",
+    "DC": "District Of Columbia",
+    "FM": "Federated States Of Micronesia",
+    "FL": "Florida",
+    "GA": "Georgia",
+    "GU": "Guam",
+    "HI": "Hawaii",
+    "ID": "Idaho",
+    "IL": "Illinois",
+    "IN": "Indiana",
+    "IA": "Iowa",
+    "KS": "Kansas",
+    "KY": "Kentucky",
+    "LA": "Louisiana",
+    "ME": "Maine",
+    "MH": "Marshall Islands",
+    "MD": "Maryland",
+    "MA": "Massachusetts",
+    "MI": "Michigan",
+    "MN": "Minnesota",
+    "MS": "Mississippi",
+    "MO": "Missouri",
+    "MT": "Montana",
+    "NE": "Nebraska",
+    "NV": "Nevada",
+    "NH": "New Hampshire",
+    "NJ": "New Jersey",
+    "NM": "New Mexico",
+    "NY": "New York",
+    "NC": "North Carolina",
+    "ND": "North Dakota",
+    "MP": "Northern Mariana Islands",
+    "OH": "Ohio",
+    "OK": "Oklahoma",
+    "OR": "Oregon",
+    "PW": "Palau",
+    "PA": "Pennsylvania",
+    "PR": "Puerto Rico",
+    "RI": "Rhode Island",
+    "SC": "South Carolina",
+    "SD": "South Dakota",
+    "TN": "Tennessee",
+    "TX": "Texas",
+    "UT": "Utah",
+    "VT": "Vermont",
+    "VI": "Virgin Islands",
+    "VA": "Virginia",
+    "WA": "Washington",
+    "WV": "West Virginia",
+    "WI": "Wisconsin",
+    "WY": "Wyoming"
+  }
+}

data/app/assets/stylesheets/caboose/{my_account_edit_order.css.scss → my_account_edit_invoice.css.scss}

@@ -1,5 +1,5 @@
 
-table.order { 
+table.invoice { 
   border-collapse: collapse;
   margin-bottom: 20px;
   th { margin: 0; padding: 10px; border: #000 0px solid; font-weight: bold; text-align: center; }

data/app/assets/templates/caboose/cart/line_items.jst.ejs

@@ -1,6 +1,6 @@
 <h3>Shopping Cart</h3>
 
-<% if (!order.line_items.length) { %>
+<% if (!invoice.line_items.length) { %>
   <p>Your cart is currently empty. <a href="/products">Click here</a> to continue shopping.</p>
 <% } else { %>
   <ul>
@@ -9,7 +9,7 @@
       <header>Price</header>
     </li>
     
-    <% _.each(order.line_items, function(lineItem) { %>
+    <% _.each(invoice.line_items, function(lineItem) { %>
       <li data-id="<%= lineItem.id %>">
         <section>
           <% if (lineItem.variant.images.length > 0) { %>
@@ -34,7 +34,7 @@
     <li>
       <footer>
         <a href="/checkout" class="btn blue">Checkout</a>
-        <h4>Subtotal: <span class="subtotal">$<%= parseFloat(Math.round(order.subtotal * 100) / 100).toFixed(2) %></span></h4>
+        <h4>Subtotal: <span class="subtotal">$<%= parseFloat(Math.round(invoice.subtotal * 100) / 100).toFixed(2) %></span></h4>
       </footer>
     </li>
   </ul>

data/app/assets/templates/caboose/checkout/line_items.jst.ejs

@@ -1,7 +1,7 @@
 <p class="wrapper">Your Cart:</p>
 
 <ul>
-  <% _.each(order.line_items, function(lineItem) { %>
+  <% _.each(invoice.line_items, function(lineItem) { %>
     <li data-id="<%= lineItem.id %>">
       <div class="wrapper">
         <aside>
@@ -17,15 +17,15 @@
 </ul>
 
 
-<p class="wrapper subtotal"><span>Subtotal:</span> <span>$<%= ((parseFloat(order.subtotal) * 100) / 100).toFixed(2) %></span></p>
+<p class="wrapper subtotal"><span>Subtotal:</span> <span>$<%= ((parseFloat(invoice.subtotal) * 100) / 100).toFixed(2) %></span></p>
 
-<% if (order.shipping > 0) { %>
-  <p class="wrapper shipping"><span>Shipping & Handling:</span> <span>$<%= (((parseFloat(order.shipping) + parseFloat(order.handling)) * 100) / 100).toFixed(2) %></span></p>
+<% if (invoice.shipping > 0) { %>
+  <p class="wrapper shipping"><span>Shipping & Handling:</span> <span>$<%= (((parseFloat(invoice.shipping) + parseFloat(invoice.handling)) * 100) / 100).toFixed(2) %></span></p>
 <% } %>
 
-<% if (order.tax > 0 && order.billing_address.state == 'AL') { %>
-  <p class="wrapper tax"><span>Tax <small>(if in Alabama)</small>:</span> <span>$<%= parseFloat(Math.round(order.tax * 100) / 100).toFixed(2) %></span></p>
+<% if (invoice.tax > 0 && invoice.billing_address.state == 'AL') { %>
+  <p class="wrapper tax"><span>Tax <small>(if in Alabama)</small>:</span> <span>$<%= parseFloat(Math.round(invoice.tax * 100) / 100).toFixed(2) %></span></p>
 <% } %>
 
-<p class="wrapper total"><span>Total:</span> <span>$<%= parseFloat(Math.round(order.total * 100) / 100).toFixed(2) %></span></p>
+<p class="wrapper total"><span>Total:</span> <span>$<%= parseFloat(Math.round(invoice.total * 100) / 100).toFixed(2) %></span></p>
 

data/app/controllers/caboose/ab_options_controller.rb

@@ -2,14 +2,14 @@ module Caboose
   class AbOptionsController < ApplicationController
     layout 'caboose/admin'
 
-    # @route GET /admin/ab_variants/:variant_id/options
+    # @route GET /admin/ab-variants/:variant_id/options
     def admin_index
       return unless user_is_allowed_to 'view', 'ab_variants'
       v = AbVariant.find(params[:variant_id])
       render :json => v.ab_options
     end
 
-    # @route POST admin/ab-variants/:variant_id/options'
+    # @route POST /admin/ab-variants/:variant_id/options'
     def admin_create
       return unless user_is_allowed_to 'edit','ab_variants'
       
@@ -26,7 +26,7 @@ module Caboose
       render :json => resp
     end
 
-    # @route PUT /admin/ab_options/:id
+    # @route PUT /admin/ab-options/:id
     def admin_update
       return unless user_is_allowed_to 'edit', 'ab_variants'
 
@@ -46,7 +46,7 @@ module Caboose
       render :json => resp
     end
 
-    # @route DELETE /admin/ab_options/:id
+    # @route DELETE /admin/ab-options/:id
     def admin_delete
       return unless user_is_allowed_to 'delete', 'ab_variants'      
       AbOption.find(params[:id]).destroy                  

data/app/controllers/caboose/ab_variants_controller.rb

@@ -6,7 +6,7 @@ module Caboose
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
 
-    # @route GET /admin/ab_variants
+    # @route GET /admin/ab-variants
     def admin_index
       return unless user_is_allowed_to 'view', 'ab_variants'
 
@@ -19,13 +19,13 @@ module Caboose
       @variants = @gen.items
     end
 
-    # @route GET /admin/ab_variants/new
+    # @route GET /admin/ab-variants/new
     def admin_new
       return unless user_is_allowed_to 'add', 'ab_variants'
       @variant = AbVariant.new
     end
 
-    # @route GET /admin/ab_variants/:id
+    # @route GET /admin/ab-variants/:id
     def admin_edit
       return unless user_is_allowed_to 'edit', 'ab_variants'
       @variant = AbVariant.find(params[:id])
@@ -53,7 +53,7 @@ module Caboose
       render json: resp
     end
 
-    # @route PUT /admin/ab_variants/:id
+    # @route PUT /admin/ab-variants/:id
     def admin_update
       return unless user_is_allowed_to 'edit', 'ab_variants'
 
@@ -76,7 +76,7 @@ module Caboose
       render :json => resp
     end
 
-    # @route DELETE /admin/ab_variants/:id
+    # @route DELETE /admin/ab-variants/:id
     def admin_destroy
       return unless user_is_allowed_to 'delete', 'ab_variants'      
       AbVariants.find(params[:id]).destroy

data/app/controllers/caboose/admin_controller.rb

@@ -12,11 +12,5 @@ module Caboose
       @return_url = params[:return_url].nil? ? '/admin/pages' : params[:return_url]
     end
     
-    # @route GET /station
-    def station
-      @user = logged_in_user
-      render :layout => 'caboose/station'
-    end
-    
   end
 end

data/app/controllers/caboose/application_controller.rb

@@ -64,26 +64,27 @@ module Caboose
     # Initialize the cart in the session
     def init_cart            
       # Check if the cart ID is defined and that it exists in the database
-      create_new_order = false
+      create_new_invoice = false
       if session[:cart_id]
-        @order = Caboose::Order.where(:id => session[:cart_id]).first
-        create_new_order = true if @order.nil? || @order.status != 'cart'                    
+        @invoice = Caboose::Invoice.where(:id => session[:cart_id]).first
+        create_new_invoice = true if @invoice.nil? || @invoice.status != 'cart'                    
       else                        
-        create_new_order = true                         
+        create_new_invoice = true                         
       end
 
-      if create_new_order # Create an order to associate with the session        
-        @order = Caboose::Order.new        
-        @order.site_id          = @site ? @site.id : nil
-        @order.status           = Caboose::Order::STATUS_CART
-        @order.financial_status = Caboose::Order::STATUS_PENDING
-        @order.date_created     = DateTime.now
-        @order.referring_site   = request.env['HTTP_REFERER']
-        @order.landing_page     = request.fullpath
-        @order.landing_page_ref = params[:ref] || nil
-        @order.save
+      if create_new_invoice # Create an invoice to associate with the session        
+        @invoice = Caboose::Invoice.new        
+        @invoice.site_id          = @site ? @site.id : nil
+        @invoice.status           = Caboose::Invoice::STATUS_CART
+        @invoice.financial_status = Caboose::Invoice::STATUS_PENDING
+        @invoice.date_created     = DateTime.now
+        @invoice.referring_site   = request.env['HTTP_REFERER']
+        @invoice.landing_page     = request.fullpath
+        @invoice.landing_page_ref = params[:ref] || nil
+        @invoice.payment_terms    = @site.store_config.default_payment_terms
+        @invoice.save
         # Save the cart ID in the session
-        session[:cart_id] = @order.id
+        session[:cart_id] = @invoice.id
       end                  
     end
     

data/app/controllers/caboose/billing_addresses_controller.rb

@@ -1,25 +1,25 @@
 module Caboose
   class BillingAddressesController < Caboose::ApplicationController
             
-    # @route GET /admin/orders/:order_id/billing-address/json
+    # @route GET /admin/invoices/:invoice_id/billing-address/json
     def admin_json
-      return if !user_is_allowed('orders', 'edit')    
-      order = Order.find(params[:order_id])      
-      render :json => order.billing_address      
+      return if !user_is_allowed('invoices', 'edit')    
+      invoice = Invoice.find(params[:invoice_id])      
+      render :json => invoice.billing_address      
     end
       
-    # @route PUT /admin/orders/:order_id/billing-address
+    # @route PUT /admin/invoices/:invoice_id/billing-address
     def admin_update
-      return if !user_is_allowed('orders', 'edit')
+      return if !user_is_allowed('invoices', 'edit')
       
       resp = Caboose::StdClass.new({'attributes' => {}})
-      order = Order.find(params[:order_id])    
-      sa = order.billing_address
+      invoice = Invoice.find(params[:invoice_id])    
+      sa = invoice.billing_address
       
       if sa.nil?
         sa = Address.create
-        order.billing_address_id = sa.id
-        order.save
+        invoice.billing_address_id = sa.id
+        invoice.save
       end
       
       save = true    
@@ -48,33 +48,33 @@ module Caboose
     
     #===========================================================================
     
-    # @route GET /my-account/orders/:order_id/billing-address/json
+    # @route GET /my-account/invoices/:invoice_id/billing-address/json
     def my_account_json
       return if !logged_in?    
-      order = Order.find(params[:order_id])      
-      if order.customer_id != logged_in_user.id        
-        render :json => { :error => "The given order does not belong to you." } 
+      invoice = Invoice.find(params[:invoice_id])      
+      if invoice.customer_id != logged_in_user.id        
+        render :json => { :error => "The given invoice does not belong to you." } 
         return
       end
-      render :json => order.billing_address      
+      render :json => invoice.billing_address      
     end
     
-    # @route PUT /my-account/orders/:order_id/billing-address
+    # @route PUT /my-account/invoices/:invoice_id/billing-address
     def my_account_update
       return if !logged_in?
       
       resp = Caboose::StdClass.new
-      order = Order.find(params[:order_id])
-      if order.customer_id != logged_in_user.id        
-        render :json => { :error => "The given order does not belong to you." } 
+      invoice = Invoice.find(params[:invoice_id])
+      if invoice.customer_id != logged_in_user.id        
+        render :json => { :error => "The given invoice does not belong to you." } 
         return
       end                
       
-      sa = order.billing_address      
+      sa = invoice.billing_address      
       if sa.nil?
         sa = Address.create
-        order.billing_address_id = sa.id
-        order.save
+        invoice.billing_address_id = sa.id
+        invoice.save
       end
       
       save = true    

data/app/controllers/caboose/block_type_sources_controller.rb

@@ -5,20 +5,20 @@ module Caboose
     # Admin actions
     #===========================================================================
     
-    # @route GET /admin/block-type-sources
+    # @route GET /admin/block-types/store/sources
     def admin_index
       return if !user_is_allowed('blocktypesources', 'view')
       @block_type_sources = BlockTypeSource.reorder("priority, name").all
       render :layout => 'caboose/admin'      
     end
     
-    # @route GET /admin/block-type-sources/new    
+    # @route GET /admin/block-types/store/sources/new    
     def admin_new
       return unless user_is_allowed('blocktypesources', 'add')
       render :layout => 'caboose/admin'
     end
     
-    # @route GET /admin/block-type-sources/:id/refresh
+    # @route GET /admin/block-types/store/sources/:id/refresh
     def admin_refresh      
       return unless user_is_allowed('blocktypesources', 'edit')
       
@@ -33,7 +33,7 @@ module Caboose
       render :json => resp      
     end
     
-    # @route GET /admin/block-type-sources/options
+    # @route GET /admin/block-types/store/sources/options
     def admin_options
       return unless user_is_allowed('blocktypesources', 'edit')      
       options = BlockType.reorder(:name).all.collect do |bts| 
@@ -42,14 +42,14 @@ module Caboose
       render :json => options
     end
     
-    # @route GET /admin/block-type-sources/:id
+    # @route GET /admin/block-types/store/sources/:id
     def admin_edit
       return unless user_is_allowed('blocktypesources', 'edit')      
       @block_type_source = BlockTypeSource.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
-    # @route POST /admin/block-type-sources
+    # @route POST /admin/block-types/store/sources
     def admin_create
       return unless user_is_allowed('blocktypesources', 'add')
 
@@ -68,7 +68,7 @@ module Caboose
       render :json => resp
     end
     
-    # @route PUT /admin/block-type-sources/:id
+    # @route PUT /admin/block-types/store/sources/:id
     def admin_update
       return unless user_is_allowed('blocktypesources', 'edit')
       
@@ -90,7 +90,7 @@ module Caboose
       render :json => resp
     end
     
-    # @route DELETE /admin/block-type-sources/:id
+    # @route DELETE /admin/block-types/store/sources/:id
     def admin_delete
       return unless user_is_allowed('blocktypesources', 'delete')                  
       BlockTypeSource.find(params[:id]).destroy            

data/app/controllers/caboose/block_types_controller.rb

@@ -1,7 +1,7 @@
 
 module Caboose
   class BlockTypesController < ApplicationController
-    
+       
     #===========================================================================
     # Admin actions
     #===========================================================================
@@ -208,47 +208,7 @@ module Caboose
       bt.children.each do |bt2|
         admin_tree_options_helper(options, bt2, " - #{prefix}")
       end      
-    end
-    
-    #===========================================================================
-    # Store Actions
-    #===========================================================================
-    
-    # @route GET /admin/block-types/store
-    def admin_store_index
-      return unless user_is_allowed('blocktypestore', 'add')
-      @pager = PageBarGenerator.new(params, {
-    		  'block_type_source_id' => '',
-    		  'name_like'	           => '',
-    		  'description_like'	   => ''    		  
-    		},{
-    		  'model'          => 'Caboose::BlockTypeSummary',
-    	    'sort'			     => 'block_type_source_id, name',
-    		  'desc'			     => false,
-    		  'base_url'		   => '/admin/block-types/store',
-    		  'use_url_params' => false
-    	})
-    	@block_type_summaries = @pager.items
-    	render :layout => 'caboose/admin'
-    end
-    
-    # @route GET /admin/block-types/store/:block_type_summary_id/download
-    def admin_store_download
-      return unless user_is_allowed('blocktypestore', 'add')
-
-      bts = BlockTypeSummary::find(params[:block_type_summary_id])
-      bts.source.refresh(bts.name)
-
-      resp = StdClass.new('success' => 'The block type has been downloaded successfully.')
-      render :json => resp
-    end
-    
-    # @route GET /admin/block-types/store/:block_type_summary_id
-    def admin_store_details
-      return unless user_is_allowed('blocktypestore', 'add')
-      @block_type_summary = BlockTypeSummary::find(params[:block_type_summary_id])
-      render :layout => 'caboose/admin'
-    end
+    end        
             
     #===========================================================================
     # Public Repo Actions