caboose-cms 0.5.16 → 0.5.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDU5MWI2YTUyYzc5NTg3NDYwOTEzYjJlMTYzMDc2ZGIwOTlkMDA2YQ==
+    ZDg5OWEzYmQ5M2NkNTRiMjhlMjc5ODBmNDE3OGViYjBiYjk4NTc3NA==
   data.tar.gz: !binary |-
-    YWJkNTI4N2Y3YWZjYTYzYzM1NzgxNTYyYTEwZGI5NDU4ODFlNDU5YQ==
+    MDdiNDRjZTUyZWNkMmU4MzU4MGNhMzVlNTdmMjM0YWI0ZjA2ZWE3Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZGE2YTExNTVkNjI5YTA3N2RmM2NhYTkxNWU0NjVmZWM3MTYzN2Y3ZDE2MDIy
-    OGRlYTg1ZjU4OGI2OGY0N2RjMjQyZTk5YzgzNjBkMTUwMTdjOTBhMGZiNTdm
-    YTIwODI5NWU5NDhlZjA2OWRhNjllMmE2ODViYTcwYmY2YjRlYjE=
+    ZDhiNGNlY2M3YjdhOTU3NTlhMzUwZTZlMmQ1Mzg2Y2VjZTliZDdmZDUzZTFi
+    ZGUyYTllZjRjMDgzMzRlOTUyYTQyMjMzZmM1YWUzMzViMTJjNjE4ODcxZmNh
+    ZjNlNzgwN2ZiYjY3OTYxYTAyMWI0OTQ2NTYyNDZjM2RmZTY1YmY=
   data.tar.gz: !binary |-
-    NWQ2MzJiNjljYzBiYTQzZDc0YjIwYTgzMDcxMzEzMjNhMjY3ODZhNjIwNDU5
-    NzIwMTVmYTdhMDVlN2NlYWIyODRmMTIwMDA2NjI1MjI1NzdjZjRhZmQwODRj
-    NTU4MjBiYmJjMDg0NWU0MzY0ZDMwOThhMTliZjE5NWZlY2FhNmQ=
+    N2UyYTAwOTFjZDYyMjA0NmY1NzMwYTY5ZTBjYTNjODIyMDFhOGE3MGU1YmY5
+    OWI5NDI0Njk0ZTg3ZjI5MDEyOTQ3OGJkNjk4MDkwZjg5OWQ3ZTU4YzIxYTgw
+    YzQxNTQ5Y2Q4MWZiZGI1OGUwNjYwNzY0NGU3ZWJiNWJjZDQ0ZjY=

data/app/controllers/caboose/sites_controller.rb

@@ -32,8 +32,34 @@ module Caboose
     
     # GET /admin/sites/1/edit
     def admin_edit
+      return if !user_is_allowed('sites', 'edit')
+      @site = Site.find(params[:id])      
+    end
+    
+    # GET /admin/sites/1/edit/store
+    def admin_edit_store_config
       return if !user_is_allowed('sites', 'edit')
       @site = Site.find(params[:id])
+      StoreConfig.create(:site_id => @site.id) if @site.store_config.nil?      
+    end
+    
+    # GET /admin/sites/1/edit/smtp
+    def admin_edit_smtp_config
+      return if !user_is_allowed('sites', 'edit')
+      @site = Site.find(params[:id])      
+      SmtpConfig.create(:site_id => @site.id)  if @site.smtp_config.nil?
+    end
+    
+    # GET /admin/sites/1/edit/block-types
+    def admin_edit_block_types
+      return if !user_is_allowed('sites', 'edit')
+      @site = Site.find(params[:id])      
+    end
+    
+    # GET /admin/sites/1/edit/delete
+    def admin_delete_form
+      return if !user_is_allowed('sites', 'edit')
+      @site = Site.find(params[:id])      
     end
         
     # POST /admin/sites
@@ -46,8 +72,10 @@ module Caboose
       
       if site.name.length == 0
         resp.error = "Please enter a valid domain."      
-      else
+      else        
         site.save
+        StoreConfig.create(:site_id => site.id)
+        SmtpConfig.create( :site_id => site.id)
         resp.redirect = "/admin/sites/#{site.id}"
       end
       
