billing 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1871d4f0eef0349654f133f1a3a8d2bf3304e9
-  data.tar.gz: 122c98a4d1aced10bbb4b37a7f865e65862a9244
+  metadata.gz: 88ff829bdbd83ab185e5ca53228d2b21c617ced3
+  data.tar.gz: 8a1e290b31270563089268bcd39e3368641e831f
 SHA512:
-  metadata.gz: b2e393db4785eb7932539fa2e78b57f25fd8f1cc51f3071118c561721bc7267fb8a8bc914efe83d21f6acae7699423b1d822852d4a9703ae47426e3b93d8735c
-  data.tar.gz: 13f5133e55ffad492d4e1c7a782d18446a42ea6d392ec4d5140dad772ba6da710e8ad2d67d9145d129337c9be04d942fd3b68c65990699835472810866d21b3b
+  metadata.gz: 5daaed3e3b140280f2b91cdfe780350f4755e1e8f64ca3f144a910b0dd5b35afffa7add8e3bd4ef587243ee6c921e1b47a0a34fb4da8c13576b147557930a1de
+  data.tar.gz: 9f6946cd864e9280b30de05cac0c14654130900419dd61a42cef8f452cefed6ac9f251c956ac01fc3fb07cbaaf0a1f6f8075d0d1b566bce2ab50c8428a2b9251

data/app/jobs/billing/issue_print_doc.rb

@@ -22,17 +22,17 @@ module Billing
       bill.print_job.runtime do |s|
         return unless bill.printable?
         s.notify "Print Doc Start"
+
+        s.print "#{bill.origin.print_header}\r\n"
+        s.print_center_row "******"
+        s.print "#{bill.name}\r\n"
+        s.print_fill_row "-"
         
-        s.print bill.origin.print_header
-        s.print "\r\n            ******            \r\n"
-        s.print "#{bill.name}".truncate(30)
-        s.print "\r\n------------------------------\r\n"
-        
-        bill.charges.each do |charge|
-          text = "#{charge.qty ? charge.qty : 1} x #{charge.name}"
-          s.print "\r\n#{text.truncate(22).ljust(22)} #{charge.price.to_s.rjust(7)}\r\n"
+        bill.charges.each_with_index do |charge, index|
+          s.print "\r\n" unless index == 0
+          s.print_text_price_row "#{charge.qty ? charge.qty : 1} x #{charge.name}", charge.price
           if charge.description
-            s.print "#{charge.description.truncate(26)}\r\n"
+            s.print_ljust_row charge.description, ' ', 4
           end
           if charge.modifier.present?
             text = charge.modifier.percent_ratio.nil? ? "" : " #{charge.modifier.percentage}"
@@ -41,10 +41,10 @@ module Billing
             else
               text += " #{ bill.origin.receipt_config ? bill.origin.receipt_config.discount_text || 'Discount' : 'Discount' }"
             end
-            s.print "#{text.ljust(22)} #{(charge.value - charge.price).to_s.rjust(7)}\r\n"
+            s.print_text_price_row text, (charge.value - charge.price)
           end
         end
-        s.print "-----------\r\n".rjust(32)
+        s.print_rjust_row "-----------"
         if bill.modifiers.global.any?
           global_modifier = bill.modifiers.global.first
           text = global_modifier.percent_ratio.nil? ? "" : " #{global_modifier.percentage}"
@@ -53,20 +53,18 @@ module Billing
           else
             text += " #{ bill.origin.receipt_config ? bill.origin.receipt_config.discount_text || 'Discount' : 'Discount' }"
           end
-          s.print "#{text.ljust(22)} #{bill.global_modifier_value.to_s.rjust(7)}\r\n"
+          s.print_text_price_row text, bill.global_modifier_value
         end
-        s.print "TOTAL:    #{bill.total.to_s.rjust(20)}\r\n"
-        
-        # s.print "..............................\r\n"
-        # bill.payments.each do |payment|
-          # s.print "#{payment.payment_type.name.humanize}\r\n"
-        # end
+        s.print_text_price_row "TOTAL:", bill.total
 
-        s.print "            ******            \r\n"
-        s.print bill.origin.print_footer
-        s.print "\r\n------------------------------\r\n"
-        s.print Time.now.strftime("Printed on %m/%d/%Y %T\r\n").rjust(32)
+        s.print_center_row "******"
+        s.print "#{bill.origin.print_footer}\r\n"
+        s.print_fill_row "-"
+        s.print_edges_row bill.number, Time.now.strftime("%Y-%d-%m %T")
         s.print "\r\n\r\n\r\n"
+        s.try :autocut if bill.origin.receipt_config.try(:paper_cut)
+        s.try :beep if bill.origin.receipt_config.try(:sound_signal)
+        s.try :pulse if bill.origin.receipt_config.try(:open_cash_drawer)
         s.notify "Print Doc End"
       end
     rescue Resque::TermException

data/app/models/billing/receipt_config.rb

@@ -1,5 +1,6 @@
 module Billing
   class ReceiptConfig < ActiveRecord::Base
-    has_many :origins, inverse_of: :receipt_config
+    has_many :origins, inverse_of: :receipt_config, dependent: :restrict_with_exception
+    validates :name, presence: true, uniqueness: { scope: :master_id }
   end
 end

data/db/migrate/20160831231640_add_paper_cut_to_billing_receipt_config.rb

@@ -0,0 +1,5 @@
+class AddPaperCutToBillingReceiptConfig < ActiveRecord::Migration
+  def change
+    add_column :billing_receipt_configs, :paper_cut, :boolean
+  end
+end

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,6 +181,7 @@ files:
 - db/migrate/20160824235224_add_print_headers_to_billing_origin.rb
 - db/migrate/20160828145106_create_billing_receipt_configs.rb
 - db/migrate/20160828145448_add_receipt_config_to_billing_origin.rb
+- db/migrate/20160831231640_add_paper_cut_to_billing_receipt_config.rb
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb