extface 0.4.5 → 0.4.6a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 094a1a3f1328988565cd7966333ba79881d8679b
-  data.tar.gz: 3059edd4c802691b120367b37df7e82cc7edcdd2
+  metadata.gz: e6a5e92df95302c771ddb50d19300c437e18b089
+  data.tar.gz: d371929e63c4779cf028f6464d03266fc5e00e7f
 SHA512:
-  metadata.gz: b3aa842dce8345e2815e7842f57134f227c2bbbfb3c0c7da77474e7b3dc14c491b0033dc59497a8b0ecee3dd0ecb674e4eb1437952bef5012fa4ec06cd721450
-  data.tar.gz: a7b41afb5321a20d4a72e1eb75c0138eff2ecf081b2aa706b6d7fcdfdd2ef9a4ebc13b7a86d28bb36ea439b2f6ec8f4b3542a98a22bc13c8b22abf4dcf222026
+  metadata.gz: 213e8d580c1e35bf442b3c49c3f4251cf7e0d47843beccc245254ef2705445931adea025c0589390e72c800a61d1c3b854a60166521f3d6142753a6ab0ee1861
+  data.tar.gz: fe4b57ffe2d57fc16f6e2958543fa43bcbaba43fc333c170d60d1d9a2ec0c13e4b827d61fb4bdec45b279cfc8ed3332ed84ee134a9bf540ed3474bda8ed65e7b

data/app/models/extface/api_driver.rb

@@ -0,0 +1,4 @@
+module Extface
+  class ApiDriver
+  end
+end

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

@@ -48,8 +48,6 @@ module Extface
     def add_total_modifier(fixed_value = nil, percent_ratio = nil) raise_not_implemented end
     def total_payment() raise_not_implemented end #auto calculated total default payment
     def close_fiscal_doc() raise_not_implemented end
-      
-    def cancel_doc_session() raise_not_implemented end #repair from broken doc session
     
     #fiscal basket session of Extface::Driver::Base::Fiscal::SaleItem instances
     def sale_and_pay_items_session(sale_items = [], operator = '', password = '') raise_not_implemented end

data/app/models/extface/driver/clock/pms.rb

@@ -0,0 +1,5 @@
+module Extface
+  class Driver::Clock::Pms < Extface::ApiDriver
+    NAME = 'ClockPMS Simple Posting (PMS API)'.freeze
+  end
+end

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

@@ -90,8 +90,8 @@ module Extface
       end
     end
     
-    def period_report_session(from, to, detailed = true)
-    end
+    # def period_report_session(from, to, detailed = true)
+    # end
     
     #print
     def open_non_fiscal_doc

data/app/models/extface/driver/datecs/commands_v1.rb

@@ -27,5 +27,43 @@ module Extface
       PAPER_MOVE                  = 0x2C
       PAPER_CUT                   = 0x2D
     end
+    
+    module Sales
+      START_NON_FISCAL_DOC  = 0x26  #other
+      END_NON_FISCAL_DOC    = 0x27  #other
+      PRINT_NON_FISCAL_TEXT = 0x2a  #other
+      START_FISCAL_DOC      = 0x30
+      SALE                  = 0x31
+      SUBTOTAL              = 0x33
+      SALE_AND_SHOW         = 0x34
+      TOTAL                 = 0x35
+      PRINT_FISCAL_TEXT     = 0x36
+      END_FISCAL_DOC        = 0x38
+      PRINT_INFO_FOR_CLIENT = 0x39
+      SALE_ITEM             = 0x3a
+      CANCEL_FISCAL_DOC     = 0x3c
+      PRINT_BARCODE         = 0x54
+      PRINT_DUPLICATE_DOC   = 0x6d
+    end
+    
+    module Reports
+      REPORT_FP_BY_NUMBER         = 0x49
+      COMPACT_REPORT_FP_BY_DATE   = 0x4f
+      REPORT_FP_BY_DATE           = 0x5e
+      COMPACT_REPORT_FP_BY_NUM    = 0x5f
+      REPORT_BY_OPERATORS         = 0x69
+      REPORT_BY_ITEMS             = 0x6F
+    end
+    
+    module Closure
+      DAY_FIN_REPORT                    = 0x45
+      EXPANDED_DAY_FIN_REPORT           = 0x6c
+      EXPANDED_DAY_FIN_REPORT_BY_DEPS   = 0x75
+      EXPANDED_DAY_FIN_REPORT_BY_ITEMS  = 0x76
+    end
+    
+    module Other
+      PAYED_RECV_ACCOUNT  = 0x46
+    end
   end
 end

