caboose-cms 0.5.90 → 0.5.91

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTZmMjA4ZGY0YTdlYTg1N2I3ZGE1ZTk2MWFhNTg1NTMxYTE0Y2QzMg==
+    MDUyNzNmNTFiNGI2ODE3ZDI0YmViNzg5MDBiMDRhNjVmZGEzOTNlZA==
   data.tar.gz: !binary |-
-    YjE4M2E4ZWRjYWEwZjQyMGQzOGRkNDc3OTEwNTQ5MzgyOTdmNWQzZQ==
+    MmNlZmIzZWM5YTRjOTE1MjYwMGNjN2JjMWE0OGMwZmE5MmU0MmU2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YzZlMzcxYzZkNzI3YzAxZGM4MWMzODk3ODNmMzU5NDNjOGY2M2YzZWM4ODdm
-    ZWFhMWI4YTgzY2Q0ODZjYjBkOTEyMDY2YzkwODJlNTcyNmYyYmQ3MzBlOTdm
-    NDEzYTcyNjk2NWVhYmEwMTcyOTM2ZWZlNGQ2NWQwY2IwMGExYTU=
+    MTllOTY3MTRkMzg5OWM3ZGYwOWM2N2U2MjQ5NjVlZjM0OGEwNjRkNjM1YmU2
+    YTMxNjRlZDA3YjlmNTcyZmNhZjBkOTA3MjA0ZDAwNjc2OTg3M2U3NjhmZGJl
+    NDMyNGRjN2U3Y2NkNjMyNzhjNWI2NDI2ZDY2NTQyYjJmNzU5NTY=
   data.tar.gz: !binary |-
-    ZTZlMmIwYWM4OWFlZTAxNjlhOTA5YWU1ODczYTY5MTI0OTE1NzRiY2MxYzVk
-    NWE2OGY0M2E2Yjk3MjVkMWVlYmZiZGRlNzdiZDk0MWUwZDdkODBmOGY0MmM3
-    MjJiM2ZjNTBlNzA3NjBlZWEyZGJiZmQ3MTE2YmVkNmYzYzlhYjI=
+    MzA4ZmNjN2E0ZmYxMGJkYjA3MmE1ZTVhNjAzOTE5MTJlZGExOTIyN2FlYjNl
+    MjZlNTJhZmZkNTJkZGRlYWM0NThiNjk5YTJmYTQyYTU2OWFlZjE1NzE0ODc2
+    NDZjYmMyZjk3MzdlY2NjZDEyNDExNzVhNjMyYmRkZTMwMzkwOWQ=

data/app/assets/stylesheets/caboose/checkout.css.scss

@@ -304,24 +304,88 @@
 
 #checkout #checkout-payment {
   margin: 42px 0;
-  h1, h2, h3, h4, h5, h6 { text-align: left }
-  input, label, select { margin: 12px 0 }
-  label { line-height: 32px }
-  input {
-    clear: both;
-    display: block;
+  background: #EFEFEF;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid #d8d8d8;
+  
+  .field {
+    border-bottom: 1px solid #d8d8d8;
     width: 100%;
+    padding: 10px 2%;
+    &::after {
+      content: "."; 
+      visibility: hidden; 
+      display: block; 
+      height: 0; 
+      clear: both;
+    }
+    &:last-of-type { border-bottom: 0; }
+    .field-text {
+      float: left;
+      font-size: 14px;
+      color: #000;
+      line-height: 31px;
+    }
+    &#credit-card { 
+      background: #fff; 
+      -webkit-border-top-left-radius: 5px;
+      -webkit-border-top-right-radius: 5px;
+      -moz-border-radius-topleft: 5px;
+      -moz-border-radius-topright: 5px;
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+      .icons {
+        float: right;
+        width: 120px;
+        position: relative;
+        top: 5px;
+      }
+    }
+    &#card-number {
+      .field-text {
+        width: 20%;
+      }
+      input[type="text"] {
+        background: transparent;
+        font-size: 15px;
+        border-width: 0;
+        outline-width: 0;
+        height: auto;
+      }
+      .icons {
+        width: 20px;
+        float: right;
+        position: relative;
+        top: 7px;
+      }
+    }
+    &#expiry {
+      padding: 15px 2% 5px 2%;
+      .field-text {
+        width: 20%;
+        position: relative;
+        bottom: 3px;
+      }
+      select {
+        &#month {
+          width: 20%;
+          min-width: 100px;
+        }
+        &#year {
+          width: 20%;
+          min-width: 100px;
+        }
+      }
+    }
   }
