stockor 0.1.7 → 0.1.8

data/spec/server/models/{location.rb → location_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Location do
+class LocationSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Location.new

data/spec/server/models/{payment_term.rb → payment_term_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PaymentTerm do
+class PaymentTermSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PaymentTerm.new

data/spec/server/models/{pick_ticket.rb → pick_ticket_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PickTicket do
+class PickTicketSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PickTicket.new

data/spec/server/models/{po_line.rb → po_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PoLine do
+class PoLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PoLine.new

data/spec/server/models/{po_receipt.rb → po_receipt_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PoReceipt do
+class PoReceiptSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PoReceipt.new

data/spec/server/models/{por_line.rb → por_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PorLine do
+class PorLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PorLine.new

data/spec/server/models/{pt_line.rb → pt_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PtLine do
+class PtLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PtLine.new

data/spec/server/models/{purchase_order.rb → purchase_order_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::PurchaseOrder do
+class PurchaseOrderSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = PurchaseOrder.new

data/spec/server/models/sales_order_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../spec_helper'
+
+class SalesOrderSpec < Skr::TestCase
+
+
+    it "can be saved" do
+        user = Lanes::User.find_by(login:'admin')
+        model = SalesOrder.from_attribute_data({
+                    terms_id: skr_payment_term(:cashy).id,
+                    location_id: skr_location(:default).id,
+                    customer_id: skr_customer(:billy).id,
+                    billing_address: {
+                        name: "Billy"
+                    },
+                    shipping_address:{
+                        name: "Billy"
+                    }
+                }, user)
+        assert model.save
+    end
+
+end

data/spec/server/models/{sku_loc.rb → sku_loc_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::SkuLoc do
+class SkuLocSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = SkuLoc.new

data/spec/server/models/{sku.rb → sku_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Sku do
+class SkuSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Sku.new

data/spec/server/models/{sku_tran.rb → sku_tran_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::SkuTran do
+class SkuTranSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = SkuTran.new

data/spec/server/models/{sku_vendor.rb → sku_vendor_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::SkuVendor do
+class SkuVendorSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = SkuVendor.new

data/spec/server/models/{so_line.rb → so_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::SoLine do
+class SoLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = SoLine.new

data/spec/server/models/{uom.rb → uom_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Uom do
+class UomSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Uom.new

data/spec/server/models/{vendor.rb → vendor_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Vendor do
+class VendorSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Vendor.new

data/spec/server/models/{vo_line.rb → vo_line_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::VoLine do
+class VoLineSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = VoLine.new

data/spec/server/models/{voucher.rb → voucher_spec.rb}

@@ -1,6 +1,6 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
-describe Skr::Voucher do
+class VoucherSpec < Skr::TestCase
 
     it "can be instantiated" do
         model = Voucher.new

data/spec/server/spec_helper.rb

@@ -0,0 +1,42 @@
+require_relative '../../lib/stockor'
+require 'lanes/spec_helper'
+
+class Lanes::TestCase
+    include Skr
+end
+
+module Skr
+
+    # Add more helper methods to be used by all tests here...
+
+    class TestCase < Lanes::TestCase
+        include Skr
+    end
+
+    class ApiTestCase < Lanes::ApiTestCase
+        include Skr
+    end
+
+end
+
+module StockorFixtureTestPatches
+    extend ActiveSupport::Concern
+
+    included do
+        alias_method_chain :table_rows, :custom_autoset_stockor_fields
+    end
+
+    def table_rows_with_custom_autoset_stockor_fields
+        results = table_rows_without_custom_autoset_stockor_fields
+        if model_class && model_class < ActiveRecord::Base
+            results[ table_name ].each do | row |
+                if self['hash_code'].blank? && model_class.column_names.include?('hash_code')
+                    row['hash_code'] = Lanes::Strings.random(8)
+                end
+            end
+        end
+        results
+    end
+end
+
+ActiveRecord::FixtureSet.send :include, StockorFixtureTestPatches

data/spec/skr/models/CustomerSpec.coffee

@@ -1,7 +1,7 @@
 describe "Skr.Models.Customer", ->
 
     beforeEach ->
-        Lanes.Testing.ModelSaver.setUser('admin')
+        Lanes.Test.ModelSaver.setUser('admin')
 
     it "can be instantiated", ->
         model = new Skr.Models.Customer()
@@ -10,16 +10,17 @@ describe "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)->
+        Lanes.Test.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"
+            terms_id: 1,
             billing_address:  { name: "Billing Address" }
             shipping_address: { name: "Shipping Address" }
         )
-        Lanes.Testing.ModelSaver.perform(model, done).then (save)->
+        Lanes.Test.ModelSaver.perform(model, done).then (save)->
             expect(save.error).not.toHaveBeenCalled()
             expect(model.errors).toBeNull()

data/spec/skr/models/SalesOrderSpec.coffee

@@ -1,5 +1,7 @@
 describe "Skr.Models.SalesOrder", ->
 
-    it "can be instantiated", ->
+    it "must have a customer to save", (done)->
         model = new Skr.Models.SalesOrder()
-        expect(model).toEqual(jasmine.any(Skr.Models.SalesOrder))
+        Lanes.Test.ModelSaver.perform(model, done).then (save)->
+            expect(save.error).toHaveBeenCalled()
+            expect(model.errors.customer).toContain("is not set")

data/spec/skr/screens/sales-order/SalesOrderSpec.coffee

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -176,6 +176,7 @@ files:
 - client/skr/models/VoLine.coffee
 - client/skr/models/Voucher.coffee
 - client/skr/models/mixins/CodeField.coffee
+- client/skr/models/mixins/VisibleID.coffee
 - client/skr/screens/.gitkeep
 - client/skr/screens/Base.coffee
 - client/skr/screens/base/index.js
@@ -185,8 +186,11 @@ 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/sales-order/SalesOrder.coffee
+- client/skr/screens/sales-order/index.js
+- client/skr/screens/sales-order/index.scss
+- client/skr/screens/sales-order/layout.html
 - client/skr/screens/sku-maint/SkuMaint.coffee
 - client/skr/screens/sku-maint/index.js
 - client/skr/screens/sku-maint/index.scss
@@ -246,7 +250,6 @@ files:
 - lib/skr.rb
 - lib/skr/access_roles.rb
 - lib/skr/concerns/acts_as_uom.rb
-- lib/skr/concerns/code_identifier.rb
 - lib/skr/concerns/gl_tran_extensions.rb
 - lib/skr/concerns/has_gl_transaction.rb
 - lib/skr/concerns/has_sku_loc_lines.rb
@@ -301,7 +304,6 @@ files:
 - lib/skr/standard_pricing_provider.rb
 - lib/skr/version.rb
 - lib/stockor.rb
-- log/test.log
 - spec/fixtures/skr/address.yml
 - spec/fixtures/skr/customer.yml
 - spec/fixtures/skr/gl_account.yml
@@ -332,37 +334,38 @@ files:
 - spec/fixtures/skr/vendor.yml
 - spec/fixtures/skr/vo_line.yml
 - spec/fixtures/skr/voucher.yml
-- 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/server/models/address_spec.rb
+- spec/server/models/customer_spec.rb
+- spec/server/models/gl_account_spec.rb
+- spec/server/models/gl_manual_entry_spec.rb
+- spec/server/models/gl_period_spec.rb
+- spec/server/models/gl_posting_spec.rb
+- spec/server/models/gl_transaction_spec.rb
+- spec/server/models/ia_line_spec.rb
+- spec/server/models/ia_reason_spec.rb
+- spec/server/models/inv_line_spec.rb
+- spec/server/models/inventory_adjustment_spec.rb
+- spec/server/models/invoice_spec.rb
+- spec/server/models/location_spec.rb
+- spec/server/models/payment_term_spec.rb
+- spec/server/models/pick_ticket_spec.rb
+- spec/server/models/po_line_spec.rb
+- spec/server/models/po_receipt_spec.rb
+- spec/server/models/por_line_spec.rb
+- spec/server/models/pt_line_spec.rb
+- spec/server/models/purchase_order_spec.rb
+- spec/server/models/sales_order_spec.rb
+- spec/server/models/sku_loc_spec.rb
+- spec/server/models/sku_spec.rb
+- spec/server/models/sku_tran_spec.rb
+- spec/server/models/sku_vendor_spec.rb
+- spec/server/models/so_line_spec.rb
+- spec/server/models/spec_helper_spec.rb
+- spec/server/models/uom_spec.rb
+- spec/server/models/vendor_spec.rb
+- spec/server/models/vo_line_spec.rb
+- spec/server/models/voucher_spec.rb
+- spec/server/spec_helper.rb
 - spec/skr/concerns/code_identifier_spec.rb
 - spec/skr/models/AddressSpec.coffee
 - spec/skr/models/CustomerSpec.coffee
@@ -396,6 +399,7 @@ files:
 - spec/skr/models/VoucherSpec.coffee
 - spec/skr/screens/Base.coffee
 - spec/skr/screens/CustomerMaint.coffee
+- spec/skr/screens/sales-order/SalesOrderSpec.coffee
 - spec/skr/screens/sku-maint/SkuMaintSpec.coffee
 - spec/skr/screens/vendor-maint/VendorMaintSpec.coffee
 - stockor.gemspec

data/client/skr/screens/mixins/Editing.coffee

@@ -1,32 +0,0 @@
-Skr.Screens.Mixins.Editing = {
-
-    included: (klass)->
-        klass::domEvents ||= {}
-        _.extend(klass::domEvents,{
-            'click .btn.save':  'saveRecord'
-            'click .btn.reset': 'resetRecord'
-            'display-record':   'onRecordTrigger'
-        })
-
-        klass::subviews ||= {}
-        _.extend(klass::subviews,{
-            finder: {
-                component: 'RecordFinder'
-                options: 'finderOptions'
-                model: 'model'
-            }
-        })
-
-    onRecordTrigger: (ev, model)->
-        this.model = model
-
-    resetRecord: ->
-        options = _.result(this,'finderOptions')
-        this.model = new options.modelClass
-
-    saveRecord: ->
-        Lanes.Views.SaveNotify(this, include:['billing_address','shipping_address','terms'])
-
-    initialize: ->
-        this.resetRecord()
-}

data/lib/skr/concerns/code_identifier.rb

@@ -1,43 +0,0 @@
-module Skr
-    module Concerns
-
-        # @see ClassMethods
-        module CodeIdentifier
-
-            extend ActiveSupport::Concern
-
-            # ### Code Identifier Concern
-            # This adds the {#has_code_identifier} class method
-            module ClassMethods
-
-                # A 2-10 character string that identifies an entity, such as a Customer, Vendor, or SKU.
-                # The code is often assigned by the user, but may also
-                # be auto-generated by {Skr::Strings.code_identifier}
-                #
-                # @param max_length [Integer] how long the code is allowed to be
-                # @param from [Symbol], method to call for a string to base the code upon
-                def has_code_identifier( from: nil, max_length: 10 )
-
-                    validates :code, :length=>2..max_length, :presence=>true, :uniqueness=>true
-
-                    alias_attribute :record_identifier, :code
-
-                    if from
-                        before_validation(:on=>:create) do
-                            source = self[from]
-                            unless source.blank?
-                                self.code ||= Skr::Strings.code_identifier( source, length:max_length )
-                            end
-                        end
-                    end
-
-                    before_validation do
-                        self.code = self.code.upcase unless self.code.blank?
-                    end
-                end
-
-            end
-
-        end
-    end
-end

data/spec/server/models/sales_order.rb

@@ -1,10 +0,0 @@
-require_relative 'spec_helper'
-
-describe Skr::SalesOrder do
-
-    it "can be instantiated" do
-        model = SalesOrder.new
-        model.must_be_instance_of(SalesOrder)
-    end
-
-end