@@ -153,5 +181,25 @@ module Caboose
       render :json => options
     end
     
+    # GET /admin/sites/payment-processor-options
+    def payment_processor_options
+      return if !user_is_allowed('sites', 'view')
+      options = [ 
+        { 'value' => 'stripe', 'text' => 'Stripe' }
+      ]
+      render :json => options
+    end
+    
+    # GET /admin/sites/smtp-auth-options
+    def smtp_auth_options
+      return if !user_is_allowed('sites', 'view')
+      options = [
+        { 'value' => SmtpConfig::AUTH_PLAIN , 'text' => SmtpConfig::AUTH_PLAIN },
+        { 'value' => SmtpConfig::AUTH_LOGIN , 'text' => SmtpConfig::AUTH_LOGIN },
+        { 'value' => SmtpConfig::AUTH_MD5   , 'text' => SmtpConfig::AUTH_MD5   }                  
+      ]
+      render :json => options
+    end
+    
   end
 end

data/app/models/caboose/schema.rb

@@ -495,6 +495,24 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :max_width      , :decimal ],
         [ :max_height     , :decimal ]
       ],
+      Caboose::StoreConfig => [
+        [ :site_id                , :integer ],     
+        [ :pp_name                , :string  ],
+        [ :pp_username            , :string  ],
+        [ :pp_password            , :string  ],
+        [ :use_usps               , :boolean , { :default => false } ],
+        [ :usps_secret_key        , :string  ],
+        [ :usps_publishable_key   , :string  ],
+        [ :allowed_shipping_codes , :string  ],
+        [ :default_shipping_code  , :string  ],    
+        [ :origin_country         , :string  ],
+        [ :origin_state           , :string  ],
+        [ :origin_city            , :string  ],
+        [ :origin_zip             , :string  ],
+        [ :fulfillment_email      , :string  ],
+        [ :shipping_email         , :string  ],
+        [ :handling_percentage    , :string  ]
+      ],
       Caboose::User => [
         [ :first_name           , :string     ],
         [ :last_name            , :string     ],

data/app/models/caboose/site.rb

@@ -7,6 +7,7 @@ class Caboose::Site < ActiveRecord::Base
   has_many :site_memberships, :class_name => 'Caboose::SiteMembership', :dependent => :delete_all
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
   has_many :post_categories, :class_name => 'Caboose::PostCategory'
+  has_one :store_config
   attr_accessible :id, :name, :description, :under_construction_html
   
   def smtp_config

data/app/models/caboose/smtp_config.rb

@@ -13,7 +13,6 @@ class Caboose::SmtpConfig < ActiveRecord::Base
     :authentication       ,
     :enable_starttls_auto
 
-
   AUTH_PLAIN = 'plain'
   AUTH_LOGIN = 'login'
   AUTH_MD5 = 'cram_md5'

data/app/models/caboose/store_config.rb

@@ -0,0 +1,22 @@
+module Caboose
+  class StoreConfig < ActiveRecord::Base
+    belongs_to :site    
+    attr_accessible :id,
+      :site_id,            
+      :pp_name,     
+      :pp_username,
+      :pp_password,
+      :use_usps,
+      :usps_secret_key,
+      :usps_publishable_key,
+      :allowed_shipping_codes, # ['0','7','6','1','2','3'],
+      :default_shipping_code,      
+      :origin_country, 
+      :origin_state, 
+      :origin_city, 
+      :origin_zip,           
+      :fulfillment_email,
+      :shipping_email,
+      :handling_percentage      
+  end
+end

data/app/views/caboose/sites/_admin_footer.html.erb

@@ -0,0 +1,2 @@
+<br style='clear: left; line-height: 0;' />
+</div><!-- modal_content2 -->

data/app/views/caboose/sites/_admin_header.html.erb

@@ -0,0 +1,40 @@
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#gravatar {
+  float: right;
+  width: 150px;
+  text-align: right;
+  margin: 0 4px 0 0;
+  padding: 0;
+}
+#gravatar img {
+  border: #fff 2px solid;
+}
+#content input[type=checkbox] { position: relative; }
+#members { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<% end %>
+
+<h1 id='page_title'>Edit Site</h1>
+<ul id='tabs'>
+<%
+tabs = {
+  'General'      => "/admin/sites/#{@site.id}",
+  'Block Types'  => "/admin/sites/#{@site.id}/block-types",
+  'Store Config' => "/admin/sites/#{@site.id}/store",
+  'SMTP Config'  => "/admin/sites/#{@site.id}/smtp",  
+  'Delete Site'  => "/admin/sites/#{@site.id}/delete" 
+}
+
+%>
+<% tabs.each do |text, href| %>
+<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %>
+<li class='back'><input type='button' value='< Back' onclick="window.location='/admin/sites';" /></li>
+</ul>
+<div id='content2'>