-  select {
-    margin-left: 12px;
-    margin-right: 12px;
-    width: 100px;
-  }
+
+
+
   iframe { display: none }
-  form {
-    width: 450px;
-    @media screen and (max-width: 768px) { width: 100% }
-  }
 }
 
 #checkout #checkout-nav {

data/app/assets/stylesheets/caboose/model_binder.css

@@ -69,7 +69,7 @@
   margin: 3px 0 0 1px;
   padding: 8px 0 6px 0;
   background: #ccc;
-  color: #000;
+  color: #000 !important;
   text-align: center;
   border: #666 1px solid;
 }

data/app/controllers/caboose/block_types_controller.rb

@@ -16,8 +16,10 @@ module Caboose
     # GET /admin/block-types/json
     def admin_json
       h = {        
-        'name'           => '',
-        'description'    => '',                
+        'name'              => '',
+        'description'       => '',
+        'name_like'         => '',
+        'description_like'  => '',
       }
       if params[:parent_id]
         h['parent_id'] = ''

data/app/controllers/caboose/domains_controller.rb

@@ -57,8 +57,23 @@ module Caboose
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
       Domain.find(params[:id]).destroy
-      render :json => { 'redirect' => "/admin/sites/#{params[:site_id]}" }
+      render :json => { 'refresh' => "/admin/sites/#{params[:site_id]}" }
     end
+
+    # 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
+      Domain.where(:site_id => params[:site_id]).all.each do |d2|
+        d2.primary = d2.id == d.id ? true : false
+        d2.save
+      end      
+      resp.success = save && d.save
+      render :json => resp
+    end 
             
   end
 end

data/app/controllers/caboose/social_controller.rb

@@ -0,0 +1,41 @@
+module Caboose
+  class SocialController < ApplicationController
+    layout 'caboose/admin'
+    
+    # GET /admin/social
+    def admin_edit
+      return if !user_is_allowed('social', 'edit')            
+      @social_config = @site.social_config
+      @social_config = SocialConfig.create(:site_id => @site.id) if @social_config.nil?
+    end
+    
+    # PUT /admin/social
+    def admin_update
+      return if !user_is_allowed('sites', 'edit')
+
+      resp = StdClass.new     
+      sc = @site.social_config
+      sc = SocialConfig.create(:site_id => @site.id) if sc.nil?
+          
+      save = true
+      params.each do |name,value|
+        case name
+          when 'site_id'              then sc.site_id              = value
+          when 'facebook_page_id'     then sc.facebook_page_id     = value
+          when 'twitter_username'     then sc.twitter_username     = value
+          when 'instagram_username'   then sc.instagram_username   = value
+          when 'youtube_url'          then sc.youtube_url          = value
+          when 'pinterest_url'        then sc.pinterest_url        = value
+          when 'vimeo_url'            then sc.vimeo_url            = value
+          when 'rss_url'              then sc.rss_url              = value
+          when 'google_plus_url'      then sc.google_plus_url      = value
+          when 'linkedin_url'         then sc.linkedin_url         = value
+    	  end
+    	end
+    	
+    	resp.success = save && sc.save
+    	render :json => resp
+    end
+    
+  end
+end

data/app/models/caboose/core_plugin.rb

