sapos-print 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f30efb41b794e0457aba97ebd82d77a7c225d82768f86dfde2523e8cc1d77c
-  data.tar.gz: 6895fb38bc99778737c7a126b6fd759505017c7362450c855d2a941e9589c218
+  metadata.gz: cc0f0e2c23bfce7306d2f9ad61b8c22133ea9a899bfbe7715ad412742e3dc0d1
+  data.tar.gz: 50c06d2cc61e089350ac62b05317d1ad894cf25debe67aba26baa6ddf0b14e35
 SHA512:
-  metadata.gz: 6efbd8f30e2c9446c76fdd7e2cd7547c80dd90b6b04fc680c1d4c3eb245a696c6372a25a19e350ac64e7b1b807ab8a8ca22a7b2f5310d2080fa2375d10bb24cc
-  data.tar.gz: 78b637abab89f3745d43c9b1cea5628997076c52f9f0399d840461d8c7a70793faada466143d8d230f6ac92ff698d97012fb00992f6197ffa7657c21b3b24c10
+  metadata.gz: bfe1ac23eb6b6696a3f97ee41d5574014e7979fc73735b3befec56c39c5e189d5175111da32e488cda1d9e7525d45a6950cbde53865fcfdfdfd7912714711ab5
+  data.tar.gz: 0fd6bd0aa7a28908221f6ed4a8f08666138542be8d6ae5d728840ede8a06da3f8c9d1e1a9a06a0696862a083a70b8503721ee0caf30c19940deff0e2f9eace03

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.9)
+    sapos-print (1.0.10)
       activesupport
       awesome_print
       json

data/lib/sapos/print/cli.rb

@@ -3,17 +3,17 @@ module Sapos
   module Print
     include Thor::Actions
     class CLI < Thor
-      
+            
       desc "setup", "Setup Wizard"
       def setup
         info 
         config = {}
         
-        url = ask("Configuration URL")
+        url = ask("URL de Configuración: ")
         if url.eql?('manual')
           data = {}
-          data["channel"] = ask("Channel:")
-          data["key"] = ask("Queue Key")
+          data["channel"] = ask("Canal:")
+          data["key"] = ask("Llave de la Cola:")
         else
           response = RestClient.get(url)
           data = JSON.parse(response)
@@ -31,16 +31,21 @@ module Sapos
 
         config[:q] = data["channel"]
         config[:key] = data["key"]
-        config[:printer] = ask("Printer Name: ")
-        config[:adapter] = ask("Printer Adapter: ", limited_to: ["console", "cups", "windows"])
+        config[:printer] = ask("Nombre de la impresora default: ")
+        config[:adapter] = ask("Adaptador: ", limited_to: ["console", "cups", "windows"])
         config[:interface] = ask("Interface", limited_to: ["text", "escp"])
         config[:user_id] = user_id
         config[:duplicate_control] = ask("¿Control Duplicados por MSGID?", limited_to: ["si", "no"])
+        config[:printers] = [config[:printer]]
         
-        if yes?("Are you sure that you want to write the configuration file?")
+        while yes?("¿Tiene impresoras adicionales?")
+          name = ask("Nombre de la impresora adicional: ")
+          config[:printers] << name
+        end
+        if yes?("¿Esta seguro que desea guardar la configuración?")
           Sapos::Print::Configuration.write(config)
           ap config
-          say "Configuration Saved! Cheers"
+          say "La configuración ha sido guardada!"
         end        
       end
       
@@ -64,9 +69,17 @@ module Sapos
       end
       
       desc "print", "demo print"
+      option :printer_name, type: :string
       def print
         info
         config = Sapos::Print.config
+        printer_name = options[:printer_name]
+        if printer_name.present?
+          if config.printers.any? && config.printers.include?(printer_name)
+            config.printer = printer_name
+          end
+        end
+        puts "Printing to: #{config.printer}"
         printer = Printer.new(config)
         printer.print(document: "This is a test\nprint page\nwithno special commands", document_number: "test", print_control: true)
       end

data/lib/sapos/print/configuration.rb

@@ -6,7 +6,7 @@ module Sapos
   module Print
     class Configuration
     
-      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache
+      attr_accessor :printer, :adapter, :interface, :q, :key, :emv_path, :emv_terminal, :user_id, :verbose, :duplicate_control, :cache, :printers
     
       def self.write(args = {})
         config_file = "#{Sapos::Print.app_directory}/config.yml"
@@ -19,6 +19,7 @@ module Sapos
           template = ERB.new(File.read(config_file))
           result = YAML.load(template.result(binding))
           @printer = result[:printer]
+          @printers = result[:printers] || []
           @adapter = result[:adapter]
           @interface = result[:interface]
           @q = result[:q]
@@ -50,7 +51,7 @@ module Sapos
       end
     
       def to_h
-        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id, duplicate_control: @duplicate_control }
+        {printer: @printer, adapter: @adapter, interface: @interface, q: @q, key: @key, emv_path: @emv_path, emv_terminal: @emv_terminal, user_id: @user_id, duplicate_control: @duplicate_control, printers: @printers }
       end
     end
   end

data/lib/sapos/print/q_reader.rb

@@ -7,7 +7,7 @@ module Sapos
         attr_accessor :printer_config, :verbose
       end
     
-      attr_accessor :pubnub, :printer, :config
+      attr_accessor :pubnub, :printer, :config, :printers
     
       def self.run!
         reader = QReader.new
@@ -29,8 +29,14 @@ module Sapos
               end
             
               document = Base64.decode64(msg)
-            
-              if !reader.printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
+              
+              current_printer = reader.printer
+              
+              if msg['printer'] && reader.printers[msg['printer']]
+                current_printer = reader.printers[msg['printer']]
+              end
+              
+              if !current_printer.print(document: document, print_control: print_control, document_number: document_number, id: msgid)
                 puts "Printer Error"
               end
             rescue => e
@@ -51,6 +57,12 @@ module Sapos
       def initialize
         @config = QReader.printer_config
         @printer = Printer.new(@config)
+        @printers = {}
+        @config.printers.each do |printer|
+          config = @config.dup
+          config.printer = printer
+          @printers[printer] = Printer.new(config)
+        end
         @pubnub = Pubnub.new(subscribe_key: @config.key, user_id: @config.user_id, ssl: true)
       end        
     end

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.10"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor