From e7cd77c675281958a81b5487aae5c7d9a75d1a2e Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 4 Oct 2015 11:54:25 +0200 Subject: [PATCH] changes --- .../supplier/app/components/page-body.js.coffee | 11 +++++++++++ .../supplier/app/models/supplier.js.coffee | 1 + .../supplier/app/templates/settings.emblem | 3 +++ .../supplier/app/views/page-body.js.coffee | 11 ----------- .../supplier/foundation1/application.js.erb | 1 + app/assets/javascripts/translations.js.coffee.erb | 1 + app/controllers/suppliers/suppliers_controller.rb | 3 ++- app/models/supplier.rb | 1 + app/serializers/suppliers/supplier_serializer.rb | 2 +- app/serializers/users/supplier_serializer.rb | 2 +- config/application.rb | 2 +- config/locales/models.en.yml | 5 +++-- config/locales/models.nl.yml | 5 +++-- config/routes.rb | 2 +- wip.md | 13 +++++++++++++ 15 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 app/assets/javascripts/supplier/app/components/page-body.js.coffee delete mode 100644 app/assets/javascripts/supplier/app/views/page-body.js.coffee diff --git a/app/assets/javascripts/supplier/app/components/page-body.js.coffee b/app/assets/javascripts/supplier/app/components/page-body.js.coffee new file mode 100644 index 00000000..c3f0f7b8 --- /dev/null +++ b/app/assets/javascripts/supplier/app/components/page-body.js.coffee @@ -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') diff --git a/app/assets/javascripts/supplier/app/models/supplier.js.coffee b/app/assets/javascripts/supplier/app/models/supplier.js.coffee index af33e958..f8c53a1b 100644 --- a/app/assets/javascripts/supplier/app/models/supplier.js.coffee +++ b/app/assets/javascripts/supplier/app/models/supplier.js.coffee @@ -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' diff --git a/app/assets/javascripts/supplier/app/templates/settings.emblem b/app/assets/javascripts/supplier/app/templates/settings.emblem index 14be963b..7faea10b 100644 --- a/app/assets/javascripts/supplier/app/templates/settings.emblem +++ b/app/assets/javascripts/supplier/app/templates/settings.emblem @@ -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" diff --git a/app/assets/javascripts/supplier/app/views/page-body.js.coffee b/app/assets/javascripts/supplier/app/views/page-body.js.coffee deleted file mode 100644 index 775ee309..00000000 --- a/app/assets/javascripts/supplier/app/views/page-body.js.coffee +++ /dev/null @@ -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') diff --git a/app/assets/javascripts/supplier/foundation1/application.js.erb b/app/assets/javascripts/supplier/foundation1/application.js.erb index cee92822..9897a119 100644 --- a/app/assets/javascripts/supplier/foundation1/application.js.erb +++ b/app/assets/javascripts/supplier/foundation1/application.js.erb @@ -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 %>; diff --git a/app/assets/javascripts/translations.js.coffee.erb b/app/assets/javascripts/translations.js.coffee.erb index 2e668c6f..3627698c 100644 --- a/app/assets/javascripts/translations.js.coffee.erb +++ b/app/assets/javascripts/translations.js.coffee.erb @@ -21,6 +21,7 @@ @ttry = (path, vars={})-> @t(path, $.extend(vars, emptyWhenNotFound: true)) + # return translation in the form # Tafel @tspan = (path, vars={}) -> "#{t(path, vars)}" diff --git a/app/controllers/suppliers/suppliers_controller.rb b/app/controllers/suppliers/suppliers_controller.rb index b7f3e23e..27c2a54e 100644 --- a/app/controllers/suppliers/suppliers_controller.rb +++ b/app/controllers/suppliers/suppliers_controller.rb @@ -72,7 +72,8 @@ module Suppliers :postal_code, :city, :country, - :facebook_promotion_url + :facebook_promotion_url, + :user_message ) end end diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 648687cf..a5cf668b 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -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 diff --git a/app/serializers/suppliers/supplier_serializer.rb b/app/serializers/suppliers/supplier_serializer.rb index c0833c72..477d7170 100644 --- a/app/serializers/suppliers/supplier_serializer.rb +++ b/app/serializers/suppliers/supplier_serializer.rb @@ -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 diff --git a/app/serializers/users/supplier_serializer.rb b/app/serializers/users/supplier_serializer.rb index 395caf9c..e5c239b4 100644 --- a/app/serializers/users/supplier_serializer.rb +++ b/app/serializers/users/supplier_serializer.rb @@ -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 diff --git a/config/application.rb b/config/application.rb index cc8f181b..c0b13881 100644 --- a/config/application.rb +++ b/config/application.rb @@ -74,7 +74,7 @@ module Qwaiter # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - config.i18n.default_locale = :en + config.i18n.default_locale = :nl config.i18n.available_locales = [:en, :nl] # Configure the default encoding used in templates for Ruby 1.9. diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml index 11459e3d..13963e2c 100644 --- a/config/locales/models.en.yml +++ b/config/locales/models.en.yml @@ -1,7 +1,7 @@ en: activemodel: models: - user: User + user: Guest supplier: Restaurant new_supplier: New restaurant table: Table @@ -19,7 +19,7 @@ en: section_element: Section element section_area: Section area plural: - user: Users + user: Guests supplier: Restaurants new_supplier: New restaurants table: Tables @@ -69,6 +69,7 @@ en: created_at: Created supplier: name: ${models.supplier} name + user_message: Message for ${models.plural.user} email: 'Email' password: 'Password' password_confirmation: 'Confirmation' diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml index aca1a5d7..4c084a46 100644 --- a/config/locales/models.nl.yml +++ b/config/locales/models.nl.yml @@ -1,7 +1,7 @@ nl: activemodel: models: - user: Gebruiker + user: Gast supplier: Restaurant new_supplier: Nieuw restaurant table: Tafel @@ -18,7 +18,7 @@ nl: section_element: Ruimte element section_area: Ruimte blok plural: - user: Gebruikers + user: Gasten supplier: Restaurants new_supplier: Nieuwe restaurants table: Tafels @@ -68,6 +68,7 @@ nl: created_at: Aangemaakt supplier: name: ${models.supplier} naam + user_message: Bericht voor ${models.plural.user} email: 'E-mail' password: 'Wachtwoord' password_confirmation: 'Bevestiging' diff --git a/config/routes.rb b/config/routes.rb index b4aba067..0da952bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -208,7 +208,7 @@ Qwaiter::Application.routes.draw do #devise_scope :supplier do #get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES} #end - scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: 'en' } do + scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: Rails.application.config.i18n.default_locale } do root to: 'pages#home' resources :contact_forms, only: [:create] resources :new_suppliers diff --git a/wip.md b/wip.md index 208746c7..af212014 100644 --- a/wip.md +++ b/wip.md @@ -1,8 +1,19 @@ Release ======= +Release todos: +-------------- +- Make font-awesome icons work +- Render supplier info pages (page-body) +- Drag drop on tablet persisting +- Top menu height for ipad resolution +- Release android version of MozoUser +- Maybe responsive supplier dashboard + Supplier -------- +- Better message when signing up and already logged in, give link to go + to current supplier!!! - fix page-body template compile view - Add supplier specific name field to my_account - Add styling to active class active navigation items in top menu, side @@ -20,9 +31,11 @@ Supplier - Change list table - Set product_category day from false to true - Product order check for product being active +- Add product_variant price_difference User ---- +- Check test ordering just inactivated product - Implement https://github.com/EddyVerbruggen/Custom-URL-scheme with mozo:// scheme - test met veel producten - remove active orders on list close