From cc13797f5ac3a51f9a27c41343eba3632fd33018 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sat, 9 Mar 2013 14:18:21 +0100 Subject: [PATCH] supplier improvements --- Gemfile | 3 +- Gemfile.lock | 15 +- app/assets/images/icons/maps_location.png | Bin 0 -> 1356 bytes .../supplier/settings/location-balloon.png | Bin 0 -> 20570 bytes .../supplier/settings/location-balloon.svg | 219 ++++++++++++++++++ .../javascripts/supplier/application.js | 14 +- .../supplier/initializer.js.coffee | 71 +++++- .../javascripts/supplier/qsupplier.js.coffee | 5 +- .../javascripts/supplier/translations.js.erb | 8 +- .../supplier/section_tables.css.sass | 17 +- .../stylesheets/supplier/structure.css.sass | 13 +- app/controllers/suppliers/lists_controller.rb | 7 +- .../suppliers/products_controller.rb | 11 +- .../suppliers/tables_controller.rb | 2 + app/decorators/product_category_decorator.rb | 29 +++ app/decorators/product_decorator.rb | 10 +- app/decorators/supplier_decorator.rb | 5 + app/helpers/application_helper.rb | 21 +- app/models/list.rb | 11 +- app/models/product_category.rb | 21 +- app/models/supplier.rb | 4 + app/views/kaminari/_first_page.html.erb | 13 ++ app/views/kaminari/_gap.html.erb | 8 + app/views/kaminari/_last_page.html.erb | 13 ++ app/views/kaminari/_next_page.html.erb | 14 ++ app/views/kaminari/_page.html.erb | 12 + app/views/kaminari/_paginator.html.erb | 27 +++ app/views/kaminari/_prev_page.html.erb | 13 ++ app/views/layouts/tablet.html.slim | 13 +- app/views/supplier/edit.html.slim | 9 +- app/views/suppliers/lists/index.html.slim | 42 ++-- .../product_categories/_form.html.slim | 9 +- .../product_categories/index.html.slim | 1 + .../product_categories/show.html.slim | 18 +- app/views/suppliers/products/index.html.slim | 87 ++++--- app/views/suppliers/sections/_form.html.slim | 2 + app/views/suppliers/sections/index.html.slim | 2 +- .../sections/manage_tables.html.slim | 30 ++- app/views/suppliers/sections/show.html.slim | 2 + .../suppliers/sections/tables_view.html.slim | 4 + app/views/suppliers/tables/_form.html.slim | 6 +- app/views/suppliers/tables/index.html.slim | 8 +- config/locales/en.yml | 1 - config/locales/models.en.yml | 9 + config/locales/models.nl.yml | 4 + config/locales/nl.yml | 1 - config/locales/supplier.en.yml | 10 +- config/locales/supplier.nl.yml | 10 +- config/routes.rb | 6 +- .../product_category_decorator_spec.rb | 64 +++++ spec/i18n_spec.rb | 17 ++ .../javascripts/jquery.ui.datepicker-en.js | 16 ++ .../javascripts/jquery.ui.datepicker-nl.js | 18 ++ 53 files changed, 819 insertions(+), 156 deletions(-) create mode 100644 app/assets/images/icons/maps_location.png create mode 100644 app/assets/images/supplier/settings/location-balloon.png create mode 100644 app/assets/images/supplier/settings/location-balloon.svg create mode 100644 app/decorators/product_category_decorator.rb create mode 100644 app/decorators/supplier_decorator.rb create mode 100644 app/views/kaminari/_first_page.html.erb create mode 100644 app/views/kaminari/_gap.html.erb create mode 100644 app/views/kaminari/_last_page.html.erb create mode 100644 app/views/kaminari/_next_page.html.erb create mode 100644 app/views/kaminari/_page.html.erb create mode 100644 app/views/kaminari/_paginator.html.erb create mode 100644 app/views/kaminari/_prev_page.html.erb create mode 100644 spec/decorators/product_category_decorator_spec.rb create mode 100644 spec/i18n_spec.rb create mode 100644 vendor/assets/javascripts/jquery.ui.datepicker-en.js create mode 100644 vendor/assets/javascripts/jquery.ui.datepicker-nl.js diff --git a/Gemfile b/Gemfile index b05d5a04..ae1107d6 100644 --- a/Gemfile +++ b/Gemfile @@ -36,12 +36,11 @@ gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git' gem 'devise', '2.0.4' gem 'devise_simply_stored' gem 'simple_form' -gem 'draper' +gem 'active_decorator' gem 'cmtool', github: 'bterkuile/cmtool' gem 'rqrcode' gem 'mini_magick' -gem 'kaminari-bootstrap' #gem "less-rails-bootstrap-devise", :git => 'git://github.com/bigbento/less-rails-bootstrap-devise.git' # To use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index 10bcd9b2..8e69f3e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,7 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) + active_decorator (0.3.4) activemodel (3.2.11) activesupport (= 3.2.11) builder (~> 3.0.0) @@ -114,10 +115,6 @@ GEM devise_simply_stored (0.0.3) devise diff-lcs (1.2.1) - draper (1.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - request_store (~> 1.0.3) email_validator (1.3.0) activemodel erubis (2.7.0) @@ -154,12 +151,6 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.7) - kaminari (0.14.1) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kaminari-bootstrap (0.1.3) - kaminari (>= 0.13.0) - rails launchy (2.2.0) addressable (~> 2.3) letter_opener (1.1.0) @@ -219,7 +210,6 @@ GEM rb-fsevent (0.9.3) rdoc (3.12.2) json (~> 1.4) - request_store (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) rqrcode (0.4.2) @@ -298,6 +288,7 @@ PLATFORMS ruby DEPENDENCIES + active_decorator bootstrap-sass bourbon cmtool! @@ -306,12 +297,10 @@ DEPENDENCIES couch_potato! devise (= 2.0.4) devise_simply_stored - draper factory_girl_rails guard-rspec haml-rails jquery-rails - kaminari-bootstrap letter_opener mini_magick mustache diff --git a/app/assets/images/icons/maps_location.png b/app/assets/images/icons/maps_location.png new file mode 100644 index 0000000000000000000000000000000000000000..5c576a5a2a876508938888a1967698b4554a4fec GIT binary patch literal 1356 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 FV1ler-oyX^ literal 0 HcmV?d00001 diff --git a/app/assets/images/supplier/settings/location-balloon.svg b/app/assets/images/supplier/settings/location-balloon.svg new file mode 100644 index 00000000..809b4a2e --- /dev/null +++ b/app/assets/images/supplier/settings/location-balloon.svg @@ -0,0 +1,219 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Klik op de kaart om je locatie aan te geven + + + \ No newline at end of file diff --git a/app/assets/javascripts/supplier/application.js b/app/assets/javascripts/supplier/application.js index d39323ad..84470745 100644 --- a/app/assets/javascripts/supplier/application.js +++ b/app/assets/javascripts/supplier/application.js @@ -1,6 +1,8 @@ //= require jquery //= require jquery_ujs //= require jquery-ui +//= require jquery.ui.datepicker-en +//= require jquery.ui.datepicker-nl // require bootstrap-transition // require bootstrap-affix // require bootstrap-alert @@ -43,15 +45,3 @@ function redirect_to(mapping, variables){ function currency(num) { return Qwaiter.currency(num); } -$(function(){ - //$locale = Qstorage.getItem('locale') || 'en'; - if(Qstorage.getItem('message')){ - var container = $('.alert-success'); - var msg_finder = Qstorage.getItem('message'); - if(msg_finder.indexOf('.') == -1) msg_finder = 'messages.'+msg_finder; - container.find('div').text(t(msg_finder)); - container.show(); - Qstorage.removeItem('message'); - } - setTranslations(); -}); diff --git a/app/assets/javascripts/supplier/initializer.js.coffee b/app/assets/javascripts/supplier/initializer.js.coffee index 2198da02..f2845e55 100644 --- a/app/assets/javascripts/supplier/initializer.js.coffee +++ b/app/assets/javascripts/supplier/initializer.js.coffee @@ -1,13 +1,8 @@ $( -> - week_days_container = $('#week_days-group') - $('.week-day-select').each( (i)-> - select = $(this) - toggle = $('') - toggle.attr('data-t', 'product_category.week_days.abbreviation.'+select.data('day')) - toggle.addClass('active') if select.val() == '1' - week_days_container.append(toggle) - toggle.click( -> select.val(Math.abs(select.val() - 1))) - ) + $('.week-day-toggle').each -> + select = $('#week-day-select-'+$(@).data('day')) + $(@).addClass('active') if select.val() == '1' + $(@).click( -> select.val(Math.abs(select.val() - 1))) $('#full_day-controller').each -> control = $('#product_category_full_day') @@ -24,10 +19,22 @@ $( -> $(@).removeClass 'icon-white' $('#sub-day-container').addClass('hide') + if Qstorage.getItem('message') + container = $('.alert-success'); + msg_finder = Qstorage.getItem('message'); + msg_finder = 'messages.'+msg_finder if msg_finder.indexOf('.') == -1 + container.find('div').text(t(msg_finder)) + container.show() + Qstorage.removeItem('message') + + $('.datepicker').datepicker(window.datepicker_options) + + setTranslations() # GOOGLE LOCATION PICKER $("input.location_picker").each( (i)-> #return if typeof(google) == 'undefined' + iconBase = 'https://maps.google.com/mapfiles/kml/' location_input = $(this) map_div = $('
').addClass("location_picker_map") @@ -43,7 +50,7 @@ $( -> lng = values[1] center = new google.maps.LatLng(lat,lng) mapOptions = - zoom: 13 + zoom: 15 center: center mapTypeId: google.maps.MapTypeId.ROADMAP, zoomControl: true @@ -59,10 +66,54 @@ $( -> position: center map: map title: 'Location' + icon: '/assets/icons/maps_location.png' ) google.maps.event.addListener(map, 'click', (point)-> marker.setPosition(point.latLng) location_input.val point.latLng.lat() + ','+ point.latLng.lng() ) + + search_field = $('') + search_field.addClass('location_picker_search') + autocomplete = new google.maps.places.Autocomplete(search_field.get(0)) + autocomplete.bindTo('bounds', map) + search_field.keypress( (e) -> + if e.which == 13 + e.preventDefault() + ) + window.autocomplete = autocomplete + map_div.before(search_field) + infowindow = new google.maps.InfoWindow() + search_marker = new google.maps.Marker({map: map, icon: iconBase + 'shapes/placemark_circle.png'}) + google.maps.event.addListener(autocomplete, 'place_changed', -> + infowindow.close() + search_marker.setVisible(false) + place = autocomplete.getPlace() + return unless place.geometry + #if place.geometry.viewport + # map.fitBounds(place.geometry.viewport) + #else + map.setCenter(place.geometry.location) + map.setZoom(17) + image = + url: place.icon + size: new google.maps.Size(71, 71) + origin: new google.maps.Point(0, 0) + anchor: new google.maps.Point(17, 34) + scaledSize: new google.maps.Size(35, 35) + #search_marker.setIcon(image) + search_marker.setPosition(place.geometry.location) + search_marker.setVisible(true) + + address = '' + if place.address_components + address = [ + (place.address_components[0] && place.address_components[0].short_name || ''), + (place.address_components[1] && place.address_components[1].short_name || ''), + (place.address_components[2] && place.address_components[2].short_name || '') + ].join(' ') + infowindow.setContent('
' + place.name + '
' + address + '
') + infowindow.open(map, search_marker) + ) ) ) diff --git a/app/assets/javascripts/supplier/qsupplier.js.coffee b/app/assets/javascripts/supplier/qsupplier.js.coffee index 292f5ba5..f124c4a8 100644 --- a/app/assets/javascripts/supplier/qsupplier.js.coffee +++ b/app/assets/javascripts/supplier/qsupplier.js.coffee @@ -13,7 +13,8 @@ root.Qsupplier= else if(e.event == 'list_needs_payment') $('#list-needs-payment-indicator-'+e.data.id).removeClass('hide') else if(e.event == 'list_added') - $('#active-lists-table tbody').append @mustache('#active-list-template', new List(e.data)) + list = new List(e.data) + $('#active-lists-table tbody').append @mustache('#active-list-template', list) else if e.event == 'list_update' list = new List(e.data) row = $('#list-row-'+list.id()) @@ -146,6 +147,8 @@ root.Qsupplier= if table.occupied then to.addClass('occupied') else to.removeClass('occupied') if table.needs_help then to.addClass('needs_help') else to.removeClass('needs_help') if table.needs_payment then to.addClass('needs_payment') else to.removeClass('needs_payment') + if table.active_order then to.addClass('active_order') else to.removeClass('active_order') + ) add_tables_to_active_section: -> number_start = $('#add-tables-number-start').val() diff --git a/app/assets/javascripts/supplier/translations.js.erb b/app/assets/javascripts/supplier/translations.js.erb index 2fd9963e..1e755beb 100644 --- a/app/assets/javascripts/supplier/translations.js.erb +++ b/app/assets/javascripts/supplier/translations.js.erb @@ -3,17 +3,18 @@ var $translations = { models: <%= I18n.t('activemodel.models', locale: :en).to_json %>, attributes: <%= I18n.t('activemodel.attributes', locale: :en).to_json %>, helpers: <%= I18n.t('helpers', locale: :en).to_json %>, + pagination: <%= I18n.t('views.pagination', locale: :en).to_json %>, <%= I18n.t('supplier', locale: :en).to_json[1..-2] %> }, nl: { models: <%= I18n.t('activemodel.models', locale: :nl).to_json %>, attributes: <%= I18n.t('activemodel.attributes', locale: :nl).to_json %>, helpers: <%= I18n.t('helpers', locale: :nl).to_json %>, + pagination: <%= I18n.t('views.pagination', locale: :nl).to_json %>, <%= I18n.t('supplier', locale: :nl).to_json[1..-2] %> } } - $transformation_mappings = { downcase: 'toLowerCase', upcase: 'toUpperCase' @@ -29,6 +30,7 @@ function t(path, vars){ } catch(err){ result = parts[parts.length - 1].capitalize(); } + if(result == '') return ''; if(!result) return parts[parts.length - 1].capitalize(); $.each(vars, function(v, value){ result = result.replace('%{'+v+'}', value)}); isafety = 0; @@ -61,10 +63,12 @@ function setTranslations(selector){ if(selector){ $(selector).find('[data-t]').each(function(){$(this).text(t($(this).data('t'), $(this).data('tAttributes')))}) }else{ - $('[data-t]').each(function(){$(this).text(t($(this).data('t'),$(this).data('tAttributes')))}) + $('[data-t]').each(function(){$(this).html(t($(this).data('t'),$(this).data('tAttributes')))}) } moment.lang($locale); $('[data-time]').each(function(){ $(this).text(moment($(this).data('time')).format($(this).data('timeFormat') || 'dd D HH:MM')) }) + + $('.datepicker').datepicker("option", $.datepicker.regional[$locale]) } diff --git a/app/assets/stylesheets/supplier/section_tables.css.sass b/app/assets/stylesheets/supplier/section_tables.css.sass index ac3129b1..aade0451 100644 --- a/app/assets/stylesheets/supplier/section_tables.css.sass +++ b/app/assets/stylesheets/supplier/section_tables.css.sass @@ -1,4 +1,4 @@ -$table-width: 75px +$table-width: 83px .section-title font-size: 24px padding: 4px 0px @@ -7,7 +7,7 @@ $table-width: 75px margin: -26px 6px 4px 6px .section-table background-color: #ccc - height: 44px + height: 48px background-repeat: no-repeat width: $table-width color: black @@ -24,6 +24,12 @@ $table-width: 75px width: 45px font-size: 42px text-align: center + .status-icons + float: right + width: 16px + span + display: none + float: right .action-button-container margin-right: -20px &.section-tables-active @@ -39,9 +45,16 @@ $table-width: 75px background-color: #ffa &.needs_help background-color: #7f7 + .needs_help + display: block &.needs_payment background-image: image-url('icons/needs-payment.png') background-position: 40px 2px + .needs_payment + display: block + &.active_order + .active_order + display: block //background-color: #f77 a &:hover diff --git a/app/assets/stylesheets/supplier/structure.css.sass b/app/assets/stylesheets/supplier/structure.css.sass index fd78de03..4c5d44f4 100644 --- a/app/assets/stylesheets/supplier/structure.css.sass +++ b/app/assets/stylesheets/supplier/structure.css.sass @@ -29,12 +29,21 @@ body .alert form margin: 0 +.location_picker_search + float: left .location_picker_map - width: 300px - height: 200px + width: 600px + height: 500px border: 1px solid black padding: 2px display: inline-block + float: left + clear: left + img + max-width: none + label + width: auto + display:inline .handle cursor: move font-size: 0.8em diff --git a/app/controllers/suppliers/lists_controller.rb b/app/controllers/suppliers/lists_controller.rb index 77ab5cf0..18eb1963 100644 --- a/app/controllers/suppliers/lists_controller.rb +++ b/app/controllers/suppliers/lists_controller.rb @@ -11,7 +11,12 @@ module Suppliers @start_time += current_supplier.night_offset.to_f.hours @end_time += current_supplier.night_offset.to_f.hours end - @lists = List.for_supplier_created_at current_supplier, @start_time..@end_time + if params[:show_all] == 'yes' + @lists = List.for_supplier(current_supplier, page: params[:page], per_page: params[:per_page] || 25) + else + @lists = List.for_supplier_created_at current_supplier, @start_time..@end_time + end + @lists.include_relation(:table) respond_to do |format| format.html # index.html.erb diff --git a/app/controllers/suppliers/products_controller.rb b/app/controllers/suppliers/products_controller.rb index c755958c..807c6541 100644 --- a/app/controllers/suppliers/products_controller.rb +++ b/app/controllers/suppliers/products_controller.rb @@ -4,7 +4,7 @@ module Suppliers # GET /products # GET /products.json def index - @products = ProductDecorator.decorate_collection(current_supplier.products) + @products = current_supplier.products respond_to do |format| format.html # index.html.erb @@ -15,7 +15,7 @@ module Suppliers # GET /products/1 # GET /products/1.json def show - @product = ProductDecorator.decorate(Product.find_by_supplier_id_and_id!(current_supplier.id, params[:id])) + @product = Product.find_by_supplier_id_and_id!(current_supplier.id, params[:id]) respond_to do |format| format.html # show.html.erb @@ -84,5 +84,12 @@ module Suppliers format.json { head :no_content } end end + + def preview_products + @date = Date.parse(params[:date]) rescue Date.today + product_categories = ProductCategory.for_supplier_in_time(current_supplier, @date.to_time) + render json: {categories: product_categories.map(&:to_client_format).select(&:present?)} + + end end end diff --git a/app/controllers/suppliers/tables_controller.rb b/app/controllers/suppliers/tables_controller.rb index 77667a68..b8c75869 100644 --- a/app/controllers/suppliers/tables_controller.rb +++ b/app/controllers/suppliers/tables_controller.rb @@ -4,6 +4,7 @@ module Suppliers # GET /tables.json def index @tables = Table.for_supplier(current_supplier, page: params[:page], per_page: params[:per_page] || 25, from_number: params[:from_number], to_number: params[:to_number]) + @tables.include_relation(:section) respond_to do |format| format.html # index.html.erb @@ -88,6 +89,7 @@ module Suppliers def qr_codes @tables = current_supplier.tables + @tables.select!{|t| t.section_id == params[:section_id]} if params[:section_id].present? render layout: 'qr_sheet' end end diff --git a/app/decorators/product_category_decorator.rb b/app/decorators/product_category_decorator.rb new file mode 100644 index 00000000..f7db6319 --- /dev/null +++ b/app/decorators/product_category_decorator.rb @@ -0,0 +1,29 @@ +module ProductCategoryDecorator + + def products + #ProductDecorator.decorate_collection(model.products) + @decorated_products ||= ActiveDecorator::Decorator.instance.decorate(super) + end + + def visible_on + sum = week_days.sum + return content_tag(:span, '', class: 'icon-eye-close icon-white') if sum.zero? + return content_tag(:span, '', class: 'icon-refresh icon-white') if sum == 7 && full_day + day_names = I18n.t('date.day_names') + days = week_days.map.with_index{|v,i| v == 1 ? day_names[i] : nil}.compact + days << days.shift if week_days.first == 1 && supplier.week_starts_on_monday? + days = days.join(', ') + unless full_day + from_time = start_from + from_time -= 1440 if from_time > 1440 + from_hour = from_time / 60.0 + to_time = end_on + to_time -= 1440 if to_time > 1440 + to_hour = to_time / 60.0 + time_display = "#{from_hour.floor}:#{'%02d' % (from_hour.modulo(1) * 60)} - #{to_hour.floor}:#{'%02d' % (to_hour.modulo(1)*60)}" + return time_display if sum == 7 + days << " #{time_display}" + end + days + end +end diff --git a/app/decorators/product_decorator.rb b/app/decorators/product_decorator.rb index 075b2ecd..ad53cf27 100644 --- a/app/decorators/product_decorator.rb +++ b/app/decorators/product_decorator.rb @@ -1,17 +1,15 @@ -class ProductDecorator < Draper::Decorator - decorates :product - delegate_all +module ProductDecorator def category_links(options = {}) if namespace = options[:namespace] - product_categories.map{|pc| h.link_to pc.name, [namespace, pc]}.join(', ').html_safe + product_categories.map{|pc| link_to pc.name, [namespace, pc]}.join(', ').html_safe else - product_categories.map{|pc| h.link_to pc.name, pc}.join(', ').html_safe + product_categories.map{|pc| link_to pc.name, pc}.join(', ').html_safe end end def display - "#{model.name} (#{h.currency(model.price)})".html_safe + "#{name} (#{currency(price)})".html_safe end # Accessing Helpers diff --git a/app/decorators/supplier_decorator.rb b/app/decorators/supplier_decorator.rb new file mode 100644 index 00000000..cb31aad2 --- /dev/null +++ b/app/decorators/supplier_decorator.rb @@ -0,0 +1,5 @@ +module SupplierDecorator + def products + ActiveDecorator::Decorator.instance.decorate super + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a1070ef8..43ac7d68 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -58,14 +58,29 @@ module ApplicationHelper current_user.try(:active_list_id) end + def week_days + @week_days ||= %w[sunday monday tuesday wednesday thursday friday saturday].freeze # Do not allow changing this value + end + + def current_supplier + #@current_supplier ||= ActiveDecorator::Decorator.instance.decorate(super) + @current_supplier ||= super + ActiveDecorator::Decorator.instance.decorate @current_supplier + @current_supplier + end + def no_content_given(model) - t('helpers.list.no_records') + content_tag(:p, t('helpers.list.no_records'), data: {t: 'helpers.list.no_records'}) end def slider_image image_tag('spinner.gif') end + def spinner + image_tag('spinner.gif') + end + def show_boolean(bool) t("general.boolean.boolean_#{bool.present? ? 'yes' : 'no'}") end @@ -90,7 +105,9 @@ module ApplicationHelper script += (buffer.presence || value).to_s end script = script.call if script.respond_to?(:call) - script.present? ? (@onload_javascripts ||= []) << script : (@onload_javascripts || []).join(';') + script.sub!(/^]+>/,'') if script + script.sub!(/<\/script>$/, '') if script + script.present? ? (@onload_javascripts ||= []) << script : (@onload_javascripts || []).join(';').html_safe end def mustache_template(template) diff --git a/app/models/list.rb b/app/models/list.rb index 68068ee5..11fc9513 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -23,8 +23,7 @@ class List validates :supplier_id, presence: true view :by_supplier_id_and_id, key: [:supplier_id, :_id] - view :by_supplier_id, key: :supplier_id - view :for_supplier_view, key: [:supplier_id, :created_at] + view :for_supplier_view, key: [:supplier_id, :state, :created_at] view :active_by_table_id_view, type: :custom, map_function: %|function(doc){ if(doc.ruby_class == 'List' && doc.state == 'active'){ @@ -75,6 +74,14 @@ class List list end + def self.for_supplier(supplier, options = {}) + total_entries = database.view(for_supplier_view({startkey: ["#{supplier.id}\u9999"], endkey: [supplier.id], include_docs: false, reduce: true, descending: true})) + options[:total_entries] = total_entries + with_pagination_options(options) do |options| + database.view(for_supplier_view({startkey: ["#{supplier.id}\u9999"], endkey: [supplier.id], include_docs: true, reduce: false, descending: true}.merge(options))) + end + end + def self.active_for_supplier(supplier_id, options = {}) database.view(active_by_supplier_id_view(key: supplier_id, reduce: false, include_docs: true)) end diff --git a/app/models/product_category.rb b/app/models/product_category.rb index 578d9589..bcfc11ce 100644 --- a/app/models/product_category.rb +++ b/app/models/product_category.rb @@ -44,6 +44,7 @@ class ProductCategory @week_days = typecasted_value end + #TODO I am uuuuggggllyyyyy def self.for_user(user, options = {}) table = options[:table] raise "ProductCategory.for_user requires a table" unless table.present? @@ -54,19 +55,17 @@ class ProductCategory product_categories = for_supplier_in_time(supplier, options[:time]) # The following part is creating the products hash. This should not be performed here!!!!!! #TODO fix this!!!@@!!@@!!@ - products = supplier.products - # sort categories - product_categories.sort_by!{|pc| (pc.position || 90000).to_i } + #products = supplier.products # Append other category if not defined by supplier - other = product_categories.find(&:other?) || (product_categories << self.other).last # Container for non categorized products + #other = product_categories.find(&:other?) || (product_categories << self.other).last # Container for non categorized products # Initialize base return object h = {table_number: table.number, table_occupied: table.occupied?, supplier_name: supplier.name, my_list: list.try(:user_ids).to_a.include?(user.id)} - (products - product_categories.map(&:products).flatten).each{ |p| other.add_product(p) } + #(products - product_categories.map(&:products).flatten).each{ |p| other.add_product(p) } - h[:categories] = product_categories.map{|pc| {name: pc.name, products: pc.products.to_a.map{|p| p.as_json}}}.select{|pc| pc && pc[:products].present?} + h[:categories] = product_categories.map(&:to_client_format).select(&:present?) h end @@ -81,7 +80,15 @@ class ProductCategory week_day = 6 if week_day < 0 # Saturday end view_options = {reduce: false, include_docs: true} - database.view(by_supplier_id_and_week_time(view_options.merge(keys: [[supplier.id, week_day], [supplier.id, week_day, minute]]))) + product_categories = database.view(by_supplier_id_and_week_time(view_options.merge(keys: [[supplier.id, week_day], [supplier.id, week_day, minute]]))) + product_categories.sort_by!{|pc| (pc.position || 90000).to_i } + # sort categories + product_categories + end + + def to_client_format + return {} unless products.present? + {name: name, products: products.to_a.map{|p| p.as_json}} end def other? diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 2c169b54..08c94e64 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -116,6 +116,10 @@ class Supplier def send_creation_notifications SupplierMailer.creation(self).deliver end + + def week_starts_on_monday? + true + end private def add_section_on_create diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb new file mode 100644 index 00000000..32d1f4b8 --- /dev/null +++ b/app/views/kaminari/_first_page.html.erb @@ -0,0 +1,13 @@ +<%# Link to the "First" page + - available local variables + url: url to the first page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +<% unless current_page.first? -%> +
  • + <%= link_to raw(t 'views.pagination.first'), url, {:remote => remote, data: {t: 'pagination.first'}} %> +
    • +<% end -%> diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb new file mode 100644 index 00000000..24f27660 --- /dev/null +++ b/app/views/kaminari/_gap.html.erb @@ -0,0 +1,8 @@ +<%# Non-link tag that stands for skipped pages... + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +
  • <%= raw(t 'views.pagination.truncate') %>
    • diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb new file mode 100644 index 00000000..d6ad7b37 --- /dev/null +++ b/app/views/kaminari/_last_page.html.erb @@ -0,0 +1,13 @@ +<%# Link to the "Last" page + - available local variables + url: url to the last page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +<% unless current_page.last? -%> +
  • + <%= link_to raw(t 'views.pagination.last'), url, {:remote => remote, data: {t: 'pagination.last'}} %> +
    • +<% end -%> diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb new file mode 100644 index 00000000..e0f92822 --- /dev/null +++ b/app/views/kaminari/_next_page.html.erb @@ -0,0 +1,14 @@ +<%# Link to the "Next" page + - available local variables + url: url to the next page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + +<% unless current_page.last? -%> +
  • + <%= link_to raw(t 'views.pagination.next'), url, :remote => remote, :rel => 'next', data: {t: 'pagination.next'} %> +
    • +<% end -%> diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb new file mode 100644 index 00000000..ca0c26ba --- /dev/null +++ b/app/views/kaminari/_page.html.erb @@ -0,0 +1,12 @@ +<%# Link showing page number + - available local variables + page: a page object for "this" page + url: url to this page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +
  • + <%= link_to page, (page.current? ? 'javascript:void(0)' : url), opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> +
    • diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb new file mode 100644 index 00000000..31404e91 --- /dev/null +++ b/app/views/kaminari/_paginator.html.erb @@ -0,0 +1,27 @@ +<%# The container tag + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote + paginator: the paginator that renders the pagination tags inside +-%> +<%= paginator.render do -%> + +<% end -%> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb new file mode 100644 index 00000000..17dd694d --- /dev/null +++ b/app/views/kaminari/_prev_page.html.erb @@ -0,0 +1,13 @@ +<%# Link to the "Previous" page + - available local variables + url: url to the previous page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +<% unless current_page.first? -%> +
  • + <%= link_to raw(t 'views.pagination.previous'), url, :remote => remote, :rel => 'prev', data: {t: 'pagination.previous'} %> +
    • +<% end -%> diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index f9404c7d..ceb5fd91 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -22,6 +22,7 @@ html lang="en" var supplier_id = '#{current_supplier.id}'; var data_host = ''; var event_host = '#{event_host}'; + var datepicker_options = {dateFormat: 'yy-mm-dd', firstDay: #{current_supplier.week_starts_on_monday? ? 1 : 0}}; = yield :head @@ -50,11 +51,11 @@ html lang="en" ul.nav#top-navigation-list //li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path //li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path - li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path - li= link_to Product.model_name.human_plural, suppliers_products_path - li= link_to Section.model_name.human_plural, suppliers_sections_path - li= link_to Table.model_name.human_plural, suppliers_tables_path - li= link_to List.model_name.human_plural, suppliers_lists_path + li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path, data: {t: 'models.plural.product_category'} + li= link_to Product.model_name.human_plural, suppliers_products_path, data: {t: 'models.plural.product'} + li= link_to Section.model_name.human_plural, suppliers_sections_path, data: {t: 'models.plural.section'} + li= link_to Table.model_name.human_plural, suppliers_tables_path, data: {t: 'models.plural.table'} + li= link_to List.model_name.human_plural, suppliers_lists_path, data: {t: 'models.plural.list'} .container .content.main-content - if flash[:alert].present? @@ -81,3 +82,5 @@ html lang="en" = javascript_include_tag "supplier/application" script#alert-template[type="text/html"]= mustache_template 'supplier/alert' = yield :footer + javascript: + jQuery(function(){#{onload_javascript}}); diff --git a/app/views/supplier/edit.html.slim b/app/views/supplier/edit.html.slim index 2d73edaa..f733af03 100644 --- a/app/views/supplier/edit.html.slim +++ b/app/views/supplier/edit.html.slim @@ -1,5 +1,5 @@ - content_for :head do - = javascript_include_tag 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false' + = javascript_include_tag "https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places&language=#{I18n.locale}" = form_for @supplier, url: supplier_update_settings_path, html: {class: 'form-horizontal'} do |f| = render 'suppliers/application/error_messages', target: current_supplier @@ -20,13 +20,14 @@ .control-group class=(@supplier.errors[:location].any? ? 'error' : nil) = f.label :location, class: 'control-label' .controls - = f.text_field :location, class: 'location_picker' + = f.text_field :location, class: 'location_picker' + = image_tag 'supplier/settings/location-balloon.png' .control-group = f.label :time_zone, class: 'control-label' .controls /= f.input :time_zone, collection: ActiveSupport::TimeZone.all, label_method: :to_s, value_method: :name, include_blank: false = f.collection_select :time_zone, ActiveSupport::TimeZone.all, :name, :to_s - .accordion-group + /.accordion-group .accordion-heading a.accordion-toggle data-toggle="collapse" data-parent="#settings-sections" href="#settings-wifi" data-t="attributes.supplier.offer_wifi" #settings-wifi.accordion-body.collapse @@ -46,7 +47,7 @@ = f.label :wifi_password, class: 'control-label' .controls = f.text_field :wifi_password, class: 'text_field' - .accordion-group + /.accordion-group .accordion-heading a.accordion-toggle data-toggle="collapse" data-parent="#settings-sections" href="#settings-reviews" data-t="settings.reviews.title" #settings-reviews.accordion-body.collapse class=(@supplier.errors[:iens_profile].any? ? 'in' : nil) diff --git a/app/views/suppliers/lists/index.html.slim b/app/views/suppliers/lists/index.html.slim index 67bab240..917630e4 100644 --- a/app/views/suppliers/lists/index.html.slim +++ b/app/views/suppliers/lists/index.html.slim @@ -1,41 +1,39 @@ - model_class = List div.page-header= title :index, model_class -form action='' method="get" - input#lists-date type="text" name="date" value=@date.to_s('%Y-%m-%d') +form#select-date-form action='' method="get" + - if params[:show_all] == 'yes' + - else + input#lists-date.datepicker type="text" name="date" value=@date.to_s('%Y-%m-%d') + = link_to '', {show_all: 'yes'}, class: 'btn', data: {t: 'lists.index.show_all'} .well - if @lists.any? + = paginate @lists if params[:show_all] == 'yes' table.table thead tr - th= model_class.human_attribute_name(:state) - th= model_class.human_attribute_name(:needs_help) - th= model_class.human_attribute_name(:needs_payment) - th= model_class.human_attribute_name(:closed_at) - th= Table.model_name.human - th.currency= model_class.human_attribute_name(:price) - th.timestamp= model_class.human_attribute_name(:created_at) - th.actions=t 'helpers.actions.title' + th data-t='attributes.list.state' = model_class.human_attribute_name(:state) + th data-t='attributes.list.needs_help' = model_class.human_attribute_name(:needs_help) + th data-t='attributes.list.needs_payment' = model_class.human_attribute_name(:needs_payment) + th data-t='attributes.list.closed_at' = model_class.human_attribute_name(:closed_at) + th data-t='models.table' = Table.model_name.human + th.currency data-t='attributes.list.price' = model_class.human_attribute_name(:price) + th.timestamp data-t='attributes.list.created_at' = model_class.human_attribute_name(:created_at) + th.actions data-t='helpers.actions.title' =t 'helpers.actions.title' tbody - @lists.each do |list| tr td= link_to list.state, [:suppliers, list] td=show_boolean list.needs_help td=show_boolean list.needs_payment - td=l list.closed_at, format: :short + td.timestamp data-time=list.closed_at.try(:utc).try(:iso8601) td= link_to_if list.table.present?, list.table.try(:number), [:suppliers, list.table] td.currency= list.price.present? ? currency(list.price) : '...' - td.timestamp=l list.created_at, format: :short + td.timestamp data-time=list.created_at.utc.iso8601 td.actions - = link_to t('helpers.links.edit'), [:edit, :suppliers, list], class: 'btn btn-mini' + = link_to t('helpers.links.edit'), [:edit, :suppliers, list], class: 'btn btn-mini', data: {t: 'helpers.links.edit'} ' - = link_to t("helpers.links.destroy"), [:suppliers, list], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger' + = link_to t("helpers.links.destroy"), [:suppliers, list], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger', data: {t: 'helpers.links.destroy'} - else = no_content_given model_class -- content_for :footer do - javascript: - $('#lists-date').datepicker({ - dateFormat: 'yy-mm-dd', - onSelect: function(dateText, inst){ - $(this).parents('form').submit(); - } - }) +javascript: + window.datepicker_options['onSelect'] = function(dateText, inst){$('#select-date-form').submit()} diff --git a/app/views/suppliers/product_categories/_form.html.slim b/app/views/suppliers/product_categories/_form.html.slim index ab079db1..f742d782 100644 --- a/app/views/suppliers/product_categories/_form.html.slim +++ b/app/views/suppliers/product_categories/_form.html.slim @@ -5,7 +5,7 @@ = hidden_field_tag 'product_category[product_ids][]', '' = label_tag nil, Product.model_name.human_plural, class: 'control-label' .controls - - for product in ProductDecorator.decorate_collection(current_supplier.products) + - for product in current_supplier.products = check_box_tag "product_category[product_ids][]", product.id, @product_category.product_ids.to_a.include?(product.id), id: "product-checker-#{product.id}" = label_tag "product-checker-#{product.id}", product.display br @@ -13,13 +13,18 @@ = label_tag nil, ProductCategory.human_attribute_name(:week_days), class: 'control-label' .controls #week_days-group.btn-group data-toggle="buttons-checkbox" + - day_names = week_days.dup; day_names << day_names.shift if current_supplier.week_starts_on_monday? + - day_names.each do |day_name| + button.week-day-toggle.btn type="button" data-day=day_name data-t="product_category.week_days.abbreviation.#{day_name}" + + span#full_day-controller.icon.icon-time #sub-day-container.hide = f.input_field :start_from, as: :select, collection: (1..24).map{|h| ["#{h}:00", h*60]} = f.input_field :end_on, as: :select, collection: (1..24).map{|h| ["#{h}:00", h*60]} .hidden - @product_category.week_days.each.with_index do |day, i| - = select_tag 'product_category[week_days][]', options_for_select([0,1], day), class: 'week-day-select', data: {day:%w[sunday monday tuesday wednesday thursday friday saturday][i]} + = select_tag 'product_category[week_days][]', options_for_select([0,1], day), class: 'week-day-select', id: "week-day-select-#{week_days[i]}", data: {day: week_days[i] } /= f.input :full_day, as: :select, collection: [true, false], label: false, include_blank: false = f.input_field :full_day, as: :boolean, label: false, wrapper: false /= f.check_box :full_day diff --git a/app/views/suppliers/product_categories/index.html.slim b/app/views/suppliers/product_categories/index.html.slim index 8dd16ecb..5d17a1fc 100644 --- a/app/views/suppliers/product_categories/index.html.slim +++ b/app/views/suppliers/product_categories/index.html.slim @@ -7,6 +7,7 @@ = content_tag_for :li, product_category do span.handle.icon-move.icon-white span.name= link_to product_category.name, [:suppliers, product_category] + span= product_category.visible_on .pull-right.actions = link_to t('helpers.links.edit'), [:edit, :suppliers, product_category], class: 'btn btn-mini' ' diff --git a/app/views/suppliers/product_categories/show.html.slim b/app/views/suppliers/product_categories/show.html.slim index 211f71ee..2c7572aa 100644 --- a/app/views/suppliers/product_categories/show.html.slim +++ b/app/views/suppliers/product_categories/show.html.slim @@ -2,17 +2,19 @@ .page-header= title :show, @product_category dl.dl-horizontal.show-list - dt= model_class.human_attribute_name(:name) + dt data-t='attributes.product_category.name'= model_class.human_attribute_name(:name) dd= @product_category.name - dt= model_class.human_attribute_name(:position) + dt data-t='attributes.product_category.position'= model_class.human_attribute_name(:position) dd= @product_category.position + dt data-t='attributes.product_category.visible_on'= model_class.human_attribute_name(:visible_on) + dd= @product_category.visible_on + dt data-t='models.plural.product'= Product.model_name.human_plural + dd= @product_category.products.map{|product| link_to product.display, suppliers_product_path(product) }.join(', ').html_safe + .form-actions - = link_to t("helpers.links.back"), suppliers_product_categories_path, class: 'btn' + = link_to t("helpers.links.back"), suppliers_product_categories_path, class: 'btn', data: {t: 'helpers.links.back'} ' - = link_to t('helpers.links.edit'), [:edit, :suppliers, @product_category], class: 'btn' + = link_to t('helpers.links.edit'), [:edit, :suppliers, @product_category], class: 'btn', data: {t: 'helpers.links.edit'} ' - = link_to t("helpers.links.destroy"), [:suppliers, @product_category], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-danger' -- content_for :row do - - @products = ProductDecorator.decorate_collection(@product_category.products) - = render template: 'suppliers/products/index' + = link_to t("helpers.links.destroy"), [:suppliers, @product_category], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-danger', data: {t: 'helpers.links.destroy'} diff --git a/app/views/suppliers/products/index.html.slim b/app/views/suppliers/products/index.html.slim index d28849a9..0d3a861b 100644 --- a/app/views/suppliers/products/index.html.slim +++ b/app/views/suppliers/products/index.html.slim @@ -1,29 +1,64 @@ - model_class = Product .page-header= title :index, model_class -.well - - if @products.any? - table.table - thead - tr - th data-t="attributes.product.name" = model_class.human_attribute_name(:name) - th data-t="attributes.product.code" = model_class.human_attribute_name(:code) - th.currency data-t="attributes.product.price" = model_class.human_attribute_name(:price) - th data-t="models.product_category" = ProductCategory.model_name.human_plural - th.timestamp data-t="attributes.product.created_at" = model_class.human_attribute_name(:created_at) - th.actions data-t="helpers.actions.title" =t 'helpers.actions.title' - tbody - - @products.each do |product| +.span7 + .well + - if @products.any? + table.table + thead tr - td.link= link_to product.name, [:suppliers, product] - td= product.code - td.currency=currency product.price - td.link= product.category_links namespace: :suppliers - td.timestamp=l product.created_at, format: :short - td.actions - = link_to t('helpers.links.edit'), [:edit, :suppliers, product], class: 'btn btn-mini' - ' - = link_to t("helpers.links.destroy"), [:suppliers, product], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger' - - else - = no_content_given model_class -= link_to t("helpers.links.new"), new_suppliers_product_path(product_category_id: @product_category.try(:id)), class: 'btn btn-primary' -/a.btn.btn-primary data-t="helpers.links.new" href=new_suppliers_product_path + th data-t="attributes.product.name" = model_class.human_attribute_name(:name) + th data-t="attributes.product.code" = model_class.human_attribute_name(:code) + th.currency data-t="attributes.product.price" = model_class.human_attribute_name(:price) + th data-t="models.plural.product_category" = ProductCategory.model_name.human_plural + th.timestamp data-t="attributes.product.created_at" = model_class.human_attribute_name(:created_at) + th.actions data-t="helpers.actions.title" =t 'helpers.actions.title' + tbody + - @products.each do |product| + tr + td.link= link_to product.name, [:suppliers, product] + td= product.code + td.currency=currency product.price + td.link= product.category_links namespace: :suppliers + td.timestamp data-time=product.created_at.utc.iso8601 + td.actions + = link_to t('helpers.links.edit'), [:edit, :suppliers, product], class: 'btn btn-mini' + ' + = link_to t("helpers.links.destroy"), [:suppliers, product], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger' + - else + = no_content_given model_class + = link_to t("helpers.links.new"), new_suppliers_product_path(product_category_id: @product_category.try(:id)), class: 'btn btn-primary', data: {t: 'product.new'} + /a.btn.btn-primary data-t="helpers.links.new" href=new_suppliers_product_path +.span4 + h4 data-t='product.preview.header'= t('supplier.product.preview.header') + input#product_preview_date.datepicker type="text" value=Date.today.strftime('%Y-%m-%d') + p data-t='product.preview.description'= t('supplier.product.preview.description') + .well + table#products-table + tbody +script#products-category-template[type="text/html"]= mustache_template 'user/products_category' +- onload_javascript do + javascript: + function update_preview_products(){ + var date = $('#product_preview_date').val(); + var body = $('#products-table tbody'); + body.html('"#{spinner}"'); + if(!date) return; + $.get('#{preview_products_suppliers_products_path(format: :json)}', {date: date}, function(res){ + var i,j, category, obj, result_html; + body.find('tr').remove(); + for(i=0; i < res.categories.length; i++){ + category = res.categories[i]; + obj = { + category: category.name, + products: category.products, + include_order_buttons: false + } + result_html = Mustache.to_html($('#products-category-template').html(), obj) + body.append(result_html) + } + }) + } + update_preview_products(); + $('#product_preview_date').change(function(){ + update_preview_products(); + }) diff --git a/app/views/suppliers/sections/_form.html.slim b/app/views/suppliers/sections/_form.html.slim index f87b8bd5..d1ac2b3f 100644 --- a/app/views/suppliers/sections/_form.html.slim +++ b/app/views/suppliers/sections/_form.html.slim @@ -15,4 +15,6 @@ .form-actions = f.submit nil, class: 'btn btn-primary' ' + = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: @section.id), class: 'btn btn-info', data: {t: 'tables.qr_codes.link'} + ' = link_to t("helpers.links.cancel"), suppliers_sections_path, class: 'btn' diff --git a/app/views/suppliers/sections/index.html.slim b/app/views/suppliers/sections/index.html.slim index 35963be4..e0cc17de 100644 --- a/app/views/suppliers/sections/index.html.slim +++ b/app/views/suppliers/sections/index.html.slim @@ -14,7 +14,7 @@ tbody - @sections.each do |section| tr - td.link= link_to section.title, [:suppliers, section] + td.link= link_to section.title, [:tables_view, :suppliers, section] td.table-info span.table-count= section.tables.size span.active-table-count= (@active_table_ids & section.tables.map(&:id)).size diff --git a/app/views/suppliers/sections/manage_tables.html.slim b/app/views/suppliers/sections/manage_tables.html.slim index 3eaa2702..a31b965b 100644 --- a/app/views/suppliers/sections/manage_tables.html.slim +++ b/app/views/suppliers/sections/manage_tables.html.slim @@ -13,7 +13,7 @@ = link_to :i, [:suppliers, table], class: 'btn btn-mini table-link' .table-number = table.number .span3 - h3= t('table.has_no_section') + h3 data-t='tables.has_no_section' = t('supplier.tables.has_no_section') .well.section-tables-container.section-tables-inactive - for table in @section.supplier.non_placed_tables .section-table{ id="section-table-#{table.id}" data-position-x=table.position_x data-position-y=table.position_y data-table-id=table.id} @@ -33,6 +33,8 @@ ' a.btn href='#arrange-tables-modal' role='button' data-toggle='modal' data-t='section.arrange_tables.button_label' = t('supplier.section.arrange_tables.button_label') ' + = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: @section.id), class: 'btn btn-info', data: {t: 'tables.qr_codes.link'} + ' = link_to t("helpers.links.destroy"), [:suppliers, @section], method: :delete, data: {confirm: are_you_sure?, t: 'helpers.links.destroy' }, class: 'btn btn-danger' - content_for :footer do javascript: @@ -50,16 +52,16 @@ #add-tables-modal.modal.hide.fade tabindex=-1 role=:dialog aria-labeledby='add-tables-modal-label' aria-hidden=true .modal-header button.close type=:button data-dismiss=:modal aria-hidden=true x - h3#add-tables-modal-label= t('supplier.section.add_tables.modal.title') + h3#add-tables-modal-label data-t='section.add_tables.modal.title' = t('supplier.section.add_tables.modal.title') .modal-body - p= t('supplier.section.add_tables.modal.body_header') + p data-t='section.add_tables.modal.body_header' = t('supplier.section.add_tables.modal.body_header') form.form-horizontal .control-group - label.control-label for='add-tables-number-start' = t('supplier.section.add_tables.modal.number_start') + label.control-label for='add-tables-number-start' data-t='section.add_tables.modal.number_start' = t('supplier.section.add_tables.modal.number_start') .controls input.input-mini#add-tables-number-start type=:number value=100 .control-group - label.control-label for='add-tables-number-end' = t('supplier.section.add_tables.modal.number_end') + label.control-label for='add-tables-number-end' data-t='section.add_tables.modal.number_end' = t('supplier.section.add_tables.modal.number_end') .controls input.input-mini#add-tables-number-end type=:number value=120 .modal-footer @@ -67,26 +69,30 @@ button.btn.btn-primary onclick="Qsupplier.add_tables_to_active_section()" data-t='section.add_tables.modal.add_button' #arrange-tables-modal.modal.hide.fade tabindex=-1 role=:dialog aria-labeledby='add-tables-modal-label' aria-hidden=true button.close type=:button data-dismiss=:modal aria-hidden=true x - h3#arrange-tables-modal-label= t('supplier.section.arrange_tables.modal.title') + h3#arrange-tables-modal-label data-t='section.arrange_tables.modal.title' = t('supplier.section.arrange_tables.modal.title') .modal-body - p= t('supplier.section.arrange_tables.modal.body_header') + p data-t='section.arrange_tables.modal.body_header' = t('supplier.section.arrange_tables.modal.body_header') form.form-horizontal .control-group - label.control-label for='arrange-tables-distributed' = t('supplier.section.arrange_tables.modal.distributed') + label.control-label for='arrange-tables-distributed' data-t='section.arrange_tables.modal.distributed' = t('supplier.section.arrange_tables.modal.distributed') .controls input#arrange-tables-distributed type="radio" name="arrange-table-option" checked=true value="distributed" .control-group - label.control-label for='arrange-tables-by_row' = t('supplier.section.arrange_tables.modal.by_row') + label.control-label for='arrange-tables-by_row' data-t='section.arrange_tables.modal.by_row' = t('supplier.section.arrange_tables.modal.by_row') .controls input#arrange-tables-by_row type="radio" name="arrange-table-option" value="by_row" - label for="arrange-tables-by-row-count"= t('supplier.section.arrange_tables.modal.by_row_count') + label for="arrange-tables-by-row-count" data-t='section.arrange_tables.modal.by_row_count' = t('supplier.section.arrange_tables.modal.by_row_count') input.input-mini#arrange-tables-by-row-count type="text" value=0 + ' + span data-t='models.plural.table' .control-group - label.control-label for='arrange-tables-by_column' = t('supplier.section.arrange_tables.modal.by_column') + label.control-label for='arrange-tables-by_column' data-t='section.arrange_tables.modal.by_column' = t('supplier.section.arrange_tables.modal.by_column') .controls input#arrange-tables-by_column type="radio" name="arrange-table-option" value="by_column" - label for="arrange-tables-by-column-count"= t('supplier.section.arrange_tables.modal.by_column_count') + label for="arrange-tables-by-column-count" data-t='section.arrange_tables.modal.by_column_count' = t('supplier.section.arrange_tables.modal.by_column_count') input.input-mini#arrange-tables-by-column-count type="text" value=0 + ' + span data-t='models.plural.table' .modal-footer button.btn data-dismiss="modal" aria-hidden=true data-t='section.arrange_tables.modal.close_button' button.btn.btn-primary onclick="Qsupplier.arrange_tables_of_active_section()" data-t='section.arrange_tables.modal.arrange_button' diff --git a/app/views/suppliers/sections/show.html.slim b/app/views/suppliers/sections/show.html.slim index da279844..469bc795 100644 --- a/app/views/suppliers/sections/show.html.slim +++ b/app/views/suppliers/sections/show.html.slim @@ -19,4 +19,6 @@ dl.dl-horizontal.show-list ' = link_to t('supplier.section.tables_view.link'), [:tables_view, :suppliers, @section], class: 'btn btn-info', data: {t: 'section.tables_view.link'} ' + = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: @section.id), class: 'btn btn-info', data: {t: 'tables.qr_codes.link'} + ' = link_to t("helpers.links.destroy"), [:suppliers, @section], method: :delete, data: {confirm: are_you_sure?, t: 'helpers.links.destroy'}, class: 'btn btn-danger' diff --git a/app/views/suppliers/sections/tables_view.html.slim b/app/views/suppliers/sections/tables_view.html.slim index 1defc10a..6e7970ad 100644 --- a/app/views/suppliers/sections/tables_view.html.slim +++ b/app/views/suppliers/sections/tables_view.html.slim @@ -7,6 +7,10 @@ - for table in @section.tables .section-table.hide{ id="section-table-#{table.id}" data-position-x=table.position_x data-position-y=table.position_y data-table-id=table.id} .table-number = link_to table.number, suppliers_table_path(table) + .status-icons + span.needs_payment.icon-flag + span.needs_help.icon-bell + span.active_order.icon-glass - content_for :footer do javascript: var current_section_id = '#{@section.id}'; diff --git a/app/views/suppliers/tables/_form.html.slim b/app/views/suppliers/tables/_form.html.slim index f68b6ac2..8bd0caf6 100644 --- a/app/views/suppliers/tables/_form.html.slim +++ b/app/views/suppliers/tables/_form.html.slim @@ -1,13 +1,13 @@ = form_for [:suppliers, @table], html: {class: 'form-horizontal' } do |f| = render 'error_messages', target: @table .control-group class=(@table.errors[:number].any? ? 'error' : nil) - = f.label :number, class: 'control-label' + = f.label :number, class: 'control-label', data: {t: 'attributes.table.number'} .controls = f.text_field :number, class: 'text_field' .control-group class=(@table.errors[:section_id].any? ? 'error' : nil) - = f.label :section_id, Supplier.model_name.human, class: 'control-label' + = f.label :section_id, Section.model_name.human, class: 'control-label', data: {t: 'models.section'} .controls - = f.collection_select :section_id, current_supplier.sections, :id, :title, include_blank: "[#{t('table.has_no_section')}]" + = f.collection_select :section_id, current_supplier.sections, :id, :title, include_blank: "[#{t('supplier.tables.has_no_section')}]" .form-actions = f.submit nil, class: 'btn btn-primary' ' diff --git a/app/views/suppliers/tables/index.html.slim b/app/views/suppliers/tables/index.html.slim index defd124d..16485d4e 100644 --- a/app/views/suppliers/tables/index.html.slim +++ b/app/views/suppliers/tables/index.html.slim @@ -24,13 +24,13 @@ div.page-header= title :index, model_class td.link= link_to_if table.section.present?, table.section.try(:title), [:suppliers, table.section] td.timestamp data-time=table.created_at.utc.iso8601 td.actions - = link_to t('helpers.links.edit'), [:edit, :suppliers, table], class: 'btn btn-mini' + = link_to t('helpers.links.edit'), [:edit, :suppliers, table], class: 'btn btn-mini', data: {t: 'helpers.links.edit'} ' - = link_to t("helpers.links.destroy"), [:suppliers, table], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger' + = link_to t("helpers.links.destroy"), [:suppliers, table], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger', data: {t: 'helpers.links.destroy'} - else = no_content_given model_class .form-actions - = link_to t("helpers.links.new"), new_suppliers_table_path, class: 'btn btn-primary' + = link_to t("helpers.links.new"), new_suppliers_table_path, class: 'btn btn-primary', data: {t: 'helpers.links.new'} ' - = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path, class: 'btn btn-info' + = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path, class: 'btn btn-info', data: {t: 'tables.qr_codes.link'} diff --git a/config/locales/en.yml b/config/locales/en.yml index e32aeb13..67f16053 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -66,7 +66,6 @@ en: successfull: '%{model} is successfully destroyed' table: is_occupied: This table is occupied - has_no_section: "Not placed" general: boolean: boolean_yes: "Yes" diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml index 956b63b0..2c66c36f 100644 --- a/config/locales/models.en.yml +++ b/config/locales/models.en.yml @@ -26,6 +26,7 @@ en: full_day: Whole day start_from: From end_on: Till + visible_on: Active on product: name: Name code: Code @@ -37,14 +38,22 @@ en: needs_help: Needs attention needs_payment: Wants to pay closed_at: Closed at + section: + title: Title + width: Width + height: Length + created_at: Created supplier: name: Name email: 'Email' password: 'Password' password_confirmation: 'Confirmation' + location: Location + time_zone: Time zone iens_profile: Iens profile id table: number: Number from_number: From number to_number: To number created_at: Created + diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml index 9b67e815..15ce8323 100644 --- a/config/locales/models.nl.yml +++ b/config/locales/models.nl.yml @@ -26,6 +26,7 @@ nl: full_day: De hele dag start_from: Van end_on: Tot + visible_on: Actief op product: name: Naam code: Code @@ -42,11 +43,14 @@ nl: title: Titel width: Breedte height: Lengte + created_at: Aangemaakt supplier: name: Naam email: 'E-mail' password: 'Wachtwoord' password_confirmation: 'Bevestiging' + location: 'Locatie' + time_zone: Tijdzone iens_profile: Iens profiel id table: number: Nummer diff --git a/config/locales/nl.yml b/config/locales/nl.yml index cb627cd6..5c52b950 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -65,7 +65,6 @@ nl: successfull: '%{model} is succesvol verwijderd' table: is_occupied: Deze tafel is bezet - has_no_section: "Niet geplaatst" general: boolean: boolean_yes: "Ja" diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml index 422fbe15..39513bbf 100644 --- a/config/locales/supplier.en.yml +++ b/config/locales/supplier.en.yml @@ -19,8 +19,11 @@ en: table_number: Table tables: qr_codes: - link: Qr codes sheet + link: Print Qr codes sheet + has_no_section: "Not placed" lists: + index: + show_all: Show all ${models.plural.list} show: title: Show %{list} section: @@ -69,3 +72,8 @@ en: thursday: T friday: F saturday: S + product: + new: 'New ${model.product|downcase}' + preview: + header: 'Select moment to preview products' + description: 'Products visible to customers at chosen moment:' diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml index 4ff4c10e..249f2ef5 100644 --- a/config/locales/supplier.nl.yml +++ b/config/locales/supplier.nl.yml @@ -19,8 +19,11 @@ nl: table_number: Tafel tables: qr_codes: - link: Qr codes + link: Print Qr codes + has_no_section: "Niet geplaatst" lists: + index: + show_all: Toon alle ${models.plural.list} show: title: "%{list} tonen" section: @@ -69,3 +72,8 @@ nl: thursday: D friday: V saturday: Z + product: + new: 'Nieuw ${model.product|downcase}' + preview: + header: 'Selecteer tijdstip voor voorbeeld' + description: 'Producten op gekozen tijdstip:' diff --git a/config/routes.rb b/config/routes.rb index cd161b2a..05f2997d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,7 +87,11 @@ Qwaiter::Application.routes.draw do get :qr_codes end end - resources :products + resources :products do + collection do + get :preview_products + end + end resources :lists resources :product_categories do collection do diff --git a/spec/decorators/product_category_decorator_spec.rb b/spec/decorators/product_category_decorator_spec.rb new file mode 100644 index 00000000..93de1a75 --- /dev/null +++ b/spec/decorators/product_category_decorator_spec.rb @@ -0,0 +1,64 @@ +require 'spec_helper' + +describe ProductCategoryDecorator do + let(:supplier) { build :supplier } + let(:product_category){ build :product_category, supplier: supplier } + let(:day_names) { %w[sunday monday tuesday wednesday thursday friday saturday]} + subject { ActiveDecorator::Decorator.instance.decorate product_category } + + describe '#visible_on' do + before do + ActiveDecorator::ViewContext.current = Suppliers::ApplicationController.new.view_context + product_category.stub(:week_days).and_return([1,1,0,0,0,1,0]) + I18n.stub(:t).with('date.day_names').and_return(day_names) + end + its(:visible_on) { should include 'sunday' } + its(:visible_on) { should include 'monday' } + its(:visible_on) { should_not include 'tuesday' } + its(:visible_on) { should_not include 'wednesday' } + its(:visible_on) { should_not include 'thursday' } + its(:visible_on) { should include 'friday' } + its(:visible_on) { should_not include 'saturday' } + its(:visible_on) { should start_with 'monday'} + + it "starts with sunday if week does not start on monday" do + supplier.stub(:week_starts_on_monday?).and_return(false) + subject.visible_on.should start_with 'sunday' + end + + it "includes the time when full day is false" do + product_category.full_day = false + product_category.start_from = 800 + product_category.end_on = 900 + subject.visible_on.should include '13:20 - 15:00' + end + + it "shows a dash when it is never visible" do + product_category.stub(:week_days).and_return([0,0,0,0,0,0,0]) + subject.visible_on.should include 'icon-eye-close' + end + + it "should display an icon when always visible" do + product_category.stub(:week_days).and_return([1,1,1,1,1,1,1]) + subject.visible_on.should include 'icon-refresh' + end + + it "should only display time when all days active and time range given" do + product_category.stub(:week_days).and_return([1,1,1,1,1,1,1]) + product_category.full_day = false + product_category.start_from = 800 + product_category.end_on = 900 + subject.visible_on.should == '13:20 - 15:00' + end + end + + describe '#products' do + it "decorates products" do + product = build :product + product_category.instance_variable_set('@products', all: [product]) + subject.products.first.should be_a ProductDecorator + end + end + + +end diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb new file mode 100644 index 00000000..724cc71b --- /dev/null +++ b/spec/i18n_spec.rb @@ -0,0 +1,17 @@ +require 'spec_helper' + +describe I18n do + describe 'translate' do + describe 'day_names' do + it "returns english day names" do + I18n.locale = :en + I18n.t('date.day_names').first.should == 'Sunday' + end + it "returns dutch day names" do + I18n.locale = :nl + I18n.t('date.day_names').first.should == 'zondag' + end + end + + end +end diff --git a/vendor/assets/javascripts/jquery.ui.datepicker-en.js b/vendor/assets/javascripts/jquery.ui.datepicker-en.js new file mode 100644 index 00000000..0ff62096 --- /dev/null +++ b/vendor/assets/javascripts/jquery.ui.datepicker-en.js @@ -0,0 +1,16 @@ + $.datepicker.regional.en = { + closeText: "Done", // Display text for close link + prevText: "Prev", // Display text for previous month link + nextText: "Next", // Display text for next month link + currentText: "Today", // Display text for current month link + monthNames: ["January","February","March","April","May","June", + "July","August","September","October","November","December"], // Names of months for drop-down and formatting + monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting + dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting + dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting + dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday + weekHeader: "Wk", // Column header for week of the year + isRTL: false, // True if right-to-left language, false if left-to-right + showMonthAfterYear: false, // True if the year select precedes month, false for month then year + yearSuffix: "" // Additional text to append to the year in the month headers + } diff --git a/vendor/assets/javascripts/jquery.ui.datepicker-nl.js b/vendor/assets/javascripts/jquery.ui.datepicker-nl.js new file mode 100644 index 00000000..a2a66415 --- /dev/null +++ b/vendor/assets/javascripts/jquery.ui.datepicker-nl.js @@ -0,0 +1,18 @@ +/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Mathias Bynens */ + $.datepicker.regional.nl = { + closeText: 'Sluiten', + prevText: '←', + nextText: '→', + currentText: 'Vandaag', + monthNames: ['januari', 'februari', 'maart', 'april', 'mei', 'juni', + 'juli', 'augustus', 'september', 'oktober', 'november', 'december'], + monthNamesShort: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun', + 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'], + dayNames: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'], + dayNamesShort: ['zon', 'maa', 'din', 'woe', 'don', 'vri', 'zat'], + dayNamesMin: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'], + weekHeader: 'Wk', + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''};