data/app/models/extface/driver/datecs/fp550.rb

@@ -16,12 +16,129 @@ module Extface
       end
     end
     
+    #tests
+    def non_fiscal_test
+      device.session("Non Fiscal Text") do |s|
+        s.notify "Printing Non Fiscal Text"
+        s.open_non_fiscal_doc
+        s.print "********************************"
+        s.print "Extface Print Test".center(32)
+        s.print "********************************"
+        s.fsend Printer::PAPER_MOVE, "1"
+        s.print "Driver: " + "#{self.class::NAME}".truncate(24)
+        s.close_non_fiscal_doc
+        s.notify "Printing finished"
+      end
+    end
+    
+    def fiscal_test
+      sale_and_pay_items_session([
+        SaleItem.new( price: 0.01, text1: "Extface Test" )
+      ])
+    end
+    
+    #reports
+    def z_report_session
+      device.session("Z Report") do |s|
+        s.notify "Z Report Start"
+        s.fsend Closure::DAY_FIN_REPORT, "0"
+        s.notify "Z Report End"
+      end
+    end
+    
+    def x_report_session
+      device.session("X Report") do |s|
+        s.notify "X Report Start"
+        s.fsend Closure::DAY_FIN_REPORT, "2"
+        s.notify "X Report End"
+      end
+    end
+    
+    #print
+    def open_non_fiscal_doc
+      fsend Sales::START_NON_FISCAL_DOC
+      @print_session = true
+    end
+    
+    def print(text) #up to 38 sybols, TODO check
+      raise "Not in print session" unless @print_session
+      fsend Sales::PRINT_NON_FISCAL_TEXT, text
+    end
+    
+    def close_non_fiscal_doc
+      fsend Sales::END_NON_FISCAL_DOC
+      @print_session = false
+    end
+    
     def check_status
       flush #clear receive buffer
       fsend(Info::GET_STATUS, 'X') # get 6 bytes status
       errors.empty?
     end
     
+    #fiscal
+    def open_fiscal_doc(operator = "1", password = "1")
+      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "1"},00001"
+      @fiscal_session = true
+    end
+    
+    def close_fiscal_doc
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend Sales::END_FISCAL_DOC
+      @fiscal_session = false
+    end
+    
+    def add_sale(sale_item)
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend Sales::SALE_AND_SHOW, build_sale_data(sale_item)
+    end
+    
+    def add_comment(text)
+      raise "Not in fiscal session" unless @fiscal_session
+    end
+    
+    def add_payment(value = nil, type_num = nil)
+      raise "Not in fiscal session" unless @fiscal_session
+      payment_data = "".tap() do |data|
+                            data << "\t"
+                            data << PAYMENT_TYPE_MAP[type_num || 1]
+                            data << ("%.2f" % value) unless value.blank?
+                          end
+      fsend(Sales::TOTAL, payment_data)
+    end
+    
+    def total_payment
+      raise "Not in fiscal session" unless @fiscal_session
+      fsend(Sales::TOTAL, "\t")
+    end
+    
+    #basket
+    def sale_and_pay_items_session(items = [], operator = "1", password = "1")
+      device.session("Fiscal Doc") do |s|
+        s.notify "Fiscal Doc Start"
+        s.open_fiscal_doc
+        s.notify "Register Sale"
+        items.each do |item|
+          s.add_sale(item)
+        end
+        s.notify "Register Payment"
+        s.total_payment
+        s.notify "Close Fiscal Receipt"
+        s.close_fiscal_doc
+        s.notify "Fiscal Doc End"
+      end
+    end
+    
+    def cancel_doc_session
+      device.session("Doc cancel") do |s|
+        s.notify "Doc Cancel Start"
+        s.fsend Sales::CANCEL_FISCAL_DOC
+        s.paper_cut
+        s.notify "Doc Cancel End"
+      end
+    end
+    
+    #common
     def fsend(cmd, data = "") #return data or nil
       packet_data = build_packet(cmd, data) #store packet to be able to re-transmit it with the same sequence number
       result = false
