spree-point-of-sale 1.0.3 → 1.1.0

data/.gitignore

@@ -8,9 +8,9 @@ tmp
 nbproject
 *.swp
 log/
-config/initializers/spree.rb
 config/environment.rb
 config/database.yml
 app/controllers/application_controller.rb
 coverage/
-Gemfile.lock
+Gemfile.lock
+spec/dummy

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - ruby-1.9.3
+script:
+  - bundle exec rake test_app
+  - bundle exec rspec .

data/Gemfile

@@ -1,19 +1,19 @@
 source "https://rubygems.org"
-gem 'rails', '3.2.16'
+gem 'rails', '4.0.2'
 gem 'mysql2'
 
 
-gem 'spree', :git => 'git://github.com/spree/spree.git', :tag => 'v2.0.3'
-gem 'spree_html_invoice' , :git => 'git://github.com/dancinglightning/spree-html-invoice.git'
+gem 'spree', :git => 'git://github.com/spree/spree.git', :tag => 'v2.1.4'
+# gem 'spree_html_invoice' , :git => 'git://github.com/dancinglightning/spree-html-invoice.git'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', :branch => '2-0-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', :branch => '2-1-stable'
 
 gemspec
 
 group :test do
-  gem 'rspec-rails', '~> 2.10'
-  gem 'shoulda-matchers', '2.2.0'
+  gem 'rspec-rails'
+  gem 'shoulda-matchers'
   gem 'simplecov', :require => false
   gem 'database_cleaner'
   gem 'rspec-html-matchers'

data/README.md

@@ -1,4 +1,4 @@
-Spree Pos [![Code Climate](https://codeclimate.com/github/vinsol/spree-point-of-sale.png)](https://codeclimate.com/github/vinsol/spree-point-of-sale)
+Spree Pos [![Code Climate](https://codeclimate.com/github/vinsol/spree-point-of-sale.png)](https://codeclimate.com/github/vinsol/spree-point-of-sale) [![Build Status](https://travis-ci.org/vinsol/spree-point-of-sale.png?branch=master)](https://travis-ci.org/vinsol/spree-point-of-sale)
 =========
 SpreePos hooks into the Admin Tab and is meant to be used to sell at a shop.
 
@@ -28,7 +28,14 @@ Add spree-point-of-sale to your Gemfile:
 ```ruby
 gem "spree-point-of-sale", require: 'spree_pos'
 ```
-  
+
+If you're still using Spree 2.0.x, you should do this instead:
+
+```ruby
+gem "spree-point-of-sale", '1.0.3', require: 'spree_pos'
+```
+
+
 If you DONT change the :pos_printing config as described above, you must also add 
 
 ```ruby
@@ -79,4 +86,20 @@ Barcode printing relies on sku to be provided for variants.
 
 There are links provided to print barcodes for individual variants in the variants index for a product or barcodes for all variants can be printed from the product listings as well.
 
-Copyright (c) 2014 Vinsol, released under the New MIT License
+
+Testing
+---------
+Be sure to bundle your dependencies and then create a dummy test app for the specs to run against.
+```ruby
+bundle
+bundle exec rake test_app
+bundle exec rspec spec
+```
+
+
+Credits
+-------
+
+[![vinsol.com: Ruby on Rails, iOS and Android developers](http://vinsol.com/vin_logo.png "Ruby on Rails, iOS and Android developers")](http://vinsol.com)
+
+Copyright (c) 2014 [vinsol.com](http://vinsol.com "Ruby on Rails, iOS and Android developers"), released under the New MIT License

data/Rakefile

@@ -3,13 +3,13 @@ require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
-require 'spree_core/testing_support/common_rake'
+require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
 task :default => [:spec, :cucumber ]
 
-spec = eval(File.read('spree_pos.gemspec'))
+spec = eval(File.read('spree-point-of-sale.gemspec'))
 
 Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
@@ -24,6 +24,7 @@ end
 
 desc "Generates a dummy app for testing"
 task :test_app do
-  ENV['LIB_NAME'] = 'spree_pos'
+  ENV['DB'] = 'mysql'
+  ENV['LIB_NAME'] = 'spree-point-of-sale'
   Rake::Task['common:test_app'].invoke
 end

data/app/assets/javascripts/admin/spree_pos.js

@@ -1,3 +1,4 @@
+//= require jquery.ui.tabs
 $( document ).ready(function() {
   $('#sku').focus();
   $( "#pos-tabs" ).tabs();

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

@@ -8,8 +8,8 @@ require 'barby/outputter/png_outputter'
 class Spree::Admin::BarcodeController < Spree::Admin::BaseController
   include Admin::BarcodeHelper
   
-  before_filter :load, :only => [:print]
-  before_filter :load_product_and_variants, :only => [:print_variants_barcodes]
+  before_action :load, :only => [:print]
+  before_action :load_product_and_variants, :only => [:print_variants_barcodes]
   layout :false
   
   def print_variants_barcodes

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

@@ -1,5 +1,5 @@
 Spree::Admin::GeneralSettingsController.class_eval do
-  before_filter :update_pos_config, :only => :update
+  before_action :update_pos_config, :only => :update
 
   def update_pos_config
     SpreePos::Config[:pos_shipping] = params[:pos_shipping]

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

@@ -1,14 +1,14 @@
 class Spree::Admin::PosController < Spree::Admin::BaseController
-  before_filter :load_order, :ensure_pos_order, :ensure_unpaid_order, :except => [:new]
+  before_action :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
-  before_filter :ensure_payment_method, :only => [:update_payment]
-  before_filter :ensure_existing_user, :only => [:associate_user]
-  before_filter :check_unpaid_pos_order, :only => :new
-  before_filter :check_discount_request, :only => :apply_discount
-  before_filter :load_line_item, :only => [:update_line_item_quantity, :apply_discount]
-  before_filter :clean_and_reload_order, :only => [:update_stock_location]
+  before_action :load_variant, :only => [:add, :remove]
+  before_action :ensure_active_store, :ensure_pos_shipping_method
+  before_action :ensure_payment_method, :only => [:update_payment]
+  before_action :ensure_existing_user, :only => [:associate_user]
+  before_action :check_unpaid_pos_order, :only => :new
+  before_action :check_discount_request, :only => :apply_discount
+  before_action :load_line_item, :only => [:update_line_item_quantity, :apply_discount]
+  before_action :clean_and_reload_order, :only => [:update_stock_location]
   
   def new
     init_pos
@@ -17,8 +17,8 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
 
   def find
     init_search
-
-    stock_location = @order.shipment.stock_location
+    #TODO -> create one method for last_shipment in order_model as it is used in verious locations.
+    stock_location = @order.shipments.last.stock_location
     @search = Spree::Variant.includes([:product]).available_at_stock_location(stock_location.id).ransack(params[:q])
     @variants = @search.result(:distinct => true).page(params[:page]).per(PRODUCTS_PER_SEARCH_PAGE)
   end
@@ -31,7 +31,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def remove
-    line_item = @order.contents.remove(@variant, 1, @order.shipment)
+    line_item = @order.contents.remove(@variant, 1, @order.shipments.last)
     @order.assign_shipment_for_pos if @order.reload.shipments.blank?
     flash.notice = line_item.quantity.zero? ? Spree.t('product_removed') : 'Quantity Updated' 
     redirect_to admin_pos_show_order_path(:number => @order.number)
@@ -82,11 +82,12 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def update_stock_location
-    @order.shipment.stock_location = user_stock_locations(spree_current_user).where(:id => params[:stock_location_id]).first
-    if @order.shipment.save
+    @shipment = @order.shipments.last
+    @shipment.stock_location = user_stock_locations(spree_current_user).where(:id => params[:stock_location_id]).first
+    if @shipment.save
       flash[:notice] = "Updated Successfully"
     else
-      flash[:error] = @order.shipment.errors.full_messages.to_sentence
+      flash[:error] = @shipment.errors.full_messages.to_sentence
     end
     redirect_to admin_pos_show_order_path(:number => @order.number)
   end
@@ -185,7 +186,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def add_variant var , quant = 1
-    line_item = @order.contents.add(var, quant, nil, @order.shipment)
+    line_item = @order.contents.add(var, quant, nil, @order.shipments.last)
     var.product.save
     line_item
   end

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

@@ -1,6 +1,7 @@
 Spree::Admin::StockLocationsController.class_eval do
+  #TODO -> Is this method different from resource_controller update action ?
   def update
-    if @stock_location.update_attributes(params[:stock_location])
+    if @stock_location.update_attributes(permitted_resource_params)
       flash[:success] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }

data/app/models/spree/order_decorator.rb

@@ -1,13 +1,13 @@
 Spree::Order.class_eval do
-  attr_accessible :state, :is_pos, :completed_at, :payment_state
+  # attr_accessible :state, :is_pos, :completed_at, :payment_state
 
-  scope :pos, where(:is_pos => true)
-  scope :unpaid, where("payment_state != 'paid'")
+  scope :pos, -> { where(:is_pos => true) }
+  scope :unpaid, -> { where("payment_state != 'paid'") }
   scope :unpaid_pos_order, ->{ pos.unpaid }
 
   def clean!
     payments.delete_all
-    line_items.each { |line_item| contents.remove(line_item.variant, line_item.quantity, shipment) }
+    line_items.each { |line_item| contents.remove(line_item.variant, line_item.quantity, shipments.last) }
     #shipment is removed on removing all items, so initializing a new shipment
     assign_shipment_for_pos
   end

data/app/models/spree/payment_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Payment.class_eval do
-  attr_accessible :card_name
+  # attr_accessible :card_name
   validates :payment_method, :presence => true, :if => ["order.is_pos?"]
   validates :card_name, :presence => true, :if => [:payment_method, "order.is_pos? && payment_method.name.scan(/card/i).present?"]
   validate :no_card_name, :if => [:payment_method, "payment_method.name.scan(/card/i).blank?"]

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

@@ -3,7 +3,7 @@ module Spree
     class PosAvailabilityValidator < ActiveModel::Validator
       def validate(line_item)
         variant = line_item.variant
-        stock_location = line_item.order.shipment.try(:stock_location)
+        stock_location = line_item.order.shipments.last.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'

data/app/models/spree/stock_location_decorator.rb

@@ -1,12 +1,12 @@
 module Spree
   StockLocation.class_eval do
-    attr_accessible :store
+    # attr_accessible :store
     belongs_to :address
 
     before_validation :associate_address
 
-    scope :stores, where(:store => true)
-    scope :not_store, where('store != ?', true)
+    scope :stores, -> { where(:store => true) }
+    scope :not_store, -> { where('store != ?', true) }
 
     validates_associated :address
 

data/app/overrides/pos_tab.rb

@@ -1,6 +1,6 @@
-Deface::Override.new(:virtual_path => "spree/layouts/admin",
+Deface::Override.new(:virtual_path => "spree/admin/shared/_menu",
                      :name => "Add Pos tab to menu",
-                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :insert_bottom => "[data-hook='admin_tabs']",
                      :text => " <%= tab( :pos , :url => admin_pos_path) %>",
                      :sequence => {:after => "promo_admin_tabs"},
                      :disabled => false)

data/app/views/spree/admin/pos/show.html.erb

@@ -6,7 +6,7 @@
       <legend>Change Stock Location</legend>
       <%= form_tag "/admin/pos/update_stock_location/#{@order.number}", :class => 'modify_stock_location_form' do %>
       <% user_stock_locations(spree_current_user).all.each do |stock_location| %>
-      <%= radio_button_tag :stock_location_id, stock_location.id, (stock_location.id == @order.shipment.stock_location.id), :id => "stock_location_#{ stock_location.id }", :class => 'stock_location_checkbox' %><%= stock_location.name %><br />
+      <%= radio_button_tag :stock_location_id, stock_location.id, (stock_location.id == @order.shipments.last.stock_location.id), :id => "stock_location_#{ stock_location.id }", :class => 'stock_location_checkbox' %><%= stock_location.name %><br />
       <% end %>
       <br />
       <%= submit_tag 'Update', :confirm => 'The Order will be cleaned. Are you sure?' %>

data/app/views/spree/admin/pos/update_stock_location.js.erb

@@ -1,4 +1,4 @@
-<% if @order.shipment.errors.full_messages.present? %>
+<% if @shipment.errors.full_messages.present? %>
   alert('Stock Location is not updated.');
 <% else %>
   alert('Stock Location is updated.');

data/config/initializers/spree.rb

@@ -0,0 +1,3 @@
+module Spree
+  extend ActionView::Helpers::TagHelper
+end

data/config/routes.rb

@@ -1,21 +1,19 @@
-Spree::Core::Engine.routes.prepend do
-  namespace :admin do
-    match "barcode/print_variants_barcodes/:id" => "barcode#print_variants_barcodes"
-    match "barcode/print/:id" => "barcode#print"
+Spree::Core::Engine.routes.draw do
+  get "admin/barcode/print_variants_barcodes/:id", to: "admin/barcode#print_variants_barcodes"
+  get "admin/barcode/print/:id", to: "admin/barcode#print"
 
-    match "pos/new" => "pos#new"
-    match "pos/show/:number" => "pos#show", :as => :pos_show_order
-    match "pos/clean/:number" => "pos#clean_order", :as => :pos_clean_order
-    match "pos/find/:number" => "pos#find"
-    match "pos/add/:number/:item" => "pos#add"
-    match "pos/remove/:number/:item" => "pos#remove"
-    match "pos/associate_user/:number" => "pos#associate_user"
-    match "pos/update_payment/:number" => "pos#update_payment"
-    match "pos/update_line_item_quantity/:number" => "pos#update_line_item_quantity" 
-    match "pos/apply_discount/:number" => "pos#apply_discount" 
+  get "admin/pos/new" , to: "admin/pos#new"
+  get "admin/pos/show/:number" , to: "admin/pos#show", as: :admin_pos_show_order
+  post "admin/pos/clean/:number" , to: "admin/pos#clean_order", as: :admin_pos_clean_order
+  get "admin/pos/find/:number" , to: "admin/pos#find"
+  get "admin/pos/add/:number/:item" , to: "admin/pos#add"
+  get "admin/pos/remove/:number/:item" , to: "admin/pos#remove"
+  post "admin/pos/associate_user/:number" , to: "admin/pos#associate_user"
+  post "admin/pos/update_payment/:number" , to: "admin/pos#update_payment"
+  post "admin/pos/update_line_item_quantity/:number" , to: "admin/pos#update_line_item_quantity" 
+  post "admin/pos/apply_discount/:number" , to: "admin/pos#apply_discount" 
 
-    match "pos/index" => "pos#new"
-    match "pos/update_stock_location/:number" => "pos#update_stock_location"
-    get "pos" , :to => "pos#new"
-  end
+  get "admin/pos/index" , to: "admin/pos#new"
+  post "admin/pos/update_stock_location/:number" , to: "admin/pos#update_stock_location"
+  get "admin/pos" , to: "admin/pos#new"
 end

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

@@ -503,7 +503,7 @@ describe Spree::Admin::PosController do
         @orders.stub(:includes).with([{ :line_items => [{ :variant => [:default_price, { :product => [:master] } ] }] } , { :adjustments => :adjustable }]).and_return(@orders)
         @stock_location = mock_model(Spree::StockLocation)
         @shipment = mock_model(Spree::Shipment)
-        order.stub(:shipment).and_return(@shipment)
+        order.stub(:shipments).and_return([@shipment])
         @shipment.stub(:stock_location).and_return(@stock_location)
         @variants = [variant]
         @variants.stub(:result).with(:distinct => true).and_return(@variants)
@@ -519,7 +519,7 @@ describe Spree::Admin::PosController do
       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 { order.should_receive(:shipments).and_return([@shipment]) }
       it { @shipment.should_receive(:stock_location).and_return(@stock_location) }
       it { Spree::Variant.should_receive(:ransack).with({"product_name_cont"=>"test-product", "meta_sort"=>"product_name asc", "deleted_at_null"=>"1", "product_deleted_at_null"=>"1", "published_at_not_null"=>"1"}).and_return(@variants) }    
       it { @variants.should_receive(:result).with(:distinct => true).and_return(@variants) }
@@ -563,7 +563,7 @@ describe Spree::Admin::PosController do
         Spree::Variant.stub(:where).with(:id => variant.id.to_s).and_return([variant])
         @order_contents = double(Spree::OrderContents)
         @shipment = mock_model(Spree::Shipment)
-        order.stub(:shipment).and_return(@shipment)
+        order.stub(:shipments).and_return([@shipment])
         order.stub(:contents).and_return(@order_contents)
         @order_contents.stub(:add).with(variant, 1, nil, @shipment).and_return(line_item)
       end
@@ -629,7 +629,6 @@ describe Spree::Admin::PosController do
         Spree::Variant.stub(:where).with(:id => variant.id.to_s).and_return([variant])
         @order_contents = double(Spree::OrderContents)
         @shipment = mock_model(Spree::Shipment)
-        order.stub(:shipment).and_return(@shipment)
         order.stub(:shipments).and_return([@shipment])
         order.stub(:assign_shipment_for_pos).and_return(true)
         order.stub(:contents).and_return(@order_contents)
@@ -669,15 +668,15 @@ describe Spree::Admin::PosController do
         end
       end
 
-      context 'shipment is destroyed on empty order' do
+      context 'shipment is not destroyed on empty order' do
         it 'assigns shipment' do
           order.should_not_receive(:assign_shipment_for_pos)
           send_request(:number => order.number, :item => variant.id)
         end
       end
 
-      context 'shipment exists after remove' do
-        before { order.stub(:shipments).and_return([]) }
+      context 'shipment destroyed after remove' do
+        before { order.stub_chain(:shipments, :blank?).and_return(true) }
 
         it 'assigns shipment' do
           order.should_receive(:assign_shipment_for_pos).and_return(true)
@@ -875,7 +874,7 @@ describe Spree::Admin::PosController do
         @shipment.stub(:stock_location=).with(@stock_location).and_return(@stock_location)
         @shipment.stub(:stock_location).and_return(@stock_location)
 
-        order.stub(:shipment).and_return(@shipment)
+        order.stub(:shipments).and_return([@shipment])
         order.stub(:save).and_return(true)
         @shipment.stub(:save).and_return(true)
       end
@@ -884,7 +883,7 @@ describe Spree::Admin::PosController do
         it { order.should_receive(:clean!).and_return(true) }
         it { controller.should_receive(:load_order).twice.and_return(true) }
         it { @shipment.should_receive(:stock_location=).with(@stock_location).and_return(@stock_location) }
-        it { order.should_receive(:shipment).and_return(@shipment) }
+        it { order.should_receive(:shipments).and_return([@shipment]) }
         it { @shipment.should_receive(:save).and_return(true) }
         it { controller.should_receive(:ensure_pos_shipping_method).and_return(true) }
         it { controller.should_receive(:ensure_active_store).and_return(true) }

data/spec/models/spree/order_decorator_spec.rb

@@ -6,10 +6,6 @@ describe Spree::Order 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") }
- 
-  [:state, :is_pos, :completed_at, :payment_state].each do |attribute|
-    it { should allow_mass_assignment_of attribute }
-  end
 
   before do
     @order = Spree::Order.create!(:is_pos => true)
@@ -29,7 +25,8 @@ describe Spree::Order do
 
   context 'scopes' do
     before :each do
-      @paid_order = Spree::Order.create!(:total => 100)
+      @paid_order = Spree::Order.create!
+      @paid_order.update_column(:total,100)
       @paid_order.update_column(:payment_state,'paid')
       @unpaid_pos_order = Spree::Order.create!(:is_pos => true, :payment_state => 'checkout')
       @paid_pos_order = Spree::Order.create!(:is_pos => true, :payment_state => 'paid')

data/spec/models/spree/payment_decorator_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Spree::Payment do
-  it { should allow_mass_assignment_of :card_name }
-
   let(:payment_method) { Spree::PaymentMethod.create!(:name => 'test-method') }
   let(:card_payment_method) { Spree::PaymentMethod.create!(:name => 'card-payment')}
   let(:order) { Spree::Order.create! }

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

@@ -4,20 +4,22 @@ 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") }
-  
+  let(:shipping_category) { Spree::ShippingCategory.create!(:name => 'test-shipping') }
+
   before do
     @order = Spree::Order.create!(:is_pos => true)
-    @product = Spree::Product.create!(:name => 'test-product', :price => 10)
+    @product = Spree::Product.create!(:name => 'test-product', :price => 10, :shipping_category => shipping_category)
     @variant = @product.master
-    @line_item = @order.line_items.build(:variant_id => @variant.id, :price => @product.price, :quantity => 3)
+    @line_item = @order.line_items.build(:variant_id => @variant.id, :quantity => 3)
+    @line_item.price = @product.price
     @shipment = @order.shipments.create!
     @line_item.stub(:order).and_return(@order)
-    @order.stub(:shipment).and_return(@shipment)
+    @order.stub(:shipments).and_return([@shipment])
   end
 
   describe 'ensures stock location' do
     it 'presence' do
-      @line_item.order.shipment.stock_location.should be_nil
+      @line_item.order.shipments.last.stock_location.should be_nil
       @line_item.save
       @line_item.errors[:stock_location].should eq(['No Active Store Associated'])
     end

data/spec/models/spree/stock_location_decorator_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Spree::StockLocation do
-  it { should allow_mass_assignment_of :store }
   it { should belong_to :address }
 
   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") }
   let(:stock_location) { Spree::StockLocation.create!(:name => 'stock', :address1 => "home", :address2 => "town", :city => "delhi", :zipcode => "110034", :country_id => country.id, :state_id => state.id, :phone => "07777676767") }
-    
+  let(:shipping_category) { Spree::ShippingCategory.create!(:name => 'test-shipping') }
+  
   context 'scopes' do
     it 'stores' do
       Spree::StockLocation.stores.should include(store)
@@ -43,7 +43,7 @@ describe Spree::StockLocation do
 
   describe '#can_supply?' do
     before do
-      @product = Spree::Product.create!(:name => 'test-product', :price => 10)
+      @product = Spree::Product.create!(:name => 'test-product', :price => 10, :shipping_category => shipping_category)
       @variant = @product.master
       @stock_item = store.stock_items.where(:variant_id => @variant.id).first
       @stock_item.update_column(:count_on_hand, 2)

data/spec/models/spree/user_decorator_spec.rb

@@ -4,12 +4,13 @@ describe Spree::User do
   let(:user) { Spree::User.create!(:email => 'test-user@pos.com', :password => 'testuser') }
   describe 'unpaid_pos_orders' do
     before do
-      @paid_order = user.orders.create!(:total => 100)
+      @paid_order = user.orders.create!
+      @paid_order.update_column(:total,100)
       @paid_order.update_column(:payment_state,'paid')
-      @unpaid_pos_order = user.orders.create!(:user_id => user.id, :is_pos => true, :payment_state => 'checkout')
-      @paid_pos_order = user.orders.create!(:user_id => user.id, :is_pos => true, :payment_state => 'paid')
+      @unpaid_pos_order = user.orders.create!(:is_pos => true, :payment_state => 'checkout')
+      @paid_pos_order = user.orders.create!(:is_pos => true, :payment_state => 'paid')
       @paid_pos_order.update_column(:payment_state,'paid')    
-      @unpaid_order = user.orders.create!(:user_id => user.id, :payment_state => 'checkout')
+      @unpaid_order = user.orders.create!(:payment_state => 'checkout')
     end
 
     it { user.unpaid_pos_orders.should eq([@unpaid_pos_order]) }

data/spec/models/spree/{varaint_decorator_spec.rb → variant_decorator_spec.rb}

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Spree::Variant do
   let(:shipping_category) { Spree::ShippingCategory.create!(:name => 'test-shipping') }
-  let(:product) { Spree::Product.create!( :name => 'new_product', :price => 10, :published_at => 'Fri, 19 Jul 2013 08:11:06 UTC +00:00', :available_on => 'Fri, 19 Jul 2013 08:11:06 UTC +00:00', :shipping_category_id => shipping_category.id ) }
+  let(:product) { Spree::Product.create!( :name => 'new_product', :price => 10, :available_on => 'Fri, 19 Jul 2013 08:11:06 UTC +00:00', :shipping_category_id => shipping_category.id ) }
 
   describe 'scopes' do
     describe 'available_at_stock_location' do
       before do
-        @variant = product.variants.create!(:sku => "M12343", :published_at => Time.current)
-        @unavailable_variant = product.variants.create!(:sku => "M12344", :published_at => Time.current)
+        @variant = product.variants.create!(:sku => "M12343")
+        @unavailable_variant = product.variants.create!(:sku => "M12344")
   
         @stock_location1 = Spree::StockLocation.create!(:name => 'test_location')
         @stock_location2 = Spree::StockLocation.create!(:name => 'test_location')

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 # require 'rspec/autorun'
 

data/spree-point-of-sale.gemspec

@@ -3,28 +3,28 @@
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = "spree-point-of-sale"
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
-  s.authors = ["Torsten R, Nishant Tuteja, Manish Kangia"]
+  s.author = ["Torsten R, Nishant Tuteja, Manish Kangia"]
 
 
   s.email     = 'info@vinsol.com'
   s.homepage  = 'http://vinsol.com'  
+  s.license   = 'MIT'
 
   s.files     = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.require_paths = ["lib"]
+  s.require_path = ["lib"]
   s.required_ruby_version = ">= 1.9.3"
 
-  s.requirements = ["none"]
+  s.requirements << "none"
   s.rubygems_version = "2.0.3"
 
   s.summary = "Point of sale screen for Spree"
   s.description = "Extend functionality for spree to give shop like ordering ability through admin end"
 
 
-  s.add_dependency('spree_core', '~> 2.0.0')
+  s.add_dependency('spree_core', '~> 2.1.0')
   s.add_dependency('barby', '>= 0')
   s.add_dependency('prawn', '>=0')
   s.add_dependency('chunky_png', '>=0')

metadata

@@ -1,88 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spree-point-of-sale
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Torsten R, Nishant Tuteja, Manish Kangia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-03-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: barby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: barby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: prawn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: prawn
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chunky_png
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: chunky_png
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Extend functionality for spree to give shop like ordering ability through
-  admin end
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+description: Extend functionality for spree to give shop like ordering ability through admin end
 email: info@vinsol.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -132,6 +136,7 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/initializers/constants.rb
+- config/initializers/spree.rb
 - config/locales/codes-fi.yml
 - config/locales/en.yml
 - config/locales/fi.yml
@@ -156,32 +161,43 @@ files:
 - 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
+- spec/models/spree/variant_decorator_spec.rb
 - spec/spec_helper.rb
 - spree-point-of-sale.gemspec
 homepage: http://vinsol.com
-licenses: []
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+- - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 9
+      - 3
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Point of sale screen for Spree
 test_files: []
+