billing 0.0.4d → 0.0.4

data/app/models/billing/modifier.rb

@@ -1,13 +1,13 @@
 module Billing
   class Modifier < ActiveRecord::Base
-    include BillItem
-    belongs_to :bill, inverse_of: :modifiers, validate: true
+    include AccountItem
+    belongs_to :account, inverse_of: :modifiers, validate: true
     belongs_to :charge, inverse_of: :modifier
     monetize :fixed_value_cents
     
     validate :percent_or_value
-    validates_uniqueness_of :charge, scope: :bill_id, allow_nil: true
-    validates_uniqueness_of :bill, scope: :charge_id
+    validates_uniqueness_of :charge, scope: :account_id, allow_nil: true
+    validates_uniqueness_of :account, scope: :charge_id
     
     private
       def percent_or_value
@@ -16,7 +16,7 @@ module Billing
       end
       
     class << self
-      def wild_args(*args)
+      def args(*args)
         case when args.blank? || args.first.kind_of?(Hash) then
           {}.merge(*args)
         when args.first.kind_of?(String) then

data/app/models/billing/origin.rb

@@ -1,11 +1,10 @@
 module Billing
   class Origin < ActiveRecord::Base
-    has_many :bills, inverse_of: :origin
+    has_many :accounts, inverse_of: :origin
     has_many :charges, inverse_of: :origin
-    has_many :payments, through: :bills
+    has_many :payments, through: :accounts
     if defined? Extface
       belongs_to :fiscal_device, ->(o) { where( extfaceable_id: o.master_id ) }, class_name: 'Extface::Device'
-      belongs_to :transfer_device, ->(o) { where( extfaceable_id: o.master_id ) }, class_name: 'Extface::Device'
     end
 
     validates_presence_of :name
@@ -14,9 +13,5 @@ module Billing
     def external_payment?
       payment_model != Payment::PAYMENT_WITH_TYPE
     end
-    
-    def room_transfer?
-      payment_model == Payment::ROOM_TRANSFER
-    end
   end
 end

data/app/models/billing/payment.rb

@@ -3,31 +3,34 @@ module Billing
     PAYMENT_WITH_TYPE = 'Billing::PaymentWithType'.freeze
     PAYMENT_EXTERNAL = 'Billing::PaymentExternal'.freeze
     PAYPAL_EXPRESS = 'Billing::PaypalExpress'.freeze
-    ROOM_TRANSFER = 'Billing::RoomTransfer'.freeze
-    PAYMENT_MODELS = [PAYMENT_WITH_TYPE, PAYMENT_EXTERNAL, PAYPAL_EXPRESS, ROOM_TRANSFER].freeze
+    PAYMENT_MODELS = [PAYMENT_WITH_TYPE, PAYMENT_EXTERNAL, PAYPAL_EXPRESS].freeze
     
-    include BillItem
+    include AccountItem
     
     attr_writer :origin
     attr_accessor :origin_id
     monetize :value_cents
 
-    belongs_to :bill, inverse_of: :payments, validate: true
+    belongs_to :account, inverse_of: :payments, validate: true
     
     scope :in_period, lambda {|from, to| where(created_at: from..to) }
-    scope :for_report, -> { joins(:bill).where(billing_bills: { balance_cents: 0 ,report_id: nil }) }
+    scope :for_report, -> { joins(:account).where(billing_accounts: { balance_cents: 0 ,report_id: nil }) }
     
     if defined? Extface
       belongs_to :extface_job, class_name: 'Extface::Job'
     end
     
-    delegate :billable, to: :bill
+    delegate :billable, to: :account
 
     validates_numericality_of :value, greater_than_or_equal_to: 0
     validates :type, inclusion: { in: PAYMENT_MODELS }
     
     after_initialize on: :create do
-      self.value = -bill.try(:balance) if value.zero?
+      self.value = -account.try(:balance) if value.zero?
+    end
+    
+    before_validation do
+      account.origin = origin unless account.origin and account.payments.many?
     end
     
     def fiscal?; false; end
@@ -40,7 +43,7 @@ module Billing
     
     private
       class << self
-        def wild_args(*args)
+        def args(*args)
           h = {}
           case when args.blank? || args.first.kind_of?(Hash) then
             args.blank? ? h : h.merge(*args)

data/app/models/billing/payment_with_type.rb

@@ -22,7 +22,7 @@ module Billing
         if pt = billable.try(:default_payment_type)
           pt
         else
