stockor 0.3.0 → 0.4.0

data/lib/skr/models/business_entity.rb

@@ -17,7 +17,7 @@ module Skr
             delegate_and_export :terms_code, :terms_description
 
             validates :name,  presence: true
-            validates :terms, :billing_address, :shipping_address, set: true
+            validates :terms, set: true
 
             before_validation :set_defaults, :on=>:create
         end

data/lib/skr/models/gl_transaction.rb

@@ -113,6 +113,9 @@ module Skr
                 glt.add_posting( amount: amount, debit: debit, credit: credit )
             else
                 options.merge!(source: owner, location: options[:location] || owner.location)
+                if owner.respond_to?(:attributes_for_gl_transaction)
+                    options.reverse_merge!( owner.attributes_for_gl_transaction )
+                end
                 glt = GlTransaction.new( options )
                 glt.add_posting( amount: amount, debit: debit, credit: credit )
                 glt.save!

data/lib/skr/models/inv_line.rb

@@ -88,18 +88,23 @@ module Skr
                 self.sku_trans.build(
                     origin: self, qty: changed_qty * -1, sku_loc: self.sku_loc, uom: self.uom,
                     mac: 0, cost: price_change,
-                    origin_description: "INV #{self.invoice.visible_id}:#{self.sku.code}",
+                    origin_description: gl_origin_description,
                     debit_gl_account:  debit, credit_gl_account: credit
                 )
             else
                 GlTransaction.push_or_save(
                   owner: self, amount: price_change,
-                  debit: debit, credit: credit
+                  debit: debit, credit: credit,
+                  options: {description: gl_origin_description}
                 )
             end
             true
         end
 
+        def gl_origin_description
+            "INV #{self.invoice.visible_id}:#{self.sku.code}"
+        end
+
         def prevent_destroy
             errors.add(:base, "Can not destroy #{self.class.model_name}, only create/modify is allowed" )
         end

data/lib/skr/models/inventory_adjustment.rb

@@ -38,11 +38,6 @@ module Skr
             state_event == :mark_applied
         end
 
-        def attributes_for_gl_transaction
-            { source: self, location: location,
-             description: "IA #{self.visible_id}" }
-        end
-
         def ensure_state_is_savable
             if applied? && state_was == 'applied'
                 errors.add('base' , "Cannot update record once it's approved and applied")

data/lib/skr/models/invoice.rb

@@ -30,7 +30,6 @@ module Skr
         has_random_hash_code
         has_gl_transaction
         is_order_like
-        has_additional_events :amount_paid_change
 
         belongs_to :sales_order,      export: true
         belongs_to :customer_project, export: true
@@ -47,17 +46,27 @@ module Skr
                  class_name: 'Skr::InvLine', inverse_of: :invoice,
                  extend: Concerns::INV::Lines, export: { writable: true }
 
-        before_save :maybe_mark_paid
+        has_many :payments, inverse_of: :invoice,
+                 extend: Concerns::INV::Payments,
+                 listen: { save: :apply_payment },
+                 export: { writable: true }
 
         before_validation :set_defaults, on: :create
 
         validates :customer, :location, set: true
         validate  :ensure_unlocked, :ensure_location_matches_so
 
+        # used to update customer account balances when invoices created / paid
         scope :open_for_customer, lambda{ | customer |
             where(state: :open, customer_id: customer.is_a?(Customer) ? customer.id : customer)
         }, export: true
 
+        scope :with_sku_id, lambda { | sku_id |
+            joins("join (select skr_sku_inv_xref.invoice_id as invoice_id from skr_sku_inv_xref " +
+                  "where sku_id=#{sku_id.to_i} group by skr_sku_inv_xref.invoice_id) as sku_inv " +
+                  "on sku_inv.invoice_id = skr_invoices.id")
+        }, export: true
+
         scope :with_details, lambda { |should_use=true |
             compose_query_using_detail_view( view: 'skr_inv_details', join_to: 'invoice_id' )
         }, export: true
@@ -65,20 +74,18 @@ module Skr
         enum state: {
             open:     1,
             paid:     5,
-            partial: 10
+            partialy_paid: 10
         }
 
         state_machine do
             state :open, initial: true
             state :paid
-            state :partial
+            state :partialy_paid
             event :mark_paid do
-                transitions from: [:open,:partial], to: :paid
-                before :apply_balances
+                transitions from: [:open,:partialy_paid], to: :paid
             end
-            event :mark_partial do
-                transitions from: [:open,:partial], to: :partial
-                before :apply_balances
+            event :mark_partialy_paid do
+                transitions from: :open, to: :partialy_paid
             end
         end
 
@@ -90,7 +97,7 @@ module Skr
 
         # @return [BigDecimal] total - amount_paid
         def unpaid_amount
-            self.total - amount_paid
+            self.total - self.payments.total
         end
 
         # @return [Boolean] is the invoice paid in full
@@ -109,36 +116,18 @@ module Skr
 
         private
 
