spree-point-of-sale 1.1.0 → 1.1.1

data/Gemfile

@@ -1,13 +1,13 @@
 source "https://rubygems.org"
-gem 'rails', '4.0.2'
+gem 'rails', '4.0.3'
 gem 'mysql2'
 
 
-gem 'spree', :git => 'git://github.com/spree/spree.git', :tag => 'v2.1.4'
+gem 'spree', '> 2.1' #, :git => 'https://github.com/spree/spree.git', :tag => 'v2.2.0'
 # 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-1-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
 
 gemspec
 

data/README.md

@@ -29,17 +29,22 @@ Add spree-point-of-sale to your Gemfile:
 gem "spree-point-of-sale", require: 'spree_pos'
 ```
 
-If you're still using Spree 2.0.x, you should do this instead:
+For specific spree versions:
 
 ```ruby
+#Spree 2.0.x
 gem "spree-point-of-sale", '1.0.3', require: 'spree_pos'
 ```
 
+```ruby
+#Spree 2.1.x
+gem "spree-point-of-sale", '1.1.1', 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/vinsol/spree-html-invoice.git', tag: '1.2'
 ```
 
 ```ruby

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

@@ -17,8 +17,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
 
   def find
     init_search
-    #TODO -> create one method for last_shipment in order_model as it is used in verious locations.
-    stock_location = @order.shipments.last.stock_location
+    stock_location = @order.pos_shipment.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,8 +30,8 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def remove
-    line_item = @order.contents.remove(@variant, 1, @order.shipments.last)
-    @order.assign_shipment_for_pos if @order.reload.shipments.blank?
+    line_item = @order.contents.remove(@variant, 1, @order.pos_shipment)
+    @order.assign_shipment_for_pos if @order.reload.pos_shipment.blank?
     flash.notice = line_item.quantity.zero? ? Spree.t('product_removed') : 'Quantity Updated' 
     redirect_to admin_pos_show_order_path(:number => @order.number)
   end
@@ -82,7 +81,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def update_stock_location
-    @shipment = @order.shipments.last
+    @shipment = @order.pos_shipment
     @shipment.stock_location = user_stock_locations(spree_current_user).where(:id => params[:stock_location_id]).first
     if @shipment.save
       flash[:notice] = "Updated Successfully"
@@ -186,7 +185,7 @@ class Spree::Admin::PosController < Spree::Admin::BaseController
   end
 
   def add_variant var , quant = 1
-    line_item = @order.contents.add(var, quant, nil, @order.shipments.last)
+    line_item = @order.contents.add(var, quant, nil, @order.pos_shipment)
     var.product.save
     line_item
   end

data/app/models/spree/order_decorator.rb

@@ -7,7 +7,7 @@ Spree::Order.class_eval do
 
   def clean!
     payments.delete_all
-    line_items.each { |line_item| contents.remove(line_item.variant, line_item.quantity, shipments.last) }
+    line_items.each { |line_item| contents.remove(line_item.variant, line_item.quantity, pos_shipment) }
     #shipment is removed on removing all items, so initializing a new shipment
     assign_shipment_for_pos
   end
@@ -35,4 +35,8 @@ Spree::Order.class_eval do
     self.email = new_user_email if associate_with_user.valid?
     associate_with_user
   end
+
+  def pos_shipment
+    shipments.last
+  end
 end

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.shipments.last.try(:stock_location)
+        stock_location = line_item.order.pos_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'

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

@@ -39,7 +39,7 @@ No Result Found
 <% end %>
 <% content_for :sidebar do %>
   <div>
-    <%= button_to "Back To Order", admin_pos_show_order_path(:number => @order.number) %>
+    <%= button_to "Back To Order", admin_pos_show_order_path(:number => @order.number), method: :get %>
   </div>
   <%= search_form_for   @search , :url => "/admin/pos/find/#{@order.number}/" do |f| %>
     <div class="box">

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.shipments.last.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.pos_shipment.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/lib/generators/spree_pos/install/install_generator.rb

@@ -3,11 +3,11 @@ module SpreePos
     class InstallGenerator < Rails::Generators::Base
       
       def add_javascripts
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_pos\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require admin/spree_pos\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_pos\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require admin/spree_pos\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

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(:shipments).and_return([@shipment])
+        order.stub(:pos_shipment).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(:shipments).and_return([@shipment]) }
+      it { order.should_receive(:pos_shipment).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(:shipments).and_return([@shipment])
+        order.stub(:pos_shipment).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,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(:shipments).and_return([@shipment])
+        order.stub(:pos_shipment).and_return(@shipment)        
         order.stub(:assign_shipment_for_pos).and_return(true)
         order.stub(:contents).and_return(@order_contents)
         @order_contents.stub(:remove).with(variant, 1, @shipment).and_return(line_item)
@@ -676,7 +676,7 @@ describe Spree::Admin::PosController do
       end
 
       context 'shipment destroyed after remove' do
-        before { order.stub_chain(:shipments, :blank?).and_return(true) }
+        before { order.stub_chain(:pos_shipment, :blank?).and_return(true) }
 
         it 'assigns shipment' do
           order.should_receive(:assign_shipment_for_pos).and_return(true)
@@ -873,8 +873,8 @@ describe Spree::Admin::PosController do
         order.stub(:bill_address=).with(address).and_return(address)
         @shipment.stub(:stock_location=).with(@stock_location).and_return(@stock_location)
         @shipment.stub(:stock_location).and_return(@stock_location)
+        order.stub(:pos_shipment).and_return(@shipment)
 
-        order.stub(:shipments).and_return([@shipment])
         order.stub(:save).and_return(true)
         @shipment.stub(:save).and_return(true)
       end
@@ -883,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(:shipments).and_return([@shipment]) }
+        it { order.should_receive(:pos_shipment).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

@@ -172,4 +172,14 @@ describe Spree::Order do
       it { @order.associate_user_for_pos('new-user@pos.com').should eq(@new_user) }
     end
   end
+
+  describe '#pos_shipment' do
+    before { @shipments = [@shipment] }
+    
+    it 'should fetch all shipments' do
+      @order.should_receive(:shipments).and_return(@shipments)
+      @shipments.should_receive(:last).and_return(@shipment) 
+      @order.pos_shipment.should eq(@shipment)
+    end
+  end
 end

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

@@ -19,7 +19,7 @@ describe Spree::Stock::PosAvailabilityValidator do
 
   describe 'ensures stock location' do
     it 'presence' do
-      @line_item.order.shipments.last.stock_location.should be_nil
+      @line_item.order.pos_shipment.stock_location.should be_nil
       @line_item.save
       @line_item.errors[:stock_location].should eq(['No Active Store Associated'])
     end

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.1.0"
+  s.version = "1.1.1"
 
   s.author = ["Torsten R, Nishant Tuteja, Manish Kangia"]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree-point-of-sale
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Torsten R, Nishant Tuteja, Manish Kangia
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-07 00:00:00 Z
+date: 2014-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -102,7 +102,6 @@ files:
 - app/controllers/spree/admin/barcode_controller.rb
 - app/controllers/spree/admin/checkout_controller_decorator.rb
 - 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
@@ -122,10 +121,6 @@ files:
 - app/overrides/codes.rb
 - app/overrides/pos_tab.rb
 - app/views/spree/admin/barcode/basic.html.erb
-- app/views/spree/admin/invoice/_line_items_invoice.html.erb
-- app/views/spree/admin/invoice/_receipt_header.html.erb
-- app/views/spree/admin/invoice/_totals_receipt.html.erb
-- app/views/spree/admin/invoice/receipt.html.erb
 - app/views/spree/admin/orders/_admin_pos_config.html.erb
 - app/views/spree/admin/orders/_pos_button.html.erb
 - app/views/spree/admin/pos/find.html.erb

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

@@ -1,14 +0,0 @@
-Spree::Admin::StockLocationsController.class_eval do
-  #TODO -> Is this method different from resource_controller update action ?
-  def update
-    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 }
-        format.js   { render :layout => false }
-      end
-    else
-      render :edit
-    end
-  end
-end

data/app/views/spree/admin/invoice/_line_items_invoice.html.erb