@@ -96,6 +213,8 @@ module Extface
       errors.add :base, "Date & Time Not Set" unless (status_0 & 0x04).zero?
       errors.add :base, "Syntax Error" unless (status_0 & 0x02).zero?
       status_1 = status[1].ord
+      errors.add :base, "Unpermitted Command In This Mode" unless (status_1 & 0x02).zero?
+      errors.add :base, "Field Overflow" unless (status_1 & 0x01).zero?
     end
     
     private

data/app/views/extface/driver/_control_fiscal.html.erb

@@ -4,5 +4,5 @@
 <%= button_to 'X Report', fiscal_device_path(@device), remote: true, name: :x_report, value: true, class: 'btn btn-warning' %>
 <%= button_to 'Z Report', fiscal_device_path(@device), remote: true, name: :z_report, value: true, class: 'btn btn-warning' %>
 
-<%= button_to 'Cancel Fiscal Doc', fiscal_device_path(@device), remote: true, name: :cancel_fiscal_doc, value: true, class: 'btn btn-warning' %>
+<%= button_to 'Cancel Fiscal Doc', fiscal_device_path(@device), remote: true, name: :cancel_fiscal_doc, value: true, class: 'btn btn-danger' %>
 

data/app/views/extface/driver/datecs/fp550/_control.html.erb

@@ -1,2 +1,12 @@
 
-<%= button_to 'Paper Cut', fiscal_device_path(@device), remote: true, name: :paper_cut, value: true %>
+<%= button_to 'Paper Cut', fiscal_device_path(@device), remote: true, name: :paper_cut, value: true, class: 'btn btn-warning'  %>
+
+<%= button_to 'Non Fiscal Test', fiscal_device_path(@device), remote: true, name: :non_fiscal_test, value: true, class: 'btn btn-warning' %>
+
+<%= button_to 'Fiscal Test', fiscal_device_path(@device), remote: true, name: :fiscal_test, value: true, class: 'btn btn-warning' %>
+
+<%= button_to 'X Report', fiscal_device_path(@device), remote: true, name: :x_report, value: true, class: 'btn btn-warning' %>
+<%= button_to 'Z Report', fiscal_device_path(@device), remote: true, name: :z_report, value: true, class: 'btn btn-warning' %>
+
+<%= button_to 'Cancel Fiscal Doc', fiscal_device_path(@device), remote: true, name: :cancel_fiscal_doc, value: true, class: 'btn btn-danger' %>
+

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.4.5"
+  VERSION = "0.4.6a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6a
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,9 +109,11 @@ files:
 - app/helpers/extface/devices_helper.rb
 - app/helpers/extface/jobs_helper.rb
 - app/helpers/extface/sse_helper.rb
+- app/models/extface/api_driver.rb
 - app/models/extface/device.rb
 - app/models/extface/driver.rb
 - app/models/extface/driver/base/fiscal.rb
+- app/models/extface/driver/clock/pms.rb
 - app/models/extface/driver/daisy/commands_fx1200.rb
 - app/models/extface/driver/daisy_fx1200.rb
 - app/models/extface/driver/datecs/commands_v1.rb
@@ -240,9 +242,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6