extface 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5694ea075490fadb29202d3113d02a0963ab8d1
-  data.tar.gz: 0fccac085b944d300d7571da5652e8e7687e24e0
+  metadata.gz: 0f43e7be656154e78b1e024bb74d6dbc833998e9
+  data.tar.gz: e3287aa51199d87998f457a52011fd3228ee25ed
 SHA512:
-  metadata.gz: 5cd19d2b097b1891328347a7c1780c6d45bb6a8e9ae3d346e731f28aa8f1ff3aab457845e305a7ba79aad1a42bf19817664fc93599df0516a07637736972b064
-  data.tar.gz: a8d425df6a8f08ac450401a09d1d48c445fc8b3036785c79e99e33996824e32bdb8e3e7a21b7fe01b3c211959f58ba0886eece123052260afb6eba24bb52ee78
+  metadata.gz: 7a1bc3344bfcc42fd1e215f21d3bf4f68a10f85f07d2cccd9bed97945ceecf25c713e610963975653e5d7241baa5ac0e37d7457af7a004b85c323e8983d952f0
+  data.tar.gz: f4e0d647d299eb222e418b7556206ee86b45cd51d33aad8ec180d5407a563ff8089d9d24a01963e5eb2f277695aeed55e0a6492c724500c8e262aa4476e6cbf4

data/app/helpers/extface/application_helper.rb

@@ -42,7 +42,26 @@ module Extface
           "#{driver.class::NAME} #{t('.control_panel')}".html_safe
         end +
         content_tag(:div, class: 'panel-body') do
-          render "extface/driver/#{driver.class.name.demodulize.underscore}/control"
+          content_tag(:div, class: 'col-sm-8') do
+            control_partial = "extface/driver/#{driver.class.name.demodulize.underscore}/control"
+            begin
+              render control_partial
+            rescue ActionView::MissingTemplate
+              case
+              when driver.fiscal? then 
+                render "extface/driver/control_fiscal"
+              when driver.print? then 
+                render "extface/driver/control_print"
+              when driver.report? then 
+                render "extface/driver/control_report"
+              else
+                render "extface/driver/control_raw"
+              end
+            end
+          end +
+          content_tag(:div, class: 'col-sm-4') do
+            text_area_tag :extface_control_monitor, nil, rows: 8, class: 'form-control'
+          end
         end
       end
     end

data/app/helpers/extface/devices_helper.rb

@@ -4,7 +4,7 @@ module Extface
     def subdrivers(object)
       [].tap do |drivers|
         object.subclasses.each do |s|
-          drivers << s
+          drivers << s unless s.abstract_class
           drivers << subdrivers(s) if s.subclasses.any?
         end
       end
@@ -14,7 +14,7 @@ module Extface
       Extface::Engine.eager_load! if Rails.env.development?
       [].tap do |drivers|
         Extface::Driver.subclasses.each do |s|
-          drivers << s
+          drivers << s unless s.abstract_class
           drivers << subdrivers(s)
         end
       end.flatten.group_by{ |x| x::GROUP }.sort.collect{ |group, drivers| [group, drivers.collect{ |d| [d::NAME, d.to_s] }.sort ] }

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

@@ -0,0 +1,78 @@
+module Extface
+  class Driver::Base::Fiscal < Extface::Driver
+    self.abstract_class = true
+    
+    NAME = 'Fiscal Device Name'.freeze
+    
+    GROUP = Extface::FISCAL_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 = false #POS, slip printers
+    FISCAL = true #cash registers, fiscal printers
+    REPORT = false #only transmit data that must be parsed by handler, CDR, report devices  
+    
+    def handle(buffer) raise_not_implemented end
+    
+    #tests
+    def non_fiscal_test() raise_not_implemented end
+    def fiscal_test() raise_not_implemented end
+
+    #reports
+    def z_report_session() raise_not_implemented end
+    def x_report_session() raise_not_implemented end
+    def period_report_session(from, to, detailed = true) raise_not_implemented end
+    
+    #repair interrupted doc
+    def cancel_doc_session() raise_not_implemented end
+
+    #print driver compatibility session
+    # device.session do |s|
+      # s.open_non_fiscal_doc if device.fiscal?
+      # s.print
+      # s.print
+      # ...
+      # s.close_non_fiscal_doc if device.fiscal?
+    # end
+    def open_non_fiscal_doc() raise_not_implemented end
+    def print() raise_not_implemented end
+    def close_non_fiscal_doc() raise_not_implemented end
+      
+    #fiscal wild session
+    def open_fiscal_doc(operator = '', password = '') raise_not_implemented end
+    def add_sale(sale_item) raise_not_implemented end #instance of Extface::Driver::Base::Fiscal::SaleItem
+    def add_comment(text = '') raise_not_implemented end
+    def add_payment(type_num, value = 0.00) 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
+    
+    class SaleItem
+      include ActiveModel::Validations
+      attr_reader :price, # Float
+                  :text1, :text2, # String
+                  :tax_group, #Float
+                  :qty, #Fixnum
+                  :percent, #Float
+                  :neto, 
+                  :number #Fixnum
+      def initialize(attributes)
+        @price, @text1, @text2, @tax_group, @qty, @percent, @neto, @number = attributes[:price], attributes[:text1].to_s, attributes[:text2].to_s, attributes[:tax_group], attributes[:qty], attributes[:percent], attributes[:neto], attributes[:number]
+        raise "invalid price" unless price.kind_of?(Float)
+        raise "invalid tax group" if tax_group.present? && !tax_group.kind_of(Integer)
+        raise "invalid qty" if qty.present? && !qty.kind_of(Float)
+      end
+    end
+
+    private
+      def raise_not_implemented
+        raise "not implemented"
+      end
+  end
+end

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

@@ -11,17 +11,8 @@
 #01h   20h–FFh 20h–FFh 20h–FFh  20h–FFh  04h  80h–FFh  05h  30h–3Fh  03h
 
 module Extface
-  class Driver::DaisyFx1200 < Extface::Driver
+  class Driver::DaisyFx1200 < Extface::Driver::Base::Fiscal
     NAME = 'Daisy FX1200 (Serial)'.freeze
-    GROUP = Extface::FISCAL_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 = false #POS, slip printers
-    FISCAL = true #cash registers, fiscal printers
-    REPORT = false #only transmit data that must be parsed by handler, CDR, report devices  
     
     RESPONSE_TIMEOUT = 3  #seconds
     INVALID_FRAME_RETRIES = 6  #seconds
@@ -55,25 +46,48 @@ module Extface
       end
     end
     
-    def autocut(partial = true) # return "P" - success, "F" - failed
-      resp = fsend(Printer::CUT)
-      resp == "P"
-    end
-     
+    #tests
     def non_fiscal_test
       device.session("Non Fiscal Text") do |s|
         s.notify "Printing Non Fiscal Text"
-        s.fsend Sales::START_NON_FISCAL_DOC
-        s.fsend Sales::PRINT_NON_FISCAL_TEXT, "********************************"
-        s.fsend Sales::PRINT_NON_FISCAL_TEXT, "Extface Print Test".center(32)
-        s.fsend Sales::PRINT_NON_FISCAL_TEXT, "********************************"
+        s.open_non_fiscal_doc
+        s.print "********************************"
+        s.print "Extface Print Test".center(32)
+        s.print "********************************"
         s.fsend Printer::MOVE, "1"
-        s.fsend Sales::PRINT_NON_FISCAL_TEXT, "Driver: " + "#{self.class::NAME}".truncate(24)
-        s.fsend Sales::END_NON_FISCAL_DOC
+        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
+    
+    def period_report_session(from, to, detailed = true)
+    end
+    
+    #print
     def open_non_fiscal_doc
       fsend Sales::START_NON_FISCAL_DOC
       @print_session = true
@@ -89,62 +103,69 @@ module Extface
       @print_session = false
     end
     
-    def fiscal_test
-      sale_and_pay_items_session([
-        { price: 0.01, text1: "Extface Test" }
-      ])
+    #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 build_sale_data(price, text1 = nil, text2 = nil, tax_group = 2, qty = nil, percent = nil, neto = nil)
-      "".tap() do |data|
-        data << text1 unless text1.blank?
-        data << "\x0a#{text2}" unless text2.blank?
-        data << "\t"
-        data << TAX_GROUPS_MAP[tax_group || 2]
-        data << price.to_s
-        data << "*#{qty.to_s}" unless qty.blank?
-        data << ",#{percent}" unless percent.blank?
-        data << "$#{neto}" unless neto.blank?
-      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(type_num)
+      raise "Not in fiscal session" unless @fiscal_session
+    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.fsend Sales::START_FISCAL_DOC, "#{operator || "1"},#{password || "1"},00001"
+        s.open_fiscal_doc
+        s.notify "Register Sale"
         items.each do |item|