data/app/views/caboose/sites/admin_delete_form.html.erb

@@ -0,0 +1,39 @@
+<%
+s = @site
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+      
+<div id='message'></div>
+<div id='controls'>
+<input type='button' value='Delete Site'    onclick="delete_site(<%= @site.id %>);" />
+</div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+function delete_site(site_id, confirm)
+{        
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the site? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_site(site_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting site...</p>");
+  $.ajax({
+    url: '/admin/sites/' + site_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/sites/admin_edit.html.erb

@@ -5,7 +5,7 @@ user_ids  = Caboose::SiteMembership.where(:site_id => s.id, :role => Caboose::Si
 admin_ids = [] if admin_ids.nil?
 user_ids = [] if user_ids.nil?
 %>
-<h1>Edit Site</h1>
+<%= render :partial => 'caboose/sites/admin_header' %>
 
 <p><div id='site_<%= @site.id %>_name'        ></div></p>
 <p><div id='site_<%= @site.id %>_description' ></div></p>
@@ -51,35 +51,9 @@ user_ids = [] if user_ids.nil?
 </table>
 </div>
 
-<h2>Block Types</h2>
-<div id='block_types'>
-<table class='data'>
-<tr><th>&nbsp;</th><th>Name</th><th>Description</th></tr>
-<% bt_ids = @site.block_type_site_memberships.collect{ |bt| bt.block_type_id } %>
-<% Caboose::BlockType.where("parent_id is null").reorder('name').all.each do |bt| %>
-  <tr>
-    <td align='center'><input type='checkbox' name='block_type_id_<%= bt.id %>' <%= bt_ids.include?(bt.id) ? "checked='true'" : '' %> onclick="toggle_block_type_site_membership(<%= @site.id %>, <%= bt.id %>, $(this).prop('checked'));" /></td>
-    <td><%= bt.name %></td>
-    <td><%= bt.description %></td>
-  </tr>
-<% end %>
-</table><br/>
-</div>
+<%= render :partial => 'caboose/sites/admin_footer' %>
 
-<div id='message'></div>
-<div id='controls'>
-<input type='button' value='Back'           onclick="window.location='/admin/sites';" />
-<input type='button' value='Delete Site'    onclick="delete_site(<%= @site.id %>);" />
-</div>
-
-<% content_for :caboose_css do %>
-<style type='text/css'>
-#content input[type=checkbox] { position: relative; }
-#members { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
-</style>
-<% end %>
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
 $(document).ready(function() {
@@ -93,31 +67,9 @@ $(document).ready(function() {
       { name: 'description'             , nice_name: 'Description'              , type: 'textarea' , value: <%= raw Caboose.json(@site.description)             %>, width: 600, height: 75 },
       { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html) %>, width: 600, height: 75 }      
     ]    
-  });  
+  });       
 });
 
-function delete_site(site_id, confirm)
-{        
-  if (!confirm)
-  {
-    var p = $('<p/>').addClass('note confirm')
-      .append('Are you sure you want to delete the site? ')
-      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_site(site_id, true); })).append(' ')
-      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
-    $('#message').empty().append(p);
-    return;
-  }
-  $('#message').html("<p class='loading'>Deleting site...</p>");
-  $.ajax({
-    url: '/admin/sites/' + site_id,
-    type: 'delete',
-    success: function(resp) {
-      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
-      if (resp.redirect) window.location = resp.redirect;
-    }
-  });
-}
-
 function set_under_construction(site_id, domain_id, checked)
 {
   $.ajax({
@@ -149,18 +101,6 @@ function remove_site_membership(site_id, user_id)
   });
 }
 
