diff --git a/Gemfile b/Gemfile
index d986d08d..e5947040 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
gem 'devise', '2.0.4'
gem 'devise_simply_stored'
-gem 'rqrcode-rails3'
+gem 'rqrcode'
gem 'mini_magick'
#gem "less-rails-bootstrap-devise", :git => 'git://github.com/bigbento/less-rails-bootstrap-devise.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a2f62b2..8ce3c83f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,8 +157,6 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
rqrcode (0.4.2)
- rqrcode-rails3 (0.1.5)
- rqrcode (>= 0.4.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
@@ -240,7 +238,7 @@ DEPENDENCIES
mini_magick
pry
rails (= 3.2.8)
- rqrcode-rails3
+ rqrcode
rspec-rails
sass-rails (~> 3.2.3)
selenium-webdriver
diff --git a/Qr scan.mm b/Qr scan.mm
new file mode 100644
index 00000000..022dd610
--- /dev/null
+++ b/Qr scan.mm
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Show products with ordering options
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee
index c9404a8e..8bca8446 100644
--- a/app/assets/javascripts/bootstrap.js.coffee
+++ b/app/assets/javascripts/bootstrap.js.coffee
@@ -1,4 +1,12 @@
jQuery ->
$("a[rel=popover]").popover()
$(".tooltip").tooltip()
- $("a[rel=tooltip]").tooltip()
\ No newline at end of file
+ $("a[rel=tooltip]").tooltip()
+ $('input.currency').each(->
+ obj = $(this)
+ original_width = obj.width()
+ obj.wrap("")
+ currency_sign = $("€ ")
+ obj.before(currency_sign)
+ obj.css('width', (original_width - currency_sign.outerWidth())+'px')
+ )
diff --git a/app/assets/javascripts/jquery.cookie.js b/app/assets/javascripts/jquery.cookie.js
new file mode 100644
index 00000000..6df1faca
--- /dev/null
+++ b/app/assets/javascripts/jquery.cookie.js
@@ -0,0 +1,96 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ * used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ * If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ * If set to null or omitted, the cookie will be a session cookie and will not be retained
+ * when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ * require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+jQuery.cookie = function(name, value, options) {
+ if (typeof value != 'undefined') { // name and value given, set cookie
+ options = options || {};
+ if (value === null) {
+ value = '';
+ options.expires = -1;
+ }
+ var expires = '';
+ if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+ var date;
+ if (typeof options.expires == 'number') {
+ date = new Date();
+ date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+ } else {
+ date = options.expires;
+ }
+ expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+ }
+ // CAUTION: Needed to parenthesize options.path and options.domain
+ // in the following expressions, otherwise they evaluate to undefined
+ // in the packed version for some reason...
+ var path = options.path ? '; path=' + (options.path) : '';
+ var domain = options.domain ? '; domain=' + (options.domain) : '';
+ var secure = options.secure ? '; secure' : '';
+ document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+ } else { // only name given, get cookie
+ var cookieValue = null;
+ if (document.cookie && document.cookie != '') {
+ var cookies = document.cookie.split(';');
+ for (var i = 0; i < cookies.length; i++) {
+ var cookie = jQuery.trim(cookies[i]);
+ // Does this cookie string begin with the name we want?
+ if (cookie.substring(0, name.length + 1) == (name + '=')) {
+ cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+ break;
+ }
+ }
+ }
+ return cookieValue;
+ }
+};
\ No newline at end of file
diff --git a/app/assets/javascripts/quser.js.coffee b/app/assets/javascripts/quser.js.coffee
index 154580fc..3d1d8600 100644
--- a/app/assets/javascripts/quser.js.coffee
+++ b/app/assets/javascripts/quser.js.coffee
@@ -59,8 +59,8 @@ root.Quser=
row.append($('
'+Qrammer.currency(res.total_amount)+' '+category+' Add ')
- callback = ((prod) ->
- ->
- product_count_holder = $('#order-product-count-'+prod._id)
- count = parseInt(product_count_holder.text())
- product_count_holder.text(1)
- Quser.add_product(prod, count)
- )(product)
- button.click(callback)
row.append(''+product.name+' ')
- order_product_count = $('1 ')
- order_count_minus = $('- ')
- order_count_minus.click(->
- val_holder = $(this).siblings('.order-product-count')
- val = parseInt(val_holder.text())
- val_holder.text(val - 1) if val > 1
- )
- order_count_plus = $('+ ')
- order_count_plus.click(->
- val_holder = $(this).siblings('.order-product-count')
- val = parseInt(val_holder.text())
- val_holder.text(val + 1)
- )
- row.append($('Add ')
+ callback = ((prod) ->
+ ->
+ product_count_holder = $('#order-product-count-'+prod._id)
+ count = parseInt(product_count_holder.text())
+ product_count_holder.text(1)
+ Quser.add_product(prod, count)
+ )(product)
+ button.click(callback)
+ order_product_count = $('1 ')
+ order_count_minus = $('- ')
+ order_count_minus.click(->
+ val_holder = $(this).siblings('.order-product-count')
+ val = parseInt(val_holder.text())
+ val_holder.text(val - 1) if val > 1
+ )
+ order_count_plus = $('+ ')
+ order_count_plus.click(->
+ val_holder = $(this).siblings('.order-product-count')
+ val = parseInt(val_holder.text())
+ val_holder.text(val + 1)
+ )
+ row.append($(''+Qrammer.currency(product.price)+' ')
- row.append($('
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+ Qwaiter #qrcode
+
+ #table_number
+
diff --git a/lib/rqrcode-rails3/renderers/svg.rb b/lib/rqrcode-rails3/renderers/svg.rb
new file mode 100644
index 00000000..33ebc731
--- /dev/null
+++ b/lib/rqrcode-rails3/renderers/svg.rb
@@ -0,0 +1,50 @@
+module RQRCode
+ module Renderers
+ class SVG
+ class << self
+ # Render the SVG from the qrcode string provided from the RQRCode gem
+ # Options:
+ # offset - Padding around the QR Code (e.g. 10)
+ # unit - How many pixels per module (Default: 11)
+ # fill - Background color (e.g "ffffff" or :white)
+ # color - Foreground color for the code (e.g. "000000" or :black)
+
+ def render(qrcode, options={})
+ offset = options[:offset].to_i || 0
+ color = options[:color] || "000"
+ unit = options[:unit] || 11
+
+ # height and width dependent on offset and QR complexity
+ dimension = (qrcode.module_count*unit) + (2*offset)
+
+ xml_tag = %{}
+ open_tag = %{}
+ close_tag = " "
+
+ result = []
+ qrcode.modules.each_index do |c|
+ tmp = []
+ qrcode.modules.each_index do |r|
+ y = c*unit + offset
+ x = r*unit + offset
+
+ next unless qrcode.is_dark(c, r)
+ tmp << %{