-          bill.payment_types.try(:first) unless bill.payment_types.many?
+          account.payment_types.try(:first) unless account.payment_types.many?
         end
       end
     

data/app/models/billing/report.rb

@@ -3,31 +3,26 @@ module Billing
     FISCAL_X_REPORT = 'x_report'.freeze
     FISCAL_Z_REPORT = 'z_report'.freeze
     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
+    F_OPERATIONS = [FISCAL_X_REPORT, FISCAL_Z_REPORT, FISCAL_PERIOD_REPORT].freeze
       
     has_paper_trail class_name: 'Billing::Version'
     belongs_to :origin, inverse_of: :reports
-    has_many :bills, inverse_of: :report, autosave: true
+    has_many :accounts, inverse_of: :report, autosave: true
     belongs_to :extface_job, class_name: 'Extface::Job'
-    has_many :payments, through: :bills
+    has_many :payments, through: :accounts
 
     monetize :payments_sum_cents
     monetize :payments_cash_cents
     monetize :payments_fiscal_cents
-    monetize :f_amount_cents
     
     validates_presence_of :origin
-    validates_absence_of :partially_paid_bills?
+    validates_absence_of :partially_paid_accounts?
     validates :f_operation, inclusion: { in: F_OPERATIONS }, allow_nil: true
     validates_presence_of :f_period_from, :f_period_to, if: :fiscal_period_report?
-    validates_presence_of :f_amount, if: :fiscal_payed_recvd?
     
-    before_validation :set_report_to_bills
+    before_validation :set_report_to_accounts
     before_create :update_summary
     
-    scope :in_period, lambda {|from, to| where(created_at: from..to) }
-    
     
     def fiscalization
       if origin.fiscal_device.present?
@@ -42,18 +37,14 @@ module Billing
         f_operation == FISCAL_PERIOD_REPORT
       end
       
-      def fiscal_payed_recvd?
-        f_operation == FISCAL_PAYED_RECVD
-      end
-      
-      def set_report_to_bills
-        self.bills << origin.bills.for_report if zeroing?
+      def set_report_to_accounts
+        self.accounts << origin.accounts.select(&:paid?) if zeroing?
       end
       
       def update_summary
-        self.payments_sum = bills.to_a.sum(Money.new(0, 'USD'), &:payments_sum)
-        self.payments_cash = bills.collect(&:payments).flatten.select{ |p| p.try(:cash?) }.sum(Money.new(0, 'USD'), &:value)
-        self.payments_fiscal = bills.collect(&:payments).flatten.select{ |p| p.try(:fiscal?) }.sum(Money.new(0, 'USD'), &:value)
+        self.payments_sum = accounts.to_a.sum(Money.new(0, 'USD'), &:payments_sum)
+        self.payments_cash = payments.select{ |p| p.try(:cash?) }.sum(Money.new(0, 'USD'), &:value)
+        self.payments_fiscal = payments.select{ |p| p.try(:fiscal?) }.sum(Money.new(0, 'USD'), &:value)
         perform_fiscal_job
       end
       
@@ -65,13 +56,11 @@ module Billing
           self.extface_job = origin.fiscal_device.driver.x_report_session
         when FISCAL_PERIOD_REPORT then
           p "period"
-        when FISCAL_PAYED_RECVD then
-          self.extface_job = origin.fiscal_device.driver.payed_recv_account(f_amount.to_f)
         end
       end
       
-      def partially_paid_bills?
-        bills.partially_paid.any?
+      def partially_paid_accounts?
+        accounts.partially_paid.any?
       end
   end
 end

data/app/models/concerns/billing/{bill_item.rb → account_item.rb}

@@ -1,16 +1,17 @@
 module Billing
-  module BillItem
+  module AccountItem
     extend ActiveSupport::Concern
     
     included do
       acts_as_paranoid if respond_to?(:acts_as_paranoid)
       has_paper_trail class_name: 'Billing::Version' if respond_to?(:has_paper_trail)
       
-      delegate :save, to: :bill, prefix: :bill
-      delegate :origins, :payment_types, to: :bill
+      delegate :save, to: :account, prefix: :account
+      delegate :origins, :payment_types, to: :account
       
-      after_save :bill_save
-      after_destroy :bill_save
+      after_save :account_save
+      
+      validates_presence_of :account
     end
 
   end

