thecore_print_commons 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e07a4722d0b75bc1c0f707a8281560c69e92f6bee16ecb99ccd4a8df7aef9b9
-  data.tar.gz: 521f40328804ab042452a217bf55072aafe9943c884d51b80f5ae2c04f1958e8
+  metadata.gz: 670b8b4f153ad70642a153811f71d2ce797e697ddc7e5af3cbc915739954abb4
+  data.tar.gz: daed3ca480be8480a89d93f4f6b494ace07a93224cee549d33c0941ec00a6431
 SHA512:
-  metadata.gz: 2057d116231dc519050992601dd15e2210e7c791427d765b5c8f29c06e12a72b3a3d87d43c70df0a8495eb32afa2678cd9ced72b9f7c3a3e294e8935d383134e
-  data.tar.gz: 754891ac9310f16af5c3f1bd75a341893ae3764e76971d4bb546b4ec77b78847c9834816915fc0ee2db08007f63e955a23db51bc9c13655ac82d7f6c6694220b
+  metadata.gz: dd44e8214bddfa87012ec35e728b623eb70c8b21478670175c2f25a627a5cc246d38d5f3bb43b1e2ad5cd5252cdd1bcfdf4564d609d5241778416f479efe4b49
+  data.tar.gz: 21d5bc33596daeef921285ea6828a5f660f50df7389c105ffc011ed4c61bc8375351277759e1811c420c1178e4b8955a25d202c99f8e8c330dd3614fd49d40d5

data/app/models/concerns/api/printer.rb

@@ -34,11 +34,14 @@ module Api::Printer
             # single_text = "#{printer.print_template.template.gsub("%DESCRIPTION%", item.description)}"
             # text = single_text * params[:quantity].to_i
             # # Preso l'ordine mi recupero l'item e ne stampo la quantità richiesta
-            # ::PrintWorker.perform_async(printer.ip, text)
+            # ::PrintWorker.perform_async('192.168.0.1', 9100, "We all love DJ")
 
             printer = Printer.find(params[:id])
-            text = printer.print_template.template.gsub(printer.print_template.translation_matrix.lines.first, params[:barcode])
-            ::PrintWorker.perform_async(printer.ip, printer.port, text)
+            base_template = printer.print_template.template.dup
+            result = printer.print_template.translation_matrix.lines.map(&:strip).inject(base_template) do |base_template, replacement|
+                base_template.gsub("$#{replacement}", params[replacement]) unless replacement.blank? && params[replacement].blank?
+            end
+            ::PrintWorker.perform_async(printer.ip, printer.port, result)
             { info: "Print job sent in background to #{printer.ip} on port #{printer.port}" }
         end
 

data/app/models/concerns/rails_admin/printer.rb

@@ -17,7 +17,7 @@ module RailsAdmin::Printer
             field :default, :toggle
             field :temperature
             field :description
-            field :online? do
+            field :is_online do
                 read_only true
                 formatted_value do # used in form views
                     (value ? "<strong style='color:green'>👍</strong>" : "<strong style='color:red'>👎</strong>").html_safe

data/app/models/printer.rb

@@ -9,7 +9,7 @@ class Printer < ApplicationRecord
   validates :port, presence: true
   validates :print_template, presence: true
   
-  def online?
+  def is_online
     begin
       Socket.tcp(self.ip, self.port, connect_timeout: 0.5).close
     rescue

data/app/workers/print_worker.rb

@@ -2,7 +2,7 @@ require 'ipaddr'
 require 'socket'
 class PrintWorker
     include Sidekiq::Worker
-    sidekiq_options retry: false
+    sidekiq_options retry: false, queue: "#{ENV["COMPOSE_PROJECT_NAME"]}_default"
     
     # ZPL print
     def perform ip, port, text

data/db/seeds.rb

@@ -1,2 +1 @@
 puts "Loading ThecorePrintCommons seeds"
-Settings.ns(:printer_commons).cups_server = 'localhost'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs