extface 0.4.6a → 0.4.6b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a5e92df95302c771ddb50d19300c437e18b089
-  data.tar.gz: d371929e63c4779cf028f6464d03266fc5e00e7f
+  metadata.gz: 559dd9a69d057d63eec58689df5acdeac89dc0b3
+  data.tar.gz: 42ab44a0dc85ab3c5c8bb730f3d5fd1ca8fedb9d
 SHA512:
-  metadata.gz: 213e8d580c1e35bf442b3c49c3f4251cf7e0d47843beccc245254ef2705445931adea025c0589390e72c800a61d1c3b854a60166521f3d6142753a6ab0ee1861
-  data.tar.gz: fe4b57ffe2d57fc16f6e2958543fa43bcbaba43fc333c170d60d1d9a2ec0c13e4b827d61fb4bdec45b279cfc8ed3332ed84ee134a9bf540ed3474bda8ed65e7b
+  metadata.gz: 22c93ea7ddc98b9c7b860b0bc071672bd4175de73a9bc1e915a455369c05aa38ba691923b7bcb61cb4b5c27aa11be64667bdad52b153466b9e1f575ac109142e
+  data.tar.gz: 1e173f3c7e95fb9993d5514590acc3f4c0b4cfe0181a737ca0abd6b331e7a39eb5d719c0d3dfb92c135a22476e4786f4dbfc084bb9b678f619ba8f56ab4c45b1

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
+          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?

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

@@ -10,7 +10,8 @@ module Extface
     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
@@ -165,7 +166,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,7 +212,7 @@ 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?
@@ -230,7 +231,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
         
@@ -252,6 +253,19 @@ module Extface
         def nak?; !!@nak; end #should retry command with same seq
         
         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 unpacked? # is it packed or unpacked message?
             @ack || @nak
           end

data/lib/extface/version.rb

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

metadata

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