shingonoide · May 11, 2012 · May 17, 2012 · May 19, 2012 · May 20, 2012 · Jun 2, 2012
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 tmp
 nbproject
 *.swp
+.rakeTasks
+*.iml
diff --git a/README.md b/README.md
@@ -1,56 +1,84 @@
-SpreePos
-===============
+SUMMARY
+-------
 
 A Point Of Sale (POS) screen for Spree.
 
-POS screen hooks into the Admin Tabs and is meant to be used with a touchscreen.
+POS screen hooks into the Admin Tabs and is meant to be used to sell inside a shop, possibly with a touchscreen and a scanner. Allows for quick checkout and basic adjustment of line item prices also with discount percentages.
 
-Basic Bar scanner input (sku/ean search) or search by name. No Customer, no shipping, no coupons...
 
-Allows for adjustment of line item prices and discount percentage of items and total 
+Features
+--------
+ * Input field for find items by sku/ean
+ * Print receipts of the order
+ * Do discounts directly from the interface
+ * Change calculator
+ * Label printing
+ * Flag orders as sold in pos
+ * Page for searching products
 
-An actual Order is only created when you press print. 
+How to use
+----------
 
-Pressing new will abandon the current sale. Also, there is no way to get to the pos screen from an existing order(yet), if those need to be edited, do so in the orders tab.
+A minimal transaction is one scan, and pressing of print button.
 
-Configure
-=========
+Basic bar scanner input (sku/ean search) or search by name. No Customer, no shipping, no coupons, but these are achievable through the order interface.
 
-And Order must be shipped, so you must configure a ShippingMethod to be used. If you don't the first will be
-taken, rarely what you want.
+POS creates orders (just like the admin/order) and in fact lets you switch between the two views freely by adding links back and forth. Pressing new customer will create a new order (in checkout), which is finalised when print is pressed. ONLY pressing print will finalise the order, if you do not press print (ie press new customer) the order will be left
+ in "checkout" state and thus not be a sale in your system.
 
-Spree::Config.set(:pos_shipping => "id_or_name")
+Installation
+------------
 
-You can use this feature to give a discount or do whatever else you can do with shipments. We use 0€ .
+The best way for using this software is by adding this code to your Gemfile:
 
-EAN
-====
+```shell
+gem "spree_pos", :git => "git://github.com/CodeCantor/spree-pos.git"
+gem "spree_html_invoice", :git => "git://github.com/CodeCantor/spree-html-invoice.git"
+```
 
-Many sales and especially POS systems rely on barcode scanning. A barcde scanner functions identical to keyboard input  to the product code. You may use the sku field for this but we use that for the supplier (or own) abbreviation.
+For installing the assets needed and creating the default objects run this command:
 
-So there is a migration supplied that provides a ean (European Article code, may be upc too) for the Variant class, and fields to edit it and search by it.
+```shell
+rails generate spree_pos:install
+```
 
-Dependencies
-============
+Continue reading the configuration section for see how to finish the setup.
 
-None..... but
+Configure
+--------
+**IMPORTANT**: You have to config the shipping method with the zone of the ship address in the pos.
 
-Pos relies on html-invoice to print a receipt. The dependency is not made explicit in case you don't need receipts. If you do add spree-html-invoice to your gemfile you _will_ want to configure the look of the receipt.
+By default, the address chosen by the pos, will be the one setted to the current user logged. You can config this address changing this options:
 
-You can install spree-product-barcodes to print product labels if need be. Otherwise use the existing upc barcodes on the products and scan them into the sku.
+  * Ship Address: You can config this options setting :pos_ship_address to the id of the Spree::Address you would like to use.
+  * Bill Address: You can config this options setting :pos_bill_address to the id of the Spree::Address you would like to use. By default it will use :ship_address if not set
 
-ToDo
-====
-I'm just starting , maybe still rough. Currently works for VAT only.
+If you would like to use an other shipping method you can change it using, :pos_shipping_method. By default, it will take 'At Store' with a flat rate.
 
-Installation
-=======
+You can also change the invoice generator url, in wich the pos will redirect after pressing the print button:
 
-Add to your Gemfile with 
+  * Pos printing: Change the option :pos_printing to the url you would like to use after pressing print.
 
-  gem "spree_pos", :git => "git://github.com/dancinglightning/spree-pos.git"
+If you change this option, the spree_html_invoice gem is not longer required.
+
+What is the EAN?
+---------------
+
+Many sales and especially POS systems rely on barcode scanning. A barcode scanner functions identical to keyboard
+input  to the product code. You may use the sku field for this but we use that for the suppliers code (or our own).
+
+So there is a migration supplied that provides a ean (European Article code, may be upc too) for the Variant class, and fields to edit it and search by it.
 
-and run bundler.
 
+TO-DO
+-----
+ * TESTS !!!!!!!!!!!!!!!!!!!!!!!!!
+ * Being able to assign a user directly to an order directly from the interface for later invoice printing.
+ * Do ease the mechanism for devolutions
+ * Refactor the view so it has the calculator prettier
+ * Being able to use promotions from this interface
+ * Create a report with the information of the day sells
+ * Recover funcionality for add stock directly from pos
 
