extface 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e38a56544aa3e63a2f350e9563a096503210917
-  data.tar.gz: d4141b8ee75bfa6df67ece1bd4142b56b60ee107
+  metadata.gz: d6649c38c68097bd3139b52d76cd71fb9e6c5aa8
+  data.tar.gz: d990d58d8584459b9b8f6c412f8419c69f579c44
 SHA512:
-  metadata.gz: 55fd769863f13a406a3b8c06959cbffd6d56babba58507f24707e999d02f7fad28a86281e7579f0a8bfc8b30a000e2e0438ce7d3cf9516681e8c3c62734af763
-  data.tar.gz: 6611ab60b423dc14c3d1ee54ade77bd80d5dea009479b69f7b0e739b0bc188b5f894e6bb56ade5153aea477ad5dedacfd455490abd7675d702ccda9ff5dbf7b6
+  metadata.gz: 9f5f8c0ee1ef326ca941f7c6f9e69a97ed514262ad706ebf6921c2d8dead109aea6799472ff45a16ed07a672c4c5221965944051eefecab1157508b45614116c
+  data.tar.gz: b62354f3c6bbfe8a0e2602134dc75438cc381febf81706f17de82f13d4a70720587b27ecae55d4f5896c058e2fb662a920efc6a6d6905268edf296e9bdf9e1a1

data/app/controllers/extface/handler_controller.rb

@@ -34,7 +34,7 @@ module Extface
           r.append device.uuid, request.body.read
           @full_buffer = r.get device.uuid
         end
-        while @full_buffer.b.present? && bytes_porcessed = device.driver.pre_handle(@full_buffer.b) #handle more than one valid packet in the buffer
+        while @full_buffer.try(:b).present? && bytes_porcessed = device.driver.pre_handle(@full_buffer.b) #handle more than one valid packet in the buffer
           Extface.redis_block do |r|
             r.set device.uuid, @full_buffer.b[bytes_porcessed..-1]
             @full_buffer = r.get device.uuid

data/app/models/extface/device.rb

@@ -32,7 +32,7 @@ module Extface
     end
 
     def session(description = nil)
-      job = jobs.create!(description: description)
+      job = jobs.create!(description: description, started_at: Time.now)
       job.thread = Thread.new do
         Thread.current[:extface_job] = job.id
         ActiveRecord::Base.establish_connection unless ActiveRecord::Base.connection.active?

data/app/models/extface/driver/base/print.rb

@@ -0,0 +1,70 @@
+module Extface
+  class Driver::Base::Print < Extface::Driver
+    self.abstract_class = true
+    
+    NAME = 'Print Device Name'.freeze
+    GROUP = Extface::PRINT_DRIVER
+    
+    DEVELOPMENT = true #driver is not ready for production (not passing all tests or has major bugs)
+    
+    # Select driver features
+    RAW = true  #responds to #push(data) and #pull
+    PRINT = true #POS, slip printers
+    FISCAL = false #cash registers, fiscal printers
+    REPORT = false #only transmit data that must be parsed by handler, CDR, report devices
+    
+    alias_method :print, :push
+    
+    def print_test_page(times = 1)
+      device.session("Print Test Page") do |s|
+        times.times do |t|
+        s.notify "Printing Test Page #{t}"
+        s.print "******************************\r\n*"
+        s.print "Extface Print Test #{t}".center(28)
+        s.print "*\r\n******************************\r\n"
+
+        s.notify "Printing driver information"
+        s.print "\r\nDriver:\r\n"
+        s.print "------------------------------\r\n"
+        s.print "#{self.class::NAME}".truncate(30)
+        s.print "\r\n"
+
+        if try(:serial?)
+          s.notify "Printing serial settings"
+          s.print "\r\nSerial Port Settings:\r\n"
+          s.print "------------------------------\r\n"
+        end
+
+        s.print "\r\n"
+        s.print "------------------------------\r\n"
+        s.print Time.now.strftime("Printed on %m/%d/%Y %T\r\n").rjust(32)
+        s.print "\r\n\r\n"
+        s.notify "Printing finished"
+        
+        s.try :autocut
+        end
+      end
+    end
+    
+    def check_status
+      return true #just pass
+    end
+    
+    def printize(bill, detailed = false, payments = true)
+      if detailed
+        device.session("Fiscal Doc") do |s|
+          s.notify "Print Doc Start"
+          s.print "******************************\r\n*"
+          s.print "Extface Print Bill".center(28)
+          s.print "*\r\n******************************\r\n"
+          s.notify "Print Sale"
+          bill.charges.each do |charge|
+          end
+        end
+      else
+        
+      end
+    end
+    
+  end
+end

data/app/models/extface/driver/daisy_fx1200.rb

@@ -150,6 +150,16 @@ module Extface
       fsend(Sales::TOTAL, "\t")
     end
     
+    def payed_recv_account(value = 0.00, payment_type_num = 0)
+      raise "Incorrect Amount Value" if value.zero?
+      device.session("Payed Out / Received on Account (#{value.to_s})") do |s|
+        s.notify "Payed / Received Start"
+        fsend Other::ADD_SUB_SUMS, "" << ("%.2f" % value)
+        status = get_printer_status
+        s.notify "Payed / Received End"
+      end
+    end
+    
     #basket
     def sale_and_pay_items_session(items = [], operator = "1", password = "1")
       device.session("Fiscal Doc") do |s|

data/app/models/extface/driver/generic_esc_pos.rb

@@ -0,0 +1,8 @@
+module Extface
+  class Driver::GenericEscPos < Extface::Driver::Base::Print
+    NAME = 'Generic ESC/POS Printer'.freeze
+    
+    DEVELOPMENT = true #driver is not ready for production (not passing all tests or has major bugs)
+
+  end
+end

data/app/models/extface/job.rb

@@ -4,10 +4,30 @@ module Extface
     
     belongs_to :device, inverse_of: :jobs
     
-    scope :active, ->{ where(arel_table[:completed_at].eq(nil).and(arel_table[:failed_at].eq(nil))) }
+    scope :active, ->{ where(arel_table[:completed_at].eq(nil).and(arel_table[:failed_at].eq(nil)).and(arel_table[:started_at].not_eq(nil))) }
     scope :completed, ->{ where(arel_table[:completed_at].not_eq(nil)) }
     scope :failed, ->{ where(arel_table[:failed_at].not_eq(nil)) }
     
+    def runtime(description = nil)
+      update!(description: description, started_at: Time.now)
+      begin
+        raise 'No device assigned' unless device.present?
+        raise 'No driver configured' unless device.driver.present?
+        if device.driver.set_job(self)
+          yield device.driver
+          complete!
+        else
+          raise device.driver.errors.full_messages.join(', ')
+        end
+      rescue => e
+        STDERR.puts e.message
+        e.backtrace.each do |line|
+          p line
+        end
+        failed! e.message
+      end
+    end
+    
     def complete!
       self.completed_at = Time.now
       save!

data/app/views/extface/driver/generic_esc_pos/_settings.html.erb

@@ -0,0 +1 @@
+<%= __FILE__.gsub(Rails.root.to_s, "") %>

data/db/migrate/20160103154233_add_started_at_to_extface_job.rb

@@ -0,0 +1,5 @@
+class AddStartedAtToExtfaceJob < ActiveRecord::Migration
+  def change
+    add_column :extface_jobs, :started_at, :timestamp
+  end
+end

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -99,6 +99,7 @@ files:
 - app/models/extface/device.rb
 - app/models/extface/driver.rb
 - app/models/extface/driver/base/fiscal.rb
+- app/models/extface/driver/base/print.rb
 - app/models/extface/driver/clock/pms.rb
 - app/models/extface/driver/daisy/commands_fx1200.rb
 - app/models/extface/driver/daisy_fx1200.rb
@@ -107,6 +108,7 @@ files:
 - app/models/extface/driver/eltrade/commands_fp4.rb
 - app/models/extface/driver/eltrade_tm_u220.rb
 - app/models/extface/driver/fidelio/fias.rb
+- app/models/extface/driver/generic_esc_pos.rb
 - app/models/extface/driver/generic_pos.rb
 - app/models/extface/driver/star_scp700.rb
 - app/models/extface/driver/star_tsp200.rb
@@ -127,6 +129,7 @@ files:
 - app/views/extface/driver/eltrade_tm_u220/_settings.html.erb
 - app/views/extface/driver/fidelio/fias/_control.html.erb
 - app/views/extface/driver/fidelio/fias/_settings.html.erb
+- app/views/extface/driver/generic_esc_pos/_settings.html.erb
 - app/views/extface/driver/generic_pos/_settings.html.erb
 - app/views/extface/driver/star_scp700/_settings.html.erb
 - app/views/extface/driver/star_tsp200/_settings.html.erb
@@ -145,6 +148,7 @@ files:
 - db/migrate/20140303112124_create_extface_drivers.rb
 - db/migrate/20140303122506_change_driver_polymorphic_to_belongs_to_extface_devices.rb
 - db/migrate/20140303123022_change_polymorphic_to_has_one_to_extface_serial_configs.rb
+- db/migrate/20160103154233_add_started_at_to_extface_job.rb
 - lib/extface.rb
 - lib/extface/engine.rb
 - lib/extface/extfaceable.rb