@@ -14,6 +14,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'               , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
     item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view') if site.name == 'application'
     item['children'] << { 'id' => 'smtp'             , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'         , 'view')
+    item['children'] << { 'id' => 'social'           , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'       , 'view')
     item['children'] << { 'id' => 'store'            , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'        , 'view')
     item['children'] << { 'id' => 'users'            , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'        , 'view')      
     item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'     , 'view')    

data/app/models/caboose/product.rb

@@ -171,5 +171,18 @@ module Caboose
       end
     end
     
+    # TODO: Implement product sales
+    #def self.products_on_sale
+    #        
+    #  query[0] = "select distinct product_id from store_variants 
+    #    where sale_price is not null 
+    #    and date_sale_starts < now() 
+    #    and date_sale_ends > now()
+    #    order by title limit 20"          
+    #  rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+    #  arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
+    #  
+    #end
+    
   end
 end

data/app/models/caboose/schema.rb

@@ -543,6 +543,18 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :authentication       , :string ], # :plain, :login, :cram_md5.
         [ :enable_starttls_auto , :boolean , { :default => true }]
       ],
+      Caboose::SocialConfig => [
+        [ :site_id              , :integer ],
+        [ :facebook_page_id     , :string ],
+        [ :twitter_username     , :string ],
+        [ :instagram_username   , :string ],
+        [ :youtube_url          , :string ],
+        [ :pinterest_url        , :string ],
+        [ :vimeo_url            , :string ],
+        [ :rss_url              , :string ],
+        [ :google_plus_url      , :string ],
+        [ :linkedin_url         , :string ]
+      ],
       Caboose::StackableGroup => [       
         [ :name           , :string  ],
         [ :extra_length   , :decimal ],
@@ -613,6 +625,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :sku                   , :string   ],
         [ :barcode               , :string   ],
         [ :price                 , :numeric   , :default => 0 ],
+        [ :sale_price            , :numberic  , :default => 0 ],
+        [ :date_sale_starts      , :datetime ],
+        [ :date_sale_end         , :datetime ],
         [ :available             , :boolean  ],
         [ :quantity_in_stock     , :integer   , :default => 0 ],        
         [ :ignore_quantity       , :boolean  ],

data/app/models/caboose/site.rb

@@ -13,6 +13,10 @@ class Caboose::Site < ActiveRecord::Base
   def smtp_config
     c = Caboose::SmtpConfig.where(:site_id => self.id).first
   end
+
+  def social_config
+    s = Caboose::SocialConfig.where(:site_id => self.id).first
+  end
   
   def self.id_for_domain(domain)
     d = Caboose::Domain.where(:domain => domain).first

data/app/models/caboose/social_config.rb

@@ -0,0 +1,17 @@
+class Caboose::SocialConfig < ActiveRecord::Base
+  self.table_name = "social_configs"
+       
+  belongs_to :site      
+  attr_accessible :id, 
+    :site_id              ,
+    :facebook_page_id     ,
+    :twitter_username     ,
+    :instagram_username   ,
+    :youtube_url          ,
+    :pinterest_url        ,
+    :vimeo_url            ,
+    :rss_url              ,
+    :google_plus_url      ,
+    :linkedin_url         
+    
+end

data/app/models/caboose/variant.rb

@@ -17,6 +17,9 @@ module Caboose
       :product_id,
       :barcode,            # Returns the barcode value of the variant.
       :price,              # Variant’s price.
+      :sale_price,
+      :date_sale_starts,
+      :date_sale_end,
       :ignore_quantity,
       :quantity,
       :quantity_in_stock,
@@ -92,5 +95,6 @@ module Caboose
       arr << self.option3 if self.option3 && self.option3.strip.length > 0
       return arr
     end
+     
   end
 end

data/app/views/caboose/block_type_store/admin_index.html.erb

@@ -37,6 +37,9 @@
   <% end %>
   </table>  
 
+  <br />
+  <%== @pager.generate %>
+
 <% else %>
 
   <p>There are no block types from any sources.</p>

data/app/views/caboose/checkout/payment.html.erb

@@ -16,8 +16,25 @@ store_config = @site.store_config
         <input type="hidden" id="x_state"       name="x_state"       value="<%= raw @order.billing_address.state      %>" />
         <input type="hidden" id="x_zip"         name="x_zip"         value="<%= raw @order.billing_address.zip        %>" />
         
-        <p><input name="x_card_num" id='billing-cc-number' type="text" maxlength="16" placeholder="Card Number" /></p>                    
-        <p>            
+
+        
+        <div class="field" id="credit-card">
+          <span class="field-text">Credit Card</span>
+          <div class="icons">
+            <img src="/assets/caboose/credit_cards.png" alt="Credit Cards Accepted" />
+          </div>
+        </div>
+
+        <div class="field" id="card-number">
+          <span class="field-text">Card</span>
+          <input name="x_card_num" id='billing-cc-number' type="text" maxlength="16" placeholder="Card number" />
+          <div class="icons">
+            <img src="/assets/caboose/lock.png" alt="Secure Connection" />
+          </div>
+        </div>
+
+        <div class="field" id="expiry">
+          <span class="field-text">Expiry</span>
           <input id="expiration" name="x_exp_date" type="hidden" />
           <select id="month" name="month">                                      
             <option value="01">01 - Jan</option>
@@ -39,7 +56,11 @@ store_config = @site.store_config
               <option value="<%= i-2000 %>"><%= i %></option>
             <% end %>
           </select>
-        </p>                                                                  
+        </div>
+
+
+
+
       </form>        
     <% end %>
   </section>

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

@@ -35,7 +35,7 @@ p.uri {
 <ul id='tabs'>
 <%
 tabs = {
-  'General'         => "/admin/pages/#{@page.id}/edit",
+  'General'         => "/admin/pages/#{@page.id}",
   'Permissions'     => "/admin/pages/#{@page.id}/permissions",
   'Content'         => "/admin/pages/#{@page.id}/content",     
   'Custom CSS'      => "/admin/pages/#{@page.id}/css", 

data/app/views/caboose/pages/admin_edit_layout.html.erb

@@ -6,7 +6,7 @@
 <p><select name='block_type_id'>
   <option value=''>-- Select a layout --</option>
   <% cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id } %>
-  <% Caboose::BlockType.where("block_type_category_id in (?)", cat_ids).reorder(:description).all.each do |bt| %>
+  <% Caboose::BlockType.includes(:block_type_site_memberships).where("block_type_category_id in (?) and block_type_site_memberships.site_id = ?", cat_ids, @site.id).reorder(:description).all.each do |bt| %>    
     <option value="<%= bt.id %>"><%= bt.description %></option>
   <% end %>
 </select></p>

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

@@ -23,7 +23,7 @@ user_ids = [] if user_ids.nil?
     <th>Under Construction</th>
     <th>Delete</th>
   </tr>
-  <% @site.domains.all.each do |d| %>
+  <% @site.domains.order(:id).all.each do |d| %>
   <tr>
     <td><%= d.domain %></td>
     <td align='center'><input type='radio'    name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
@@ -158,7 +158,10 @@ function set_primary_domain(site_id, domain_id)
   $.ajax({
     url: '/admin/sites/' + site_id + '/domains/' + domain_id + '/set-primary',
     type: 'put',    
-    success: function(resp) {}
+    success: function(resp) {
+      if (resp.error) $('#domain_message').html("<p class='note error'>" + resp.error + "<br /></p>");
+      if (resp.success) window.location.reload(true);
+    }
   });
 }
 

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

@@ -0,0 +1,46 @@
+<%
+sc = @social_config
+%>
+<h1>Social Media Config</h1>
+
+<p>Find your Facebook page ID <a href="http://findmyfacebookid.com/" target="_blank">here</a>.</p>
+<p><div id="socialconfig_<%= sc.id %>_facebook_page_id"     ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_twitter_username"     ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_instagram_username"   ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_youtube_url"          ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_pinterest_url"        ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_vimeo_url"            ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_rss_url"              ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_google_plus_url"      ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_linkedin_url"         ></div></p>
+      
+<div id='message'></div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+    
+  new ModelBinder({
+    name: 'SocialConfig',
+    id: <%= sc.id %>,
+    update_url: '/admin/social',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'facebook_page_id' , nice_name: 'Facebook Page ID' , type: 'text', value: <%= raw Caboose.json(sc.facebook_page_id) %>, width: 400 },
+      { name: 'twitter_username' , nice_name: 'Twitter Username' , type: 'text', value: <%= raw Caboose.json(sc.twitter_username) %>, width: 400 },
+      { name: 'instagram_username' , nice_name: 'Instagram Username' , type: 'text', value: <%= raw Caboose.json(sc.instagram_username) %>, width: 400 },
+      { name: 'youtube_url' , nice_name: 'YouTube URL' , type: 'text', value: <%= raw Caboose.json(sc.youtube_url) %>, width: 400 },
+      { name: 'pinterest_url' , nice_name: 'Pinterest URL' , type: 'text', value: <%= raw Caboose.json(sc.pinterest_url) %>, width: 400 },
+      { name: 'vimeo_url' , nice_name: 'Vimeo URL' , type: 'text', value: <%= raw Caboose.json(sc.vimeo_url) %>, width: 400 },
+      { name: 'rss_url' , nice_name: 'RSS Feed URL' , type: 'text', value: <%= raw Caboose.json(sc.rss_url) %>, width: 400 },
+      { name: 'google_plus_url' , nice_name: 'Google Plus URL' , type: 'text', value: <%= raw Caboose.json(sc.google_plus_url) %>, width: 400 },
+      { name: 'linkedin_url' , nice_name: 'LinkedIn URL' , type: 'text', value: <%= raw Caboose.json(sc.linkedin_url) %>, width: 400 }
+    ]    
+  });
+      
+});
+
+</script>
+<% end %>

