spree-point-of-sale 1.0.2 → 1.0.3

data/README.md

@@ -1,5 +1,5 @@
-SpreePos
-===============
+Spree Pos [![Code Climate](https://codeclimate.com/github/vinsol/spree-point-of-sale.png)](https://codeclimate.com/github/vinsol/spree-point-of-sale)
+=========
 SpreePos hooks into the Admin Tab and is meant to be used to sell at a shop.
 
 Allows you to search and add items available at the selected stock location. 
@@ -26,13 +26,13 @@ To your Gemfile add:
 Add spree-point-of-sale to your Gemfile:
 
 ```ruby
-  gem "spree-point-of-sale", require: 'spree_pos'
+gem "spree-point-of-sale", require: 'spree_pos'
 ```
   
 If you DONT change the :pos_printing config as described above, you must also add 
 
 ```ruby
-  gem 'spree_html_invoice' , :git => 'git://github.com/dancinglightning/spree-html-invoice.git'
+gem 'spree_html_invoice' , :git => 'git://github.com/dancinglightning/spree-html-invoice.git'
 ```
 
 ```ruby

data/app/controllers/spree/admin/pos_controller.rb

@@ -2,7 +2,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   before_filter :load_order, :ensure_pos_order, :ensure_unpaid_order, :except => [:new]
   helper_method :user_stock_locations
   before_filter :load_variant, :only => [:add, :remove]
-  before_filter :ensure_active_store, :ensure_pos_shipping_method, :only => [:new]
+  before_filter :ensure_active_store, :ensure_pos_shipping_method
   before_filter :ensure_payment_method, :only => [:update_payment]
   before_filter :ensure_existing_user, :only => [:associate_user]
   before_filter :check_unpaid_pos_order, :only => :new
@@ -49,6 +49,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   def apply_discount
     @item.price = @item.variant.price * ( 1.0 - @discount/100.0 )
     @item.save
+    flash[:error] = @item.errors.full_messages.to_sentence if @item.errors.present?
     redirect_to admin_pos_show_order_path(:number => @order.number)
   end
 

data/app/models/spree/line_item_decorator.rb

@@ -0,0 +1,9 @@
+Spree::LineItem.class_eval do
+  validates_with Spree::Stock::PosAvailabilityValidator, :if => "order.is_pos?"
+
+  #remove the validation of Spree::Stock::Avilability and then re assign it to be for only non-pos orders
+  _validators[nil].reject! { |v| v.class == Spree::Stock::AvailabilityValidator }
+  _validate_callbacks.reject! { |c| c.raw_filter.class == Spree::Stock::AvailabilityValidator }
+
+  validates_with Spree::Stock::AvailabilityValidator, :unless => "order.is_pos?"
+end

data/app/models/spree/stock/pos_availability_validator.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Stock
+    class PosAvailabilityValidator < ActiveModel::Validator
+      def validate(line_item)
+        variant = line_item.variant
+        stock_location = line_item.order.shipment.try(:stock_location)
+        quantity_required = line_item.quantity - line_item.quantity_was.to_i
+        if !stock_location || !stock_location.active? || !stock_location.store?
+          line_item.errors[:stock_location] << 'No Active Store Associated'
+        elsif !stock_location.can_supply?(quantity_required, variant)
+          line_item.errors[:quantity] << 'Adding More Than Available'
+        end
+      end
+    end
+  end
+end

data/app/models/spree/stock_location_decorator.rb

@@ -10,6 +10,11 @@ module Spree
 
     validates_associated :address
 
+    def can_supply?(quantity, variant)
+      stock_item = stock_items.where(:variant_id => variant.id).first
+      quantity <= stock_item.count_on_hand
+    end
+
     private
       def associate_address
         self.address = Spree::Address.where(:firstname => name, :lastname => '(Store)', :state_id => state_id, :country_id => country_id, :address1 => address1, :address2 => address2, :phone => phone, :zipcode => zipcode, :city => city).first_or_initialize if respond_to?(:state_id) && store?

data/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "spree_pos"
+require "spree-point-of-sale"
 
 module SpreePointOfSale
   class Application < Rails::Application

data/spec/controllers/spree/admin/pos_controller_spec.rb

@@ -31,6 +31,8 @@ describe Spree::Admin::PosController do
 
   context 'before filters' do
     before do
+      controller.stub(:ensure_pos_shipping_method).and_return(true)
+      controller.stub(:ensure_active_store).and_return(true)
       @orders = [order]
       Spree::Order.stub(:by_number).with(order.number).and_return(@orders)
       @orders.stub(:includes).with([{ :line_items => [{ :variant => [:default_price, { :product => [:master] } ] }] } , { :adjustments => :adjustable }]).and_return(@orders)
@@ -107,6 +109,7 @@ describe Spree::Admin::PosController do
     end
 
     describe 'ensure_active_store' do
+      before { controller.unstub(:ensure_active_store) }
       def send_request(params = {})
         get :new, params.merge!(:use_route => 'spree')
       end
@@ -154,6 +157,7 @@ describe Spree::Admin::PosController do
 
     describe 'ensure_pos_shipping_method' do
       before do
+        controller.unstub(:ensure_pos_shipping_method)
         @shipping_method = mock_model(Spree::ShippingMethod, :name => 'pos-shipping')
         SpreePos::Config[:pos_shipping] = @shipping_method.name
         @stock_location = mock_model(Spree::StockLocation)
@@ -335,7 +339,7 @@ describe Spree::Admin::PosController do
   context 'actions' do
     before do
       controller.stub(:ensure_pos_shipping_method).and_return(true)
-      controller.stub(:ensure_payment_method).and_return(true)
+      controller.stub(:ensure_active_store).and_return(true)
       Spree::StockLocation.stub_chain(:active,:stores,:first,:address).and_return(address)
       controller.instance_variable_set(:@order,order)
       controller.stub(:check_valid_order).and_return(true)
@@ -362,6 +366,7 @@ describe Spree::Admin::PosController do
       end
 
       context 'before filters' do
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         it { controller.should_not_receive(:check_valid_order) }
@@ -428,7 +433,8 @@ describe Spree::Admin::PosController do
       context 'update_line_item_quantity' do
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         it { order.should_receive(:line_items).and_return(@line_items) }
         it { line_item.should_receive(:quantity=).with('2').and_return(true) }
@@ -473,6 +479,12 @@ describe Spree::Admin::PosController do
         line_item.stub(:price=).with(18.0).and_return(true)
       end
 
+      it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
+      it { controller.should_receive(:ensure_pos_order).and_return(true) }
+      it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+      it { controller.should_receive(:ensure_active_store).and_return(true) }
+      it { controller.should_not_receive(:ensure_payment_method) }
+
       it { order.should_receive(:line_items).and_return(@line_items) }
       it { line_item.should_receive(:variant).and_return(variant) }
       it { line_item.should_receive(:save).and_return(true) }
@@ -504,7 +516,8 @@ describe Spree::Admin::PosController do
       
       it { controller.should_receive(:ensure_pos_order).and_return(true) }      
       it { controller.should_receive(:ensure_unpaid_order).and_return(true) }      
-      it { controller.should_not_receive(:ensure_pos_shipping_method) }
+      it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+      it { controller.should_receive(:ensure_active_store).and_return(true) }
       it { controller.should_not_receive(:ensure_payment_method) }
       it { order.should_receive(:shipment).and_return(@shipment) }
       it { @shipment.should_receive(:stock_location).and_return(@stock_location) }
@@ -562,7 +575,8 @@ describe Spree::Admin::PosController do
       describe 'adds to order' do
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         
         it { order.should_receive(:contents).and_return(@order_contents) }
@@ -630,7 +644,8 @@ describe Spree::Admin::PosController do
       describe 'removes from order' do
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         
         it { order.should_receive(:contents).and_return(@order_contents) }
@@ -691,7 +706,8 @@ describe Spree::Admin::PosController do
       context 'before filters' do
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         after { send_request({:number => order.number}) }
       end
@@ -728,7 +744,8 @@ describe Spree::Admin::PosController do
       context 'before filters' do
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         after { send_request(:number => order.number, :new_email =>'test-user@pos.com') }
       end
@@ -790,7 +807,8 @@ describe Spree::Admin::PosController do
       end
 
       context 'before filters' do
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
         it { controller.should_receive(:ensure_payment_method).and_return(true) }
         it { controller.should_receive(:ensure_pos_order).and_return(true) }
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
@@ -868,7 +886,8 @@ describe Spree::Admin::PosController do
         it { @shipment.should_receive(:stock_location=).with(@stock_location).and_return(@stock_location) }
         it { order.should_receive(:shipment).and_return(@shipment) }
         it { @shipment.should_receive(:save).and_return(true) }
-        it { controller.should_not_receive(:ensure_pos_shipping_method) }
+        it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
+        it { controller.should_receive(:ensure_active_store).and_return(true) }
         it { controller.should_not_receive(:ensure_payment_method) }
         it { controller.should_receive(:ensure_unpaid_order).and_return(true) }
         it { controller.should_receive(:ensure_pos_order).and_return(true) }

data/spec/models/spree/line_item_decorator_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Spree::LineItem do
+  describe 'validations' do
+    it 'validates through Spree::Stock::PosAvailabilityValidator for pos orders' do
+      subject._validators[nil].select do |validator|
+        validator.class == Spree::Stock::PosAvailabilityValidator && validator.options[:if] == "order.is_pos?"
+      end.should_not be_blank
+    end
+
+    it 'removes validation through Spree::Stock::AvailabilityValidator' do
+      subject._validators[nil].select do |validator|
+        validator.class == Spree::Stock::AvailabilityValidator && validator.options.blank?
+      end.should be_blank
+    end
+
+    it 'removes callback for Spree::Stock::AvailabilityValidator' do
+      subject._validate_callbacks.select do |callback|
+        callback.raw_filter.class == Spree::Stock::AvailabilityValidator && callback.options.blank?
+      end.should be_blank
+    end
+
+    it 'validates through Spree::Stock::AvailabilityValidator for non pos orders' do
+      subject._validators[nil].select do |validator|
+        validator.class == Spree::Stock::AvailabilityValidator && validator.options[:unless] == "order.is_pos?"
+      end.should_not be_blank
+    end
+  end
+end

data/spec/models/spree/stock/pos_availability_validator_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Spree::Stock::PosAvailabilityValidator do
+  let(:country) { Spree::Country.create!(:name => 'mk_country', :iso_name => "mk") }
+  let(:state) { country.states.create!(:name => 'mk_state') }
+  let(:store) { Spree::StockLocation.create!(:name => 'store', :store => true, :address1 => "home", :address2 => "town", :city => "delhi", :zipcode => "110034", :country_id => country.id, :state_id => state.id, :phone => "07777676767") }
+  
+  before do
+    @order = Spree::Order.create!(:is_pos => true)
+    @product = Spree::Product.create!(:name => 'test-product', :price => 10)
+    @variant = @product.master
+    @line_item = @order.line_items.build(:variant_id => @variant.id, :price => @product.price, :quantity => 3)
+    @shipment = @order.shipments.create!
+    @line_item.stub(:order).and_return(@order)
+    @order.stub(:shipment).and_return(@shipment)
+  end
+
+  describe 'ensures stock location' do
+    it 'presence' do
+      @line_item.order.shipment.stock_location.should be_nil
+      @line_item.save
+      @line_item.errors[:stock_location].should eq(['No Active Store Associated'])
+    end
+
+    it 'as active' do
+      store.update_attributes(:active => false, :store => true)
+      @shipment.stub(:stock_location).and_return(store)
+      @line_item.save
+      @line_item.errors[:stock_location].should eq(['No Active Store Associated'])
+    end
+
+    it 'as store' do
+      store.update_attributes(:active => true, :store => false)
+      @shipment.stub(:stock_location).and_return(store)
+      @line_item.save
+      @line_item.errors[:stock_location].should eq(['No Active Store Associated'])
+    end
+
+    it 'as store' do
+      store.update_attributes(:active => true, :store => true)
+      @shipment.stub(:stock_location).and_return(store)
+      @line_item.save
+      @line_item.errors[:stock_location].should be_blank
+    end
+  end
+
+  describe 'checks for supply' do
+    before do
+      store.update_attributes(:active => true, :store => true)
+      @shipment.stub(:stock_location).and_return(store)
+    end
+
+    it 'adds error if cant supply' do
+      @line_item.save
+      @line_item.errors[:quantity].should eq(['Adding More Than Available'])
+    end
+
+    it 'no error if can supply' do
+      store.stock_items.update_all(:count_on_hand => 4)
+      @line_item.save!
+      @line_item.errors[:quantity].should be_blank
+    end
+
+    it 'finds out quantity difference' do
+      @line_item.should_receive(:quantity_was).and_return(nil)
+      @line_item.save
+    end
+  end
+end 

data/spec/models/spree/stock_location_decorator_spec.rb

@@ -40,4 +40,17 @@ describe Spree::StockLocation do
       it { @invalid_store.errors[:address].should eq(['is invalid']) }
     end
   end
+
+  describe '#can_supply?' do
+    before do
+      @product = Spree::Product.create!(:name => 'test-product', :price => 10)
+      @variant = @product.master
+      @stock_item = store.stock_items.where(:variant_id => @variant.id).first
+      @stock_item.update_column(:count_on_hand, 2)
+    end
+
+    it { store.can_supply?(1,@variant).should be_true }
+    it { store.can_supply?(2,@variant).should be_true }
+    it { store.can_supply?(3,@variant).should be_false }
+  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'rspec/rails'
 
 require 'rubygems'
 require 'bundler/setup'
-require 'spree_pos'
+require 'spree-point-of-sale'
 require 'database_cleaner'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/spree-point-of-sale.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = "spree-point-of-sale"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.authors = ["Torsten R, Nishant Tuteja, Manish Kangia"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree-point-of-sale
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -100,11 +100,13 @@ files:
 - app/controllers/spree/admin/pos_controller.rb
 - app/controllers/spree/admin/stock_locations_controller_decorator.rb
 - app/helpers/admin/barcode_helper.rb
+- app/models/spree/line_item_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/payment_decorator.rb
 - app/models/spree/payment_method/point_of_sale.rb
 - app/models/spree/shipment_decorator.rb
 - app/models/spree/stock/coordinator_decorator.rb
+- app/models/spree/stock/pos_availability_validator.rb
 - app/models/spree/stock_location_decorator.rb
 - app/models/spree/user_decorator.rb
 - app/models/spree/variant_decorator.rb
@@ -145,11 +147,13 @@ files:
 - spec/constants_spec.rb
 - spec/controllers/spree/admin/barcode_controller_spec.rb
 - spec/controllers/spree/admin/pos_controller_spec.rb
+- spec/models/spree/line_item_decorator_spec.rb
 - spec/models/spree/order_decorator_spec.rb
 - spec/models/spree/payment_decorator_spec.rb
 - spec/models/spree/payment_method/point_of_sale_spec.rb
 - spec/models/spree/shipment_decorator_spec.rb
 - spec/models/spree/stock/coordinator_spec.rb
+- spec/models/spree/stock/pos_availability_validator_spec.rb
 - spec/models/spree/stock_location_decorator_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/models/spree/varaint_decorator_spec.rb