billing 0.0.7i → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0947871a8781aa70a9ab5fb3e8f920572f804c0
-  data.tar.gz: 2834ca5fba520f2aa7de92f0bf1475ce0dcc0bb0
+  metadata.gz: 2ad7f574f1fd705d1c3fa07c37a6d82206cebe8d
+  data.tar.gz: d9c2f1161ef14b21b15fce52fa6befe525946cd9
 SHA512:
-  metadata.gz: 3dab27eda9362c02de2c7b510dc7d3a3f52e2bd5834d438f951ca29c721c44b7ba8f474798d1ca030b0821284e07bfccd999c781895eae95df4152d86f45aaea
-  data.tar.gz: 1ee6a7e48da1e9d50abf84cecf95c95f7036a14adc072ceb2e5e9a14581e669305070323434f0fc8dc6701405cc9b08cb2258127f0b8e61253fb08e931ecfbec
+  metadata.gz: 59892ba7beb3905f859f85f4c564191c0e85ac59c2cc48486f6077653f9e8881c10bba5ff39e6242ac6768e978b8de4663cad0f27f0e2c4058643ec398c77dc7
+  data.tar.gz: df3c4069cc8a8cb59d6439fb9daf72fa9cbba6889c02c375dc7dc9d264781ff1ce614d3056896942fdbaebcb4c885109c8a789dfb7919f3e2a8cb551224a0497

data/app/models/billing/bill.rb

@@ -39,7 +39,6 @@ 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
@@ -90,24 +89,17 @@ module Billing
     end
     
     def fiscalize(detailed = false)
-      #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
-      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.extface_job if save
-      end
+      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
-      global_modifiers = modifiers.select{ |m| m.charge.nil? }
-      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)
-        end
-        return gvalue
+      if global_modifiers = modifiers.select{ |m| m.charge.nil? }
+        Money.new(0).tap() do |value|
+          global_modifiers.each do |global_modifier|
+            value += global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio)
+          end
+        end if global_modifiers.any?
       end
     end
     
@@ -115,10 +107,6 @@ 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
@@ -164,26 +152,17 @@ module Billing
       end
       
       def perform_autofin
-        p "!!!!!!!!!!perform_autofin"
         if autofin
           self.finalized_at = Time.now
-          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
+          if defined? Extface
+            self.extface_job = origin.fiscal_device.driver.fiscalize(self) if fiscalizable? && origin.try(:fiscal_device)
           end
         end
         true
       end
       
-      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
+      def fiscalizable?
+        payments.select(&:fiscal?).any?
       end
 
   end

data/app/models/billing/report.rb

@@ -5,8 +5,7 @@ module Billing
     FISCAL_PERIOD_REPORT = 'period_report'.freeze
     FISCAL_PAYED_RECVD = 'payed_recvd'.freeze
     F_OPERATIONS = [FISCAL_X_REPORT, FISCAL_Z_REPORT, FISCAL_PERIOD_REPORT, FISCAL_PAYED_RECVD].freeze
-
-    acts_as_paranoid if respond_to?(:acts_as_paranoid)
+      
     has_paper_trail class_name: 'Billing::Version'
     belongs_to :origin, inverse_of: :reports
     has_many :bills, inverse_of: :report, autosave: true

data/app/models/billing/version.rb

@@ -1,7 +1,5 @@
 module Billing
   class Version < PaperTrail::Version
     self.table_name = :billing_versions
-    
-    belongs_to :changable, -> { with_deleted }, polymorphic: true, foreign_key: :item_id, foreign_type: :item_type
   end
 end

data/lib/billing/engine.rb

@@ -6,10 +6,5 @@ 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.7i"
+  VERSION = "0.0.7"
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150512040421) do
+ActiveRecord::Schema.define(version: 20150510142229) do
 
   create_table "billing_bills", force: :cascade do |t|
     t.integer  "billable_id"
@@ -231,7 +231,6 @@ ActiveRecord::Schema.define(version: 20150512040421) do
     t.string   "f_operation",              limit: 255
     t.integer  "f_amount_cents",                       default: 0,     null: false
     t.string   "f_amount_currency",        limit: 255, default: "USD", null: false
-    t.datetime "deleted_at"
   end
 
   add_index "billing_reports", ["origin_id"], name: "index_billing_reports_on_origin_id"
@@ -280,8 +279,6 @@ ActiveRecord::Schema.define(version: 20150512040421) do
     t.string   "ip",             limit: 255
     t.string   "user_agent",     limit: 255
     t.text     "object_changes"
-    t.integer  "master_id"
-    t.string   "master_type"
   end
 
   add_index "billing_versions", ["item_type", "item_id"], name: "index_billing_versions_on_item_type_and_item_id"

