billing 0.0.7e → 0.0.7f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372a49ba72a93955ca4508c334463629b9e73683
-  data.tar.gz: 2e7eff4b288280bb857c4e4bb1b52d2952d7d3bd
+  metadata.gz: 805e2665500fc7301222f87a0fccd5d44274c9da
+  data.tar.gz: 15a32f01fb6c33cc0d924b2e7b3a1e3aa777e1df
 SHA512:
-  metadata.gz: 19e435c9c58a9b8e176de78ab838909c257412e4d2f3749e3f30b3dbc61dcf0f67649ca9d768736190b8dac37fcce1316af72e3afc66c053b12043dcba59cead
-  data.tar.gz: 17bd694ea1398b1e10d2039190fea28fba72bd50fd34641f4f7a1e7314a145e8b8a0a24d109e1310292e97ae7c4d47a4cf04b8e5e7a3b2e1b1690964ca9d996b
+  metadata.gz: ce7748011a09d97a8fa6f82d75223c8f78e92dd88aa326500b243d90f82e719db092f18c46bb041816c912e67f83795de90e4b712d6b3c67af1fb20a752fd784
+  data.tar.gz: 1393357178169a6e7edac86475c9c710d593761ca81a84173815af3f4f716ebff816c2d9afe83b9c20a972040923ee370f8c2de0645045e1ff9695df04b9bfb9

data/app/jobs/billing/issue_fiscal_doc.rb

@@ -0,0 +1,128 @@
+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
+      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
+
+module Billing
+  class IssueFiscalDoc
+    extend Resque::Plugins::ExtfaceLonelyDevice
+    
+    def self.redis_key(bill_id)
+      "extface_#{Bill.find(bill_id).extface_job.device_id}"
+    end
+
+    def self.perform(bill_id)
+      bill = Bill.find(bill_id)
+      qname = "extface_#{bill.extface_job.device_id}"
+      wjs = Resque::Worker.working.find_all{ |w| w.job && w.job['queue'] == qname }
+      
+      p "############################"
+      p "d: #{bill.extface_job.device_id} Issue Fiscal Doc ##{bill_id}, job: #{bill.extface_job_id}, wjs: #{wjs.inspect}"
+      p "____________________________"
+      p "active jobs: #{bill.extface_job.device.jobs.active.count}"
+      
+
+        bill.extface_job.runtime do |s|
+          return unless bill.fiscalizable?
+          operator_mapping = bill.find_operator_mapping_for(s)
+          s.notify "Fiscal Doc Start"
+          s.autofix_unclosed_doc
+          s.open_fiscal_doc(operator_mapping.try(:mapping), operator_mapping.try(:pwd))
+          s.notify "Register Sale"
+          bill.charges.each do |charge|
+            neto, percent_ratio = nil, nil, nil
+            if modifier = charge.modifier
+              neto = modifier.fixed_value
+              percent_ratio = modifier.percent_ratio unless neto.present?
+            end
+            if charge.price.zero? #printing comments with zero charges (TODO check zero charges allowed?)
+              s.add_comment charge.text
+            else
+              s.add_sale(
+                s.class::SaleItem.new(
+                  price: charge.price.to_f, 
+                  text1: charge.name,
+                  text2: charge.description,
+                  tax_group: charge.find_tax_group_mapping_for(s), #find tax group mapping by ratio , not nice
+                  qty: charge.qty,
+                  neto: neto,
+                  percent_ratio: percent_ratio #TODO check format
+                )
+              )
+            end
+          end
+          if global_modifier_value = bill.global_modifier_value
+            s.notify "Register Global Modifier"
+            s.add_total_modifier global_modifier_value.to_f 
+          end
+          s.notify "Register Payment"
+          bill.payments.each do |payment|
+            s.add_payment payment.value.to_f, payment.find_payment_type_mapping_for(s)
+          end
+          s.notify "Close Fiscal Receipt"
+          s.close_fiscal_doc
+          s.notify "Fiscal Doc End"
+        end
+    rescue Resque::TermException
+      reenqueue(bill_id)
+    end
+  end
+end

data/app/models/billing/bill.rb

@@ -39,6 +39,7 @@ module Billing
       self.name = "B:#{number}" if name.nil?
     end
     before_save :perform_autofin, if: :becomes_paid?
+    after_save :create_fiscal_job, if: :fiscalizable?
     
     validates_numericality_of :total, greater_than_or_equal_to: 0
     validates_numericality_of :balance, less_than_or_equal_to: 0
@@ -89,8 +90,9 @@ module Billing
     end
     
     def fiscalize(detailed = false)
-      self.extface_job = origin.fiscal_device.driver.fiscalize(self, detailed) if fiscalizable? && origin.try(:fiscal_device)
-      self.extface_job if save
+      #TODO create resque job
+      #self.extface_job = origin.fiscal_device.driver.fiscalize(self, detailed) if fiscalizable? && origin.try(:fiscal_device)
+      #self.extface_job if save
     end
     
     def global_modifier_value
@@ -108,6 +110,10 @@ module Billing
       # get operator, who close/pay the bill?
       #operator.operator_fiscal_driver_mapping.find_by(extface_driver_id: fiscal_driver.id) if fiscal_driver.fiscal?
     end
+    
+    def fiscalizable?
+      self.finalized_at.present? && payments.select(&:fiscal?).any? && origin.try(:fiscal_device) && balance.zero?
+    end
 
     private
       def calculate_modifiers
@@ -153,17 +159,26 @@ module Billing
       end
       
       def perform_autofin
+        p "!!!!!!!!!!perform_autofin"
         if autofin
           self.finalized_at = Time.now
-          if defined? Extface
-            self.extface_job = origin.fiscal_device.driver.fiscalize(self) if fiscalizable? && origin.try(:fiscal_device)
+          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
           end
         end
         true
       end
       
-      def fiscalizable?
-        payments.select(&:fiscal?).any?
+      def create_fiscal_job
+        if self.extface_job_id_changed? && defined?(Resque) && defined?(Extface) && device = origin.try(:fiscal_device)
+          p "device: #{device.try(:id)}"
+          p "self: #{self.try(:id)}"
+          p "self.finalized_at changed: #{self.finalized_at_changed?}"
+          
+          Resque.enqueue_to("extface_#{device.id}", Billing::IssueFiscalDoc, self.id)
+        end
+        true
       end
 
   end

data/lib/billing/engine.rb

@@ -6,5 +6,10 @@ require 'collection_proxy_wild'
 module Billing
   class Engine < ::Rails::Engine
     isolate_namespace Billing
+    config.to_prepare do
+      PaperTrail::Version.module_eval do
+        self.abstract_class = true
+      end
+    end
   end
 end

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.0.7e"
+  VERSION = "0.0.7f"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.7e
+  version: 0.0.7f
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/jobs/billing/issue_fiscal_doc.rb
 - app/models/billing/bill.rb
 - app/models/billing/charge.rb
 - app/models/billing/department.rb
@@ -253,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Billing for Rails 4 app