billing 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185414d1f916093119f225eb3af4509801ea0592
-  data.tar.gz: 5a643ae84c05265e996bdcc5bbbff13f377ad2e6
+  metadata.gz: 5d71320db03d43f48dc3ab5a41ba771aac145534
+  data.tar.gz: a679fda97bcf6323af367e7638b8da7a6d9bbf28
 SHA512:
-  metadata.gz: 8a5a448c3c5a5d3cf9b2693f84f935e603078091d8bf9d7d3d6b8f8faaccdccdcaab9fbbce9b27118b24070723aa6076b814d85df118aee22e5e6abbd339f748
-  data.tar.gz: 90cbdd19dccc69c905cfcc1666873b0134e38a6882132350ccd9ca4cb698021c8d4a774bbeecb9856b0ea6dc372136dd98136b78d82f756064bae227a6ce5d0f
+  metadata.gz: 0d09060049be62c40491c79129a77289c864b519d8360d5fd198cdbb7393e6af880b40ae562db7d09492326dbd0983d39503402dc1dcf5504d99a5bf9b79bf03
+  data.tar.gz: 8acc69df070e7c86deda9ec883aa88cbc7213c7f8bd3e803f6d26a820a11d9998d7a032d7b95403b61adee76ce8974e4fdd454639863e54e3638a6a05e448767

data/app/jobs/billing/issue_print_doc.rb

@@ -30,16 +30,16 @@ module Billing
         
         bill.charges.each do |charge|
           text = "#{charge.qty ? charge.qty : 1} x #{charge.name}"
-          s.print "\r\n#{text.ljust(22)} #{charge.price.to_s.rjust(7)}\r\n"
+          s.print "\r\n#{text.truncate(22).ljust(22)} #{charge.price.to_s.rjust(7)}\r\n"
           if charge.description
-            s.print "#{charge.description.truncate(30)}\r\n"
+            s.print "#{charge.description.truncate(26)}\r\n"
           end
           if charge.modifier.present?
             text = charge.modifier.percent_ratio.nil? ? "" : " #{charge.modifier.percentage}"
             if charge.modifier.positive?
-              text += " Surcharge"
+              text += " #{ bill.origin.receipt_config ? bill.origin.receipt_config.surcharge_text || 'Surcharge' : 'Surcharge' }"
             else
-              text += " Discount"
+              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"
           end
@@ -49,9 +49,9 @@ module Billing
           global_modifier = bill.modifiers.global.first
           text = global_modifier.percent_ratio.nil? ? "" : " #{global_modifier.percentage}"
           if global_modifier.positive?
-            text += " Surcharge"
+            text += " #{ bill.origin.receipt_config ? bill.origin.receipt_config.surcharge_text || 'Surcharge' : 'Surcharge' }"
           else
-            text += " Discount"
+            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"
         end

data/app/models/billing/bill.rb

@@ -100,6 +100,7 @@ module Billing
       if defined?(Extface) && fiscalizable? && device = origin.try(:fiscal_device)
         #self.extface_job = origin.fiscal_device.driver.fiscalize(self) if fiscalizable? && origin.try(:fiscal_device)
         self.extface_job = device.jobs.new
+        self.perform_fiscalize = true
         self.extface_job if save
       end
     end

data/app/models/billing/origin.rb

@@ -8,6 +8,7 @@ module Billing
       belongs_to :transfer_device, ->(o) { where( extfaceable_id: o.master_id ) }, class_name: 'Extface::Device'
       belongs_to :print_device, ->(o) { where( extfaceable_id: o.master_id ) }, class_name: 'Extface::Device'
     end
+    belongs_to :receipt_config, inverse_of: :origins
 
     validates_presence_of :name
     validates :payment_model, inclusion: { in: Payment::PAYMENT_MODELS }

data/app/models/billing/receipt_config.rb

@@ -0,0 +1,5 @@
+module Billing
+  class ReceiptConfig < ActiveRecord::Base
+    has_many :origins, inverse_of: :receipt_config
+  end
+end

data/db/migrate/20160828145106_create_billing_receipt_configs.rb

@@ -0,0 +1,15 @@
+class CreateBillingReceiptConfigs < ActiveRecord::Migration
+  def change
+    create_table :billing_receipt_configs do |t|
+      t.integer :master_id
+      t.string :type
+      t.string :name
+      t.string :discount_text
+      t.string :surcharge_text
+      t.boolean :sound_signal
+      t.boolean :open_cash_drawer
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160828145448_add_receipt_config_to_billing_origin.rb

@@ -0,0 +1,5 @@
+class AddReceiptConfigToBillingOrigin < ActiveRecord::Migration
+  def change
+    add_reference :billing_origins, :receipt_config, index: true, foreign_key: true
+  end
+end

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/fixtures/billing/receipt_configs.yml

@@ -0,0 +1,19 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  master_id: 1
+  type: 
+  name: MyString
+  discount_text: MyString
+  surcharge_text: MyString
+  sound_signal: false
+  open_cash_drawer: false
+
+two:
+  master_id: 1
+  type: 
+  name: MyString
+  discount_text: MyString
+  surcharge_text: MyString
+  sound_signal: false
+  open_cash_drawer: false

data/test/models/billing/receipt_config_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Billing
+  class ReceiptConfigTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - app/models/billing/paypal_express.rb
 - app/models/billing/plu.rb
 - app/models/billing/profile.rb
+- app/models/billing/receipt_config.rb
 - app/models/billing/report.rb
 - app/models/billing/resource.rb
 - app/models/billing/room_transfer.rb
@@ -178,6 +179,8 @@ files:
 - db/migrate/20160723160908_add_print_device_to_billing_origin.rb
 - db/migrate/20160723234233_add_print_job_to_billing_bill.rb
 - 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
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb
@@ -239,6 +242,7 @@ files:
 - test/fixtures/billing/payments.yml
 - test/fixtures/billing/plus.yml
 - test/fixtures/billing/profiles.yml
+- test/fixtures/billing/receipt_configs.yml
 - test/fixtures/billing/resources.yml
 - test/fixtures/billing/tax_groups.yml
 - test/fixtures/profiles.yml
@@ -252,6 +256,7 @@ files:
 - test/models/billing/payment_type_test.rb
 - test/models/billing/plu_test.rb
 - test/models/billing/profile_test.rb
+- test/models/billing/receipt_config_test.rb
 - test/models/billing/resource_test.rb
 - test/models/billing/tax_group_test.rb
 - test/test_helper.rb
@@ -287,6 +292,7 @@ test_files:
 - test/fixtures/billing/payments.yml
 - test/fixtures/billing/bills.yml
 - test/fixtures/billing/resources.yml
+- test/fixtures/billing/receipt_configs.yml
 - test/fixtures/billing/charges.yml
 - test/fixtures/billing/departments.yml
 - test/fixtures/billing/modifiers.yml
@@ -344,6 +350,7 @@ test_files:
 - test/models/billing/payment_test.rb
 - test/models/billing/resource_test.rb
 - test/models/billing/operator_test.rb
+- test/models/billing/receipt_config_test.rb
 - test/models/billing/origin_test.rb
 - test/models/billing/profile_test.rb
 - test/models/billing/payment_type_test.rb