extface 0.4.6k → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede5b88e7959cc6c14c2a2b7eaa1ece5ed393e5b
-  data.tar.gz: 313d55aae1f2178e4c0e4d7aa5b54ef171846fd8
+  metadata.gz: 86eeadecf20a2ea8daa39cb2ba6ebdbe73a34412
+  data.tar.gz: 382850d445c1c6b67deea928c4721f3c64010603
 SHA512:
-  metadata.gz: 4684b142a6421b87b1156638862b140670c65d9f9d0bc9574e5c784afe1b3be11b03c9c209fde52827292a5455ae43ebde7581b01e18dbcde84caf458b4ff92b
-  data.tar.gz: 726b94534299b4be2c7cc7ffe02fec9b220f1ba54774e7105a14ed06c8300b9147e5566d721e87c466a1882aaef37ca7bd2ac7380ef3002a5d901c264a421c0d
+  metadata.gz: a106262ddd387f6952e355fbf55dad497171295d7c02f9c0701c829d3bd26e0db74829663df377fb7a429b489265f96c254d8e30485b4afec9fe322f5cecba6e
+  data.tar.gz: a1fb0ba140eb33919fcf1119004df102335e66d101820b2d9f340af7eb43a9e5a3e795990b6e78e16e6781a117bb097b3a8dd847cf205427cd5f6d60284ead55

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

@@ -119,24 +119,17 @@ 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: '',
+              text1: bill.name,
               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 invalid_frames > INVALID_FRAME_RETRIES
+              if nak_messages > 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 << "$#{'%.2f' % item.neto}" unless item.neto.blank?
+          data << "$#{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 & 0x01).zero?
+        errors.add :base, "Syntax Error" unless (status[0].ord & 0x02).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

@@ -6,31 +6,11 @@ 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") || buffer.index("\x16") || buffer.index("\x15")
+      if i = buffer.index(/[\x03\x16\x15]/)   # find position of frame possible delimiter
         rpush buffer[0..i]                    # this will make data available for #pull(timeout) method
         return i+1                            # return number of bytes processed
       end
@@ -97,8 +77,8 @@ module Extface
     end
     
     #fiscal
-    def open_fiscal_doc(operator = "1", password = "000000")
-      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "000000"},00001"
+    def open_fiscal_doc(operator = "1", password = "1")
+      fsend Sales::START_FISCAL_DOC, "#{operator.presence || "1"},#{password.presence || "1"},00001"
       @fiscal_session = true
     end
     
@@ -152,7 +132,7 @@ module Extface
     def cancel_doc_session
       device.session("Doc cancel") do |s|
         s.notify "Doc Cancel Start"
-        s.fsend Sales::CANCEL_FISCAL_DOC
+        s.fsend Sales::CANCEL_DOC
         s.paper_cut
         s.notify "Doc Cancel End"
       end
@@ -185,7 +165,7 @@ module Extface
               end
             elsif !resp.ack?
               invalid_frames += 1
-              if invalid_frames > INVALID_FRAME_RETRIES
+              if nak_messages > INVALID_FRAME_RETRIES
                 errors.add :base, "#{INVALID_FRAME_RETRIES} Broken Packets Received. Abort!"
                 break
               end
@@ -231,25 +211,11 @@ 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 & 0x01).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
-      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
@@ -262,7 +228,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
         
@@ -284,7 +250,6 @@ 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.6k"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.4.6k
+  version: 0.4.6
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6