billing 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a0bd23ac0ea7985a56a4a4ffb41890f30b290f
-  data.tar.gz: f5a71cf981e5bf73c36a797893bd81fcb112cb66
+  metadata.gz: 5aaf6345b7a91cc0df617048d93da36900ca1cc4
+  data.tar.gz: f99bb213cb8264b2247a9ba5156804397bff807b
 SHA512:
-  metadata.gz: e46daa7655ef8825493c364fee6104cc37b37ada9b0ade3ae7e761654abc6408af0f8e57d20da42525bd04c21c658d9a4d07a60a2d06d1cc963cb6ae2efcc882
-  data.tar.gz: caa0ec0e93301541458037bc462cb6054db3582e44269aeb3f8b64376ddb44d1a8e7ee1138dc16bc4cbaa2eb6d0aef3cf4ab9941fce4603ab1ca533442f91ea2
+  metadata.gz: 82b21b36a0434f25cf474e3a5b83967e86fd6d6e2e68d50d5773c4dc0b8ea9fb87f32114403c8f5e017b2590b8d5290e82c72559908d00075b1f4aa3822e9b84
+  data.tar.gz: 1c1fcb92d3abd50601794356b4fb6a06dd34f02a8127b72fcb321283f9cdf22710b914751b7943b90ef13d92b843f19f93c351c555de5e2c556bc503f2126250

data/app/jobs/billing/issue_fiscal_doc.rb

@@ -1,69 +1,4 @@
-module Resque
-  module Plugins
-    module ExtfaceLonelyDevice
-      LOCK_TIMEOUT = 60 * 60 * 24 * 5 # 5 days
-
-      def lock_timeout
-        Time.now.to_i + LOCK_TIMEOUT + 1
-      end
-
-      def requeue_interval
-        self.instance_variable_get(:@requeue_interval) || 1
-      end
-
-      # Overwrite this method to uniquely identify which mutex should be used
-      # for a resque worker.
-      def redis_key(*args)
-        "extface_"
-      end
-
-      def can_lock_queue?(*args)
-        now = Time.now.to_i
-        key = redis_key(*args)
-        timeout = lock_timeout
-
-        # Per http://redis.io/commands/setnx
-        return true  if Resque.redis.setnx(key, timeout)
-        return false if Resque.redis.get(key).to_i > now
-        return true  if Resque.redis.getset(key, timeout).to_i <= now
-        return false
-      rescue ActiveRecord::RecordNotFound #redis_key exception
-        p "Not found!!!"
-        sleep 1
-        reenqueue(*args) #will stop if new redis_key exception
-      end
-
-      def unlock_queue(*args)
-        Resque.redis.del(redis_key(*args))
-      end
-
-      def reenqueue(*args)
-        Resque.enqueue_to(redis_key(*args), self, *args)
-      end
-
-      def before_perform(*args)
-        unless can_lock_queue?(*args)
-          # Sleep so the CPU's rest
-          sleep(requeue_interval)
-
-          # can't get the lock, so re-enqueue the task
-          reenqueue(*args)
-
-          # and don't perform
-          raise Resque::Job::DontPerform
-        end
-      end
-
-      def around_perform(*args)
-        begin
-          yield
-        ensure
-          unlock_queue(*args)
-        end
-      end
-    end
-  end
-end
+require 'rescue/plugins/extface_lonely_device'
 
 module Billing
   class IssueFiscalDoc

data/app/jobs/billing/issue_print_doc.rb

@@ -1,69 +1,4 @@
-module Resque
-  module Plugins
-    module ExtfaceLonelyDevice
-      LOCK_TIMEOUT = 60 * 60 * 24 * 5 # 5 days
-
-      def lock_timeout
-        Time.now.to_i + LOCK_TIMEOUT + 1
-      end
-
-      def requeue_interval
-        self.instance_variable_get(:@requeue_interval) || 1
-      end
-
-      # Overwrite this method to uniquely identify which mutex should be used
-      # for a resque worker.
-      def redis_key(*args)
-        "extface_"
-      end
-
-      def can_lock_queue?(*args)
-        now = Time.now.to_i
-        key = redis_key(*args)
-        timeout = lock_timeout
-
-        # Per http://redis.io/commands/setnx
-        return true  if Resque.redis.setnx(key, timeout)
-        return false if Resque.redis.get(key).to_i > now
-        return true  if Resque.redis.getset(key, timeout).to_i <= now
-        return false
-      rescue ActiveRecord::RecordNotFound #redis_key exception
-        p "Not found!!!"
-        sleep 1
-        reenqueue(*args) #will stop if new redis_key exception
-      end
-
-      def unlock_queue(*args)
-        Resque.redis.del(redis_key(*args))
-      end
-
-      def reenqueue(*args)
-        Resque.enqueue_to(redis_key(*args), self, *args)
-      end
-
-      def before_perform(*args)
-        unless can_lock_queue?(*args)
-          # Sleep so the CPU's rest
-          sleep(requeue_interval)
-
-          # can't get the lock, so re-enqueue the task
-          reenqueue(*args)
-
-          # and don't perform
-          raise Resque::Job::DontPerform
-        end
-      end
-
-      def around_perform(*args)
-        begin
-          yield
-        ensure
-          unlock_queue(*args)
-        end
-      end
-    end
-  end
-end
+require 'rescue/plugins/extface_lonely_device'
 
 module Billing
   class IssuePrintDoc