-Copyright (c) 2011 [Torsten Rüger], released under the New BSD License
+Copyright (c) 2011 [Torsten Ruger], released under the New BSD License
+Copyright (c) 2013 [Enrique Alvarez (enrique at codecantor dot com)], released under the New BSD License
diff --git a/Rakefile b/Rakefile
@@ -3,11 +3,9 @@ require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 require 'spree_core/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
-Cucumber::Rake::Task.new
 
 task :default => [:spec, :cucumber ]
 

diff --git a/Versionfile b/Versionfile
@@ -1,6 +1,12 @@
 # This file is used to designate compatibilty with different versions of Spree
 # Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details
 
-"0.70.x" => { :branch => "master"}
+"0.70.x" => { :ref => "793ca3ad2822877babf60c5e3d3bd7b3f39be3db"}
+# note: the 1.0 version was in never in production use as I had server crashes with 1.0 and upgraded immediately to 1.1
+"1.0.x" => { :ref => "7075b1b483faa183679761f060072515e45dcaf7"}
+
+"1.1.x" => { :ref => "ccb4209c94a326f1760bef0b8a7fd32a3f4be121" }
+"2.0.x" => { :branch => "master" }
+
 
 
diff --git a/app/assets/images/admin/pos/order.jpg b/app/assets/images/admin/pos/order.jpg
diff --git a/app/assets/javascripts/admin/pos/keyboard.js.coffee b/app/assets/javascripts/admin/pos/keyboard.js.coffee
@@ -0,0 +1 @@
+console.log 'keyboard'
diff --git a/app/assets/javascripts/admin/pos/pos.js b/app/assets/javascripts/admin/pos/pos.js
@@ -0,0 +1 @@
+//= require jquery
diff --git a/app/assets/javascripts/admin/pos/refund/all.js b/app/assets/javascripts/admin/pos/refund/all.js
@@ -0,0 +1 @@
+//= require jquery
diff --git a/app/assets/stylesheets/admin/html-label.css b/app/assets/stylesheets/admin/html-label.css
@@ -0,0 +1,20 @@
+@page  { 
+	margin-left:1mm;
+	margin-right:1mm;
+	margin-top:1mm;
+	margin-bottom:1mm;
+	 }
+
+body {
+    font-family:"Helvetica";
+	color:#000000;
+	width:200px;
+}
+
+.label-name {
+	font-size:13px;
+}
+
+.label-price {
+	font-size:13px;
+}
diff --git a/app/assets/stylesheets/admin/pos/refund/all.css b/app/assets/stylesheets/admin/pos/refund/all.css
@@ -0,0 +1,3 @@
+body {
+    margin-left: 100px;
+}
diff --git a/app/assets/stylesheets/admin/stickers-print.css.scss b/app/assets/stylesheets/admin/stickers-print.css.scss
@@ -0,0 +1,106 @@
+/* margin print */
+
+@page{
+   margin: 0;
+}
+
+/* css sticker */
+
+body, div {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+.page {
+  width: 210mm;
+  height: 297mm;
+  text-align: center;
+  overflow: hidden;
+  font-family: 'Oswald';
+  font-size: 0.8em;
+} 
+
+.data_sticker {
+  line-height: 20px;
+  overflow: hidden;
+}
+
+.data_image {
+  margin-top: -2px !important;
+}
+
+div.sticker {
+  width: 4.24cm;
+  height: 1.95cm !important;
+  margin: 0.5cm !important;
+  float: left;
+  overflow: hidden;
+  &:nth-child(4n+4) {
+    margin-right: 0 !important;
+  }
+  &:nth-child(37),  &:nth-child(38),  &:nth-child(39),  &:nth-child(40) {
+    margin-bottom: 0 !important;
+  }
+}
+
+img {
+  width: 100%; 
+}
+
+.sku_sticker, .price_sticker {
+  width: 50%;
+  display: block;
+  float: left;
+}
+
+.sku_sticker {
+  font-weight: 300;
+  opacity: 0.7;
+}
+
+.profiler-results {
+  display: none !important;
+}
+
+/*
+body {
+  margin: 0;
+  padding: 0;
+}
+* {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+.page {
+  width: 21cm;
+  min-height: 29.7cm;
+  padding: 2cm;
+  margin: 1cm auto;
+}
+.subpage {
+  padding: 1cm;
+  height: 256mm;
+}
+
+@page {
+  size: A4;
+  margin: 0;
+}
+@media print {
+  html, body {
+    width: 210mm;
+    height: 297mm;
+  }
+
+  .page {
+    margin: 0;
+    border: initial;
+    border-radius: initial;
+    width: initial;
+    min-height: initial;
+    box-shadow: initial;
+    background: initial;
+    page-break-after: always;
+  }
+}
+*/
-Original file line number
+Diff line change
@@ @@ -7,3 +7,5 @@ @@
     tmp
     nbproject
     *.swp
+    .rakeTasks
+    *.iml