Skip to content

Commit bbeddae

Browse files
committed
fix: serial server url method
1 parent a8a9c7e commit bbeddae

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

app/models/company.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@ class Company < ApplicationRecord
99
validates :serial_service_url, format: { with: URI::DEFAULT_PARSER.make_regexp(%w[http https]), message: "debe ser una URL válida" }, allow_blank: true
1010

1111
# Printer model enum
12-
validates :printer_model, inclusion: { in: %w[zebra tsc], message: "must be either 'zebra' or 'tsc'" }, allow_nil: true
12+
validates :printer_model, inclusion: { in: %w[zebra tsc], message: "must be either 'zebra' or 'tsc'"}, allow_nil: true
1313

1414
# Set default printer model
1515
after_initialize :set_default_printer_model
1616

17-
private
18-
19-
def set_default_printer_model
20-
self.printer_model ||= 'zebra'
21-
end
22-
2317
# Google Sheets Configuration
2418
def google_sheets_configured?
2519
google_sheets_enabled? &&
@@ -39,7 +33,7 @@ def set_google_credentials(credentials_hash)
3933
# Validate Google credentials format
4034
def validate_google_credentials
4135
return true unless google_credentials.present?
42-
36+
4337
begin
4438
parsed = JSON.parse(google_credentials)
4539
required_keys = %w[type project_id private_key_id private_key client_email client_id auth_uri token_uri]
@@ -64,10 +58,16 @@ def scale_and_printer_configured?
6458

6559
# Serial service URL helpers
6660
def serial_service_url_configured?
67-
serial_service_url.present?
61+
read_attribute(:serial_service_url).present?
6862
end
6963

70-
def serial_service_base_url
71-
serial_service_url.presence || 'http://192.168.1.91:5000'
64+
def serial_service_url
65+
read_attribute(:serial_service_url).presence || ''
66+
end
67+
68+
private
69+
70+
def set_default_printer_model
71+
self.printer_model ||= 'zebra'
7272
end
7373
end

app/services/serial_communication_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def get_base_url(company: nil)
188188
company
189189
end
190190

191-
company&.serial_service_base_url
191+
company&.serial_service_url
192192
end
193193

194194
def parse_response(response)

0 commit comments

Comments
 (0)