-          s.fsend Sales::SALE_AND_SHOW, build_sale_data(item[:price], item[:text1], item[:text2], item[:tax_group], item[:qty], item[:percent], item[:neto])
+          s.add_sale(item)
         end
-        s.fsend(Sales::TOTAL, "\t")
-        s.fsend(Sales::END_FISCAL_DOC)
+        s.notify "Register Payment"
+        s.total_payment
+        s.notify "Close Fiscal Receipt"
+        s.close_fiscal_doc
         s.notify "Fiscal Doc End"
       end
     end
     
-    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
-    
     def cancel_doc_session
       device.session("Doc cancel") do |s|
         s.notify "Doc Cancel Start"
         s.fsend Sales::CANCEL_DOC
+        s.autocut
         s.notify "Doc Cancel End"
       end
     end
-    
+
+    #other
+    def autocut(partial = true) # return "P" - success, "F" - failed
+      resp = fsend(Printer::CUT)
+      resp == "P"
+    end
+
+    # auto called for session, return true for OK
     def check_status
       flush
       fsend(Info::STATUS) # return 6 byte status
@@ -163,16 +184,7 @@ module Extface
         packet << ETX
       end
     end
-    
-    def fsend!(cmd, data = "") # return data or raise
-      push build_packet(cmd, data) # return 6 byte status
-      if resp = frecv(RESPONSE_TIMEOUT)
-        return resp.data if resp.valid?
-      else
-        raise errors.full_messages.join(', ')
-      end
-    end
-    
+
     def fsend(cmd, data = "") #return data or nil
       packet_data = build_packet(cmd, data)
       result = false
@@ -199,7 +211,20 @@ module Extface
       end
     end
    
-    private 
+    private
+      def build_sale_data(item)
+        "".tap() do |data|
+          data << item.text1 unless item.text1.blank?
+          data << "\x0a#{text2}" unless item.text2.blank?
+          data << "\t"
+          data << TAX_GROUPS_MAP[item.tax_group || 2]
+          data << item.price.to_s
+          data << "*#{item.qty.to_s}" unless item.qty.blank?
+          data << ",#{item.percent}" unless item.percent.blank?
+          data << "$#{neto}" unless item.neto.blank?
+        end
+      end
+    
       def bcc(buffer)
         sum = 0
         buffer.each_byte do |byte|

data/app/models/extface/driver/eltrade/commands_fp4.rb

@@ -36,7 +36,11 @@ module Extface
       PRINT_RECEIPT_HEADER  = 0x38
     end
     module Reports
-      SILENT0_PLU           = 0x22
+      FP_DETAILED_BLOCKS    = 0x1C
+      FP_GENERAL_BLOCKS     = 0x1D
+      FP_DETAILED_DATES     = 0x1E
+      FP_GENERAL_DATES      = 0x1F
+      SILENT_PLU            = 0x22
       SILENT_PRINTER        = 0x23
       PLU_REPORT            = 0x32
       DAILY_REPORT          = 0x33

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

@@ -5,17 +5,8 @@
 #AAh    55h    0–FFh   0–FFh  10h–70h  0-FFh  30h–3Fh  0-FFh
 
 module Extface
-  class Driver::EltradeTmU220 < Extface::Driver
-    NAME = 'Eltrade TM-U220 (Serial)'.freeze
-    GROUP = Extface::FISCAL_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 = false #POS, slip printers
-    FISCAL = true #cash registers, fiscal printers
-    REPORT = false #only transmit data that must be parsed by handler, CDR, report devices 
+  class Driver::EltradeTmU220 < Extface::Driver::Base::Fiscal
+    NAME = 'Eltrade TM-U220 (Serial)'.freeze 
     
     RESPONSE_TIMEOUT = 3  #seconds
     INVALID_FRAME_RETRIES = 6  #count
@@ -43,54 +34,75 @@ module Extface
       return bytes_processed
     end
     
-    def open_receipt(variant = nil)
-      fsend Receipt::OPEN_RECEIPT
-      unless variant.blank?
-        fsend Receipt::PRINT_RECEIPT, variant
+    #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.print ""
+        s.print "Driver: " + "#{self.class::NAME}".truncate(24)
+        s.close_non_fiscal_doc
+        s.notify "Printing finished"
       end
-      status = get_printer_status
     end
     
-    def close_receipt
-      fsend Receipt::CLOSE_RECEIPT
-      status = get_printer_status
+    def fiscal_test
+      sale_and_pay_items_session([
+        SaleItem.new( price: 0.01, text1: "Extface Test" )
+      ])
     end
     
-    def send_comment(text)
-      fsend Receipt::PRINT_RECEIPT, Receipt::Variant::COMMENT + text
-      status = get_printer_status
+    #reports
+    def z_report_session
+      device.session("Z Report") do |s|
+        s.notify "Z Report Start"
+        s.fsend Reports::DAILY_REPORT, FLAG_TRUE
+        status = s.get_printer_status
+        s.notify "Z Report End"
+      end
     end
     
-    def send_plu(plu_data)
-      fsend Receipt::PRINT_RECEIPT, Receipt::Variant::PLU + plu_data
-      status = get_printer_status
+    def x_report_session
+      device.session("Z Report") do |s|
+        s.notify "X Report Start"
+        s.fsend Reports::DAILY_REPORT, FLAG_FALSE
+        status = s.get_printer_status
+        s.notify "X Report End"
+      end
     end
     
-    def send_payment(type_num = 0, value = nil) # 0, 1, 2, 3
-      value_bytes = "\x00\x00\x00\x00" # recalculate
-      unless value.nil?
-        value_units = (value * 100).to_i # !FIXME
-        value_bytes = "".b
-        4.times{ |shift| value_bytes.insert 0, ((value_units >> shift*8) & 0xff).chr }
+    def period_report_session(from, to, detailed = true)
+      device.session("FP Report #{from.to_date.human} = #{to.to_date.human}") do |s|
+        dates_bytes = "".b
+        dates_bytes << from.day
+        dates_bytes << from.month
+        dates_bytes << from.year - 2000
+        dates_bytes << 0
+        dates_bytes << to.day
+        dates_bytes << to.month
+        dates_bytes << to.year - 2000
+        dates_bytes << 0
+        s.notify "FP Report Start"
+        s.fsend detailed ? Reports::FP_DETAILED_DATES : Reports::FP_GENERAL_DATES, dates_bytes
+        status = s.get_printer_status
+        s.notify "FP Report End"
       end
-      fsend Receipt::PRINT_RECEIPT, "" << (9 + type_num).chr << value_bytes
-      status = get_printer_status
     end
     
-    def non_fiscal_test
-      device.session("Non Fiscal Text") do |s|
-        s.notify "Printing Non Fiscal Text"
-        s.open_non_fiscal_doc
-        s.send_comment "********************************"
-        s.send_comment "Extface Print Test".center(32)
-        s.send_comment "********************************"
-        s.send_comment ""
-        s.send_comment "Driver: " + "#{self.class::NAME}".truncate(24)
-        s.close_non_fiscal_doc
-        s.notify "Printing finished"
+    def cancel_doc_session
+      device.session("Doc cancel") do |s|
+        s.notify "Doc Cancel Start"
+        # cancel old one by open/close new one
+        s.open_fiscal_doc
+        s.close_fiscal_doc
+        s.notify "Doc Cancel End"
       end
     end
     
+    #print
     def open_non_fiscal_doc
       open_receipt Receipt::Variant::START_COMMENT_RECEIPT
       @print_session = true
@@ -102,85 +114,70 @@ module Extface
     end
     
     def close_non_fiscal_doc
+      raise "Not in print session" unless @print_session
       close_receipt
       @print_session = false
     end
+
+
+    #fiscal
+    def open_fiscal_doc(operator = '', password = '')
+      set_operatior(operator) if operator.present?
+      open_receipt
+      @fiscal_session = true
+    end
     
-    def fiscal_test
-      sale_and_pay_items_session([
-        { price: 0.01, text1: "Extface Test" }
-      ])
+    def close_fiscal_doc
+      raise "Not in fiscal session" unless @fiscal_session
+      close_receipt
+      @fiscal_session = false
+    end
+    
+    def add_sale(sale_item)
+      raise "Not in fiscal session" unless @fiscal_session
+      send_plu build_sale_data(sale_item)
+      add_comment(sale_item.text2) if sale_item.text2.present?
     end
     
