thecore_print_commons 2.1.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea66f408d04dee9a18484a617f170c16ca1e74ce5011b87b2063b25cfd86c0b
-  data.tar.gz: 85566448eaa20b0601a4b82e17f5d668bfefdb1e3b565c099d91bf066e463228
+  metadata.gz: 0a660e7e19c51f70f096e2b7692f9e32fa0ff49fb308bc9436ca8d6e4179fc7a
+  data.tar.gz: 881571a78ffdd8a223c292ff34321be4fe9c90e25144db74980c3e915bbce5af
 SHA512:
-  metadata.gz: a4ee226bad981af3220ba0eb1dda3a4699c1967c45278a2e18fccfdca5494bbcced4a0f6f0cedaa608badb5702db4164bbddc9cfd23989c80df9a2ac9c84606a
-  data.tar.gz: 4abcbc5eea0f199b71696b2075ef3b23c4af111c1d9d51bb2c636fa7928f302f860c4494212dbb74def14d89e50713fb33c6cbd09d738dd73a3c3af78aaf4d43
+  metadata.gz: 1fd987aab9e01e8e6dc24330cb9ffb21483677721e4c2098ab01ef5824811ddbda2a589663815fba799e3d54d369cdca4769ebdf53d5b2bfbd48c683993e1f4b
+  data.tar.gz: 18b8d864e56936271a2a44798ae9cf33a8fce903a52e7c6005ac9447be3d9d1ad1bedcae54fd79c9164188e10790a925a506996b5f265d712650454477b342d8

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

@@ -6,8 +6,8 @@ module RailsAdmin::Printer
             navigation_label I18n.t("admin.settings.label")
             navigation_icon 'fa fa-print'
             
-            field :print_template
             field :name
+            field :print_template
             field :ip
             field :port do
                 default_value do
@@ -15,9 +15,18 @@ module RailsAdmin::Printer
                 end
             end
             field :default, :toggle
-            field :temperature
-            field :description
-            field :online? do
+            
+            show do
+                field :temperature
+                field :description
+            end
+            
+            edit do
+                field :temperature
+                field :description
+            end
+
+            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
@@ -31,15 +40,6 @@ module RailsAdmin::Printer
                     value ? "OK" : "KO" # used in exports, where no html/data is allowed
                 end
             end
-            
-            list do
-                configure :description do
-                    visible false
-                end
-                configure :temperature do
-                    visible false
-                end
-            end
         end
     end
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 description: Thecorized thecore_print_commons full description.
 email:
 - gabriele.tassoni@gmail.com