stockor 0.1.5 → 0.1.7

data/client/skr/screens/vendor-maint/index.scss

@@ -0,0 +1,8 @@
+/*
+ If your screen does not use any custom styles
+
+ You should remove this file and it's reference from config/screens.rb
+
+ Otherwise Lanes will continue to fetch an empty file whenever
+ the screen is displayed
+*/

data/client/skr/screens/vendor-maint/layout.html

@@ -0,0 +1,32 @@
+<div class="vendor-maint">
+    <%= h.toolbar buttons: ['save','reset'] %>
+
+    <div class="header">
+        <div class="row">
+            <%= h.subview 'finder',  widths: [12,4,4,3], label: 'Code' %>
+            <%= h.text_field 'name', widths: [12,8,8,9] %>
+        </div>
+
+        <div class="row">
+            <%= h.text_field 'notes', widths: [12,9] %>
+            <%= h.subview 'terms', widths: [12,3] %>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="<%= h.grid_widths 12,6 %>">
+            <fieldset class="addresses bordered">
+                <legend>Billing Address</legend>
+                <%= h.subview 'billaddr', unwrapped: true %>
+
+            </fieldset>
+        </div>
+        <div class="<%= h.grid_widths 12,6 %>">
+            <fieldset class="addresses bordered">
+                <legend>Shiping Address</legend>
+                <%= h.subview 'shipaddr', unwrapped: true %>
+            </fieldset>
+        </div>
+    </div>
+
+</div>

data/client/skr/styles.scss

@@ -1 +1,10 @@
 /* Enter styles for your application in scss format here */
+.header-top {
+    .logo {
+        display: inline-block;
+        height: 48px;
+        width: 150px;
+        margin: 2px;
+        background: url(asset_path('images/skr/logo-sm.png')) no-repeat;
+    }
+}

data/config/routes.rb

@@ -1,3 +1,5 @@
+require 'stockor'
+
 Lanes::API.routes.draw do
     resources Skr::Customer
     resources Skr::Address

data/config/screens.rb

@@ -1,4 +1,4 @@
-Lanes::Screen.define_group 'customer' do | group |
+Lanes::Screen.define_group 'maint' do | group |
     group.title       = "Customers"
     group.description = "Maintain records related to Customers"
     group.icon        = "icon-users"
@@ -8,10 +8,29 @@ end
 Lanes::Screen.define "customer-maint" do | screen |
     screen.title       = "Customer Maintenance"
     screen.icon        = "icon-wrench2"
-    screen.group_id    = "customer"
+    screen.group_id    = "maint"
     screen.model_class = "Customer"
     screen.view_class  = "Skr.Screens.CustomerMaint"
     screen.js          = 'skr/screens/customer-maint.js'
     screen.css         = 'skr/screens/customer-maint.css'
 end
 
+Lanes::Screen.define "sku-maint" do | screen |
+    screen.title       = "SKU Maintenance"
+    screen.icon        = "icon-wrench2"
+    screen.group_id    = "maint"
+    screen.model_class = "Sku"
+    screen.view_class  = "Skr.Screens.SkuMaint"
+    screen.js          = "skr/screens/sku-maint.js"
+    screen.css         = "skr/screens/sku-maint.css"
+end
+
+Lanes::Screen.define "vendor-maint" do | screen |
+    screen.title       = "Vendor Maintenance"
+    screen.icon        = "icon-wrench2"
+    screen.group_id    = "maint"
+    screen.model_class = "Vendor"
+    screen.view_class  = "Skr.Screens.VendorMaint"
+    screen.js          = "skr/screens/vendor-maint.js"
+    screen.css         = "skr/screens/vendor-maint.css"
+end

data/db/migrate/20140224034759_create_skr_skus.rb

@@ -5,7 +5,7 @@ class CreateSkrSkus < ActiveRecord::Migration
     def change
 
         create_skr_table "skus" do |t|
-            t.skr_reference "default_vendor",   null: false, to_table: 'vendors'
+            t.skr_reference "default_vendor",   null: true,  to_table: 'vendors'
             t.skr_reference "gl_asset_account", null: false, to_table: 'gl_accounts'
             t.string   "default_uom_code",      null: false
             t.string   "code",                  null: false

data/db/seed.rb

@@ -5,7 +5,11 @@ require_relative '../lib/skr'
 
 module Skr
 
-    user = Lanes::User.where(login: 'admin').first!
+    user = Lanes::User.where(login: 'admin').first
+    if user.nil?
+        user = Lanes::User.new(name: "Admin", email: "admin@test.com",
+                               login: 'admin', role_names: ['admin'])
+    end
     Lanes::User.scoped_to(user) do
         seeds_path = Pathname.new(__FILE__).dirname.join('seed')
 
@@ -22,8 +26,6 @@ module Skr
         YAML::load( seeds_path.join('payment_terms.yml').read ).each do | acct_data |
             PaymentTerm.where(code: acct_data['code'].to_s).any? || PaymentTerm.create!(acct_data)
         end
-
-
     end
 
 end

data/lib/skr/concerns/sku_extensions.rb

@@ -0,0 +1,52 @@
+module Skr
+    module Concerns
+
+        module Sku
+
+            module Locations
+                # Attempt to find a {SkuLoc} record and create it if not found
+                def find_or_create_for( location )
+                    location_id = location.is_a?(Numeric) ? location : location.id
+                    for_location(location) || create!({ :location_id=>location_id })
+                end
+
+                def for_location( location )
+                    location_id = location.is_a?(Numeric) ? location : location.id
+                    detect{ |l| l.location_id==location_id }
+                end
+
+                def default
+                    loc_id = Location.default.id
+                    detect{ |sl| sl.location_id == loc_id }
+                end
+            end
+
+            module Vendors
+                def default
+                    vendid = self.proxy_association.owner.default_vendor_id
+                    detect{ |sv| sv.vendor_id == vendid }
+                end
+                def for_vendor( vendor )
+                    vendor_id = vendor.is_a?(Numeric) ? vendor : vendor.id
+                    detect{ |v| v.vendor_id==vendor_id }
+                end
+            end
+
+            module Uoms
+                def default
+                    code = self.proxy_association.owner.default_uom_code
+                    with_code( code )
+                end
+
+                # Return the uom with code.  Since the UOM's are probably already loaded
+                # for the SKU, it makes sense to search over the in-memory collection
+                # vs hitting the DB again.
+                def with_code( code )
+                    detect{|uom| uom.code == code }
+                end
+
+            end
+        end
+
+    end
+end

data/lib/skr/configuration.rb

@@ -42,7 +42,7 @@ module Skr
             # The Freight GL account number to use for freshly created Vendors
             freight: '6420',
             # The Asset GL account number to use for freshly created SKUs
-            asset: '1100',
+            asset: '1110',
             # Clearing account for inventory that's been
             inventory_receipts_clearing: '2600',
             # Holding account for funds that are awaiting deposit

data/lib/skr/db/migration_helpers.rb

@@ -1,4 +1,4 @@
-require 'lanes/configuration'
+require_relative '../configuration'
 
 module Skr
 

data/lib/skr/extension.rb

@@ -9,14 +9,6 @@ module Skr
         root_path Pathname.new(__FILE__).dirname.join("..","..").expand_path
         components "record-finder", "select-field"
 
-        def on_boot
-            Lanes::API::Root.before do
-                Thread.current[:demo_user_info] = {
-                  name: session[:name],
-                  email: session[:email]
-                }
-            end
-        end
 
     end
 

data/lib/skr/models/business_entity.rb

@@ -8,8 +8,10 @@ module Skr
             has_random_hash_code
             has_code_identifier from: 'name'
 
-            belongs_to :billing_address,  class_name: 'Skr::Address',     export: { writable: true }
-            belongs_to :shipping_address, class_name: 'Skr::Address',     export: { writable: true }
+            belongs_to :billing_address,  class_name: 'Skr::Address',
+              export: { writable: true }, dependent: :destroy
+            belongs_to :shipping_address, class_name: 'Skr::Address',
+              export: { writable: true }, dependent: :destroy
             belongs_to :terms,            class_name: 'Skr::PaymentTerm', export: { writable: true }
 
             delegate_and_export :terms_code, :terms_description

data/lib/skr/models/sku.rb

@@ -31,7 +31,7 @@ module Skr
         validates :uoms,                presence: true, :on => :update
         validates :description,         presence: true
         validates :gl_asset_account,    set: true
-        validates :default_vendor,      set: true
+        validates :default_vendor,      set: true, if: :does_track_inventory
         validates :default_uom_code,    presence: true, :on => :update
         validate  :ensure_default_uom_exists
 

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.1.5'
+    VERSION='0.1.7'
 end

data/spec/skr/models/CustomerSpec.coffee

@@ -1,5 +1,25 @@
 describe "Skr.Models.Customer", ->
 
+    beforeEach ->
+        Lanes.Testing.ModelSaver.setUser('admin')
+
     it "can be instantiated", ->
         model = new Skr.Models.Customer()
         expect(model).toEqual(jasmine.any(Skr.Models.Customer))
+
+
+    it "sends failure messages when code isn't set", (done)->
+        model = new Skr.Models.Customer()
+        Lanes.Testing.ModelSaver.perform(model, done).then (save)->
+            expect(save.error).toHaveBeenCalled()
+            expect(model.errors?.code).toContain("blank")
+
+    it "saves when fields are set", (done)->
+        model = new Skr.Models.Customer(
+            code: "SPECTEST", name: "A Spec Test Customer"
+            billing_address:  { name: "Billing Address" }
+            shipping_address: { name: "Shipping Address" }
+        )
+        Lanes.Testing.ModelSaver.perform(model, done).then (save)->
+            expect(save.error).not.toHaveBeenCalled()
+            expect(model.errors).toBeNull()

data/spec/skr/screens/sku-maint/SkuMaintSpec.coffee

@@ -0,0 +1,5 @@
+describe "Skr.Screens.SkuMaint", ->
+
+    it "can be instantiated", ->
+        view = new Skr.Screens.SkuMaint()
+        expect(view).toEqual(jasmine.any(Skr.Screens.SkuMaint));

data/stockor.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Stockor is a complete ERP system that includes billing, inventory, and customer management}
 
   spec.homepage      = "http://stockor.org/"
-  spec.license       = "GPL-3.0"
+  spec.license       = "AGPL-3.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_dependency 'aasm'#, '~>4.0'
+  spec.add_dependency 'aasm', '~>4.1'
 
-  spec.add_dependency 'lanes'#, '~>0.1'
+  spec.add_dependency 'lanes'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: lanes
   requirement: !ruby/object:Gem::Requirement
@@ -130,12 +130,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dir-locals.el"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE-AGPL3.txt
 - README.md
 - Rakefile
+- client/images/skr/logo-sm.png
 - client/skr/Extension.coffee
 - client/skr/components/.gitkeep
 - client/skr/components/address/Address.coffee
@@ -182,6 +185,16 @@ files:
 - client/skr/screens/customer-maint/index.js
 - client/skr/screens/customer-maint/index.scss
 - client/skr/screens/customer-maint/layout.html
+- client/skr/screens/mixins/Editing.coffee
+- client/skr/screens/mixins/index.js
+- client/skr/screens/sku-maint/SkuMaint.coffee
+- client/skr/screens/sku-maint/index.js
+- client/skr/screens/sku-maint/index.scss
+- client/skr/screens/sku-maint/layout.html
+- client/skr/screens/vendor-maint/VendorMaint.coffee
+- client/skr/screens/vendor-maint/index.js
+- client/skr/screens/vendor-maint/index.scss
+- client/skr/screens/vendor-maint/layout.html
 - client/skr/styles.scss
 - client/skr/views/.gitkeep
 - client/skr/views/Base.coffee
@@ -244,6 +257,7 @@ files:
 - lib/skr/concerns/locked_fields.rb
 - lib/skr/concerns/pt_extensions.rb
 - lib/skr/concerns/random_hash_code.rb
+- lib/skr/concerns/sku_extensions.rb
 - lib/skr/concerns/so_extensions.rb
 - lib/skr/concerns/state_machine.rb
 - lib/skr/concerns/visible_id_identifier.rb
