extface 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e194d96503291176e30f033e6da0fd08c0c8d3
-  data.tar.gz: 1a5245753295ef5bdede712a3b1f3630a951d5ee
+  metadata.gz: c5694ea075490fadb29202d3113d02a0963ab8d1
+  data.tar.gz: 0fccac085b944d300d7571da5652e8e7687e24e0
 SHA512:
-  metadata.gz: 721dcf1ed4d2262cd581dc468bae1c149a1a9c8e0d7d19ae0ef08c065faea54e44b2698a7c349da443c47b2764e15ddc1273e02dd84fad37dddaa0217ba8464a
-  data.tar.gz: fb5a48ef620c50c217c5bab0b6f3c077fab1a7a8a7c5693ddcb2554bf80538f647b6fbfaacf20e4973813570bd3cdaf713e43415fb4867728d8cf5f00079c2df
+  metadata.gz: 5cd19d2b097b1891328347a7c1780c6d45bb6a8e9ae3d346e731f28aa8f1ff3aab457845e305a7ba79aad1a42bf19817664fc93599df0516a07637736972b064
+  data.tar.gz: a8d425df6a8f08ac450401a09d1d48c445fc8b3036785c79e99e33996824e32bdb8e3e7a21b7fe01b3c211959f58ba0886eece123052260afb6eba24bb52ee78

data/app/controllers/extface/devices_controller.rb

@@ -51,7 +51,21 @@ module Extface
 
     def test_page
       set_device
-      @job = @device.driver.print_test_page if params[:test_page]
+      if @device.fiscal?
+        @job = @device.session("Print Test") do |s|
+          s.notify "Printing Text"
+          s.open_non_fiscal_doc
+          s.print "********************************"
+          s.print "Extface Print Test".center(32)
+          s.print "********************************"
+          s.print ""
+          s.print "Driver: " + "#{@device.driver.class::NAME}".truncate(24)
+          s.close_non_fiscal_doc
+          s.notify "Printing finished"
+        end
+      else
+        @job = @device.driver.print_test_page if params[:test_page]
+      end
       render action: :show
     end
     

data/app/helpers/extface/application_helper.rb

@@ -36,5 +36,16 @@ module Extface
       end
     end
 
+    def driver_control(driver)
+      content_tag(:div, class: 'panel panel-default') do
+        content_tag(:div, class: 'panel-heading') do
+          "#{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"
+        end
+      end
+    end
+
   end
 end

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

@@ -74,6 +74,21 @@ module Extface
       end
     end
     
+    def open_non_fiscal_doc
+      fsend Sales::START_NON_FISCAL_DOC
+      @print_session = true
+    end
+    
+    def print(text)
+      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 fiscal_test
       sale_and_pay_items_session([
         { price: 0.01, text1: "Extface Test" }

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

@@ -80,17 +80,32 @@ module Extface
     def non_fiscal_test
       device.session("Non Fiscal Text") do |s|
         s.notify "Printing Non Fiscal Text"
-        s.open_receipt Receipt::Variant::START_COMMENT_RECEIPT
+        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_receipt
+        s.close_non_fiscal_doc
         s.notify "Printing finished"
       end
     end
     
+    def open_non_fiscal_doc
+      open_receipt Receipt::Variant::START_COMMENT_RECEIPT
+      @print_session = true
+    end
+    
+    def print(text)
+      raise "Not in print session" unless @print_session
+      send_comment text
+    end
+    
+    def close_non_fiscal_doc
+      close_receipt
+      @print_session = false
+    end
+    
     def fiscal_test
       sale_and_pay_items_session([
         { price: 0.01, text1: "Extface Test" }
@@ -118,15 +133,18 @@ module Extface
     
     def sale_and_pay_items_session(items = [], operator = "1", password = "1")
       device.session("Fiscal Doc") do |s|
-        s.notify "Fiscal Doc Start"
+        s.notify "Open Fiscal Receipt"
         s.open_receipt
+        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?
         end
+        s.notify "Register Payment"
         s.send_payment
+        s.notify "Close Fiscal Receipt"
         s.close_receipt
-        s.notify "Fiscal Doc End"
+        s.notify "Fiscalization Completed!"
       end
     end
     

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

@@ -66,7 +66,9 @@
 
 <hr />
 
-<% if @device.print? %>
+<%= 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? %>

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

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

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

@@ -0,0 +1,12 @@
+<ul class='nav nav-tabs'>
+  <li class='active'><%= link_to t('.status'), '#status', data: { toggle: :tab } %></li>
+  <li><%= link_to t('.reports'), '#reports', data: { toggle: :tab } %></li>
+</ul>
+<div class='tab-content'>
+  <div class='tab-pane active' id='status'>
+    Status Pane
+  </div>
+  <div class='tab-pane' id='reports'>
+    Reports Pane
+  </div>
+</div>

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

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

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

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

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

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

data/lib/extface/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,10 +109,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/daisy_fx1200/_settings.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