-function toggle_block_type_site_membership(site_id, block_type_id, checked)
-{
-  $.ajax({
-    url: '/admin/block-types/' + block_type_id,
-    type: 'put',
-    data: {
-      site_id: [site_id, checked ? 1 : 0]
-    },        
-    succes: function(resp) {}
-  });
-}
-
 function add_domain(site_id, domain)
 {
   if (!domain)
@@ -222,18 +162,3 @@ function set_primary_domain(site_id, domain_id)
 
 </script>
 <% end %>
-
-<% content_for :caboose_css do %>
-<style type='text/css'>
-#gravatar {
-  float: right;
-  width: 150px;
-  text-align: right;
-  margin: 0 4px 0 0;
-  padding: 0;
-}
-#gravatar img {
-  border: #fff 2px solid;
-}
-</style>
-<% end %>

data/app/views/caboose/sites/admin_edit_block_types.html.erb

@@ -0,0 +1,45 @@
+<%
+s = @site
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<h2>Block Types</h2>
+<div id='block_types'>
+<table class='data'>
+<tr><th>&nbsp;</th><th>Name</th><th>Description</th></tr>
+<% bt_ids = @site.block_type_site_memberships.collect{ |bt| bt.block_type_id } %>
+<% Caboose::BlockType.where("parent_id is null").reorder('name').all.each do |bt| %>
+  <tr>
+    <td align='center'><input type='checkbox' name='block_type_id_<%= bt.id %>' <%= bt_ids.include?(bt.id) ? "checked='true'" : '' %> onclick="toggle_block_type_site_membership(<%= @site.id %>, <%= bt.id %>, $(this).prop('checked'));" /></td>
+    <td><%= bt.name %></td>
+    <td><%= bt.description %></td>
+  </tr>
+<% end %>
+</table><br/>
+</div>
+      
+<div id='message'></div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+      
+});
+
+function toggle_block_type_site_membership(site_id, block_type_id, checked)
+{
+  $.ajax({
+    url: '/admin/block-types/' + block_type_id,
+    type: 'put',
+    data: {
+      site_id: [site_id, checked ? 1 : 0]
+    },        
+    succes: function(resp) {}
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/sites/admin_edit_smtp_config.html.erb

@@ -0,0 +1,51 @@
+<%
+s = @site
+smtp_config = s.smtp_config
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+
+<h2>SMTP Config</h2>
+<p><div id='smtpconfig_<%= smtp_config.id %>_address'              ></div></p>  
+<p><div id='smtpconfig_<%= smtp_config.id %>_port'                 ></div></p>
+<p><div id='smtpconfig_<%= smtp_config.id %>_domain'               ></div></p>
+<p><div id='smtpconfig_<%= smtp_config.id %>_user_name'            ></div></p>
+<p><div id='smtpconfig_<%= smtp_config.id %>_password'             ></div></p>
+<p><div id='smtpconfig_<%= smtp_config.id %>_authentication'       ></div></p>
+<p><div id='smtpconfig_<%= smtp_config.id %>_enable_starttls_auto' ></div></p>
+      
+<div id='message'></div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#content input[type=checkbox] { position: relative; }
+#members { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+    
+  new ModelBinder({
+    name: 'SmtpConfig',
+    id: <%= smtp_config.id %>,
+    update_url: '/admin/sites/<%= @site.id %>/smtp',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'address'              , nice_name: 'Address'                 , type: 'text'     , value: <%= raw Caboose.json(smtp_config.address              ) %>, width: 400 },  
+      { name: 'port'                 , nice_name: 'Port'                    , type: 'text'     , value: <%= raw Caboose.json(smtp_config.port                 ) %>, width: 400 },
+      { name: 'domain'               , nice_name: 'Domain'                  , type: 'text'     , value: <%= raw Caboose.json(smtp_config.domain               ) %>, width: 400 },
+      { name: 'user_name'            , nice_name: 'Username'                , type: 'text'     , value: <%= raw Caboose.json(smtp_config.user_name            ) %>, width: 400 },
+      { name: 'password'             , nice_name: 'Password'                , type: 'text'     , value: <%= raw Caboose.json(smtp_config.password             ) %>, width: 400 },
+      { name: 'authentication'       , nice_name: 'Authentication'          , type: 'select'   , value: <%= raw Caboose.json(smtp_config.authentication       ) %>, width: 400 , options_url: '/admin/sites/smtp-auth-options' },
+      { name: 'enable_starttls_auto' , nice_name: 'Enable Start TLS Auto'   , type: 'checkbox' , value: <%= raw smtp_config.enable_starttls_auto ? 1 : 0        %>, width: 400 }                  
+    ]    
+  });
+      
+});
+
+</script>
+<% end %>