@@ -287,7 +301,6 @@ files:
 - lib/skr/standard_pricing_provider.rb
 - lib/skr/version.rb
 - lib/stockor.rb
-- lib/tasks/debug-activity.rake
 - log/test.log
 - spec/fixtures/skr/address.yml
 - spec/fixtures/skr/customer.yml
@@ -319,20 +332,38 @@ files:
 - spec/fixtures/skr/vendor.yml
 - spec/fixtures/skr/vo_line.yml
 - spec/fixtures/skr/voucher.yml
-- spec/skr/address.rb
+- spec/server/models/address.rb
+- spec/server/models/customer.rb
+- spec/server/models/gl_account.rb
+- spec/server/models/gl_manual_entry.rb
+- spec/server/models/gl_period.rb
+- spec/server/models/gl_posting.rb
+- spec/server/models/gl_transaction.rb
+- spec/server/models/ia_line.rb
+- spec/server/models/ia_reason.rb
+- spec/server/models/inv_line.rb
+- spec/server/models/inventory_adjustment.rb
+- spec/server/models/invoice.rb
+- spec/server/models/location.rb
+- spec/server/models/payment_term.rb
+- spec/server/models/pick_ticket.rb
+- spec/server/models/po_line.rb
+- spec/server/models/po_receipt.rb
+- spec/server/models/por_line.rb
+- spec/server/models/pt_line.rb
+- spec/server/models/purchase_order.rb
+- spec/server/models/sales_order.rb
+- spec/server/models/sku.rb
+- spec/server/models/sku_loc.rb
+- spec/server/models/sku_tran.rb
+- spec/server/models/sku_vendor.rb
+- spec/server/models/so_line.rb
+- spec/server/models/spec_helper.rb
+- spec/server/models/uom.rb
+- spec/server/models/vendor.rb
+- spec/server/models/vo_line.rb
+- spec/server/models/voucher.rb
 - spec/skr/concerns/code_identifier_spec.rb
-- spec/skr/customer.rb
-- spec/skr/gl_account.rb
-- spec/skr/gl_manual_entry.rb
-- spec/skr/gl_period.rb
-- spec/skr/gl_posting.rb
-- spec/skr/gl_transaction.rb
-- spec/skr/ia_line.rb
-- spec/skr/ia_reason.rb
-- spec/skr/inv_line.rb
-- spec/skr/inventory_adjustment.rb
-- spec/skr/invoice.rb
-- spec/skr/location.rb
 - spec/skr/models/AddressSpec.coffee
 - spec/skr/models/CustomerSpec.coffee
 - spec/skr/models/GlAccountSpec.coffee
@@ -363,33 +394,15 @@ files:
 - spec/skr/models/VendorSpec.coffee
 - spec/skr/models/VoLineSpec.coffee
 - spec/skr/models/VoucherSpec.coffee
-- spec/skr/payment_term.rb
-- spec/skr/pick_ticket.rb
-- spec/skr/po_line.rb
-- spec/skr/po_receipt.rb
-- spec/skr/por_line.rb
-- spec/skr/pt_line.rb
-- spec/skr/purchase_order.rb
-- spec/skr/sales_order.rb
 - spec/skr/screens/Base.coffee
 - spec/skr/screens/CustomerMaint.coffee
+- spec/skr/screens/sku-maint/SkuMaintSpec.coffee
 - spec/skr/screens/vendor-maint/VendorMaintSpec.coffee
-- spec/skr/sku.rb
-- spec/skr/sku_loc.rb
-- spec/skr/sku_tran.rb
-- spec/skr/sku_vendor.rb
-- spec/skr/so_line.rb
-- spec/skr/spec_helper.rb
-- spec/skr/uom.rb
-- spec/skr/vendor.rb
-- spec/skr/views/AddressSpec.coffee
-- spec/skr/vo_line.rb
-- spec/skr/voucher.rb
 - stockor.gemspec
 - tmp/.gitkeep
 homepage: http://stockor.org/
 licenses:
-- GPL-3.0
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []