extface 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86eeadecf20a2ea8daa39cb2ba6ebdbe73a34412
-  data.tar.gz: 382850d445c1c6b67deea928c4721f3c64010603
+  metadata.gz: 905561e9d8179ca1ad66c6677a6a63be78cd5d40
+  data.tar.gz: 0f152bcf718ee7d6386fa53460c6c5a71b307d4d
 SHA512:
-  metadata.gz: a106262ddd387f6952e355fbf55dad497171295d7c02f9c0701c829d3bd26e0db74829663df377fb7a429b489265f96c254d8e30485b4afec9fe322f5cecba6e
-  data.tar.gz: a1fb0ba140eb33919fcf1119004df102335e66d101820b2d9f340af7eb43a9e5a3e795990b6e78e16e6781a117bb097b3a8dd847cf205427cd5f6d60284ead55
+  metadata.gz: bbe9348d5e1d1419cf55014638705fe61dc61de9ab19d16f3db420ae7b25f7e690c3a217e38d85609a680dfd5aeb143f246aa132ac96257abe9595be9b280355
+  data.tar.gz: 51ac47fac3046fa4bd6b9dba3f3a2a3ea5a676f35fcfe78548b2090a460d292571e2c0b0d91e0c7804edc9db277e3deea76fda2dbbcbd4dfa9737a5158f77719

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

@@ -119,17 +119,24 @@ module Extface
           s.notify "Fiscal Doc Start"
           s.open_fiscal_doc(operator_mapping.try(:mapping), operator_mapping.try(:pwd))
           s.notify "Register Sale"
+          total_modifier = nil # send payments sum, so modifier make no sence! think
+          # if global_modifier_value = bill.global_modifier_value
+            # s.notify "Register Global Modifier"
+            # total_modifier = global_modifier_value.to_f 
+          # end
           s.add_sale(
             SaleItem.new(
               price: bill.payments_sum.to_f, 
-              text1: bill.name,
+              #text1: bill.name,
+              text1: '',
               tax_group: bill.charges.first.find_tax_group_mapping_for(self), #find tax group mapping by ratio , not nice
+              neto: total_modifier
             )
           )
-          if global_modifier_value = bill.global_modifier_value
-            s.notify "Register Global Modifier"
-            s.add_total_modifier global_modifier_value.to_f 
-          end
+          # if global_modifier_value = bill.global_modifier_value
+            # s.notify "Register Global Modifier"
+            # s.add_total_modifier global_modifier_value.to_f 
+          # end
           s.notify "Register Payment"
           bill.payments.each do |payment|
             s.add_payment payment.value.to_f, payment.find_payment_type_mapping_for(self)

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

@@ -224,7 +224,7 @@ module Extface
               end
             elsif !resp.ack?
               invalid_frames += 1
-              if nak_messages > INVALID_FRAME_RETRIES
+              if invalid_frames > INVALID_FRAME_RETRIES
                 errors.add :base, "#{INVALID_FRAME_RETRIES} Broken Packets Received. Abort!"
                 break
               end
@@ -256,7 +256,7 @@ module Extface
           data << ("%.2f" % item.price)
           data << "*#{item.qty.to_s}" unless item.qty.blank?
           data << ",#{item.percent}" unless item.percent.blank?
-          data << "$#{neto}" unless item.neto.blank?
+          data << "$#{'%.2f' % item.neto}" unless item.neto.blank?
         end
       end
     
@@ -283,7 +283,7 @@ module Extface
         errors.add :base, "Fiscal Device General Error" unless (status[0].ord & 0x20).zero?
         errors.add :base, "Invalid Command" unless (status[0].ord & 0x02).zero?
         errors.add :base, "Date & Time Not Set" unless (status[0].ord & 0x04).zero?
-        errors.add :base, "Syntax Error" unless (status[0].ord & 0x02).zero?
+        errors.add :base, "Syntax Error" unless (status[0].ord & 0x01).zero?
         
         errors.add :base, "Wrong Password" unless (status[1].ord & 0x40).zero?
         errors.add :base, "Cutter Error" unless (status[1].ord & 0x20).zero?
@@ -317,7 +317,38 @@ module Extface
           when 22 then errors.add :base, "Disabled operation"
           when 23 then errors.add :base, "Deep void after discount"
           when 24 then errors.add :base, "Deep void for not existing record"