data/app/views/caboose/sites/admin_edit_store_config.html.erb

@@ -0,0 +1,66 @@
+<%
+s = @site
+store_config = s.store_config
+%>
+<%= render :partial => 'caboose/sites/admin_header' %>
+     
+<p><div id='storeconfig_<%= store_config.id %>_pp_name'                 ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_pp_username'             ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_pp_password'             ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_use_usps'                ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_usps_secret_key'         ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_usps_publishable_key'    ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_allowed_shipping_codes'  ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_default_shipping_code'   ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_origin_country'          ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_origin_state'            ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_origin_city'             ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_origin_zip'              ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_fulfillment_email'       ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_shipping_email'          ></div></p>
+<p><div id='storeconfig_<%= store_config.id %>_handling_percentage'     ></div></p>
+      
+<div id='message'></div>
+
+<%= render :partial => 'caboose/sites/admin_footer' %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#content input[type=checkbox] { position: relative; }
+#members { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+
+  new ModelBinder({
+    name: 'StoreConfig',
+    id: <%= store_config.id %>,
+    update_url: '/admin/sites/<%= @site.id %>/store',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'pp_name'                 , nice_name: 'Payment Processor Type'     , type: 'select'   , value: <%= raw Caboose.json(store_config.pp_name                ) %>, width: 400 , options_url: '/admin/sites/payment-processor-options' },
+      { name: 'pp_username'             , nice_name: 'Payment Processor Username' , type: 'text'     , value: <%= raw Caboose.json(store_config.pp_username            ) %>, width: 400 },
+      { name: 'pp_password'             , nice_name: 'Payment Processor Password' , type: 'text'     , value: <%= raw Caboose.json(store_config.pp_password            ) %>, width: 400 },
+      { name: 'use_usps'                , nice_name: 'Use USPS'                   , type: 'checkbox' , value: <%= raw Caboose.json(store_config.use_usps ? 1 : 0       ) %>, width: 400 },
+      { name: 'usps_secret_key'         , nice_name: 'USPS Secret Key'            , type: 'text'     , value: <%= raw Caboose.json(store_config.usps_secret_key        ) %>, width: 400 },
+      { name: 'usps_publishable_key'    , nice_name: 'USPS Publishable Key'       , type: 'text'     , value: <%= raw Caboose.json(store_config.usps_publishable_key   ) %>, width: 400 },
+      { name: 'allowed_shipping_codes'  , nice_name: 'Allowed Shipping Codes'     , type: 'text'     , value: <%= raw Caboose.json(store_config.allowed_shipping_codes ) %>, width: 400 },
+      { name: 'default_shipping_code'   , nice_name: 'Default Shipping Code'      , type: 'text'     , value: <%= raw Caboose.json(store_config.default_shipping_code  ) %>, width: 400 },
+      { name: 'origin_country'          , nice_name: 'Origin Country'             , type: 'text'     , value: <%= raw Caboose.json(store_config.origin_country         ) %>, width: 400 },
+      { name: 'origin_state'            , nice_name: 'Origin State'               , type: 'text'     , value: <%= raw Caboose.json(store_config.origin_state           ) %>, width: 400 },
+      { name: 'origin_city'             , nice_name: 'Origin City'                , type: 'text'     , value: <%= raw Caboose.json(store_config.origin_city            ) %>, width: 400 },
+      { name: 'origin_zip'              , nice_name: 'Origin Zip'                 , type: 'text'     , value: <%= raw Caboose.json(store_config.origin_zip             ) %>, width: 400 },
+      { name: 'fulfillment_email'       , nice_name: 'Fulfillment Email'          , type: 'text'     , value: <%= raw Caboose.json(store_config.fulfillment_email      ) %>, width: 400 },
+      { name: 'shipping_email'          , nice_name: 'Shipping Email'             , type: 'text'     , value: <%= raw Caboose.json(store_config.shipping_email         ) %>, width: 400 },
+      { name: 'handling_percentage'     , nice_name: 'Handling Percentage'        , type: 'text'     , value: <%= raw Caboose.json(store_config.handling_percentage    ) %>, width: 400 }            
+    ]    
+  });
+        
+});
+
+</script>
+<% end %>