data/config/routes.rb

@@ -42,6 +42,7 @@ Caboose::Engine.routes.draw do
   post    "admin/sites/:site_id/domains"           => "domains#admin_add"
   put     "admin/sites/:site_id/domains/:id"       => "domains#admin_update"
   delete  "admin/sites/:site_id/domains/:id"       => "domains#admin_delete"
+  put     "admin/sites/:site_id/domains/:id/set-primary" => "domains#admin_set_primary"
   
   #=============================================================================
   # Store
@@ -64,6 +65,14 @@ Caboose::Engine.routes.draw do
   get     "admin/smtp"               => "smtp#admin_edit"  
   put     "admin/smtp"               => "smtp#admin_update"
     
+  #=============================================================================
+  # Social
+  #=============================================================================  
+  
+  get     "admin/social"               => "social#admin_edit"  
+  put     "admin/social"               => "social#admin_update"
+
+
   #=============================================================================
   # Shipping Packages
   #=============================================================================

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.90'
+  VERSION = '0.5.91'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.90
+  version: 0.5.91
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -367,6 +367,7 @@ files:
 - app/assets/images/caboose/caboose_logo_small.png
 - app/assets/images/caboose/caboose_nav.png
 - app/assets/images/caboose/caboose_nav_black.png
+- app/assets/images/caboose/credit_cards.png
 - app/assets/images/caboose/default_user_pic.png
 - app/assets/images/caboose/loading_black_on_white.gif
 - app/assets/images/caboose/loading_black_on_yellow.gif
