').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 + '
')
+ 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') %>
+ <%= 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}"