enju_circulation 0.3.9 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acae0635971690b1966d9ec8c5c3f5c608528c624feb76f201ce0cc90b473e4
-  data.tar.gz: 60815d7876aee8efe0aba781e33cc919c2ff5af9830761dc1aff778398522bea
+  metadata.gz: ae2524b7384336afe28edefb0a5fd0ea8004c5ca9a56e87048df9047fade290b
+  data.tar.gz: c178fa1fb96decbd1e5b567055dda1e052e17e84da7e4101bdb2606f1c95e467
 SHA512:
-  metadata.gz: ec55abc5f36563dbba595a2984564c1f8f45911acf3fc24fdcddba3c4f0b0b3d66981081638a4ff7d768122ba510196e49d2546af9b4522b928d39d9aad6b1fe
-  data.tar.gz: fc0727906cdea3789852dbee7c97684b600f4ca0b5aa143a8c75caff5c5f0f104a3ec6d284bb92c76a3d99121c974261341924a4d3450e94162c0dcde6fd5b9c
+  metadata.gz: 5f6c642dbfabfcce25d17386a11b4c34fc8aee9589b2147604c7efd8e8314cfea7440d6774d23593380657da02cda3abba621991ff140336bab16318cb63251f
+  data.tar.gz: d2dcf749b0de72a7be4e976f16d15cd7f3397b228a23f3582b028f1a8a9849378e7c6688ebe64ab115fda2b40fa296d9e8019148fd184567a42cbd8787b1dad5

data/README.md

@@ -1,7 +1,6 @@
 # EnjuCirculation
-[![Travis CI](https://travis-ci.com/next-l/enju_circulation.svg?branch=1.3)](https://travis-ci.com/next-l/enju_circulation)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_circulation/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_circulation?branch=1.3)
-[![security](https://hakiri.io/github/next-l/enju_circulation/1.3.svg)](https://hakiri.io/github/next-l/enju_circulation/1.3)
+[![CircleCI](https://circleci.com/gh/next-l/enju_circulation/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_circulation/tree/2.x)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_circulation/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_circulation?branch=2.x)
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/checkins_controller.rb

@@ -77,12 +77,12 @@ class CheckinsController < ApplicationController
         end
         flash[:message] << message if message
         format.html { redirect_to checkins_url(basket_id: @checkin.basket_id) }
-        format.json { render json: {result: @checkin, messages: flash[:message]}, status: :created, location: @checkin }
+        format.json { render json: @checkin, status: :created, location: @checkin }
         format.js { redirect_to checkins_url(basket_id: @basket.id, format: :js) }
       else
         @checkins = @basket.checkins.page(1)
         format.html { render action: "new" }
-        format.json { render json: {messages: @checkin.errors}, status: :unprocessable_entity }
+        format.json { render json: @checkin.errors, status: :unprocessable_entity }
         format.js { render action: "index" }
       end
     end

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -101,7 +101,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
       :user_group_id, :checkout_type_id,
       :checkout_limit, :checkout_period, :checkout_renewal_limit,
       :reservation_limit, :reservation_expired_period,
-      :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
+      :set_due_date_after_closing_day, :fixed_due_date, :note, :position,
       :user_group, :checkout_type
     )
   end

data/app/helpers/items_helper.rb

@@ -1,16 +1,16 @@
 module ItemsHelper
   def circulation_status_facet(facet)
     string = ''
-    circulation_status = CirculationStatus.where(name: facet.value).select([:name, :display_name]).first
+    circulation_status = CirculationStatus.where(name: facet.value).select([:name, :display_name_translations]).first
     if circulation_status
       # string << form_icon(circulation_status)
       current = true if params[:circulation_status] == circulation_status.name
       if current
         content_tag :strong do
-          link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+          link_to("#{circulation_status.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+        link_to("#{circulation_status.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
       end
     end
   end

data/app/models/checked_item.rb

@@ -82,26 +82,16 @@ class CheckedItem < ApplicationRecord
     if due_date_string.present?
       self.due_date = Time.zone.parse(due_date_string).try(:end_of_day)
     else
-      lending_rule = item.lending_rule(basket.user)
-      return nil if lending_rule.nil?
-
-      if lending_rule.fixed_due_date.blank?
-        # self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
-        self.due_date = lending_rule.loan_period.days.since(Time.zone.now).end_of_day
-      else
-        # self.due_date = item_checkout_type.fixed_due_date
-        self.due_date = lending_rule.fixed_due_date.tomorrow.end_of_day
-      end
+      due_date = item_checkout_type.checkout_period.days.since Time.zone.today
       # 返却期限日が閉館日の場合
-      while item.shelf.library.closed?(due_date)
-        if item_checkout_type.set_due_date_before_closing_day
-          self.due_date = due_date.yesterday.end_of_day
-        else
-          self.due_date = due_date.tomorrow.end_of_day
-        end
+      if item.shelf.library.closed?(due_date) && item_checkout_type.set_due_date_after_closing_day
+        self.due_date = due_date.tomorrow.end_of_day
+      else
+        self.due_date = due_date.end_of_day
       end
     end
-    return due_date
+
+    self
   end
 
   def set_item

data/app/models/checkin.rb

@@ -1,7 +1,7 @@
 class Checkin < ApplicationRecord
   default_scope { order('checkins.id DESC') }
   scope :on, lambda {|date| where('created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day)}
-  has_one :checkout
+  has_one :checkout, dependent: :nullify
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket
@@ -91,5 +91,6 @@ end
 #  basket_id    :integer
 #  created_at   :datetime
 #  updated_at   :datetime
-#  lock_version :integer          default("0"), not null
+#  lock_version :integer          default(0), not null
+#  checkin_id   :bigint
 #

data/app/models/checkout.rb

@@ -174,8 +174,8 @@ end
 #  librarian_id           :integer
 #  basket_id              :integer
 #  due_date               :datetime
-#  checkout_renewal_count :integer          default("0"), not null
-#  lock_version           :integer          default("0"), not null
+#  checkout_renewal_count :integer          default(0), not null
+#  lock_version           :integer          default(0), not null
 #  created_at             :datetime
 #  updated_at             :datetime
 #  shelf_id               :integer

data/app/models/checkout_stat_has_user.rb

@@ -17,7 +17,7 @@ end
 #  id                    :integer          not null, primary key
 #  user_checkout_stat_id :integer          not null
 #  user_id               :integer          not null
-#  checkouts_count       :integer          default("0"), not null
+#  checkouts_count       :integer          default(0), not null
 #  created_at            :datetime
 #  updated_at            :datetime
 #

data/app/models/checkout_type.rb

@@ -12,17 +12,19 @@ class CheckoutType < ApplicationRecord
   has_many :items
 
   paginates_per 10
+  translates :display_name
 end
 
 # == Schema Information
 #
 # Table name: checkout_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/circulation_status.rb

@@ -2,9 +2,9 @@ class CirculationStatus < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 
-  default_scope { order('circulation_statuses.position') }
   scope :available_for_checkout, -> { where(name: 'Available On Shelf') }
   has_many :items
+  translates :display_name
 
   private
 
@@ -17,11 +17,12 @@ end
 #
 # Table name: circulation_statuses
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/concerns/enju_circulation/enju_item.rb

@@ -35,36 +35,24 @@ module EnjuCirculation
       has_many :reserves
       has_many :checked_items
       has_many :baskets, through: :checked_items
-      belongs_to :circulation_status
+      belongs_to :circulation_status, validate: true
       belongs_to :checkout_type
-      has_many :lending_policies, dependent: :destroy
       has_one :item_has_use_restriction, dependent: :destroy
       has_one :use_restriction, through: :item_has_use_restriction
+      validates_associated :circulation_status, :checkout_type
       validates :circulation_status, :checkout_type, presence: true
-      validate :check_circulation_status
-
       searchable do
         string :circulation_status do
           circulation_status.name
         end
       end
       accepts_nested_attributes_for :item_has_use_restriction
-
-      before_update :delete_lending_policy
     end
 
     def set_circulation_status
       self.circulation_status = CirculationStatus.find_by(name: 'In Process') if circulation_status.nil?
     end
 
-    def check_circulation_status
-      #circulation_status.name_will_change!
-      #return unless circulation_status.name_change.first == 'Removed'
-      return unless circulation_status.name == 'Removed'
-      errors[:base] << I18n.t('activerecord.errors.models.item.attributes.circulation_status_id.is_rented') if rented?
-      errors[:base] << I18n.t('activerecord.errors.models.item.attributes.circulation_status_id.is_reserved') if reserved?
-    end
-
     def checkout_status(user)
       return nil unless user
        user.profile.user_group.user_group_has_checkout_types.find_by(checkout_type_id: checkout_type.id)
@@ -80,10 +68,6 @@ module EnjuCirculation
       false
     end
 
-    def rented?
-      rent?
-    end
-
     def reserved_by_user?(user)
       if manifestation.next_reservation
         return true if manifestation.next_reservation.user == user
@@ -105,8 +89,6 @@ module EnjuCirculation
         manifestation.next_reservation.transition_to!(:completed)
         manifestation.reload
       end
-
-      reload
       update!(circulation_status: CirculationStatus.find_by(name: 'On Loan'))
     end
 
@@ -135,36 +117,10 @@ module EnjuCirculation
       false
     end
 
-    def lending_rule(user)
-      policy = lending_policies.find_by(user_group_id: user.profile.user_group.id)
-      if policy
-        policy
-      else
-        create_lending_policy(user)
-      end
-    end
-
     def not_for_loan?
       !manifestation.items.for_checkout.include?(self)
     end
 
-    def create_lending_policy(user)
-      rule = user.profile.user_group.user_group_has_checkout_types.find_by(checkout_type_id: checkout_type_id)
-      return nil unless rule
-      LendingPolicy.create!(
-        item_id: id,
-        user_group_id: rule.user_group_id,
-        fixed_due_date: rule.fixed_due_date,
-        loan_period: rule.checkout_period,
-        renewal: rule.checkout_renewal_limit
-      )
-    end
-
-    def delete_lending_policy
-      return nil unless changes[:checkout_type_id]
-      lending_policies.delete_all
-    end
-
     def next_reservation
       Reserve.waiting.find_by(item_id: id)
     end

data/app/models/concerns/enju_circulation/enju_user_group.rb

@@ -5,7 +5,6 @@ module EnjuCirculation
     included do
       has_many :user_group_has_checkout_types, dependent: :destroy
       has_many :checkout_types, through: :user_group_has_checkout_types
-      has_many :lending_policies
       accepts_nested_attributes_for :user_group_has_checkout_types, allow_destroy: true, reject_if: :all_blank
 
       validates :number_of_day_to_notify_due_date,

data/app/models/concerns/enju_circulation/enju_withdraw.rb

@@ -3,8 +3,7 @@ module EnjuCirculation
     extend ActiveSupport::Concern
 
     included do
-      before_create :withdraw!
-      validate :check_item
+      before_save :withdraw!, on: :create
     end
 
     def withdraw!
@@ -13,10 +12,5 @@ module EnjuCirculation
       item.use_restriction = UseRestriction.where(name: 'Not For Loan').first
       item.index!
     end
-
-    def check_item
-      errors.add(:item_id, :is_rented) if item.try(:rent?)
-      errors.add(:item_id, :is_reserved) if item.try(:reserved?)
-    end
   end
 end

data/app/models/manifestation_checkout_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                             :integer          not null, primary key
 #  to_state                       :string
-#  metadata                       :text             default("{}")
+#  metadata                       :text             default({})
 #  sort_key                       :integer
 #  manifestation_checkout_stat_id :integer
 #  created_at                     :datetime

data/app/models/manifestation_reserve_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                            :integer          not null, primary key
 #  to_state                      :string
-#  metadata                      :text             default("{}")
+#  metadata                      :text             default({})
 #  sort_key                      :integer
 #  manifestation_reserve_stat_id :integer
 #  created_at                    :datetime

data/app/models/reserve.rb

@@ -2,7 +2,7 @@ class Reserve < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
-  scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}
+  scope :waiting, -> {not_in_state(:completed, :expired, :retained).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}
   scope :retained, -> {in_state(:retained).where('retained_at IS NOT NULL')}
   scope :completed, -> {in_state(:completed).where('checked_out_at IS NOT NULL')}
   scope :canceled, -> {in_state(:canceled).where('canceled_at IS NOT NULL')}
@@ -371,7 +371,7 @@ class Reserve < ApplicationRecord
   end
 
   def manifestation_must_include_item
-    if manifestation && item && !completed?
+    if item_id.present? && !completed?
       errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
     end
   end
@@ -404,10 +404,10 @@ end
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
-#  expiration_notice_to_patron  :boolean          default("0")
-#  expiration_notice_to_library :boolean          default("0")
+#  expiration_notice_to_patron  :boolean          default(FALSE)
+#  expiration_notice_to_library :boolean          default(FALSE)
 #  pickup_location_id           :integer
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
-#  lock_version                 :integer          default("0"), not null
+#  lock_version                 :integer          default(0), not null
 #

data/app/models/reserve_state_machine.rb

@@ -14,15 +14,16 @@ class ReserveStateMachine
   transition from: :requested, to: [:retained, :canceled, :expired, :completed]
 
   after_transition(to: :requested) do |reserve|
-    reserve.update(request_status_type: RequestStatusType.find_by(name: 'In Process'), item_id: nil, retained_at: nil)
+    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil)
   end
 
   after_transition(to: :retained) do |reserve|
     # TODO: 「取り置き中」の状態を正しく表す
-    reserve.update(request_status_type: RequestStatusType.find_by(name: 'In Process'), retained_at: Time.zone.now)
+    reserve.update(request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now)
     Reserve.transaction do
       if reserve.item
         other_reserves = reserve.item.reserves.waiting
+        other_reserves += reserve.item.reserves.in_state(:retained)
         other_reserves.each{|r|
           if r != reserve
             r.transition_to!(:postponed)

data/app/models/reserve_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id          :integer          not null, primary key
 #  to_state    :string
-#  metadata    :text             default("{}")
+#  metadata    :text             default({})
 #  sort_key    :integer
 #  reserve_id  :integer
 #  created_at  :datetime

data/app/models/retain.rb

@@ -0,0 +1,15 @@
+class Retain < ApplicationRecord
+  belongs_to :reserve
+  belongs_to :item
+end
+
+# == Schema Information
+#
+# Table name: retains
+#
+#  id         :bigint           not null, primary key
+#  reserve_id :bigint           not null
+#  item_id    :bigint           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/app/models/user_checkout_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                    :integer          not null, primary key
 #  to_state              :string
-#  metadata              :text             default("{}")
+#  metadata              :text             default({})
 #  sort_key              :integer
 #  user_checkout_stat_id :integer
 #  created_at            :datetime

data/app/models/user_group_has_checkout_type.rb

@@ -13,31 +13,9 @@ class UserGroupHasCheckoutType < ApplicationRecord
   validates :checkout_renewal_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
   validates :reservation_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
   validates :reservation_expired_period, numericality: {only_integer: true, greater_than_or_equal_to: 0}
-  after_update :update_lending_policy
 
   acts_as_list scope: :user_group_id
 
-  def create_lending_policy
-    checkout_type.items.find_each do |item|
-      policy = LendingPolicy.where(item_id: item.id, user_group_id: user_group_id).select(:id).first
-      unless policy
-        sql = ['INSERT INTO lending_policies (item_id, user_group_id, loan_period, renewal, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', item.id, user_group_id, checkout_period, checkout_renewal_limit, Time.zone.now, Time.zone.now]
-        ActiveRecord::Base.connection.execute(
-          self.class.send(:sanitize_sql_array, sql)
-        )
-      end
-    end
-  end
-
-  def update_lending_policy
-    checkout_type.items.each do |item|
-      sql = ['UPDATE lending_policies SET loan_period = ?, renewal = ?, updated_at = ? WHERE user_group_id = ? AND item_id = ?', checkout_period, checkout_renewal_limit, Time.zone.now, user_group_id, item.id]
-      ActiveRecord::Base.connection.execute(
-        self.class.send(:sanitize_sql_array, sql)
-      )
-    end
-  end
-
   def self.update_current_checkout_count
     sql = [
       'SELECT count(checkouts.id) as current_checkout_count,
@@ -68,19 +46,19 @@ end
 #
 # Table name: user_group_has_checkout_types
 #
-#  id                              :integer          not null, primary key
-#  user_group_id                   :integer          not null
-#  checkout_type_id                :integer          not null
-#  checkout_limit                  :integer          default("0"), not null
-#  checkout_period                 :integer          default("0"), not null
-#  checkout_renewal_limit          :integer          default("0"), not null
-#  reservation_limit               :integer          default("0"), not null
-#  reservation_expired_period      :integer          default("7"), not null
-#  set_due_date_before_closing_day :boolean          default("0"), not null
-#  fixed_due_date                  :datetime
-#  note                            :text
-#  position                        :integer
-#  created_at                      :datetime
-#  updated_at                      :datetime
-#  current_checkout_count          :integer
+#  id                             :integer          not null, primary key
+#  user_group_id                  :integer          not null
+#  checkout_type_id               :integer          not null
+#  checkout_limit                 :integer          default(0), not null
+#  checkout_period                :integer          default(0), not null
+#  checkout_renewal_limit         :integer          default(0), not null
+#  reservation_limit              :integer          default(0), not null
+#  reservation_expired_period     :integer          default(7), not null
+#  set_due_date_after_closing_day :boolean          default(FALSE), not null
+#  fixed_due_date                 :datetime
+#  note                           :text
+#  position                       :integer
+#  created_at                     :datetime
+#  updated_at                     :datetime
+#  current_checkout_count         :integer
 #

data/app/models/user_reserve_stat_transition.rb

@@ -12,7 +12,7 @@ end
 #
 #  id                   :integer          not null, primary key
 #  to_state             :string
-#  metadata             :text             default("{}")
+#  metadata             :text             default({})
 #  sort_key             :integer
 #  user_reserve_stat_id :integer
 #  created_at           :datetime

data/app/views/carrier_type_has_checkout_types/_form.html.erb

@@ -3,11 +3,11 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.carrier_type') -%><br />
-    <%= f.select(:carrier_type_id, @carrier_types.collect{|m| [m.display_name.localize, m.id]}, include_blank: true) -%>
+    <%= f.select(:carrier_type_id, @carrier_types.collect{|m| [m.display_name, m.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.checkout_type') -%><br />
-    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, include_blank: true) -%>
+    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name, c.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label :note -%><br />

data/app/views/carrier_type_has_checkout_types/index.html.erb

@@ -12,8 +12,8 @@
 
 <%- @carrier_type_has_checkout_types.each do |carrier_type_has_checkout_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to carrier_type_has_checkout_type.carrier_type.display_name.localize, carrier_type_has_checkout_type.carrier_type -%></td>
-    <td><%= link_to carrier_type_has_checkout_type.checkout_type.display_name.localize, carrier_type_has_checkout_type.checkout_type -%></td>
+    <td><%= link_to carrier_type_has_checkout_type.carrier_type.display_name, carrier_type_has_checkout_type.carrier_type -%></td>
+    <td><%= link_to carrier_type_has_checkout_type.checkout_type.display_name, carrier_type_has_checkout_type.checkout_type -%></td>
     <td><%= carrier_type_has_checkout_type.note -%></td>
     <td>
       <%= link_to t('page.show'), carrier_type_has_checkout_type -%>

data/app/views/carrier_type_has_checkout_types/show.html.erb

@@ -5,12 +5,12 @@
 
 <p>
   <strong><%= t('activerecord.models.carrier_type') -%>:</strong>
-  <%= link_to @carrier_type_has_checkout_type.carrier_type.display_name.localize, @carrier_type_has_checkout_type.carrier_type -%>
+  <%= link_to @carrier_type_has_checkout_type.carrier_type.display_name, @carrier_type_has_checkout_type.carrier_type -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.models.checkout_type') -%>:</strong>
-  <%= link_to @carrier_type_has_checkout_type.checkout_type.display_name.localize, @carrier_type_has_checkout_type.checkout_type -%>
+  <%= link_to @carrier_type_has_checkout_type.checkout_type.display_name, @carrier_type_has_checkout_type.checkout_type -%>
 </p>
 
 <p>

data/app/views/carrier_types/_carrier_type_has_checkout_type_fields.html.erb

@@ -1,5 +1,5 @@
 <div class="nested-fields">
   <%= f.label :checkout_type_id -%>
-  <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
+  <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name, c.id]}) %>
   <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %><br />
 </div>

data/app/views/checked_items/new.html.erb

@@ -18,7 +18,7 @@
   <ul>
     <%- @basket.user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
-        <%= available_checkout_type.checkout_type.display_name.localize -%>:
+        <%= available_checkout_type.checkout_type.display_name -%>:
         <%= @basket.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
       </li>
     <%- end -%>

data/app/views/checkins/_checkin.html.erb

@@ -15,7 +15,7 @@
       <% if checkin.item %>
         <%= link_to checkin.item.item_identifier, checkin.item -%>
         <br />
-        (<%= link_to checkin.item.shelf.library.display_name.localize, checkin.item.shelf.library %>)
+        (<%= link_to checkin.item.shelf.library.display_name, checkin.item.shelf.library %>)
         <% if defined?(EnjuInterLibraryLoan) %>
           <br />
           <%- unless checkin.item.shelf.library == current_user.library -%>

data/app/views/checkout_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/checkout_types/index.html.erb

@@ -23,7 +23,7 @@
     </td>
     <td><%= checkout_type.name -%></td>
     <td>
-      <%= link_to checkout_type.display_name.localize, checkout_type -%>
+      <%= link_to checkout_type.display_name, checkout_type -%>
       <br />
       <%= checkout_type.note %>
     </td>

data/app/views/checkout_types/show.html.erb

@@ -10,14 +10,14 @@
 
 <p>
   <strong><%= t('activerecord.attributes.checkout_type.display_name') -%>:</strong>
-  <%= @checkout_type.display_name.localize -%>
+  <%= @checkout_type.display_name -%>
 </p>
 
 <p>
 <strong><%= t('activerecord.models.user_group') -%></strong>
 <ul>
   <%- @checkout_type.user_group_has_checkout_types.each do |available_user_group| -%>
-    <li><%= link_to available_user_group.user_group.display_name.localize, available_user_group.user_group -%></li>
+    <li><%= link_to available_user_group.user_group.display_name, available_user_group.user_group -%></li>
   <%- end -%>
 </ul>
 

data/app/views/checkouts/_index_user.html.erb

@@ -15,7 +15,7 @@
   <ul>
     <%- user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
       <li>
-        <%= available_checkout_type.checkout_type.display_name.localize -%>:
+        <%= available_checkout_type.checkout_type.display_name -%>:
         <%= user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
       </li>
     <%- end -%>