caboose-cms 0.8.68 → 0.8.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3be7648fb20dea0f63181aa3fc29816743639b3
-  data.tar.gz: 378b44904c3a735619e44c5a150ed12ff50e4c4b
+  metadata.gz: 1cfc02f075a8168b8cc2a37b8d77a05dc992577e
+  data.tar.gz: b826855fa8d846491736f1587f3fc61350376f75
 SHA512:
-  metadata.gz: f7e3584b65a103265aeeee1d52353053dd3d5277d552b3bc9e16a63be3e5ec03c4be2338c6d2db8787a71d246b8c8f9555784b4cb1e8390ec522518dd02b6933
-  data.tar.gz: 03a0db1c20df423d62d674fd7c3d16f49ecff43d14b55f9267850be35c2dd91ee3f067ff1447eef5f5c99616b7438b13c7dabb3627ed264ab4d1e35ba2bf51af
+  metadata.gz: 448a241fe8ae7635c6bc63369316ccee561c7b6b4138d445f7408312557090e7753fde0fa4a59ddc163f5a6f4be3a6bb6c594a67cda69c568147b3853eacaf38
+  data.tar.gz: 81d78ea2b5d8eebab3d02ed76b5cbc4f3028abf71375a9f9a22e32e8521514b255954f46ebca68f03d701bb6f23913df2433db2948519222d5211b6420fa4982

data/app/models/caboose/authenticator.rb

@@ -4,14 +4,15 @@ module Caboose
 
     def authenticate(username, password, site = nil, request = nil)
       resp = StdClass.new        
+      username = username.downcase if username
       pass = Digest::SHA1.hexdigest(Caboose::salt + password)
       
       user = nil
       if username == 'superadmin'
-        user = User.where(:username => username).first        
+        user = User.where("lower(username) = ?", username).first        
       else
-        user = User.where(:username => username, :site_id => site.id).first
-        user = User.where(:email    => username, :site_id => site.id).first if user.nil?
+        user = User.where("site_id = ? and lower(username) = ?" , site.id, username).first
+        user = User.where("site_id = ? and lower(email) = ?"    , site.id, username).first if user.nil?
       end
       
       ll = LoginLog.new      

data/app/models/caboose/invoice.rb

@@ -72,6 +72,8 @@ module Caboose
     FINANCIAL_STATUS_CAPTURED            = 'captured'
     FINANCIAL_STATUS_REFUNDED            = 'refunded'
     FINANCIAL_STATUS_VOIDED              = 'voided'
+    FINANCIAL_STATUS_WAIVED              = 'waived'
+    FINANCIAL_STATUS_OVERDUE             = 'overdue'
     FINANCIAL_STATUS_PAID_BY_CHECK       = 'paid by check'
     FINANCIAL_STATUS_PAID_BY_OTHER_MEANS = 'paid by other means'
         

data/app/models/caboose/line_item.rb

@@ -27,27 +27,21 @@ module Caboose
       :hide_prices           ,
       :user_subscription_id  ,            
       :date_starts           ,
-      :date_ends             
+      :date_ends
+    
+    STATUS_PENDING = 'pending'
+    STATUS_SHIPPED = 'shipped'
 
     #
     # Scopes
-    #
-    
+    #    
     scope :pending, where('status = ?', 'pending')
     scope :fulfilled, where('status = ?', 'shipped')
     scope :unfulfilled, where('status != ?', 'shipped')
-    #
-    # Validations
-    #
-    
-    validates :status, :inclusion => {
-      :in      => ['pending', 'shipped'],
-      :message => "%{value} is not a valid status. Must be either 'pending' or 'shipped'"
-    }
     
-    validates :quantity, :numericality => { :greater_than_or_equal_to => 0 }
+    #validates :quantity, :numericality => { :greater_than_or_equal_to => 0 }    
+    #validate :quantity_in_stock
     
-    validate :quantity_in_stock
     def quantity_in_stock
       errors.add(:base, "There #{self.variant.quantity_in_stock > 1 ? 'are' : 'is'} only #{self.variant.quantity_in_stock} left in stock.") if self.variant.quantity_in_stock - self.quantity < 0
     end

data/app/models/caboose/schema.rb

@@ -864,7 +864,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :payment_profile_id           , :string     ],
         [ :locked                       , :boolean     , { :default => false }],
         [ :authnet_customer_profile_id  , :string     ],
-        [ :authnet_payment_profile_id   , :string     ],
+        [ :authnet_payment_profile_id   , :string     ],        
         [ :valid_authnet_payment_id     , :boolean     , { :default => false }],
         [ :stripe_customer_id           , :string     ],
         [ :card_last4                   , :string     ],

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

@@ -9,12 +9,15 @@
 <%
 tabs = {                             
   'General'         => "/admin/users/#{@edituser.id}",
-  'Payment Method'  => "/admin/users/#{@edituser.id}/payment-method",
   'Login Logs'      => "/admin/login-logs?user_id=#{@edituser.id}",
   'Password'        => "/admin/users/#{@edituser.id}/password",
   'Roles'           => "/admin/users/#{@edituser.id}/roles",    
   'Delete'          => "/admin/users/#{@edituser.id}/delete"  
 }
+if @site.use_store
+	arr = tabs.to_a.insert(1, ['Payment Method', "/admin/users/#{@edituser.id}/payment-method"])
+  tabs = Hash[arr]
+end
 tabs = Caboose.plugin_hook('admin_user_tabs', tabs, @edituser, @site)
 %>
 <% tabs.each do |text, href| %>
@@ -23,4 +26,4 @@ tabs = Caboose.plugin_hook('admin_user_tabs', tabs, @edituser, @site)
 <% end %>
 <li class='back'><input type='button' value='< Back' onclick="window.location='/admin/users';" /></li>
 </ul>
-<div id='content2'>
+<div id='content2'>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.68'
+  VERSION = '0.8.69'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.68
+  version: 0.8.69
 platform: ruby
 authors:
 - William Barry