billing 0.0.4d → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca16dec983eeeea4ce9b20cd27e90de954c4ea13
-  data.tar.gz: 6dd48dd7320540e7fdb111673a88087489731e85
+  metadata.gz: f6a8b7a29cfa69d401eb731dbb4dcc67a9016d5e
+  data.tar.gz: 4ef3454d28c7e0b42f9bb55108131baad90d7ef4
 SHA512:
-  metadata.gz: 4faaa4ce8278d8e8a8e448c2e30ee00c7a51e0c8d37b56a93f7737aea366c93589b31d7cedd39b8000b1c51fb844ee0cfa3e737a29ff6ac318619576f5a2289a
-  data.tar.gz: 65471f1a0ccb28af1936255efa2a841c536e588639cfaaed0c07363503cb1d7aa17b064abe4ef5108d0b4efa7cd7783e5545b7384ef01ba22efa3f7a1d290468
+  metadata.gz: 1c2f6ff8668e4f23630342d787596721706900dc4dfe9b2aa5f33552774fa42f6f165912b456ec220d0866fe68f9bb06ceb64ba79bb4c52d3a3f3a5a361d8d5f
+  data.tar.gz: 5e39901f8155e9a73206311bd4bea98417856e366456868579cc2be1ee3717f660c3cb625ac445e9321fee0317ae55fa587dc13d39756bd9c17c14ddae0255e0

data/app/assets/javascripts/billing/accounts.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/billing/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/app/assets/javascripts/billing/charges.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/billing/modifiers.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/billing/accounts.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/billing/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/app/assets/stylesheets/billing/charges.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/billing/modifiers.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/billing/payments.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/billing/accounts_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "billing/application_controller"
+
+module Billing
+  class AccountsController < ApplicationController
+    before_action :set_account, except: [:index, :new, :create]
+    
+    def index
+      @accounts = billable.billing_accounts
+    end
+    
+    def new
+      @account = billable.billing_accounts.new
+    end
+    
+    def create
+      @account = billable.billing_accounts.new
+      if @account.save
+        redirect_to @account
+      else
+        render action: :new
+      end
+    end
+    
+    private
+      def set_account
+        @account = billable.billing_accounts.find(params[:id]) 
+      end
+  end
+end

data/app/controllers/billing/application_controller.rb

@@ -0,0 +1,22 @@
+module Billing
+  class ApplicationController < ActionController::Base
+    prepend_before_filter :include_extra_module
+    helper_method :billable
+    
+    def index
+    end
+    
+    def billable
+      @billable ||= billing_mapping.i_klass.find_by(billing_mapping.i_find_key => params[billing_mapping.i_param])
+    end
+
+    private
+      def billing_mapping
+        @billing_mapping ||= Billing::Mapping.find(request.fullpath)
+      end
+      
+      def include_extra_module
+        self.class.send(:include, billing_mapping.i_extra_module) if billing_mapping.i_extra_module.present?
+      end
+  end
+end

data/app/controllers/billing/charges_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "billing/application_controller"
+
+module Billing
+  class ChargesController < ApplicationController
+    before_action :set_account
+
+    def new
+      @charge = @account.charges.new
+    end
+    
+    def create
+      @charge = @account.charges.new(charge_params)
+      if @charge.save
+        redirect_to @account
+      else
+        render action: :new
+      end
+    end
+    
+    private
+      def set_account
+        @account = billable.billing_accounts.find(params[:account_id])
+      end
+      
+      def charge_params
+        params.require(:charge).permit(:price)
+      end
+  end
+end

data/app/controllers/billing/modifiers_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "billing/application_controller"
+
+module Billing
+  class ModifiersController < ApplicationController
+    before_action :set_account
+
+    def new
+      @modifier = @account.modifiers.new
+    end
+    
+    def create
+      @modifier = @account.modifiers.new(modifier_params)
+      if @modifier.save
+        redirect_to @account
+      else
+        render action: :new
+      end
+    end
+    
+    private
+      def set_account
+        @account = billable.billing_accounts.find(params[:account_id])
+      end
+      
+      def modifier_params
+        params.require(:modifier).permit(:percent_ratio, :fixed_value, :charge_id)
+      end
+  end
+end

data/app/controllers/billing/payments_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "billing/application_controller"
+
+module Billing
+  class PaymentsController < ApplicationController
+    before_action :set_account
+
+    def new
+      @payment = @account.payments.new(value: @account.total)
+    end
+    
+    def create
+      @payment = @account.payments.new(payment_params)
+      if @payment.save
+        redirect_to @account
+      else
+        render action: :new
+      end
+    end
+    
+    private
+      def set_account
+        @account = billable.billing_accounts.find(params[:account_id])
+      end
+      
+      def payment_params
+        params.require(:payment).permit(:value)
+      end
+  end
+end

data/app/helpers/billing/accounts_helper.rb

@@ -0,0 +1,4 @@
+module Billing
+  module AccountsHelper
+  end
+end

data/app/helpers/billing/application_helper.rb

@@ -0,0 +1,4 @@
+module Billing
+  module ApplicationHelper
+  end
+end

data/app/helpers/billing/charges_helper.rb

@@ -0,0 +1,4 @@
+module Billing
+  module ChargesHelper
+  end
+end

data/app/helpers/billing/modifiers_helper.rb

@@ -0,0 +1,4 @@
+module Billing
+  module ModifiersHelper
+  end
+end

data/app/helpers/billing/payments_helper.rb

@@ -0,0 +1,4 @@
+module Billing
+  module PaymentsHelper
+  end
+end

data/app/models/billing/{bill.rb → account.rb}

@@ -1,5 +1,5 @@
 module Billing
-  class Bill < ActiveRecord::Base
+  class Account < ActiveRecord::Base
     acts_as_paranoid if respond_to?(:acts_as_paranoid)
     has_paper_trail class_name: 'Billing::Version' if respond_to?(:has_paper_trail)
       
@@ -11,11 +11,11 @@ module Billing
     monetize :balance_cents
     
     belongs_to :billable, polymorphic: true
-    has_many :charges, inverse_of: :bill, dependent: :destroy
-    has_many :modifiers, inverse_of: :bill, dependent: :destroy
-    has_many :payments, inverse_of: :bill, dependent: :restrict_with_error
-    belongs_to :origin, inverse_of: :bills
-    belongs_to :report, inverse_of: :bills
+    has_many :charges, inverse_of: :account, dependent: :destroy
+    has_many :modifiers, inverse_of: :account, dependent: :destroy
+    has_many :payments, inverse_of: :account, dependent: :restrict_with_error
+    belongs_to :origin, inverse_of: :accounts
+    belongs_to :report, inverse_of: :accounts
     
     if defined? Extface
       belongs_to :extface_job, class_name: 'Extface::Job'
@@ -28,14 +28,11 @@ module Billing
     scope :unpaid, -> { where(arel_table[:balance_cents].lt(0)) }
     scope :open, -> { where.not(balance_cents: 0) }
     scope :partially_paid, -> { where.not( payments_sum_cents: 0, balance_cents: 0 ) }
-    scope :for_report, -> { where(balance_cents: 0 ,report_id: nil) }
     
-    before_validation do
-      update_sumaries
-      self.origin = payments.first.try(:origin) unless origin.present? or payments.many?
-    end
-    before_create do
-      self.number = "#{billable.id}:#{billable.billing_bills.count}"
+    before_validation :update_sumaries
+    
+    before_save on: :create do
+      self.number = "#{billable.id}:#{billable.billing_accounts.count}"
       self.name = "B:#{number}" if name.nil?
     end
     before_save :perform_autofin, if: :becomes_paid?
@@ -48,15 +45,18 @@ module Billing
       :payments_of_diff_fiscalization?, :multiple_cash_payments?, if: :has_payments?
     
     def charge(*args)
-      charges.wild *args
+      c = charges.new Charge.args(*args)
+      c if c.save
     end
     
     def modify(*args)
-      modifiers.wild *args
+      m = modifiers.new Modifier.args(*args)
+      m if m.save
     end
     
     def pay(*args)
-      payments.wild *args
+      p = build_typed_payment Payment.args(*args)
+      p if p.save
     end
     
     def modifier_items
@@ -80,8 +80,7 @@ module Billing
     end
     
     def build_typed_payment(attributes = {})
-      payment_origin = attributes[:origin] || origins.find_by_id(attributes[:origin_id])
-      payments.new(attributes.merge(type: (payment_origin || origin).try(:payment_model) || 'Billing::PaymentWithType'))
+      payments.new(attributes.merge(type: origin.try(:payment_model) || 'Billing::PaymentWithType'))
     end
     
     def fiscalize #TODO test
@@ -91,29 +90,24 @@ module Billing
 
     private
       def calculate_modifiers
-        charges_a = charges.to_a
         @modifier_items = ModifierItems.new.tap() do |items|
-          modifiers.select{ |m| m.charge.present? }.each do |charge_modifier|
-            charge = charges_a.find{ |c| c == charge_modifier.charge }
-            mod_value = charge_modifier.percent_ratio.nil? ? charge_modifier.fixed_value : (charge_modifier.charge.price * charge_modifier.percent_ratio)
-            p mod_value
-            charge.value = charge.price + mod_value
-            #p charge.value
-            #p "-"
-            items << Charge.new(price: mod_value, chargable: charge)
-          end
-          modifiers.select{ |m| m.charge.nil? }.each do |global_modifier|
-            items << Charge.new(price: global_modifier.percent_ratio.nil? ? global_modifier.fixed_value : (charges_a.sum(&:value).to_money * global_modifier.percent_ratio))
+          modifiers.each do |modifier|
+            if charge = modifier.charge
+              charge.value = modifier.percent_ratio.nil? ? modifier.fixed_value : (charge.price * modifier.percent_ratio)
+              items << Charge.new(price: charge.value, chargable: charge)
+            else
+              items << Charge.new(price: modifier.percent_ratio.nil? ? modifier.fixed_value : (charges.to_a.sum(&:price).to_money * modifier.percent_ratio))
+            end
           end
         end
       end
       def update_sumaries
+        self.charges_sum = charges.to_a.sum(&:price).to_money
         calculate_modifiers
-        self.charges_sum = charges.to_a.sum(0.to_money, &:value).to_money
-        self.discounts_sum = @modifier_items.discounts.sum(0.to_money, &:price).to_money
-        self.surcharges_sum = @modifier_items.surcharges.sum(0.to_money, &:price).to_money
-        self.payments_sum = payments.to_a.sum(0.to_money, &:value).to_money
-        self.total = charges.to_a.sum(0.to_money, &:price) + surcharges_sum + discounts_sum
+        self.discounts_sum = -@modifier_items.discounts.sum(&:price).to_money
+        self.surcharges_sum = @modifier_items.surcharges.sum(&:price).to_money
+        self.payments_sum = payments.to_a.sum(&:value).to_money
+        self.total = charges_sum + surcharges_sum - discounts_sum
         self.balance = payments_sum - total
       end
       
@@ -144,8 +138,7 @@ module Billing
       end
       
       def fiscalizable?
-        payments.select(&:fiscal?).any?
+        payments.select(&:fiscal?)
       end
-
   end
 end

data/app/models/billing/charge.rb

@@ -1,48 +1,34 @@
 module Billing
   class Charge < ActiveRecord::Base
-    include BillItem
-    
-    attr_accessor :tax_group, :plu, :department
-    
-    belongs_to :bill, inverse_of: :charges, validate: true
+    include AccountItem
+    belongs_to :account, inverse_of: :charges, validate: true
     belongs_to :chargable, polymorphic: true
     belongs_to :origin, inverse_of: :charges
     has_one :modifier, inverse_of: :charge
 
-    monetize :price_cents, with_model_currency: :price_currency
+    monetize :price_cents
     monetize :value_cents
     
-    delegate :paid?, to: :bill
+    delegate :paid?, to: :account
     
-    scope :unpaid, -> { joins(:bill).where.not(billing_bills: { balance_cents: 0}) }
-    scope :paid, -> { joins(:bill).where(billing_bills: { balance_cents: 0}) }
+    scope :unpaid, -> { joins(:account).where.not(billing_accounts: { balance_cents: 0}) }
+    scope :paid, -> { joins(:account).where(billing_accounts: { balance_cents: 0}) }
     scope :in_period, lambda {|from, to| where(revenue_at: from..to) }
     
     validates_presence_of :price
     validates_numericality_of :value, greater_than_or_equal_to: 0
     
-    after_initialize do
-      self.value = price #unless modifier.present? #bill validation will update modified value
+    before_save do
+      self.value = price unless modifier.present? #FIXME global account modifier lost
     end
     
     class << self
-      include Billing::BillTextParser
-      def wild_args(*args)
+      def args(*args)
         case when args.blank? || args.first.is_a?(Hash) then
-          return {}.merge(*args)
-        when args.size == 1 && args.first.is_a?(String) then
-          if match = args.shift.match(/(\d+[.,]\d+\*|\d+\*|)(\d+[.,]\d+[A-Z]*|\d+[A-Z]*|)(#\d+|)(@\d+|)([+-]\d+[.,]\d+\%?|[+-]\d+\%?|)(\/\S+|)/)
-            qty_s, price_s, plu_s, tax_group_s, mod_s, text = match.captures
-            return {
-              qty: parse_qty(qty_s),
-              price: price_s.to_money,
-              plu: parse_plu(plu_s),
-              name: parse_text(text)
-            }
-          end
+          {}.merge(*args)
         else
           h = { price: args.shift.to_money }
-          return args.any? ? h.merge(*args) : h
+          args.any? ? h.merge(*args) : h
         end
       end
     end