@@ -1,34 +0,0 @@
-<table width="700" cellspacing="0" cellpadding="7" border="0" class="line_items" style="border:solid 1px #cccccc; border-bottom:none; margin:30px 0;" >
-  <colgroup>
-    <col/>
-    <col/>
-    <col class="price"/>
-    <col class="qty"/>
-    <col class="total"/>
-  </colgroup>
-  <tr>
-    <th align="left" bgcolor="#cccccc" style="background:#cccccc;" class="sku bold"><font face="Arial, Helvetica, sans-serif" size="2"><%= t(:sku) %></font></th>
-    <th align="left" bgcolor="#cccccc" style="background:#cccccc;" class="desc bold"><font face="Arial, Helvetica, sans-serif" size="2"><%= t(:item_description) %></font></th>
-    <th align="left" bgcolor="#cccccc" style="background:#cccccc;" class="price bold"><font face="Arial, Helvetica, sans-serif" size="2"><%=t(:price) unless @receipt%></font></th>
-    <th align="left" bgcolor="#cccccc" style="background:#cccccc;" class="qty bold"><font face="Arial, Helvetica, sans-serif" size="2"><%= t(:qty) %> </font></th>
-    <th align="right" bgcolor="#cccccc" style="background:#cccccc;" class="total bold"><font face="Arial, Helvetica, sans-serif" size="2"><%= t(:total) %></font></th>
-  </tr>
-  <% @order.line_items.each do |item| %>
-    <tr >
-      <td class="cell" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=item.variant.sku %></font></td>
-      <td class="cell" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= item.variant.product.fullname rescue item.variant.product.name %></font></td>
-      <td class="cell price" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(item.price) unless @receipt%></font></td>
-      <td class="cell qty" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=item.quantity %></font></td>
-      <td align="right" class="cell total" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(item.price * item.quantity) %></font></td>
-    </tr>
-    <% if item.respond_to? :discount and item.discount > 0 %>
-       <tr style="border-bottom:solid 1px #cccccc;">
-        <td class="cell" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2">&nbsp;</font></td>
-        <td class="cell" style="border-bottom:solid 1px #cccccc;">(<font face="Arial, Helvetica, sans-serif" size="2"><%= t(:discount) %>)</font></td>
-        <td class="cell price" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(-1 * item.discount) %></font></td>
-        <td class="cell qty" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2">&nbsp;</font></td>
-        <td class="cell total" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%=number_to_currency(-1 * item.discount * item.quantity) %></font></td>
-      </tr>
-    <% end %>
-  <% end %>
-</table>

data/app/views/spree/admin/invoice/_receipt_header.html.erb

@@ -1,13 +0,0 @@
-<table width="700" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td width="272"><%= logo %></td>
-    <td class="info" align="center" style=" font-size: 14px; letter-spacing: 2px; line-height: 1.3; padding: 6px; text-align: center; text-transform: uppercase; width: 700px;">
-    	<font face="Georgia,"Times New Roman",Times,serif" color="black">
-    	<!--<div class="shop"><%= Spree::Config[:site_name] %></div>-->    
-      Fredrikinkatu 19 (Viiskulma) <br>
-      00120 Helsinki<br><br>
-      <%=I18n.l(@order.completed_at.to_date) if @order.completed_at %>&nbsp;/&nbsp;
-      <%= Spree.t(:order_number) %> <%=@order.number%></font>
-    </td>
-  </tr>
-</table>

data/app/views/spree/admin/invoice/_totals_receipt.html.erb

@@ -1,25 +0,0 @@
-<table width="700" cellspacing="0" cellpadding="7" border="0" class="line_items" style="border:solid 1px #cccccc; border-bottom:none; margin:30px 0;" >
-  <% @order.adjustments.eligible.each do |adjustment| %>
-  <tr class="total">
-    <td class="cel1 bold" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= adjustment.label %>:</font></td>
-    <td class="cel2 cell" align="right" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= adjustment.display_amount.to_html %></font></td>
-  </tr>
-  <% end %>
-  <tr>
-    <td class="cel1 bold" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><strong><%= t(:order_total) %>:</strong></font></td>
-    <td class="cel2 cell" align="right" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><strong><span id='summary-order-total'><%= number_to_currency @order.total %></span></strong></font></td>
-  </tr>
-  <% if @order.price_adjustment_totals.present? %>
-  <tr>
-    <td class="cel1" style="border-bottom:solid 1px #cccccc;" style="border-bottom:solid 1px #cccccc;"></td>
-    <td class="cel2" style="border-bottom:solid 1px #cccccc;"></td>
-  </tr>
-  <% @order.price_adjustment_totals.keys.each do |key| %>
-  <% next unless @order.price_adjustment_totals[key] %>
-  <tr class="total">
-    <td class="cel1 bold" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= key %>:</font></td>
-    <td class="cel2 cell" align="right" style="border-bottom:solid 1px #cccccc;"><font face="Arial, Helvetica, sans-serif" size="2"><%= number_to_currency @order.price_adjustment_totals[key] %></font></td>
-  </tr>
-  <% end %>
-  <% end %>
-</table>

data/app/views/spree/admin/invoice/receipt.html.erb

@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><%= Spree.t("#{params[:template]}.header") %></title>
-</head>
-
-<body onLoad="self.print()"> 
-  <div class="receipt">
-    <div id="header">
-      <%= render :partial => "spree/admin/invoice/receipt_header" %>
-    </div>
-    
-    <div class="wrapper">
-      <div class="line_items">
-        <%= render :partial => "spree/admin/invoice/line_items_invoice" %>
-      </div>
-      <!--<div class="spacer"> &nbsp;</div>-->
-      <div class="totals">
-        <%= render :partial => "spree/admin/invoice/totals_receipt" %>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
-