@@ -87,24 +22,32 @@ module Billing
       bill.print_job.runtime do |s|
         return unless bill.printable?
         s.notify "Print Doc Start"
-        s.print "******************************\r\n*"
-        s.print "Bill ##{bill.number}".center(28)
-        s.print "*\r\n******************************\r\n"
-        s.print "------------------------------\r\n"
+        
+        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|
           s.print "#{charge.name.ljust(22)} #{charge.value.to_s.rjust(7)}\r\n"
+          if charge.modifier.present?
+            s.print "  Item modifier:     #{charge.modifier.human.to_s.rjust(7)}\r\n"
+          end
+        end
+        if bill.modifiers.any?
+          s.print "  Global modifier:   #{bill.global_modifier_value.to_s.rjust(7)}\r\n"
         end
         s.print "-----------\r\n".rjust(32)
-        s.print "#{bill.total}\r\n".rjust(32)
+        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 "\r\n"
-        s.print "------------------------------\r\n"
+
+        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 "\r\n\r\n\r\n"
         s.notify "Print Doc End"

data/app/models/billing/bill.rb

@@ -107,7 +107,7 @@ module Billing
       if global_modifiers.any?
         gvalue = Money.new(0)
         global_modifiers.each do |global_modifier|
-          gvalue += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio)
+          gvalue += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges.to_a.sum(0.to_money, &:value).to_money * global_modifier.percent_ratio)
         end
         return gvalue
       end

data/app/models/billing/modifier.rb

@@ -11,6 +11,10 @@ module Billing
     validates_uniqueness_of :charge, scope: :bill_id, allow_nil: true
     validates_uniqueness_of :bill, scope: :charge_id
     
+    def human
+      percent_ratio.nil? ? fixed_value : "#{(percent_ratio * 100).to_i}%" 
+    end
+    
     private
       def percent_or_value
         errors.add :percent_or_value, I18n.t('errors.messages.blank') if percent_ratio.blank? and fixed_value.zero?

data/app/models/billing/modifier_items.rb

@@ -1,11 +1,11 @@
 module Billing
   class ModifierItems < Array
     def discounts
-      select{ |m| m.price < 0 }
+      select{ |m| m.price < 0.to_money }
     end
     
     def surcharges
-      select{ |m| m.price > 0 }
+      select{ |m| m.price > 0.to_money }
     end
   end
 end

data/db/migrate/20160824235224_add_print_headers_to_billing_origin.rb

@@ -0,0 +1,6 @@
+class AddPrintHeadersToBillingOrigin < ActiveRecord::Migration
+  def change
+    add_column :billing_origins, :print_header, :string
+    add_column :billing_origins, :print_footer, :string
+  end
+end

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/rescue/plugins/extface_lonely_device.rb

@@ -0,0 +1,67 @@
+module Resque
+  module Plugins
+    module ExtfaceLonelyDevice
+      LOCK_TIMEOUT = 60 * 60 * 24 * 5 # 5 days
+
+      def lock_timeout
+        Time.now.to_i + LOCK_TIMEOUT + 1
+      end
+
+      def requeue_interval
+        self.instance_variable_get(:@requeue_interval) || 1
+      end
+
+      # Overwrite this method to uniquely identify which mutex should be used
+      # for a resque worker.
+      def redis_key(*args)
+        "extface_"
+      end
+
+      def can_lock_queue?(*args)
+        now = Time.now.to_i
+        key = redis_key(*args)
+        timeout = lock_timeout
+
+        # Per http://redis.io/commands/setnx
+        return true  if Resque.redis.setnx(key, timeout)
+        return false if Resque.redis.get(key).to_i > now
+        return true  if Resque.redis.getset(key, timeout).to_i <= now
+        return false
+      rescue ActiveRecord::RecordNotFound #redis_key exception
+        p "Not found!!!"
+        sleep 1
+        reenqueue(*args) #will stop if new redis_key exception
+      end
+
+      def unlock_queue(*args)
+        Resque.redis.del(redis_key(*args))
+      end
+
+      def reenqueue(*args)
+        #Resque.enqueue_to(redis_key(*args), self, *args)
+        Resque.redis.lpush("queue:#{Resque.queue_from_class(self)}", Resque.encode(class: self, args: args))
+      end
+
+      def before_perform(*args)
+        unless can_lock_queue?(*args)
+          # Sleep so the CPU's rest
+          sleep(requeue_interval)
+
+          # can't get the lock, so re-enqueue the task
+          reenqueue(*args)
+
+          # and don't perform
+          raise Resque::Job::DontPerform
+        end
+      end
+
+      def around_perform(*args)
+        begin
+          yield
+        ensure
+          unlock_queue(*args)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,11 +177,13 @@ files:
 - db/migrate/20150512040421_add_deleted_at_to_billing_report.rb
 - 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
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb
 - lib/billing/version.rb
 - lib/collection_proxy_wild.rb
+- lib/rescue/plugins/extface_lonely_device.rb
 - lib/tasks/billing.rake
 - lib/tasks/billing_tasks.rake
 - test/billing_test.rb