-        # attributes for GlTransaction
-        def attributes_for_gl_transaction
-            { location: location, source: self,
-              description: "INV #{self.visible_id}" }
-        end
-
         # set the state if the amount_paid was changed
-        def maybe_mark_paid
-            return unless amount_paid_changed?
+        def apply_payment(pymnt)
             if self.fully_paid? && self.may_mark_paid?
-                self.mark_paid
-            elsif self.amount_paid > 0 && self.may_mark_partial?
-                self.mark_partial
-            end
-        end
+                self.mark_paid!
+            elsif self.payments.total > 0 && self.may_mark_partialy_paid?
+                Lanes.logger_debug('paying')
 
-        def apply_balances
-            return unless amount_paid_changed?
-            change = amount_paid - amount_paid_was
-            Lanes.logger.debug "Applying payment #{amount_paid} changed: #{change}"
-            return if change.zero?
-            GlTransaction.push_or_save(
-              owner: self, amount: change,
-              debit: customer.gl_receivables_account,
-              credit: GlAccount.default_for(:deposit_holding)
-            )
-            fire_pubsub_event( :amount_paid_change )
-            true
-        end
+                #self.mark_partialy_paid!
 
+                Lanes.logger_debug('paid')
+            end
+        end
 
         def set_defaults
 

data/lib/skr/models/location.rb

@@ -5,7 +5,7 @@ module Skr
 
         has_code_identifier :from=>'name'
 
-        mount_uploader :logo, Lanes::Concerns::ImageUploader
+        has_one :logo, as: :owner, :class_name=>'Lanes::Asset', export: { writable: false }, :dependent => :destroy
 
         belongs_to :address, export: { writable: true }
 

data/lib/skr/models/payment.rb

@@ -1,20 +1,31 @@
 module Skr
 
+    # A payment can be for either incoming or outgoing, if incoming must
+    # be associated with an Invoice, otherwise a Vendor or PaymentCategory
     class Payment < Model
+
+        SEQUENTIAL_ID_PREFIX = 'Pmnt-'
+
         has_visible_id
         has_random_hash_code
         has_gl_transaction
 
         belongs_to :category,     class_name: 'Skr::PaymentCategory', export: true
         belongs_to :vendor,       class_name: 'Skr::Vendor',          export: true
+        belongs_to :invoice,      class_name: 'Skr::Invoice',         export: true
         belongs_to :bank_account, class_name: 'Skr::BankAccount',     export: true
         belongs_to :location,     class_name: 'Skr::Location',        export: true
 
-        validates :name, :amount, :category, :bank_account, presence: true
+        validates :name, :amount, :bank_account, presence: true
+
+        attr_accessor :credit_card
+        whitelist_attributes :credit_card
 
         has_one :gl_transaction, class_name: 'Skr::GlTransaction', as: :source
 
         before_validation :set_defaults, on: :create
+        before_validation :attempt_charging_provided_card,
+                          on: :create, if: :credit_card
 
         after_save :apply_transaction
 
@@ -22,27 +33,62 @@ module Skr
             { 'position' => :absolute }
         end
 
+        def incoming?
+            vendor.present?
+        end
+
+        def outgoing?
+            vendor.present? || category.present?
+        end
+
       private
 
-        def attributes_for_gl_transaction
-            { location: location, source: self,
-              description: "Payment #{self.visible_id}" }
+        def attempt_charging_provided_card
+            return unless credit_card.present?
+
+            card = ActiveMerchant::Billing::CreditCard.new(credit_card)
+            gw = Skr::MerchantGateway.get
+            resp = gw.purchase(amount, card)
+            if resp.success?
+                metadata['authorization'] = resp.authorization
+            else
+                errors.add(:credit_card, "purchase failed: #{resp.message}")
+            end
         end
 
-        def apply_transaction
-            credit = vendor ? vendor.gl_payables_account : category.gl_account
+        def gl_accounts
+            if vendor
+                [vendor.gl_payables_account, bank_account.gl_account]
+            elsif invoice
+                [bank_account.gl_account,
+                 invoice.customer.gl_receivables_account]
+            else
+                [category.gl_account, bank_account.gl_account]
+            end
+        end
 
+        def apply_transaction
+            (credit, debit) = gl_accounts
             GlTransaction.push_or_save(
-                owner: self, amount: amount,
-                debit: bank_account.gl_account,
-                credit: credit
+                owner:  self,  amount: amount,
+                debit:  debit, credit: credit
             )
         end
 
         def set_defaults
             self.location     ||= Location.default
             self.date         ||= Date.today
-            self.check_number ||= SequentialId.next_for("Pmnt-#{bank_account.id}")
+            if name.blank?
+                if self.vendor
+                    self.name = vendor.name
+                elsif self.invoice
+                    self.name = invoice.billing_address.name
+                end
+            end
+            if bank_account && outgoing?
+                self.check_number ||= SequentialId.next_for(SEQUENTIAL_ID_PREFIX + bank_account.id.to_s)
+            end
+            self.bank_account ||= BankAccount.default
         end
 
     end