data/config/routes.rb

@@ -28,13 +28,19 @@ Caboose::Engine.routes.draw do
   put     "admin/sites/:site_id/domains/:id" => "domains#admin_update"
   delete  "admin/sites/:site_id/domains/:id" => "domains#admin_delete"
                                                                                                                                      
-  get     "admin/sites/options"              => "sites#options"
-  get     "admin/sites"                      => "sites#admin_index"    
-  get     "admin/sites/new"                  => "sites#admin_new"  
-  get     "admin/sites/:id"                  => "sites#admin_edit"  
-  put     "admin/sites/:id"                  => "sites#admin_update"  
-  post    "admin/sites"                      => "sites#admin_add"  
-  delete  "admin/sites/:id"                  => "sites#admin_delete"
+  get     "admin/sites/options"                    => "sites#options"
+  get     "admin/sites/payment-processor-options"  => "sites#payment_processor_options"      
+  get     "admin/sites/smtp-auth-options"          => "sites#smtp_auth_options"      
+  get     "admin/sites"                            => "sites#admin_index"    
+  get     "admin/sites/new"                        => "sites#admin_new"  
+  get     "admin/sites/:id/store"                  => "sites#admin_edit_store_config"
+  get     "admin/sites/:id/smtp"                   => "sites#admin_edit_smtp_config"
+  get     "admin/sites/:id/block-types"            => "sites#admin_edit_block_types"
+  get     "admin/sites/:id/delete"                 => "sites#admin_delete_form"
+  get     "admin/sites/:id"                        => "sites#admin_edit"
+  put     "admin/sites/:id"                        => "sites#admin_update"  
+  post    "admin/sites"                            => "sites#admin_add"  
+  delete  "admin/sites/:id"                        => "sites#admin_delete"
     
   get     "admin/redirects"      => "redirects#admin_index"    
   get     "admin/redirects/new"  => "redirects#admin_new"  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.16'
+  VERSION = '0.5.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - William Barry
@@ -476,6 +476,7 @@ files:
 - app/models/caboose/stackable_group.rb
 - app/models/caboose/states.rb
 - app/models/caboose/std_class.rb
+- app/models/caboose/store_config.rb
 - app/models/caboose/tax_calculator.rb
 - app/models/caboose/tax_line.rb
 - app/models/caboose/user.rb
@@ -662,7 +663,13 @@ files:
 - app/views/caboose/settings/edit.html.erb
 - app/views/caboose/settings/index.html.erb
 - app/views/caboose/settings/new.html.erb
+- app/views/caboose/sites/_admin_footer.html.erb
+- app/views/caboose/sites/_admin_header.html.erb
+- app/views/caboose/sites/admin_delete_form.html.erb
 - app/views/caboose/sites/admin_edit.html.erb
+- app/views/caboose/sites/admin_edit_block_types.html.erb
+- app/views/caboose/sites/admin_edit_smtp_config.html.erb
+- app/views/caboose/sites/admin_edit_store_config.html.erb
 - app/views/caboose/sites/admin_index.html.erb
 - app/views/caboose/sites/admin_new.html.erb
 - app/views/caboose/stackable_groups/admin_index.html.erb