data/app/views/billing/accounts/index.html.erb

@@ -0,0 +1,7 @@
+<h1>Accounts#index</h1>
+<p>Find me in app/views/billing/accounts/index.html.erb</p>
+<%= link_to :new, new_account_path %>
+<hr />
+<% @accounts.each do |account| %>
+  <%= link_to account.inspect, account %>
+<% end %>

data/app/views/billing/accounts/new.html.erb

@@ -0,0 +1,8 @@
+<h1>
+  New account
+  <small><%= billable %></small>
+</h1>
+<%= form_for @account do |f| %>
+  <%= @account.inspect %>
+  <%= f.submit %>
+<% end %>

data/app/views/billing/accounts/show.html.erb

@@ -0,0 +1,29 @@
+<%= @account.inspect %>
+<h2>
+  total: <%= @account.total %>
+  <br />
+  balance: <%= @account.balance %>
+</h2>
+<hr />
+Charges:<br />
+<% @account.charges.each do |charge| %>
+  <%= charge.inspect %>
+<% end %>
+<%= link_to :charge, [:new, @account, :charge] %>
+<hr />
+Modifiers:<br />
+<% @account.modifiers.each do |modifier| %>
+  <%= modifier.inspect %>
+<% end %>
+<%= link_to :modifier, [:new, @account, :modifier] %>
+<div>
+  <% @account.modifier_items.each do |mi| %>
+    <%= mi.inspect %><br />
+  <% end %>
+</div>
+<hr />
+Payments:<br />
+<% @account.payments.each do |payment| %>
+  <%= payment.inspect %>
+<% end %>
+<%= link_to :pay, [:new, @account, :payment] %>

data/app/views/billing/application/index.html.erb

@@ -0,0 +1,3 @@
+<%= link_to :accounts, accounts_path %>
+<br />
+<%= link_to :new_account, new_account_path %>

data/app/views/billing/charges/new.html.erb

@@ -0,0 +1,12 @@
+<h1>
+  New charge
+  <small><%= @account %></small>
+</h1>
+<%= form_for [@account, @charge] do |f| %>
+  <%= @charge.inspect %>
+  <br />
+  <%= f.number_field :price, step: 0.01 %>
+  <br />
+  <%= f.submit %>
+<% end %>
+

data/app/views/billing/modifiers/new.html.erb

@@ -0,0 +1,18 @@
+<h1>
+  New Modifier
+  <small><%= @account %></small>
+</h1>
+<div>
+  <%= @modifier.errors.full_messages.join(', ') %>
+</div>
+<%= form_for [@account, @modifier] do |f| %>
+  <%= @modifier.inspect %>
+  <br />
+  percent ratio <%= f.number_field :percent_ratio, step: 0.001 %>
+  <br />
+  fixed value <%= f.number_field :fixed_value, step: 0.01 %>
+  <br />
+  <%= f.select :charge_id, @account.charges.collect(&:id), { include_blank: true } %>
+  <br />
+  <%= f.submit %>
+<% end %>

data/app/views/billing/payments/new.html.erb

@@ -0,0 +1,11 @@
+<h1>
+  New payment
+  <small><%= @account %></small>
+</h1>
+<%= form_for [@account, @payment] do |f| %>
+  <%= @payment.inspect %>
+  <br />
+  <%= f.number_field :value, step: 0.01 %>
+  <br />
+  <%= f.submit %>
+<% end %>

data/app/views/layouts/billing/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Billing</title>
+  <%= stylesheet_link_tag    "billing/application", media: "all" %>
+  <%= javascript_include_tag "billing/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/config/routes.rb

@@ -1,3 +1,8 @@
 Billing::Engine.routes.draw do
-
+  resources :accounts do
+    resources :charges
+    resources :modifiers
+    resources :payments
+  end
+  root "application#index"
 end

data/lib/billing.rb

@@ -1,5 +1,7 @@
 require "billing/engine"
 require "billing/billable"
+require "billing/mapping"
+require "billing/routes"
 
 module Billing
   mattr_reader :mappings

data/lib/billing/billable.rb

@@ -9,10 +9,10 @@ module Billing
     module ClassMethods
       def has_billing(options={})
         payment_types_scope = options.delete(:payment_types)
-        has_many :billing_bills, options.merge(as: :billable).reverse_merge(class_name: 'Billing::Bill')
-        provide_billing_items(:billing_bills)
+        has_many :billing_accounts, options.merge(as: :billable).reverse_merge(class_name: 'Billing::Account')
+        provide_billing_items(:billing_accounts)
         if options[:as]
-          has_many options[:as], options.merge(as: :billable).reverse_merge(class_name: 'Billing::Bill')
+          has_many options[:as], options.merge(as: :billable).reverse_merge(class_name: 'Billing::Account')
           provide_billing_items(options[:as])
         end
         if payment_types_scope.present?

data/lib/billing/engine.rb

@@ -1,8 +1,5 @@
 require 'money-rails'
 require 'paper_trail'
-
-require 'collection_proxy_wild'
-
 module Billing
   class Engine < ::Rails::Engine
     isolate_namespace Billing

data/lib/billing/mapping.rb

@@ -0,0 +1,32 @@
+module Billing
+  class Mapping
+    attr_reader :name, :i_klass, :i_param, :i_find_key, :i_extra_module
+    def initialize(resource, options)
+      @name = (options[:as] || resource).to_s
+      
+      @i_klass = (options[:billable_type] || name.to_s.classify).to_s.constantize
+      
+      @i_param = options[:billable_param] || "#{name.singularize}_id" #default #{resource}_id
+
+      # key to find interfaceable in controller, when
+      # :uuid then find_by! :uuid => params[:uuid]
+      # :shop_uuid then find_by! :uuid => params[:shop_uuid]
+      # :shop_id then find_by! :id => params[:shop_id]
+      @i_find_key = @i_param[/^(#{resource}_|)(\w+)/,2]
+      # FIXME not before schema load
+      #raise "#{@i_klass.name} has no method #{@i_find_key}" unless @i_klass.new.respond_to? @i_find_key
+      #raise "Did you forget to add 'has_extface_devices' in #{@i_klass.name} ?" unless @i_klass.new.respond_to? :extface_devices
+      @i_extra_module = options[:controller_include].to_s.constantize if options[:controller_include].present?
+    end
+    
+    def mount_point
+      "#{name}_billing"
+    end
+    
+    class << self
+      def find(fullpath)
+        Billing.mappings[fullpath[%r{/(\w+)_billing\/}, 1]]
+      end
+    end
+  end
+end

data/lib/billing/routes.rb

@@ -0,0 +1,16 @@
+module ActionDispatch::Routing
+  class Mapper
+    def billing_for(resource, options = {})
+      mapping = Billing.add_mapping(resource, options)
+      mount Billing::Engine, at: mapping.mount_point, as: [options[:as],:billing].compact.join('_')
+      get "#{mapping.mount_point}/accounts", to: "billing/accounts#index", as: options[:as] ? options[:as].to_s.pluralize.intern : :billing_accounts
+      get "#{mapping.mount_point}/accounts/:account_id", to: "billing/accounts#show", as: options[:as] ? options[:as].to_s.singularize.intern : :billing_account
+      get "#{mapping.mount_point}/accounts/:account_id/charges", to: "billing/charges#index", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_charges" : :billing_account_charges
+      get "#{mapping.mount_point}/accounts/:account_id/charges/new", to: "billing/charges#new", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_new_charge" : :billing_account_new_charge
+      get "#{mapping.mount_point}/accounts/:account_id/charges/:charge_id", to: "billing/charges#show", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_charge" : :billing_account_charge
+      get "#{mapping.mount_point}/accounts/:account_id/payments", to: "billing/payments#index", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_payments" : :billing_account_payments
+      get "#{mapping.mount_point}/accounts/:account_id/payments/new", to: "billing/payments#new", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_new_payment" : :billing_account_new_payment
+      get "#{mapping.mount_point}/accounts/:account_id/payments/:payment_id", to: "billing/payments#show", as: options[:as] ? "#{options[:as].to_s.singularize.intern}_payment" : :billing_account_payment
+    end
+  end
+end

data/lib/billing/version.rb

@@ -1,3 +1,3 @@
 module Billing
-  VERSION = "0.0.4d"
+  VERSION = "0.0.4"
 end

data/test/controllers/billing/accounts_controller_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+module Billing
+  class AccountsControllerTest < ActionController::TestCase
+    setup do
+      @account = billing_accounts(:one)
+    end
+
+    test "should get index" do
+      get :index
+      assert_response :success
+    end
+
+    test "new" do
+      get :new
+      assert_response :success
+    end
+  end
+end