data/test/dummy/log/development.log

@@ -2331,482 +2331,3 @@ Migrating to AddObjectChangesToBillingVersions (20150510142229)
             FROM sqlite_temp_master
             WHERE name='index_billing_versions_on_item_type_and_item_id' AND type='index'
 
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to AddMasterToBillingVersion (20150510235441)
-   (0.1ms)  begin transaction
-   (0.5ms)  ALTER TABLE "billing_versions" ADD "master_id" integer
-   (0.3ms)  ALTER TABLE "billing_versions" ADD "master_type" varchar
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150510235441"]]
-   (82.0ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.3ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_billable_id_and_billable_type' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_billable_id_and_billable_type' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_extface_job_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_extface_job_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_report_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_report_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_revenue_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_revenue_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_chargable_id_and_chargable_type' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_chargable_id_and_chargable_type' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_departments_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_departments_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_departments_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_departments_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_modifiers_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_modifiers_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_op_fp_mappings_on_operator_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_op_fp_mappings_on_operator_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_op_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_op_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_operators_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_operators_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_transfer_device_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_transfer_device_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_fiscal_device_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_fiscal_device_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payment_types_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payment_types_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payments_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payments_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payments_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payments_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_plus_on_department_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_plus_on_department_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_plus_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_plus_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_pt_fp_mappings_on_payment_type_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_pt_fp_mappings_on_payment_type_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_pt_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_pt_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_reports_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_reports_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_tg_fp_mappings_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_tg_fp_mappings_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_tg_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_tg_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_versions_on_item_type_and_item_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_versions_on_item_type_and_item_id' AND type='index'
-
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to AddDeletedAtToBillingReport (20150512040421)
-   (0.1ms)  begin transaction
-   (0.6ms)  ALTER TABLE "billing_reports" ADD "deleted_at" datetime
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150512040421"]]
-   (114.6ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.3ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_billable_id_and_billable_type' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_billable_id_and_billable_type' AND type='index'
-
-   (0.3ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_extface_job_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_extface_job_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_bills_on_report_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_bills_on_report_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_revenue_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_revenue_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_charges_on_chargable_id_and_chargable_type' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_charges_on_chargable_id_and_chargable_type' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_departments_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_departments_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_departments_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_departments_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_modifiers_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_modifiers_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_op_fp_mappings_on_operator_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_op_fp_mappings_on_operator_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_op_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_op_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_operators_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_operators_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_transfer_device_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_transfer_device_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_origins_on_fiscal_device_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_origins_on_fiscal_device_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payment_types_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payment_types_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payments_on_bill_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payments_on_bill_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_payments_on_deleted_at' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_payments_on_deleted_at' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_plus_on_department_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_plus_on_department_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_plus_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_plus_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_pt_fp_mappings_on_payment_type_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_pt_fp_mappings_on_payment_type_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_pt_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_pt_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_reports_on_origin_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_reports_on_origin_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_tg_fp_mappings_on_tax_group_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_tg_fp_mappings_on_tax_group_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_tg_fp_mappings_on_extface_driver_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_tg_fp_mappings_on_extface_driver_id' AND type='index'
-
-   (0.2ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_billing_versions_on_item_type_and_item_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_billing_versions_on_item_type_and_item_id' AND type='index'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billing
 version: !ruby/object:Gem::Version
-  version: 0.0.7i
+  version: 0.0.7
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ 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
@@ -90,7 +76,6 @@ 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
@@ -172,8 +157,6 @@ files:
 - db/migrate/20141229234928_create_billing_resources.rb
 - db/migrate/20150311013019_add_pwd_to_billing_operator_mapping.rb
 - db/migrate/20150510142229_add_object_changes_to_billing_versions.rb
-- db/migrate/20150510235441_add_master_to_billing_version.rb
-- db/migrate/20150512040421_add_deleted_at_to_billing_report.rb
 - lib/billing.rb
 - lib/billing/billable.rb
 - lib/billing/engine.rb
@@ -263,12 +246,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Billing for Rails 4 app

data/app/jobs/billing/issue_fiscal_doc.rb

@@ -1,132 +0,0 @@
-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
-
-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/db/migrate/20150510235441_add_master_to_billing_version.rb

@@ -1,6 +0,0 @@
-class AddMasterToBillingVersion < ActiveRecord::Migration
-  def change
-    add_column :billing_versions, :master_id, :integer
-    add_column :billing_versions, :master_type, :string
-  end
-end

data/db/migrate/20150512040421_add_deleted_at_to_billing_report.rb

@@ -1,5 +0,0 @@
-class AddDeletedAtToBillingReport < ActiveRecord::Migration
-  def change
-    add_column :billing_reports, :deleted_at, :timestamp
-  end
-end