changes
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
App.PageBodyComponent = Ember.Component.extend
|
||||
setTemplate: (->
|
||||
body = @get('templateBody')
|
||||
body ||= ""
|
||||
try
|
||||
template = Ember.HTMLBars.compile(body)
|
||||
catch
|
||||
template = Ember.HTMLBars.compile(tspan('page.cannot_compile'))
|
||||
@set 'template', Ember.HTMLBars.template(template)
|
||||
@rerender()
|
||||
).on('init').observes('templateBody')
|
||||
@@ -1,6 +1,7 @@
|
||||
attr = DS.attr
|
||||
App.Supplier = DS.Model.extend
|
||||
name: attr 'string'
|
||||
user_message: attr 'string'
|
||||
email: attr 'string'
|
||||
time_zone: attr 'string'
|
||||
address: attr 'string'
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
.form-row
|
||||
.form-label: label=t 'attributes.supplier.name'
|
||||
.form-field= input type="text" value=globals.current_supplier.name class="supplier-name"
|
||||
.form-row
|
||||
.form-label: label=t 'attributes.supplier.user_message'
|
||||
.form-field= textarea value=globals.current_supplier.user_message class="supplier-user-message"
|
||||
.form-row
|
||||
.form-label: label=t 'attributes.supplier.email'
|
||||
.form-field= input value=globals.current_supplier.email type="email" class="supplier-email"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#App.PageBodyView = Ember.View.extend
|
||||
# setTemplate: (->
|
||||
# body = @get('templateBody')
|
||||
# body ||= ""
|
||||
# try
|
||||
# template = Ember.Handlebars.compile(body)
|
||||
# catch
|
||||
# template = Ember.Handlebars.compile(tspan('page.cannot_compile'))
|
||||
# @set 'template', template
|
||||
# @rerender()
|
||||
# ).on('init').observes('templateBody')
|
||||
@@ -22,6 +22,7 @@ var Qstorage = localStorage;
|
||||
$.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
|
||||
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
|
||||
|
||||
|
||||
String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); }
|
||||
|
||||
window.time_zones = <%= ActiveSupport::TimeZone.all.map{|tz| {name: tz.name, formatted: "GMT#{tz.formatted_offset} #{tz.name}"}}.to_json.html_safe %>;
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
@ttry = (path, vars={})->
|
||||
@t(path, $.extend(vars, emptyWhenNotFound: true))
|
||||
|
||||
|
||||
# return translation in the form
|
||||
# <span data-t="models.table">Tafel</span>
|
||||
@tspan = (path, vars={}) -> "<span data-t='#{path}' class='translation' data-t-attributes='#{JSON.stringify(vars)}'>#{t(path, vars)}</span>"
|
||||
|
||||
@@ -72,7 +72,8 @@ module Suppliers
|
||||
:postal_code,
|
||||
:city,
|
||||
:country,
|
||||
:facebook_promotion_url
|
||||
:facebook_promotion_url,
|
||||
:user_message
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -19,6 +19,7 @@ class Supplier
|
||||
property :facebook_promotion_url
|
||||
property :week_starts_on_monday, type: :boolean, default: true
|
||||
property :employee_settings_storage
|
||||
property :user_message
|
||||
|
||||
# PAYMENT
|
||||
property :accept_bitpay, type: :boolean, default: false
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class Suppliers::SupplierSerializer
|
||||
include Qwaiter::SupplierBaseSerializer
|
||||
attributes :open, :name, :email, :lat, :lng, :time_zone, :address, :house_number, :house_number_addition, :postal_code, :city, :country,
|
||||
:facebook_promotion_url, :iens_profile, :week_starts_on_monday, :orders_in_process_count, :orders_placed_count
|
||||
:facebook_promotion_url, :iens_profile, :week_starts_on_monday, :orders_in_process_count, :orders_placed_count, :user_message
|
||||
|
||||
has_many :sections, serializer: Suppliers::SectionSerializer
|
||||
has_many :product_categories, serializer: Suppliers::ProductCategorySerializer
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
class Users::SupplierSerializer
|
||||
include Qwaiter::UserBaseSerializer
|
||||
attributes :open, :name, :orders_placed_count, :orders_in_process_count
|
||||
attributes :open, :name, :orders_placed_count, :orders_in_process_count, :user_message
|
||||
has_many :product_categories, serializer: Users::ProductCategorySerializer
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user