Split Print into Save / Save & Print -- saving no longer requires also printing
deploy / deploy (push) Successful in 9s
deploy / deploy (push) Successful in 9s
Name is now required (it's the only thing identifying what got saved), and printing is an explicit separate choice instead of an implicit side-effect of naming something.
This commit is contained in:
1 parent
148f7dc248
commit
abb4eb0edb
3 files changed
+28
-12
No files matched your search
@@ -219,15 +219,22 @@ end
|
|||||||
|
|
||||||
post '/shipping/zpl' do
|
post '/shipping/zpl' do
|
||||||
zpl = params[:zpl].to_s
|
zpl = params[:zpl].to_s
|
||||||
|
name = params[:save_as].to_s
|
||||||
if zpl.strip.empty?
|
if zpl.strip.empty?
|
||||||
flash 'ZPL text is empty', 'warning'
|
flash 'ZPL text is empty', 'warning'
|
||||||
|
elsif name.empty?
|
||||||
|
flash 'Name is required to save', 'warning'
|
||||||
else
|
else
|
||||||
LABEL_REPO.save(name: params[:save_as], type: 'zpl', content: zpl) unless params[:save_as].to_s.empty?
|
LABEL_REPO.save(name: name, type: 'zpl', content: zpl)
|
||||||
|
if params[:commit] == 'save_and_print'
|
||||||
begin
|
begin
|
||||||
print_to_datamax(zpl)
|
print_to_datamax(zpl)
|
||||||
flash 'ZPL sent to printer', 'success'
|
flash "Saved '#{name}' and sent to printer", 'success'
|
||||||
rescue => e
|
rescue => e
|
||||||
flash "ZPL print failed (#{e.message})", 'danger'
|
flash "Saved '#{name}', but print failed (#{e.message})", 'danger'
|
||||||
|
end
|
||||||
|
else
|
||||||
|
flash "Saved '#{name}'", 'success'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
redirect '/upload'
|
redirect '/upload'
|
||||||
@@ -296,15 +303,22 @@ end
|
|||||||
|
|
||||||
post '/epson/raw' do
|
post '/epson/raw' do
|
||||||
content = params[:content].to_s
|
content = params[:content].to_s
|
||||||
|
name = params[:save_as].to_s
|
||||||
if content.strip.empty?
|
if content.strip.empty?
|
||||||
flash 'Receipt text is empty', 'warning'
|
flash 'Receipt text is empty', 'warning'
|
||||||
|
elsif name.empty?
|
||||||
|
flash 'Name is required to save', 'warning'
|
||||||
else
|
else
|
||||||
LABEL_REPO.save(name: params[:save_as], type: 'escpos', content: content) unless params[:save_as].to_s.empty?
|
LABEL_REPO.save(name: name, type: 'escpos', content: content)
|
||||||
|
if params[:commit] == 'save_and_print'
|
||||||
begin
|
begin
|
||||||
print_raw_escpos(content)
|
print_raw_escpos(content)
|
||||||
flash 'Sent to Epson printer', 'success'
|
flash "Saved '#{name}' and sent to printer", 'success'
|
||||||
rescue => e
|
rescue => e
|
||||||
flash "Epson print failed (#{e.message})", 'danger'
|
flash "Saved '#{name}', but print failed (#{e.message})", 'danger'
|
||||||
|
end
|
||||||
|
else
|
||||||
|
flash "Saved '#{name}'", 'success'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
redirect '/epson'
|
redirect '/epson'
|
||||||
|
|||||||
+4
-3
@@ -37,11 +37,12 @@ GS V 0x00 # Full cut</code></pre>
|
|||||||
</div>
|
</div>
|
||||||
<div class="row g-2 align-items-end">
|
<div class="row g-2 align-items-end">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<label for="save_as_escpos" class="form-label">Save as (optional)</label>
|
<label for="save_as_escpos" class="form-label">Name</label>
|
||||||
<input name="save_as" class="form-control" type="text" id="save_as_escpos" placeholder="receipt name" />
|
<input name="save_as" class="form-control" type="text" id="save_as_escpos" placeholder="receipt name" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-secondary" type="submit">Print</button>
|
<button class="btn btn-outline-secondary" type="submit" name="commit" value="save">Save</button>
|
||||||
|
<button class="btn btn-secondary" type="submit" name="commit" value="save_and_print">Save & Print</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
+4
-3
@@ -23,11 +23,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="row g-2 align-items-end">
|
<div class="row g-2 align-items-end">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<label for="save_as_zpl" class="form-label">Save as (optional)</label>
|
<label for="save_as_zpl" class="form-label">Name</label>
|
||||||
<input name="save_as" class="form-control" type="text" id="save_as_zpl" placeholder="label name" />
|
<input name="save_as" class="form-control" type="text" id="save_as_zpl" placeholder="label name" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-secondary" type="submit">Print</button>
|
<button class="btn btn-outline-secondary" type="submit" name="commit" value="save">Save</button>
|
||||||
|
<button class="btn btn-secondary" type="submit" name="commit" value="save_and_print">Save & Print</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in new issue
Block a user