spree-point-of-sale 1.0.0 → 1.0.1

data/README.md

@@ -8,44 +8,53 @@ Apply discount on items, associate the order to customer email and save the deta
 
 Dependencies
 ============
-1)spree_html_invoice(optional)
+1) spree_html_invoice (optional)
 
 By default POS relies on html-invoice to print a receipt. You can configure this away by setting :pos_printing to the url where you want to redirect after print. 
 
-2)barby
+2) barby
 
-3)prawn
+3) prawn
 
-4)chunky_png
+4) chunky_png
 
 
 SET UP
 =======
 To your Gemfile add:
 
-  1) gem "spree_pos", :git => "git://github.com/vinsol/spree-point-of-sale.git"
+Add spree-point-of-sale to your Gemfile:
 
-  2) If you DONT change the :pos_printing config as described above, you must also add 
+```ruby
+  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'
+```
 
-and run bundler.
+```ruby
+bundle install
+```
 
 Finally for migrations, css and javascript do
 
-  bundle exec rails g spree_pos:install
-
+```ruby
+bundle exec rails g spree_pos:install
+```
 
 Configure
 =========
 You must configure:
 
-1)ShippingMethod : Create a shipping method for pos and set it from the admin end via general settings. 
+1) ShippingMethod : Create a shipping method for pos and set it from the admin end via general settings. 
 Usually something like "pickup" with cost 0.
 
-2)Payment Methods : They can be added under PointOfSale payment method from admin end itself.
+2) Payment Methods : They can be added under PointOfSale payment method from admin end itself.
 
-3)Store : Make sure atleast one of your stock locations is marked as store.
+3) Store : Make sure atleast one of your stock locations is marked as store.
 
 
 Order
@@ -68,4 +77,6 @@ Barcode printing and SKU
 ========
 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.
+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

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_pos_shipping_method, :only => [:new]
+  before_filter :ensure_active_store, :ensure_pos_shipping_method, :only => [:new]
   before_filter :ensure_payment_method, :only => [:update_payment]
   before_filter :ensure_existing_user, :only => [:associate_user]
   before_filter :check_unpaid_pos_order, :only => :new
@@ -137,6 +137,10 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
     redirect_to '/', :flash => { :error => 'No shipping method available for POS orders. Please assign one.'} and return unless Spree::ShippingMethod.where(:name => SpreePos::Config[:pos_shipping]).first
   end
 
+  def ensure_active_store
+    redirect_to '/', :flash => { :error => 'No active store present. Please assign one.'} and return if Spree::StockLocation.stores.active.blank?
+  end
+
   def load_order
     @order = Spree::Order.by_number(params[:number]).includes([{ :line_items => [{ :variant => [:default_price, { :product => [:master] } ] }] } , { :adjustments => :adjustable }] ).first
     raise "No order found for -#{params[:number]}-" unless @order

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

@@ -106,10 +106,61 @@ describe Spree::Admin::PosController do
       end
     end
 
+    describe 'ensure_active_store' do
+      def send_request(params = {})
+        get :new, params.merge!(:use_route => 'spree')
+      end
+
+      context 'store does not exist' do
+        it 'redirects to root' do
+          send_request
+          response.should redirect_to('/')
+        end
+
+        it 'sets the flash message' do
+          send_request
+          flash[:error].should eq('No active store present. Please assign one.')
+        end
+      end
+
+      context 'store does exist' do
+        before do
+          @shipping_method = mock_model(Spree::ShippingMethod, :name => 'pos-shipping')
+          SpreePos::Config[:pos_shipping] = @shipping_method.name
+          @stock_location = mock_model(Spree::StockLocation)
+          @stock_location.stub(:address).and_return(address)
+          @stock_locations = [@stock_location]
+          @stock_locations.stub(:where).with(:id => @stock_location.id.to_s).and_return(@stock_locations)
+          Spree::StockLocation.stub_chain(:active, :stores).and_return(@stock_locations)
+          Spree::ShippingMethod.stub(:where).with(:name => @shipping_method.name).and_return([@shipping_method])
+        end
+
+        it 'does not redirect to root' do
+          send_request
+          response.should_not redirect_to('/')
+        end
+
+        it 'sets no error message for store' do
+          send_request
+          flash[:error].should eq("You have an unpaid/empty order. Please either complete it or update items in the same order.")
+        end
+
+        it 'renders show page' do
+          send_request
+          response.should redirect_to admin_pos_show_order_path(:number => order.number)
+        end
+      end
+    end
+
     describe 'ensure_pos_shipping_method' do
       before do
         @shipping_method = mock_model(Spree::ShippingMethod, :name => 'pos-shipping')
         SpreePos::Config[:pos_shipping] = @shipping_method.name
+        @stock_location = mock_model(Spree::StockLocation)
+        @stock_location.stub(:address).and_return(address)
+        @stock_locations = [@stock_location]
+        @stock_locations.stub(:where).with(:id => @stock_location.id.to_s).and_return(@stock_locations)
+        Spree::StockLocation.stub_chain(:active, :stores).and_return(@stock_locations)
       end
 
       def send_request(params = {})
@@ -299,6 +350,11 @@ describe Spree::Admin::PosController do
         @new_order.stub(:assign_shipment_for_pos).and_return(true)
         @new_order.stub(:associate_user!).and_return(true)
         @new_order.stub(:save!).and_return(true)
+        @stock_location = mock_model(Spree::StockLocation)
+        @stock_location.stub(:address).and_return(address)
+        @stock_locations = [@stock_location]
+        @stock_locations.stub(:where).with(:id => @stock_location.id.to_s).and_return(@stock_locations)
+        Spree::StockLocation.stub_chain(:active, :stores).and_return(@stock_locations)
       end
 
       def send_request(params = {})

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.0"
+  s.version = "1.0.1"
 
   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.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -139,7 +139,7 @@ files:
 - db/migrate/20131014053417_add_is_pos_to_spree_orders.rb
 - db/migrate/20131025110309_add_card_name_to_spree_payments.rb
 - lib/generators/spree_pos/install/install_generator.rb
-- lib/spree_pos.rb
+- lib/spree-point-of-sale.rb
 - lib/spree_pos/configuration.rb
 - lib/spree_pos/engine.rb
 - spec/constants_spec.rb