data/lib/skr/models/po_receipt.rb

@@ -31,14 +31,6 @@ module Skr
 
         private
 
-        def attributes_for_gl_transaction
-            {   location: location, source: self,
-                description: "PO RECPT #{self.visible_id}" }
-        end
-
-        def logit
-        end
-
         def record_freight
             GlTransaction.current.add_posting( amount: self.freight,
               debit: GlAccount.default_for( :inventory_receipts_clearing ),

data/lib/skr/models/sales_order.rb

@@ -36,7 +36,7 @@ module Skr
         has_many   :invoices,     inverse_of: :sales_order, listen: { save: 'on_invoice' }
 
         validates :location, :terms, :customer, set: true
-        validates :billing_address, :shipping_address, :order_date, presence: true
+        validates :order_date, presence: true
         validate  :ensure_location_changes_are_valid
 
         after_save :check_if_location_changed
@@ -47,11 +47,16 @@ module Skr
         # joins the so_amount_details view which includes additional fields:
         # customer_code, customer_name, bill_addr_name, total, num_lines, total_other_charge_amount,
         # total_tax_amount, total_shipping_amount,subtotal_amount
-
         scope :with_details, lambda { | *args |
             compose_query_using_detail_view(view: 'skr_so_details')
         }, export: true
 
+        scope :with_sku_id, lambda { | sku_id |
+            joins("join (select skr_sku_so_xref.sales_order_id from skr_sku_so_xref " +
+                  "where sku_id=#{sku_id.to_i} group by skr_sku_so_xref.sales_order_id) as sku_so " +
+                  "on sku_so.sales_order_id = skr_sales_orders.id")
+        }, export: true
+
         # joins the so_allocation_details which includes the additional fields:
         # number_of_lines,  allocated_total, number_of_lines_allocated, number_of_lines_fully_allocated
         scope :with_allocation_details, lambda {

data/lib/skr/models/sequential_id.rb

@@ -16,7 +16,12 @@ module Skr
         end
 
         def self.set_next( klass, value )
-            self.connection.raw_connection.exec( "update #{table_name} set current_value = $1 where name = $2", [ value, klass.to_s ] )
+            record = self.find_or_initialize_by(name: klass.to_s)
+            return if record.new_record? and 0 == value.to_i
+            record.unlock_fields(:current_value) do
+                record.current_value = value.to_i
+                record.save
+            end
         end
 
     end

data/lib/skr/models/sku.rb

@@ -54,6 +54,9 @@ module Skr
             with_qty_details.where("details.qty_on_order > details.qty_on_hand")
         }, export: true
 
+        def price
+            uoms.default.price
+        end
 
         # Rebuilding is sometimes needed for cases where the location's
         # allocation/on order/reserved counts get out of sync with the

data/lib/skr/print.rb

@@ -3,6 +3,7 @@ require 'erb_latex'
 require 'active_support/core_ext/integer/inflections'
 require_relative 'print/template'
 require_relative 'print/form'
+require_relative 'print/context'
 
 module Skr
     module Print

data/lib/skr/print/context.rb

@@ -0,0 +1,19 @@
+module Skr
+    module Print
+        class Context < ErbLatex::Context
+
+            def pluralize(count, word)
+                count == 1 ? word : word.pluralize
+            end
+
+
+            def get_snippet(name)
+                snips = Skr.system_settings['latex_snippets'] || {}
+                if name && snips[name]
+                    snips[name]
+                end
+            end
+
+        end
+    end
+end

data/lib/skr/print/form.rb

@@ -14,7 +14,12 @@ module Skr
             end
 
             def as_pdf
-                template.to_stringio
+                begin
+                    template.to_stringio
+                rescue => e
+                    Lanes.logger.warn e.log
+                    raise
+                end
             end
 
             def as_latex
@@ -35,6 +40,7 @@ module Skr
             def template
                 ErbLatex::Template.new( @latex,
                                         data: data,
+                                        context: Skr::Print::Context,
                                         layout: ROOT.join('layout.tex.erb'),
                                         partials_path: ROOT.join('partials'),
                                         packages_path: ROOT.join('packages')

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.3.0'
+    VERSION='0.4.0'
 end

data/npm-build/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "stockor",
+  "version": "0.0.1",
+  "private": true,
+  "description": "Assets built for Stockor",
+  "main": "vendor.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "AGPL-3.0",
+  "dependencies": {
+    "card": "^1.3.2",
+    "payment": "^1.0.4"
+  },
+  "devDependencies": {
+    "bourbon": "^4.2.7",
+    "coffee-loader": "^0.7.2",
+    "coffee-script": "^1.10.0",
+    "css-loader": "^0.23.1",
+    "node-sass": "^3.7.0",
+    "sass-loader": "^3.2.0",
+    "style-loader": "^0.13.1",
+    "webpack": "^1.13.1"
+  }
+}