@@ -374,6 +375,7 @@ files:
 - app/assets/images/caboose/loading_small_black_on_white.gif
 - app/assets/images/caboose/loading_small_white_on_black.gif
 - app/assets/images/caboose/loading_white_on_black.gif
+- app/assets/images/caboose/lock.png
 - app/assets/images/caboose/login_image.png
 - app/assets/images/caboose/modal_overlay.png
 - app/assets/images/caboose/password_image.png
@@ -527,6 +529,7 @@ files:
 - app/controllers/caboose/shipping_packages_controller.rb
 - app/controllers/caboose/sites_controller.rb
 - app/controllers/caboose/smtp_controller.rb
+- app/controllers/caboose/social_controller.rb
 - app/controllers/caboose/stackable_groups_controller.rb
 - app/controllers/caboose/station_controller.rb
 - app/controllers/caboose/store_controller.rb
@@ -620,6 +623,7 @@ files:
 - app/models/caboose/site.rb
 - app/models/caboose/site_membership.rb
 - app/models/caboose/smtp_config.rb
+- app/models/caboose/social_config.rb
 - app/models/caboose/stackable_group.rb
 - app/models/caboose/states.rb
 - app/models/caboose/std_class.rb
@@ -828,6 +832,7 @@ files:
 - app/views/caboose/sites/admin_index.html.erb
 - app/views/caboose/sites/admin_new.html.erb
 - app/views/caboose/smtp/admin_edit.html.erb
+- app/views/caboose/social/admin_edit.html.erb
 - app/views/caboose/stackable_groups/admin_index.html.erb
 - app/views/caboose/station/index.html.erb
 - app/views/caboose/store/admin_edit.html.erb