-    def build_sale_data(price, text1 = "", text2 = nil, tax_group = 2, qty = 1, percent = nil, neto = nil, number = nil)
-      "".b.tap() do |data|
-        price_units = (price * 100).to_i # !FIXME
-        price_bytes = "".b
-        4.times{ |shift| price_bytes.insert 0, ((price_units >> shift*8) & 0xff).chr }
-        data << price_bytes
-        qty_units = ((qty || 1) * 1000).to_i # !FIXME
-        qty_bytes = "".b
-        4.times{ |shift| qty_bytes.insert 0, ((qty_units >> shift*8) & 0xff).chr }
-        data << qty_bytes
-        data << "\x00".b #number len FIXME
-        data << "\xAA\xAA\xAA\xAA\xAA\xAA".b #number FIXME
-        text = text1.truncate(20)
-        data << text.length.chr
-        data << text.ljust(20, " ").b
-        data << (tax_group || 2).chr
+    def add_comment(text)
+      raise "Not in fiscal session" unless @fiscal_session
+      send_comment text
+    end
+    
+    def add_payment(type_num = 0, value = nil) # 0, 1, 2, 3
+      raise "Not in fiscal session" unless @fiscal_session
+      value_bytes = "\x00\x00\x00\x00" # recalculate
+      unless value.nil?
+        value_units = (value * 100).to_i # !FIXME
+        value_bytes = "".b
+        4.times{ |shift| value_bytes.insert 0, ((value_units >> shift*8) & 0xff).chr }
       end
+      fsend Receipt::PRINT_RECEIPT, "" << (9 + type_num).chr << value_bytes
+      status = get_printer_status
     end
     
-    def sale_and_pay_items_session(items = [], operator = "1", password = "1")
+    def total_payment
+      raise "Not in fiscal session" unless @fiscal_session
+      add_payment
+    end
+
+    #basket
+    def sale_and_pay_items_session(items = [], operator = '', password = '')
       device.session("Fiscal Doc") do |s|
         s.notify "Open Fiscal Receipt"
-        s.open_receipt
+        s.open_fiscal_doc operator, password
         s.notify "Register Sale"
         items.each do |item|
-          s.send_plu build_sale_data(item[:price], item[:text1], nil, item[:tax_group], item[:qty], nil, nil, item[:number])
-          s.send_comment(item[:text2]) unless item[:text2].blank?
+          s.add_sale(item)
         end
         s.notify "Register Payment"
-        s.send_payment
+        s.total_payment
         s.notify "Close Fiscal Receipt"
-        s.close_receipt
+        s.close_fiscal_doc
         s.notify "Fiscalization Completed!"
       end
     end
     
-    def z_report_session
-      device.session("Z Report") do |s|
-        s.notify "Z Report Start"
-        s.fsend Reports::DAILY_REPORT, FLAG_TRUE
-        status = s.get_printer_status
-        s.notify "Z Report End"
-      end
-    end
-    
-    def x_report_session
-      device.session("Z Report") do |s|
-        s.notify "X Report Start"
-        s.fsend Reports::DAILY_REPORT, FLAG_FALSE
-        status = s.get_printer_status
-        s.notify "X Report End"
-      end
-    end
-    
-    def cancel_doc_session
-      device.session("Doc cancel") do |s|
-        s.notify "Doc Cancel Start"
-        # cancel old one by open/close new one
-        s.open_receipt
-        s.close_receipt
-        s.notify "Doc Cancel End"
-      end
-    end
-    
-    def check_ready!
-      fsend Info::GET_STATUS
-      raise errors.full_messages.join(", ") if errors.any?
-    end
-    
     def get_printer_status
       PrinterStatus.new(fsend(Info::GET_PRINTER_STATUS))
     end
@@ -254,15 +251,58 @@ module Extface
       end
     end
     
-    def check_sum(buffer)
-      sum = 0
-      buffer.each_byte do |byte|
-        sum -= byte
-      end
-      sum & 0xff
-    end
-    
     private
+      def open_receipt(variant = nil)
+        fsend Receipt::OPEN_RECEIPT
+        unless variant.blank?
+          fsend Receipt::PRINT_RECEIPT, variant
+        end
+        status = get_printer_status
+      end
+      
+      def close_receipt
+        fsend Receipt::CLOSE_RECEIPT
+        status = get_printer_status
+      end
+      
+      def send_comment(text)
+        fsend Receipt::PRINT_RECEIPT, Receipt::Variant::COMMENT + text
+        status = get_printer_status
+      end
+      
+      def send_plu(plu_data)
+        fsend Receipt::PRINT_RECEIPT, Receipt::Variant::PLU + plu_data
+        status = get_printer_status
+      end
+      
+      #def build_sale_data(price, text1 = "", text2 = nil, tax_group = 2, qty = 1, percent = nil, neto = nil, number = nil)
+      def build_sale_data(sale_item)
+        "".b.tap() do |data|
+          price_units = (sale_item.price * 100).to_i # !FIXME
+          price_bytes = "".b
+          4.times{ |shift| price_bytes.insert 0, ((price_units >> shift*8) & 0xff).chr }
+          data << price_bytes
+          qty_units = ((sale_item.qty || 1) * 1000).to_i # !FIXME
+          qty_bytes = "".b
+          4.times{ |shift| qty_bytes.insert 0, ((qty_units >> shift*8) & 0xff).chr }
+          data << qty_bytes
+          data << "\x00".b #number len FIXME
+          data << "\xAA\xAA\xAA\xAA\xAA\xAA".b #number FIXME
+          text = sale_item.text1.truncate(20)
+          data << text.length.chr
+          data << text.ljust(20, " ").b
+          data << (sale_item.tax_group || 2).chr
+        end
+      end
+      
+      def check_sum(buffer)
+        sum = 0
+        buffer.each_byte do |byte|
+          sum -= byte
+        end
+        sum & 0xff
+      end
+
       def sequence_number(increment = true)
         @seq ||= 0
         @seq += 1 if increment
@@ -308,7 +348,6 @@ module Extface
           end
           
           def response_code_validation
-            p "############################### #{cmd.ord.to_s(16)}"
             case cmd.ord
             when 0x2c then
               case data[0] # printer error code

data/app/views/extface/devices/show.html.erb

@@ -68,25 +68,14 @@
 
 <%= driver_control @device.driver %>
 
-<% if true #@device.print? %>
-  <%= button_to 'Print Test Page', test_page_device_path(@device), remote: true, name: :test_page, value: true, class: 'btn btn-warning' %>
-<% end %>
-<% if @device.fiscal? %>
-  <%= 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-warning' %>
-<% end %>
-
-<br />Simulate push data from device
+<!-- <br />Simulate push data from device
 
     <div class="input-group">
       <input type="text" id='data' class="form-control">
       <span class="input-group-btn">
         <%= link_to 'Push', extface.push_url(@device.uuid), id: :push, class: 'btn btn-warning'%>
       </span>
-    </div><!-- /input-group -->
+    </div>-->
 
 <h1>Jobs</h1>
 <table class='table'>

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

@@ -0,0 +1,8 @@
+<%= 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-warning' %>
+

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

@@ -0,0 +1 @@
+<%= button_to 'Print Test Page', test_page_device_path(@device), remote: true, name: :test_page, value: true, class: 'btn btn-warning' %>

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - app/helpers/extface/sse_helper.rb
 - app/models/extface/device.rb
 - app/models/extface/driver.rb
+- app/models/extface/driver/base/fiscal.rb
 - app/models/extface/driver/daisy/commands_fx1200.rb
 - app/models/extface/driver/daisy_fx1200.rb
 - app/models/extface/driver/eltrade/commands_fp4.rb
@@ -109,15 +110,15 @@ files:
 - app/views/extface/devices/form.html.erb
 - app/views/extface/devices/index.html.erb
 - app/views/extface/devices/show.html.erb
-- app/views/extface/driver/daisy_fx1200/_control.html.erb
+- app/views/extface/driver/_control_fiscal.html.erb
+- app/views/extface/driver/_control_print.html.erb
+- app/views/extface/driver/_control_raw.html.erb
+- app/views/extface/driver/_control_report.html.erb
 - app/views/extface/driver/daisy_fx1200/_settings.html.erb
-- app/views/extface/driver/eltrade_tm_u220/_control.html.erb
+- app/views/extface/driver/eltrade_tm_u220/_control_.html.erb
 - app/views/extface/driver/eltrade_tm_u220/_settings.html.erb
-- app/views/extface/driver/generic_pos/_control.html.erb
 - app/views/extface/driver/generic_pos/_settings.html.erb
-- app/views/extface/driver/star_scp700/_control.html.erb
 - app/views/extface/driver/star_scp700/_settings.html.erb
-- app/views/extface/driver/star_tsp200/_control.html.erb
 - app/views/extface/driver/star_tsp200/_settings.html.erb
 - app/views/extface/jobs/_form.html.erb
 - app/views/extface/jobs/edit.html.erb

data/app/views/extface/driver/star_scp700/_control.html.erb

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

data/app/views/extface/driver/star_tsp200/_control.html.erb

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