extface 0.4.1b → 0.4.2a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 178303c328b58ad61130fa1ae3fcba9ab4ddef44
-  data.tar.gz: c2c145a2957be5ebf5e042ae09dc900cf1b62419
+  metadata.gz: 2074253636c61eafa8261786c522090891eafec2
+  data.tar.gz: 281d1a9ac7b0c52bbffc48c54fcd921c48b24ff2
 SHA512:
-  metadata.gz: df62a69f4786b4b65fcb41a2a03ad6682f967d5a3bfde371d604b93523d8f19bd199588a8614e5f9477fdcf2aa3baae8f1c536c4fe002f446d8beb757527abf6
-  data.tar.gz: 7e77ecda2b063f8cfeab9fccfae612f6297409d4df79cdb5f1002138b141942d2b99aa9f4cc0c6482554bf8daff7451b6840d7c6931b58bd3905f631b4267e06
+  metadata.gz: f519ca8fb87256c2f72fb68b7f6626422ab346042122d3712be65f1a0b18e76b98418123e537cda8eda082db24e7d2e505c86c191eb7ee47b16e098e417e7b19
+  data.tar.gz: c8363e8ca2d5b9b4c0ec1585d3d3f3657aa1dbc5c6ebef37d489ea12dab05f39a9998d72232a54dc2b0be03ed7a463d1ded4bb572039daa79176f4940fe7f027

data/app/controllers/extface/jobs_controller.rb

@@ -3,6 +3,13 @@ require_dependency "extface/application_controller"
 module Extface
   class JobsController < ApplicationController
     include ActionController::Live
+    
+    skip_before_filter :include_extra_module
+    before_action :allow_cross_origin
+
+    def allow_cross_origin
+      headers['Access-Control-Allow-Origin'] = '*'
+    end
 
     def show
       response.headers['Content-Type'] = 'text/event-stream'

data/app/models/extface/device.rb

@@ -57,15 +57,14 @@ module Extface
     
     #initial billing module fiscalization support
     def fiscalize(billing_account, detailed = false)
-      if billing_account.instance_of?(Billing::Bill) && billing_account.valid?
         driver.sale_and_pay_items_session(
           [].tap() do |payments|
             billing_account.payments.each do |payment|
               payments << Extface::Driver::Base::Fiscal::SaleItem.new(price: payment.value.to_f, text1: payment.description)
             end
           end
-        )
-      end
+        ) if billing_account.kind_of?(Billing::Bill) && billing_account.valid?
+     
     end
   end
 end

data/app/models/extface/driver.rb

@@ -47,14 +47,14 @@ module Extface
     def push(buffer)
       if @job
         #retry if current device job is not @job (waiting on queue)
-        wait_on_queue = 20 #stop me writing endless things
-        begin
-          if current_device_job = device.jobs(true).active.try(:first)
-            if current_device_job != @job
-              #wait_on_queue = 20 #FIXME!
-              p "#### current_job is not first_on_queue"
-            end
+        wait_on_queue = 2 #stop me writing endless things
+        if current_device_job = device.jobs(true).active.try(:first)
+          if current_device_job != @job
+            wait_on_queue = 20 #FIXME!
+            p "#### current_job is not first_on_queue"
           end
+        end
+        begin
           Timeout.timeout(Extface.device_timeout) do
             Extface.redis_block do |r|
               r.subscribe(@job.id) do |on| #blocking until delivered
@@ -70,7 +70,7 @@ module Extface
             end
           end
         rescue Timeout::Error
-          (wait_on_queue -= 1) > 0 ? retry : raise(e) #let it be!
+          (wait_on_queue -= 1) > 0 ? retry : raise("Timeout waiting on queue") #let it be!
         end
       else
         raise "No job given"

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

@@ -75,15 +75,15 @@ module Extface
     end
     
     def period_report_session(from, to, detailed = true)
-      device.session("FP Report #{from.to_date.human} = #{to.to_date.human}") do |s|
+      device.session("FP Report #{from.to_date.human} - #{to.to_date.human} (#{ detailed ? 'detailed' : 'short' })") do |s|
         dates_bytes = "".b
-        dates_bytes << from.day
-        dates_bytes << from.month
-        dates_bytes << from.year - 2000
+        dates_bytes << pbcd(from.day)
+        dates_bytes << pbcd(from.month)
+        dates_bytes << pbcd(from.year - 2000)
         dates_bytes << 0
-        dates_bytes << to.day
-        dates_bytes << to.month
-        dates_bytes << to.year - 2000
+        dates_bytes << pbcd(to.day)
+        dates_bytes << pbcd(to.month)
+        dates_bytes << pbcd(to.year - 2000)
         dates_bytes << 0
         s.notify "FP Report Start"
         s.fsend detailed ? Reports::FP_DETAILED_DATES : Reports::FP_GENERAL_DATES, dates_bytes
@@ -268,6 +268,10 @@ module Extface
       end
     end
     
+    def pbcd(byte)
+      ((byte / 10) << 4) | (byte % 10)
+    end
+    
     private
       def open_receipt(variant = nil)
         fsend Receipt::OPEN_RECEIPT

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.4.1b"
+  VERSION = "0.4.2a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.4.1b
+  version: 0.4.2a
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails