enju_circulation 0.0.65 → 0.0.66

data/app/models/checkin.rb

@@ -10,6 +10,7 @@ class Checkin < ActiveRecord::Base
   validates_uniqueness_of :item_id, :scope => :basket_id, :message => I18n.t('checkin.already_checked_in')
   validates_presence_of :item_id, :message => I18n.t('checkin.item_not_found')
   validates_presence_of :basket_id
+  validate :available_for_checkin?, :on => :create
 
   attr_accessor :item_identifier
 
@@ -17,6 +18,17 @@ class Checkin < ActiveRecord::Base
     10
   end
 
+  def available_for_checkin?
+    if item.blank?
+      errors[:base] << I18n.t('checkin.item_not_found')
+      return
+    end
+
+    if basket.items.where('item_id = ?', item.id).first
+      errors[:base] << I18n.t('checkin.already_checked_in')
+    end
+  end
+
   def item_checkin(current_user)
     message = ''
     Checkin.transaction do

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.65"
+  VERSION = "0.0.66"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.66
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails