diff --git a/Gemfile b/Gemfile index a71a9c5..19f8a58 100644 --- a/Gemfile +++ b/Gemfile @@ -45,6 +45,7 @@ gem 'simple_form' gem 'kaminari' gem 'to_csv-rails' gem 'barby' +gem 'barby-chunky_png' # gem 'bootstrap-multiselect-rails' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 04d4920..f41b582 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,6 +42,8 @@ GEM sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) barby (0.6.5) + barby-chunky_png (0.3.4) + chunky_png (= 0.8.0) bcrypt (3.1.12) bindex (0.5.0) builder (3.2.3) @@ -60,6 +62,7 @@ GEM capistrano-rbenv (2.1.3) capistrano (~> 3.1) sshkit (~> 1.3) + chunky_png (0.8.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -225,6 +228,7 @@ PLATFORMS DEPENDENCIES barby + barby-chunky_png bcrypt (~> 3.1.7) byebug capistrano diff --git a/app/controllers/batch_line_items_controller.rb b/app/controllers/batch_line_items_controller.rb index b1fe17b..62d3386 100644 --- a/app/controllers/batch_line_items_controller.rb +++ b/app/controllers/batch_line_items_controller.rb @@ -170,7 +170,7 @@ class BatchLineItemsController < ApplicationController barcode = BatchLineItem.generate_barcode update_barcode = BatchLineItem.find_by_asset_identity(out[2]) update_barcode.barcode = barcode - barcode_128 = Barby::Code128.new(barcode) + barcode_128 = Barby::Code128B.new(barcode) update_barcode.barcode_format = barcode_128 update_barcode.save end diff --git a/app/models/batch_line_item.rb b/app/models/batch_line_item.rb index 0ef0693..b107461 100644 --- a/app/models/batch_line_item.rb +++ b/app/models/batch_line_item.rb @@ -42,11 +42,11 @@ class BatchLineItem < ApplicationRecord def self.generate_barcode o = [('0'..'9')].map { |i| i.to_a }.flatten - barcode = (0...10).map { o[rand(o.length)] }.join + barcode = (0...8).map { o[rand(o.length)] }.join find_account_no = BatchLineItem.find_by_barcode(barcode) if !find_account_no.nil? o = [('0'..'9')].map { |i| i.to_a }.flatten - barcode = (0...10).map { o[rand(o.length)] }.join + barcode = (0...8).map { o[rand(o.length)] }.join end return barcode end