-          when 24 then errors.add :base, "Payment without sale"
+          when 25 then errors.add :base, "Payment without sale"
+          when 26 then errors.add :base, "Qty more than stock"
+          when 41 then errors.add :base, "Invalid barcode"
+          when 42 then errors.add :base, "Sale with null barcode"
+          when 43 then errors.add :base, "Wight barcode attempt"
+          when 44 then errors.add :base, "Missing barcode sale"
+          when 45 then errors.add :base, "Duplicate barcode"
+          when 66 then errors.add :base, "Invalid password"
+          when 71 then errors.add :base, "!!!Invalid FP data!!!"
+          when 72 then errors.add :base, "!!!Error writing FP!!!"
+          when 76 then errors.add :base, "NAP server info required"
+          when 90 then errors.add :base, "Non zero period report"
+          when 91 then errors.add :base, "Non zero daily report"
+          when 92 then errors.add :base, "Non zero operator report"
+          when 93 then errors.add :base, "Non zero items report"
+          when 94 then errors.add :base, "Field can not be programmed"
+          when 81 then errors.add :base, "Daily report overflow"
+          when 82 then errors.add :base, "24 without daily report"
+          when 83 then errors.add :base, "Oerators report overflow"
+          when 84 then errors.add :base, "Items report overflow"
+          when 85 then errors.add :base, "Period report overflow"
+          when 88 then errors.add :base, "KLEN overflow"
+          when 102 then errors.add :base, "TAX terminal connection missing"
+          when 104 then errors.add :base, "TAX terminal connection error"
+          when 108 then errors.add :base, "3 attempts wrong password"
+          when 110 then errors.add :base, "SIM card changed"
+          when 111 then errors.add :base, "TAX terminal - NAP server error"
+          when 113 then errors.add :base, "NAP rejected data"
+          when 117 then errors.add :base, "Unable to register TAX terminal into mobile network"
+          when 118 then errors.add :base, "Forbidden operation"
+          when 119 then errors.add :base, "Invalid value"
+          when 120 then errors.add :base, "Missing value"
         end
         
         errors.add :base, "General Fiscal Memory Error" unless (status[4].ord & 0x20).zero?

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

@@ -6,11 +6,31 @@ module Extface
     INVALID_FRAME_RETRIES = 6  #count (bad length, bad checksum)
     ACKS_MAX_WAIT = 60 #count / nothing is forever
     NAKS_MAX_COUNT = 3 #count
+    
+    TAX_GROUPS_MAP = {
+      1 => "\xc0",
+      2 => "\xc1",
+      3 => "\xc2",
+      4 => "\xc3",
+      5 => "\xc4",
+      6 => "\xc5",
+      7 => "\xc6",
+      8 => "\xc7"
+    }
+    
+    PAYMENT_TYPE_MAP = {
+      1 => "P",
+      2 => "N",
+      3 => "C",
+      4 => "D",
+      5 => "B"
+    }
 
     include Extface::Driver::Datecs::CommandsV1
 
     def handle(buffer)
-      if i = buffer.index(/[\x03\x16\x15]/)   # find position of frame possible delimiter
+      #if i = buffer.index(/[\x03\x16\x15]/)   # find position of frame possible delimiter
+      if i = buffer.index("\x03") || buffer.index("\x16") || buffer.index("\x15")
         rpush buffer[0..i]                    # this will make data available for #pull(timeout) method
         return i+1                            # return number of bytes processed
       end
@@ -77,8 +97,8 @@ module Extface
     end
     
     #fiscal
-    def open_fiscal_doc(operator = "1", password = "1")
-      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "1"},00001"
+    def open_fiscal_doc(operator = "1", password = "000000")
+      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "000000"},00001"
       @fiscal_session = true
     end
     
@@ -132,7 +152,7 @@ module Extface
     def cancel_doc_session
       device.session("Doc cancel") do |s|
         s.notify "Doc Cancel Start"
-        s.fsend Sales::CANCEL_DOC
+        s.fsend Sales::CANCEL_FISCAL_DOC
         s.paper_cut
         s.notify "Doc Cancel End"
       end
@@ -165,7 +185,7 @@ module Extface
               end
             elsif !resp.ack?
               invalid_frames += 1
-              if nak_messages > INVALID_FRAME_RETRIES
+              if invalid_frames > INVALID_FRAME_RETRIES
                 errors.add :base, "#{INVALID_FRAME_RETRIES} Broken Packets Received. Abort!"
                 break
               end
@@ -211,11 +231,25 @@ module Extface
       errors.add :base, "Fiscal Device General Error" unless (status_0 & 0x20).zero?
       errors.add :base, "Invalid Command" unless (status_0 & 0x02).zero?
       errors.add :base, "Date & Time Not Set" unless (status_0 & 0x04).zero?
-      errors.add :base, "Syntax Error" unless (status_0 & 0x02).zero?
+      errors.add :base, "Syntax Error" unless (status_0 & 0x01).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
+      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 << ("%.2f" % item.price)
+          data << "*#{item.qty.to_s}" unless item.qty.blank?
+          data << ",#{item.percent}" unless item.percent.blank?
+          data << ",;#{'%.2f' % item.neto}" unless item.neto.blank?
+        end
+      end
       
       def sequence_number
         @seq ||= 0x1f
@@ -228,7 +262,7 @@ module Extface
         include ActiveModel::Validations
         attr_reader :frame, :len, :seq, :cmd, :data, :status, :bcc
         
-        validates_presence_of :frame, unless: :unpacked?
+        validates_presence_of :frame#, unless: :unpacked?
         validate :bcc_validation
         validate :len_validation
         
@@ -250,6 +284,7 @@ module Extface
         def nak?; !!@nak; end #should retry command with same seq
         
         private
+
           def unpacked? # is it packed or unpacked message?
             @ack || @nak
           end

data/lib/extface/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails