diff --git a/app/assets/javascripts/supplier/app/app.js.coffee b/app/assets/javascripts/supplier/app/app.js.coffee index 820acea0..3846fc7e 100644 --- a/app/assets/javascripts/supplier/app/app.js.coffee +++ b/app/assets/javascripts/supplier/app/app.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App = Ember.Application.create +@App = Ember.Application.create LOG_TRANSITIONS: true rootElement: '#ember-app-container' store: -> @__container__.lookup('controller:application').store diff --git a/app/assets/javascripts/supplier/app/components/dropdown_link.js.coffee b/app/assets/javascripts/supplier/app/components/dropdown_link.js.coffee index 365640b1..44894b72 100644 --- a/app/assets/javascripts/supplier/app/components/dropdown_link.js.coffee +++ b/app/assets/javascripts/supplier/app/components/dropdown_link.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.DropdownLink = Ember.Component.extend +App.DropdownLink = Ember.Component.extend templateName: 'dropdown_link_view' active: false classNames: ['dropdown-container'] diff --git a/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee b/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee index c7452116..8af996d7 100644 --- a/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee +++ b/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalDialogComponent = Ember.Component.extend +App.ModalDialogComponent = Ember.Component.extend actions: close: -> @sendAction() diff --git a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee index add28b63..9f985191 100644 --- a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ApplicationController = Ember.Controller.extend +App.ApplicationController = Ember.Controller.extend active_section: null init: -> #success = (supplier)=> diff --git a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee index b2f73845..787ad5fb 100644 --- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.IndexController = Ember.ObjectController.extend +App.IndexController = Ember.ObjectController.extend needs: ['application'] lists: (-> @store.all('list')).property() orders: (-> @store.all('order')).property() @@ -21,7 +21,7 @@ Qsupplier.App.IndexController = Ember.ObjectController.extend actions: ### markListAsHelped: (id)-> - if list = Qsupplier.App.List.findCached(id) + if list = App.List.findCached(id) list.is_helped() closeList: (list)-> @@ -31,12 +31,12 @@ Qsupplier.App.IndexController = Ember.ObjectController.extend markOrderDelivered: (id)-> $.post('/supplier/order_is_delivered', order_id: id) - if order = Qsupplier.App.Order.findCached(id) + if order = App.Order.findCached(id) order.set('state', 'delivered') markOrderActive: (id)-> $.post('/supplier/mark_order_in_process', order_id: id) - if order = Qsupplier.App.Order.findCached(id) + if order = App.Order.findCached(id) order.set('state', 'active') cancelOrder: (order)-> $.post "/supplier/orders/#{order.id}/cancel" diff --git a/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee index c25726c5..b53a719c 100644 --- a/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ListController = Ember.ObjectController.extend +App.ListController = Ember.ObjectController.extend needs: ['application', 'lists', 'list'] #wtf? list, otherwise an Ember error list: (-> @get('model')).property('model') showTotal: (-> diff --git a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee index cd3c5ed7..d4861ded 100644 --- a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ListsIndexController = Ember.ArrayController.extend +App.ListsIndexController = Ember.ArrayController.extend loading: true dateChanged: (-> @set 'loading', true diff --git a/app/assets/javascripts/supplier/app/controllers/modal_add_section_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_add_section_controller.js.coffee index 1aea00ff..67301112 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_add_section_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_add_section_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalAddSectionController = Ember.ObjectController.extend +App.ModalAddSectionController = Ember.ObjectController.extend alert_message: null section_title: '' section_width: 15 diff --git a/app/assets/javascripts/supplier/app/controllers/modal_close_list_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_close_list_controller.js.coffee index fc86457e..34d0d2b1 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_close_list_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_close_list_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalCloseListController = Ember.ObjectController.extend +App.ModalCloseListController = Ember.ObjectController.extend actions: close: -> @send 'closeModal' diff --git a/app/assets/javascripts/supplier/app/controllers/modal_confirm_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_confirm_controller.js.coffee index 507b7ff9..f04a7b1e 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_confirm_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_confirm_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalConfirmController = Ember.ObjectController.extend +App.ModalConfirmController = Ember.ObjectController.extend actions: close: -> @get('model.cancel').call(@) if @get('model.cancel') diff --git a/app/assets/javascripts/supplier/app/controllers/modal_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_controller.js.coffee index 006a3c11..ef92188b 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalController = Ember.ObjectController.extend +App.ModalController = Ember.ObjectController.extend modal_options: {} actions: close: -> diff --git a/app/assets/javascripts/supplier/app/controllers/modal_info_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_info_controller.js.coffee index d35f46b3..99cdc654 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_info_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_info_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalInfoController = Ember.ObjectController.extend +App.ModalInfoController = Ember.ObjectController.extend actions: close: -> @get('model.cancel').call(@) if @get('model.cancel') diff --git a/app/assets/javascripts/supplier/app/controllers/modal_section_add_tables_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_section_add_tables_controller.js.coffee index 69aa76dd..f6e1f133 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_section_add_tables_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_section_add_tables_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalSectionAddTablesController = Ember.ObjectController.extend +App.ModalSectionAddTablesController = Ember.ObjectController.extend number_start: 100 number_end: 110 actions: diff --git a/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee index d7c14143..4ec4d717 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ModalSectionArrangeTablesController = Ember.ObjectController.extend +App.ModalSectionArrangeTablesController = Ember.ObjectController.extend alert_message: null arrange_type: 'distributed' # can be distributed, by_row or by_column row_count: 2 diff --git a/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee index 5626c161..db6efc08 100644 --- a/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionController = Ember.ObjectController.extend +App.SectionController = Ember.ObjectController.extend needs: ['application', 'sections', 'section'] #wtf? section, otherwise an Ember error editmode: false actions: diff --git a/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee index 979060d3..d67017cd 100644 --- a/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee @@ -1,2 +1,2 @@ -Qsupplier.App.SectionsController = Ember.ArrayController.extend +App.SectionsController = Ember.ArrayController.extend needs: ['application'] diff --git a/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee index 86641e64..a5edefda 100644 --- a/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionsIndexController = Ember.ArrayController.extend +App.SectionsIndexController = Ember.ArrayController.extend needs: ['application', 'sections', 'index'] sections: (-> @get('controllers.sections.model')).property('controllers.sections.model') sectionQrCodesUrl: ((a,b,c)-> diff --git a/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee index 909c2780..c3c99879 100644 --- a/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SettingsController = Ember.ObjectController.extend +App.SettingsController = Ember.ObjectController.extend needs: ['application'] model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier') time_zones: (-> window.time_zones ).property() diff --git a/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee index 3bf3d9e6..60d0c343 100644 --- a/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee @@ -1,2 +1,2 @@ -Qsupplier.App.TableController = Ember.ObjectController.extend +App.TableController = Ember.ObjectController.extend table: (-> @get('model')).property('model') diff --git a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee index b82c4bcb..48eae8df 100644 --- a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.TablesIndexController = Ember.ArrayController.extend +App.TablesIndexController = Ember.ArrayController.extend tables: (-> @get('model').sortBy('casted_number')).property('model.@each.number') actions: editTable: (table)-> diff --git a/app/assets/javascripts/supplier/app/models/join_request.js.coffee b/app/assets/javascripts/supplier/app/models/join_request.js.coffee index e3a4e631..1f31d669 100644 --- a/app/assets/javascripts/supplier/app/models/join_request.js.coffee +++ b/app/assets/javascripts/supplier/app/models/join_request.js.coffee @@ -1,4 +1,4 @@ attr = DS.attr -Qsupplier.App.JoinRequest= DS.Model.extend +App.JoinRequest= DS.Model.extend list: DS.belongsTo('list') user: DS.belongsTo('user') diff --git a/app/assets/javascripts/supplier/app/models/list.js.coffee b/app/assets/javascripts/supplier/app/models/list.js.coffee index dad72152..4d3a9469 100644 --- a/app/assets/javascripts/supplier/app/models/list.js.coffee +++ b/app/assets/javascripts/supplier/app/models/list.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.List = DS.Model.extend +App.List = DS.Model.extend state: attr 'string' needs_help: attr 'boolean' needs_payment: attr 'boolean' diff --git a/app/assets/javascripts/supplier/app/models/order.js.coffee b/app/assets/javascripts/supplier/app/models/order.js.coffee index ae595680..4bac0fc7 100644 --- a/app/assets/javascripts/supplier/app/models/order.js.coffee +++ b/app/assets/javascripts/supplier/app/models/order.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.Order = DS.Model.extend +App.Order = DS.Model.extend state: attr('string') list: DS.belongsTo('list') price: attr('number') diff --git a/app/assets/javascripts/supplier/app/models/product.js.coffee b/app/assets/javascripts/supplier/app/models/product.js.coffee index 4cdac7c6..7ec7b997 100644 --- a/app/assets/javascripts/supplier/app/models/product.js.coffee +++ b/app/assets/javascripts/supplier/app/models/product.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.Product = DS.Model.extend +App.Product = DS.Model.extend name: attr 'string' price: attr 'number' product_category: DS.belongsTo('product_category') diff --git a/app/assets/javascripts/supplier/app/models/product_category.js.coffee b/app/assets/javascripts/supplier/app/models/product_category.js.coffee index b0e081c0..096bf301 100644 --- a/app/assets/javascripts/supplier/app/models/product_category.js.coffee +++ b/app/assets/javascripts/supplier/app/models/product_category.js.coffee @@ -1,4 +1,4 @@ attr = DS.attr -Qsupplier.App.ProductCategory = DS.Model.extend +App.ProductCategory = DS.Model.extend name: attr('string') products: DS.hasMany('product') diff --git a/app/assets/javascripts/supplier/app/models/product_order.js.coffee b/app/assets/javascripts/supplier/app/models/product_order.js.coffee index d6490edc..8d7001ab 100644 --- a/app/assets/javascripts/supplier/app/models/product_order.js.coffee +++ b/app/assets/javascripts/supplier/app/models/product_order.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.ProductOrder = DS.Model.extend +App.ProductOrder = DS.Model.extend quantity: attr 'number', defaultValue: 1 price: attr 'number' product: DS.belongsTo('product') diff --git a/app/assets/javascripts/supplier/app/models/section.js.coffee b/app/assets/javascripts/supplier/app/models/section.js.coffee index cad16296..251325c2 100644 --- a/app/assets/javascripts/supplier/app/models/section.js.coffee +++ b/app/assets/javascripts/supplier/app/models/section.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.Section = DS.Model.extend +App.Section = DS.Model.extend title: attr 'string' width: attr 'number' height: attr 'number' diff --git a/app/assets/javascripts/supplier/app/models/supplier.js.coffee b/app/assets/javascripts/supplier/app/models/supplier.js.coffee index a3da6c2d..6b2c99f6 100644 --- a/app/assets/javascripts/supplier/app/models/supplier.js.coffee +++ b/app/assets/javascripts/supplier/app/models/supplier.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.Supplier = DS.Model.extend +App.Supplier = DS.Model.extend name: attr 'string' email: attr 'string' time_zone: attr 'string' diff --git a/app/assets/javascripts/supplier/app/models/table.js.coffee b/app/assets/javascripts/supplier/app/models/table.js.coffee index 8ff2fd85..601638c9 100644 --- a/app/assets/javascripts/supplier/app/models/table.js.coffee +++ b/app/assets/javascripts/supplier/app/models/table.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.Table = DS.Model.extend +App.Table = DS.Model.extend number: attr 'number' width: attr 'number' height: attr 'number' diff --git a/app/assets/javascripts/supplier/app/models/user.js.coffee b/app/assets/javascripts/supplier/app/models/user.js.coffee index 4ea5ac9e..399d5cae 100644 --- a/app/assets/javascripts/supplier/app/models/user.js.coffee +++ b/app/assets/javascripts/supplier/app/models/user.js.coffee @@ -1,5 +1,5 @@ attr = DS.attr -Qsupplier.App.User= DS.Model.extend +App.User= DS.Model.extend facebook_id: attr('string') email: attr('string') name: attr('string') diff --git a/app/assets/javascripts/supplier/app/modifications/model_extensions.js.coffee b/app/assets/javascripts/supplier/app/modifications/model_extensions.js.coffee index 8d429a73..ba5001a2 100644 --- a/app/assets/javascripts/supplier/app/modifications/model_extensions.js.coffee +++ b/app/assets/javascripts/supplier/app/modifications/model_extensions.js.coffee @@ -8,7 +8,7 @@ DS.Model.reopen DS.Model.reopenClass findCached: (id)-> return null unless id - @store.all(@toString()).findProperty('id', id) + @store.all(@typeKey).findProperty('id', id) updateOrAdd: (attributes)-> if cached = @findCached(attributes.id) @@ -45,7 +45,7 @@ DS.Model.reopenClass nested_attributes = {} nested_attributes[self_name] = attributes # pushPayload makes association back references, just push not yet 2014-06-27 - new_record = @store.pushPayload(@toString(), nested_attributes) + new_record = @store.pushPayload(nested_attributes) #debugger if options.debug diff --git a/app/assets/javascripts/supplier/app/router.js.coffee b/app/assets/javascripts/supplier/app/router.js.coffee index 34183c0e..0d90d500 100644 --- a/app/assets/javascripts/supplier/app/router.js.coffee +++ b/app/assets/javascripts/supplier/app/router.js.coffee @@ -1,10 +1,10 @@ # For more information see: http://emberjs.com/guides/routing/ # and for queryParams: https://github.com/alexspeller/website/blob/a96d9afe4506454b155cc64299e86e558ce3c9f1/source/guides/routing/query-params.md -Qsupplier.App.Router.reopen +App.Router.reopen # location: 'history' rootURL: '/supplier' -Qsupplier.App.Router.map -> +App.Router.map -> @route '/', queryParams: ['section_id'] @resource 'sections', -> @resource 'section', path: ':section_id' diff --git a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee index 93bf3020..ab716b5b 100644 --- a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ApplicationRoute = Ember.Route.extend +App.ApplicationRoute = Ember.Route.extend beforeModel: -> # Preload only active lists and orders @supplier = @store.push 'supplier', supplier_object diff --git a/app/assets/javascripts/supplier/app/routes/index_route.js.coffee b/app/assets/javascripts/supplier/app/routes/index_route.js.coffee index 7f9da9fb..75158ff9 100644 --- a/app/assets/javascripts/supplier/app/routes/index_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/index_route.js.coffee @@ -1,9 +1,9 @@ -# Qsupplier.App.IndexRoute = Ember.Route.extend +# App.IndexRoute = Ember.Route.extend # model: (params, queryParams)-> # Ember.Object.create # # Find with condition does not work since the resulting array promise is not updated for newly created records - # #lists: Qsupplier.App.List.find({state: 'active'}) - # #orders: Qsupplier.App.Order.find({state: 'active'}) + # #lists: App.List.find({state: 'active'}) + # #orders: App.Order.find({state: 'active'}) # #lists: @store.filter 'list', (l)-> l.get('state') == 'active' # DOES NOT WORK!!!! (yet) # # use filter to create a scope on all the records # #lists: @store.filter 'list', -> true @@ -16,7 +16,7 @@ # controller.set('model', model) # #$('#section_selector').on 'change', (-> controller.set('sectionId', $(this).val())) # #controller.set 'lists', @store.all('list') - # #controller.set 'lists', Qsupplier.App.List.all() #.filterProperty('state', 'active') - # #controller.set 'orders', Qsupplier.App.Order.all() + # #controller.set 'lists', App.List.all() #.filterProperty('state', 'active') + # #controller.set 'orders', App.Order.all() # #controller.set 'lists', model.get('lists') # #controller.set 'orders', model.get('orders') diff --git a/app/assets/javascripts/supplier/app/routes/lists_index_route.js.coffee b/app/assets/javascripts/supplier/app/routes/lists_index_route.js.coffee index f88b4d2a..2ae0e8d3 100644 --- a/app/assets/javascripts/supplier/app/routes/lists_index_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/lists_index_route.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ListsIndexRoute = Ember.Route.extend +App.ListsIndexRoute = Ember.Route.extend #model: -> @store.find 'list' setupController: (controller, model)-> controller.set 'date', (new Date()).toISOString().substr(0,10) unless controller.get('date') diff --git a/app/assets/javascripts/supplier/app/routes/section_route.js.coffee b/app/assets/javascripts/supplier/app/routes/section_route.js.coffee index 8ce28504..be30ba83 100644 --- a/app/assets/javascripts/supplier/app/routes/section_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/section_route.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionRoute = Ember.Route.extend +App.SectionRoute = Ember.Route.extend model: (params) -> @store.findById 'section', params.section_id renderTemplate: -> @render 'section' diff --git a/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee b/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee index 19b4c336..83c756de 100644 --- a/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionsRoute = Ember.Route.extend +App.SectionsRoute = Ember.Route.extend model: -> @store.all 'section' # setupController: (controller, collection) -> diff --git a/app/assets/javascripts/supplier/app/routes/settings_route.js.coffee b/app/assets/javascripts/supplier/app/routes/settings_route.js.coffee index 2d4c1154..7599102a 100644 --- a/app/assets/javascripts/supplier/app/routes/settings_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/settings_route.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SettingsRoute = Ember.Route.extend +App.SettingsRoute = Ember.Route.extend model: -> Em.RSVP.hash supplier: @controllerFor('application').get('supplier') diff --git a/app/assets/javascripts/supplier/app/routes/tables_index_route.js.coffee b/app/assets/javascripts/supplier/app/routes/tables_index_route.js.coffee index 0034b009..ce01ba00 100644 --- a/app/assets/javascripts/supplier/app/routes/tables_index_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/tables_index_route.js.coffee @@ -1,2 +1,2 @@ -Qsupplier.App.TablesIndexRoute = Ember.Route.extend +App.TablesIndexRoute = Ember.Route.extend model: -> @store.all('table') diff --git a/app/assets/javascripts/supplier/app/store.js.coffee b/app/assets/javascripts/supplier/app/store.js.coffee index 2ccfea78..ee33051e 100644 --- a/app/assets/javascripts/supplier/app/store.js.coffee +++ b/app/assets/javascripts/supplier/app/store.js.coffee @@ -1,6 +1,6 @@ -Qsupplier.App.ApplicationSerializer = DS.ActiveModelSerializer +App.ApplicationSerializer = DS.ActiveModelSerializer -Qsupplier.App.ApplicationStore = DS.Store.extend +App.ApplicationStore = DS.Store.extend adapter: DS.RESTAdapter.extend namespace: 'supplier' # user underscored paths diff --git a/app/assets/javascripts/supplier/app/templates/_list_content.emblem b/app/assets/javascripts/supplier/app/templates/_list_content.emblem index 599cb70a..d3878236 100644 --- a/app/assets/javascripts/supplier/app/templates/_list_content.emblem +++ b/app/assets/javascripts/supplier/app/templates/_list_content.emblem @@ -11,7 +11,7 @@ if list.closed_at =state 'list' list.state .display-row .display-label   - .display-field: Qsupplier.App.CloseListButtonView content=list + .display-field: App.CloseListButtonView content=list .row each user in list.users img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square" alt="f" diff --git a/app/assets/javascripts/supplier/app/templates/active_list.emblem b/app/assets/javascripts/supplier/app/templates/active_list.emblem index d7a2bbb4..76098f79 100644 --- a/app/assets/javascripts/supplier/app/templates/active_list.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_list.emblem @@ -7,7 +7,7 @@ td.status-icons if view.content.needs_payment | span.icon.needs-payment -td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content" +td.numeric.table_number: App.TableNumberWithInfoView contextBinding="view.content" td.section_title: link-to 'section' view.content.section.id: span=view.content.section.title td.currency.total_list_amount {{currency view.content.total}} td.actions @@ -16,7 +16,7 @@ td.actions span.fa-stack.fa-2x.fa-stack-sized i.fa.fa-bell.fa-stack-small i.fa.fa-ban.revoke - Qsupplier.App.MarkListHelpedButtonView content=view.content - Qsupplier.App.CloseListButtonView content=view.content + App.MarkListHelpedButtonView content=view.content + App.CloseListButtonView content=view.content button.show-list.button{action "showList" view.content.id}: span diff --git a/app/assets/javascripts/supplier/app/templates/active_order.emblem b/app/assets/javascripts/supplier/app/templates/active_order.emblem index 5a0ca75e..6fa41cfb 100644 --- a/app/assets/javascripts/supplier/app/templates/active_order.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_order.emblem @@ -4,7 +4,7 @@ td.user-info.show-for-large-up td.status-icons span.active-order.fa.fa-check.fa-lg td= view.content.display -td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content.list" +td.numeric.table_number: App.TableNumberWithInfoView contextBinding="view.content.list" td.section_title: link-to 'section' view.content.list.section.id: span=view.content.list.section.title td.currency=currency view.content.total td.actions diff --git a/app/assets/javascripts/supplier/app/templates/index.emblem b/app/assets/javascripts/supplier/app/templates/index.emblem index 1e4520fa..b0f207e3 100644 --- a/app/assets/javascripts/supplier/app/templates/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/index.emblem @@ -1,7 +1,7 @@ .page-header div.dashboard-section-selection - Qsupplier.App.HomeSectionSelectorView selectionBinding="controller.controllers.application.active_section" content=controller.sections prompt=controllers.application.supplier.name - Qsupplier.App.HomeSectionJumperView + App.HomeSectionSelectorView selectionBinding="controller.controllers.application.active_section" content=controller.sections prompt=controllers.application.supplier.name + App.HomeSectionJumperView h3=t 'active_lists.title' .well table.active-lists-table.table @@ -14,7 +14,7 @@ th.currency=t 'active_lists.price' th.actions tbody - each list in controller.active_lists: Qsupplier.App.ActiveListView contentBinding="list" + each list in controller.active_lists: App.ActiveListView contentBinding="list" .page-header h3=t 'active_orders.title' .well @@ -29,4 +29,4 @@ th.currency=t 'active_orders.price' th.actions tbody - each order in controller.active_orders: Qsupplier.App.ActiveOrderView contentBinding="order" + each order in controller.active_orders: App.ActiveOrderView contentBinding="order" diff --git a/app/assets/javascripts/supplier/app/templates/lists/index.emblem b/app/assets/javascripts/supplier/app/templates/lists/index.emblem index 32f3b8e2..53943013 100644 --- a/app/assets/javascripts/supplier/app/templates/lists/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/lists/index.emblem @@ -1,5 +1,5 @@ h1=t 'models.plural.list' -Qsupplier.App.ListDisplayDateSelector valueBinding="date" +App.ListDisplayDateSelector valueBinding="date" if sorted_lists table.table thead diff --git a/app/assets/javascripts/supplier/app/templates/modal_add_section.emblem b/app/assets/javascripts/supplier/app/templates/modal_add_section.emblem index ff203429..13e186d6 100644 --- a/app/assets/javascripts/supplier/app/templates/modal_add_section.emblem +++ b/app/assets/javascripts/supplier/app/templates/modal_add_section.emblem @@ -12,12 +12,12 @@ modal-dialog action="close" .form-label label=t 'attributes.section.width' .form-field - Qsupplier.App.NumberField valueBinding="section_width" + App.NumberField valueBinding="section_width" .form-row .form-label label=t 'attributes.section.height' .form-field - Qsupplier.App.NumberField valueBinding="section_height" + App.NumberField valueBinding="section_height" .modal-footer hr button.confirm-cancel{action "close"}=t 'section.add_section.modal.close_button' diff --git a/app/assets/javascripts/supplier/app/templates/modal_section_add_tables.emblem b/app/assets/javascripts/supplier/app/templates/modal_section_add_tables.emblem index 1d6a525f..f88e08ee 100644 --- a/app/assets/javascripts/supplier/app/templates/modal_section_add_tables.emblem +++ b/app/assets/javascripts/supplier/app/templates/modal_section_add_tables.emblem @@ -11,13 +11,13 @@ modal-dialog action="close" label for='add-tables-number-start' =t 'section.add_tables.modal.number_start' .form-field - Qsupplier.App.NumberField valueBinding="number_start" + App.NumberField valueBinding="number_start" .form-row .form-label label for='add-tables-number-end' =t 'section.add_tables.modal.number_end' .form-field - Qsupplier.App.NumberField valueBinding="number_end" + App.NumberField valueBinding="number_end" .modal-footer hr button.confirm-cancel{action "close"}=t 'section.add_tables.modal.close_button' diff --git a/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem b/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem index 0efa68d4..44593a33 100644 --- a/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem +++ b/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem @@ -23,11 +23,11 @@ modal-dialog action="close" ==t 'section.arrange_tables.modal.distributed.explanation' if isByRow ==t 'section.arrange_tables.modal.by_row.before_field' - Qsupplier.App.NumberField valueBinding="row_count" + App.NumberField valueBinding="row_count" ==t 'section.arrange_tables.modal.by_row.after_field' if isByColumn ==t 'section.arrange_tables.modal.by_column.before_field' - Qsupplier.App.NumberField valueBinding="column_count" + App.NumberField valueBinding="column_count" ==t 'section.arrange_tables.modal.by_column.after_field' .modal-footer hr diff --git a/app/assets/javascripts/supplier/app/templates/modals/edit_table.emblem b/app/assets/javascripts/supplier/app/templates/modals/edit_table.emblem index 0e60f191..a0bedfb3 100644 --- a/app/assets/javascripts/supplier/app/templates/modals/edit_table.emblem +++ b/app/assets/javascripts/supplier/app/templates/modals/edit_table.emblem @@ -6,7 +6,7 @@ modal-dialog action="close" p=t 'table.edit.modal.body_header' .form-row .form-label=t 'attributes.table.number' - .form-field: Qsupplier.App.NumberField valueBinding="model.number" + .form-field: App.NumberField valueBinding="model.number" .form-row .form-label=t 'models.section' .form-field diff --git a/app/assets/javascripts/supplier/app/templates/section.emblem b/app/assets/javascripts/supplier/app/templates/section.emblem index 38c0c62d..8c000b26 100644 --- a/app/assets/javascripts/supplier/app/templates/section.emblem +++ b/app/assets/javascripts/supplier/app/templates/section.emblem @@ -1,7 +1,7 @@ .section-tabs-container link-to 'sections' class="goto-sections-index-tab-header": span each section in sections - Qsupplier.App.SectionTabHeaderView context=section + App.SectionTabHeaderView context=section a.add-section{action "addSection"}: span .section-manage-tables.pull-right if editmode @@ -17,7 +17,7 @@ /button.btn.dropdown-toggle data-toggle="dropdown" span Action span.caret - Qsupplier.App.DropdownLink title="Action" + App.DropdownLink title="Action" ul li a{action "addTables"}: span.section-add-tables-icon=t 'section.add_tables.button_label' @@ -28,10 +28,10 @@ li a.section-destroy{action "destroySection"}: span.section-remove-icon=t 'helpers.links.destroy' Ember.TextField valueBinding="title" class="section-edit-title-field" - Qsupplier.App.NumberField valueBinding="width" class="dimension section-edit-width-field" + App.NumberField valueBinding="width" class="dimension section-edit-width-field" span.fa.fa-lg.fa-times - Qsupplier.App.NumberField valueBinding="height" class="dimension section-edit-height-field" + App.NumberField valueBinding="height" class="dimension section-edit-height-field" a.section-normal-mode-button{ action "finishEditable" }: span else a.section-edit-mode-button{ action "makeEditable" }: span -Qsupplier.App.SectionTablesView contentBinding="tables" +App.SectionTablesView contentBinding="tables" diff --git a/app/assets/javascripts/supplier/app/templates/section_table.emblem b/app/assets/javascripts/supplier/app/templates/section_table.emblem index df0027f7..6222d79c 100644 --- a/app/assets/javascripts/supplier/app/templates/section_table.emblem +++ b/app/assets/javascripts/supplier/app/templates/section_table.emblem @@ -7,8 +7,8 @@ if table.active_list div.table-actions .title= table.number .table-action-row - Qsupplier.App.MarkListHelpedButtonView contentBinding="table.active_list" - Qsupplier.App.CloseListButtonView contentBinding="table.active_list" + App.MarkListHelpedButtonView contentBinding="table.active_list" + App.CloseListButtonView contentBinding="table.active_list" .table-action-row=currency table.active_list.total /.table-action-row a{action "editTable" table}: span.fa.fa-lg.fa-wrench diff --git a/app/assets/javascripts/supplier/app/templates/section_tables.emblem b/app/assets/javascripts/supplier/app/templates/section_tables.emblem index 78a12bf3..001eb342 100644 --- a/app/assets/javascripts/supplier/app/templates/section_tables.emblem +++ b/app/assets/javascripts/supplier/app/templates/section_tables.emblem @@ -1,2 +1,2 @@ each table in tables - Qsupplier.App.SectionTableView content=table + App.SectionTableView content=table diff --git a/app/assets/javascripts/supplier/app/templates/settings.emblem b/app/assets/javascripts/supplier/app/templates/settings.emblem index 35f146ca..99272af7 100644 --- a/app/assets/javascripts/supplier/app/templates/settings.emblem +++ b/app/assets/javascripts/supplier/app/templates/settings.emblem @@ -4,7 +4,7 @@ h2=t 'settings.title' .form-field: Ember.TextField valueBinding="controller.model.name" .form-row .form-label: label=t 'attributes.supplier.email' - .form-field: Qsupplier.App.EmailField valueBinding="controller.model.email" classNames="supplier-email" + .form-field: App.EmailField valueBinding="controller.model.email" classNames="supplier-email" /input.location_picker name="location" type="text" valueBinding="location" /.form-row .location_picker_map @@ -18,7 +18,7 @@ h2=t 'settings.title' .row .large-8.medium-8.columns: Ember.TextField valueBinding="controller.model.address" .large-1.show-for-large-up.columns   - .large-2.medium-2.small-3.columns: Qsupplier.App.NumberField valueBinding="controller.model.house_number" + .large-2.medium-2.small-3.columns: App.NumberField valueBinding="controller.model.house_number" .large-1.medium-2.small-2.columns: Ember.TextField valueBinding="controller.model.house_number_addition" .form-row .form-label: label=t 'attributes.supplier.postal_code' @@ -33,7 +33,7 @@ if editIensProfile .form-row .form-label: label=t 'attributes.supplier.iens_profile' .form-field - Qsupplier.App.NumberField valueBinding="controller.model.iens_profile" + App.NumberField valueBinding="controller.model.iens_profile" = image_tag 'supplier/settings/iens-example.png' span=t "settings.reviews.explanation" .form-row.form-actions diff --git a/app/assets/javascripts/supplier/app/views/active_list_view.js.coffee b/app/assets/javascripts/supplier/app/views/active_list_view.js.coffee index 38c69d69..0dbf84a7 100644 --- a/app/assets/javascripts/supplier/app/views/active_list_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/active_list_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ActiveListView = Ember.View.extend +App.ActiveListView = Ember.View.extend tagName: 'tr' templateName: 'active_list' classNameBindings: ['classIdentifier'] diff --git a/app/assets/javascripts/supplier/app/views/active_order_view.js.coffee b/app/assets/javascripts/supplier/app/views/active_order_view.js.coffee index 164f2c63..436c1e3f 100644 --- a/app/assets/javascripts/supplier/app/views/active_order_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/active_order_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ActiveOrderView = Ember.View.extend +App.ActiveOrderView = Ember.View.extend tagName: 'tr' templateName: 'active_order' classNameBindings: ['content.active:active', 'content.delivered:delivered', 'classIdentifier'] diff --git a/app/assets/javascripts/supplier/app/views/application_view.js.coffee b/app/assets/javascripts/supplier/app/views/application_view.js.coffee index e4048c27..03b7b74a 100644 --- a/app/assets/javascripts/supplier/app/views/application_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/application_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ApplicationView = Ember.View.extend +App.ApplicationView = Ember.View.extend didInsertElement: -> Qsupplier.watch_events() selector_mappings = diff --git a/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee b/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee index 0c9f81fe..34ed6d29 100644 --- a/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.CloseListButtonView = Ember.View.extend +App.CloseListButtonView = Ember.View.extend templateName: 'close_list_button' classNames: ['close-list-button'] classNameBindings: ['content.active:show:hide'] diff --git a/app/assets/javascripts/supplier/app/views/email_field.js.coffee b/app/assets/javascripts/supplier/app/views/email_field.js.coffee index 4753ab64..6eda3535 100644 --- a/app/assets/javascripts/supplier/app/views/email_field.js.coffee +++ b/app/assets/javascripts/supplier/app/views/email_field.js.coffee @@ -1,3 +1,3 @@ -Qsupplier.App.EmailField = Ember.TextField.extend +App.EmailField = Ember.TextField.extend type: 'email' #attributeBindings: ['min', 'max', 'step'] diff --git a/app/assets/javascripts/supplier/app/views/home_section_jumper_view.js.coffee b/app/assets/javascripts/supplier/app/views/home_section_jumper_view.js.coffee index fd9ee5b6..4fba307f 100644 --- a/app/assets/javascripts/supplier/app/views/home_section_jumper_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/home_section_jumper_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.HomeSectionJumperView = Ember.View.extend +App.HomeSectionJumperView = Ember.View.extend tagName: 'a' classNames: ['main-board-section-jumper'] href: '#' diff --git a/app/assets/javascripts/supplier/app/views/home_section_selector_view.js.coffee b/app/assets/javascripts/supplier/app/views/home_section_selector_view.js.coffee index 4230d14b..d4599d37 100644 --- a/app/assets/javascripts/supplier/app/views/home_section_selector_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/home_section_selector_view.js.coffee @@ -1,7 +1,7 @@ HomeSectionOption = Ember.SelectOption.extend select_label: (-> "- #{@get('content.title')}").property('content.title') valueBinding: 'content.id' -Qsupplier.App.HomeSectionSelectorView = Ember.Select.extend +App.HomeSectionSelectorView = Ember.Select.extend classNames: 'section_selector' optionView: HomeSectionOption #valueBinding: 'controller.active_section_id' diff --git a/app/assets/javascripts/supplier/app/views/list_display_date_selector.js.coffee b/app/assets/javascripts/supplier/app/views/list_display_date_selector.js.coffee index 595d391b..a3515d98 100644 --- a/app/assets/javascripts/supplier/app/views/list_display_date_selector.js.coffee +++ b/app/assets/javascripts/supplier/app/views/list_display_date_selector.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.ListDisplayDateSelector = Ember.TextField.extend +App.ListDisplayDateSelector = Ember.TextField.extend classNames: 'datepicker' didInsertElement: -> setTranslations @$().hide() diff --git a/app/assets/javascripts/supplier/app/views/mark_list_helped_button_view.js.coffee b/app/assets/javascripts/supplier/app/views/mark_list_helped_button_view.js.coffee index a8fbd9d0..f1db3805 100644 --- a/app/assets/javascripts/supplier/app/views/mark_list_helped_button_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/mark_list_helped_button_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.MarkListHelpedButtonView = Ember.View.extend +App.MarkListHelpedButtonView = Ember.View.extend templateName: 'mark_list_helped_button' classNames: ['mark_list_as_helped'] classNameBindings: ['content.needs_help:show:hide'] diff --git a/app/assets/javascripts/supplier/app/views/number_field.js.coffee b/app/assets/javascripts/supplier/app/views/number_field.js.coffee index 4ef3f300..fd784ba4 100644 --- a/app/assets/javascripts/supplier/app/views/number_field.js.coffee +++ b/app/assets/javascripts/supplier/app/views/number_field.js.coffee @@ -1,3 +1,3 @@ -Qsupplier.App.NumberField = Ember.TextField.extend +App.NumberField = Ember.TextField.extend type: 'number' attributeBindings: ['min', 'max', 'step'] diff --git a/app/assets/javascripts/supplier/app/views/section_tab_header_view.js.coffee b/app/assets/javascripts/supplier/app/views/section_tab_header_view.js.coffee index 091d173a..c8fbe711 100644 --- a/app/assets/javascripts/supplier/app/views/section_tab_header_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/section_tab_header_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionTabHeaderView = Ember.View.extend DragNDrop.Droppable, +App.SectionTabHeaderView = Ember.View.extend DragNDrop.Droppable, templateName: 'section_tab_header' classNames: ['section-tab-header'] classNameBindings: ['section_header_class', 'controller.controllers.application.isDragging:table-dragging', 'section_active'] diff --git a/app/assets/javascripts/supplier/app/views/section_table_view.js.coffee b/app/assets/javascripts/supplier/app/views/section_table_view.js.coffee index fc09c081..9c7d3e32 100644 --- a/app/assets/javascripts/supplier/app/views/section_table_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/section_table_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionTableView = Ember.View.extend DragNDrop.Draggable, +App.SectionTableView = Ember.View.extend DragNDrop.Draggable, templateName: 'section_table' classNames: ['section-table'] attributeBindings: ['style'] diff --git a/app/assets/javascripts/supplier/app/views/section_tables_view.js.coffee b/app/assets/javascripts/supplier/app/views/section_tables_view.js.coffee index 6a0e82ab..4b605d64 100644 --- a/app/assets/javascripts/supplier/app/views/section_tables_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/section_tables_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SectionTablesView = Ember.View.extend DragNDrop.Droppable, +App.SectionTablesView = Ember.View.extend DragNDrop.Droppable, classNames: ['well', 'section-tables-container', 'section-tables-active'] templateName: 'section_tables' didInsertElement: -> diff --git a/app/assets/javascripts/supplier/app/views/section_view.js.coffee b/app/assets/javascripts/supplier/app/views/section_view.js.coffee index 10be8251..595ac16e 100644 --- a/app/assets/javascripts/supplier/app/views/section_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/section_view.js.coffee @@ -1,4 +1,4 @@ -#Qsupplier.App.SectionView = Ember.View.extend {} +#App.SectionView = Ember.View.extend {} #initFoundation: (-> #debugger #@$().foundation() diff --git a/app/assets/javascripts/supplier/app/views/settings_view.js.coffee b/app/assets/javascripts/supplier/app/views/settings_view.js.coffee index b2f26755..d25f4be3 100644 --- a/app/assets/javascripts/supplier/app/views/settings_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/settings_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.SettingsView = Ember.View.extend +App.SettingsView = Ember.View.extend templateName: 'settings' didInsertElement: -> return diff --git a/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee b/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee index e1b7f828..ed2851df 100644 --- a/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee @@ -1,3 +1,3 @@ -Qsupplier.App.TableActionsView = Ember.Component.extend +App.TableActionsView = Ember.Component.extend tagName: 'ul' templateName: 'table_actions' diff --git a/app/assets/javascripts/supplier/app/views/table_number_with_info_view.js.coffee b/app/assets/javascripts/supplier/app/views/table_number_with_info_view.js.coffee index 0e485c85..41b76adb 100644 --- a/app/assets/javascripts/supplier/app/views/table_number_with_info_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/table_number_with_info_view.js.coffee @@ -1,4 +1,4 @@ -Qsupplier.App.TableNumberWithInfoView = Ember.View.extend +App.TableNumberWithInfoView = Ember.View.extend tagName: 'span' templateName: 'table_number_with_info' classNames: 'table-number-with-info' diff --git a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee index b4db24de..a9916c6f 100644 --- a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee +++ b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee @@ -6,11 +6,11 @@ root.Qsupplier= console.log "Event: #{e.event}" console.log e.data if(e.event == 'new_order') - if Qsupplier.App - Qsupplier.App.store().pushPayload(e.data) + if App + App.store().pushPayload(e.data) # Fix for ember pushPayload bug not creating the proper relations/triggers setTimeout -> - if order = Qsupplier.App.store().all('order').findProperty('id', e.data.order.id) + if order = App.store().all('order').findProperty('id', e.data.order.id) # console.log "Ugly ember fix for adding order #{e.data.order.id} as relation to its list" list = order.get('list') list.get('orders').addRecord order @@ -20,35 +20,35 @@ root.Qsupplier= table.set 'active_list', list if table_list isnt list , 200 else if(e.event == 'list_needs_help') - if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) + if App and list = App.List.findCached(e.data.id) list.markNeedsHelp() # old stuff # $('#list-needs-help-indicator-'+e.data.id).removeClass('hide') # $('#list-is-helped-button-'+e.data.id).removeClass('hide') # $('.section-table-list-'+e.data.id).addClass('needs_help') else if(e.event == 'list_needs_payment') - if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) + if App and list = App.List.findCached(e.data.id) list.markNeedsPayment() # old stuff $('#list-needs-payment-indicator-'+e.data.id).removeClass('hide') $('.section-table-list-'+e.data.id).addClass('needs_payment') else if(e.event == 'list_is_paid') - if list = Qsupplier.App.List.findCached(e.data.id) + if list = App.List.findCached(e.data.id) list.markIsPaid() else if e.event == 'list_update' - if Qsupplier.App - list = Qsupplier.App.List.updateOrAdd(e.data.list) + if App + list = App.List.updateOrAdd(e.data.list) else if e.event == 'list_closed' - if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) + if App and list = App.List.findCached(e.data.id) list.markClosed() $('.list-row-'+e.data.id).remove() $('.of-list-'+e.data.id).remove() table_list_class = 'section-table-list-'+e.data.id $('.'+table_list_class).removeClass('occupied needs_help needs_payment active_order').removeClass(table_list_class) else if e.event == 'order_closed' - order.markClosed() if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id) + order.markClosed() if App and order = App.Order.findCached(e.data.id) else if e.event == 'list_helped' - if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) + if App and list = App.List.findCached(e.data.id) list.markHelped() # list_id = e.data.id @@ -56,12 +56,12 @@ root.Qsupplier= # $('#list-is-helped-button-'+list_id).addClass('hide') # $('.section-table-list-'+list_id).removeClass('needs_help') else if e.event == 'order_being_processed' - if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id) + if App and order = App.Order.findCached(e.data.id) order.markActive() # $('#order-in-process-button-'+e.data.id).hide() # $('.order-row-'+e.data.id).removeClass('placed').addClass('active') else if e.event == 'order_being_delivered' - if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id) + if App and order = App.Order.findCached(e.data.id) order.markDelivered() # $('.order-row-'+e.data.id).remove() # $('.section-table-list-'+e.data.list_id).removeClass('active_order') @@ -70,9 +70,9 @@ root.Qsupplier= else if e.event == 'orders_placed_count' $('.supplier-orders-placed-count-number').text e.data.count else if e.event == 'list_changed_table' - Qsupplier.App && Qsupplier.App.List.updateOrAdd(e.data.list) + App && App.List.updateOrAdd(e.data.list) else if e.event == 'order_cancelled' - if Qsupplier.App and order = Qsupplier.App.Order.findCached(e.data.id) + if App and order = App.Order.findCached(e.data.id) order.markCancelled() $('.supplier-orders-placed-count-number').text(e.data.orders_placed_count) if e.data.orders_placed_count == 0 or e.data.orders_placed_count $('.supplier-orders-in-process-count-number').text(e.data.orders_in_process_count) if e.data.orders_in_process_count == 0 or e.data.orders_in_process_count diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1802774a..0015ee26 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,6 +50,10 @@ module ApplicationHelper 'mozo.bar' end + def site_page_title + application_title + end + # Helper for displaying HTML currency values def currency(amount, opts={}) amount ||= 0.0 @@ -102,10 +106,10 @@ module ApplicationHelper end def facebook_link - link_to 'Facebook', 'https://www.facebook.com/Qwaiter', target: :_blank + link_to 'Facebook', 'https://www.facebook.com/mozo.bar', target: :_blank end def twitter_link - link_to 'Twitter', 'https://www.twitter.com/Qwaiter', target: :_blank + link_to 'Twitter', 'https://www.twitter.com/mozo.bar', target: :_blank end # Add a script call to be executed when the dom is loaded. diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index c9f15410..c924e484 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -4,7 +4,7 @@ html lang="en" meta charset="utf-8" meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" meta name="viewport" content="width=device-width, initial-scale=1.0" - title= content_for?(:title) ? yield(:title) : application_title + title= site_page_title = csrf_meta_tags /! Le HTML5 shim, for IE6-8 support of HTML elements /[if lt IE 9] diff --git a/app/views/layouts/theme1.html.slim b/app/views/layouts/theme1.html.slim index 9b00a6e6..a1a2722c 100644 --- a/app/views/layouts/theme1.html.slim +++ b/app/views/layouts/theme1.html.slim @@ -4,7 +4,7 @@ html lang="en" meta charset="utf-8" meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" meta name="viewport" content="width=device-width, initial-scale=1.0" - title= content_for?(:title) ? yield(:title) : application_title + title= site_page_title = csrf_meta_tags /! Le HTML5 shim, for IE6-8 support of HTML elements diff --git a/lib/rqrcode-rails3/qr_container.svg b/lib/rqrcode-rails3/qr_container.svg index f3e7b4f5..48db9b1c 100644 --- a/lib/rqrcode-rails3/qr_container.svg +++ b/lib/rqrcode-rails3/qr_container.svg @@ -14,8 +14,8 @@ height="318.89764" id="svg2991" version="1.1" - inkscape:version="0.48.2 r9819" - sodipodi:docname="table_qr_image2.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="qr_container.svg"> image/svg+xml - + @@ -219,82 +219,80 @@ x="277.10553" y="160.40939" id="tspan3801">#table_number - - - Q - - - WAITE - - - R - - - - - - - - - + + MOZO + + + .BAR + + + + + + + + diff --git a/spec/support/ember_helpers.rb b/spec/support/ember_helpers.rb index 664352bc..3ec3c52f 100644 --- a/spec/support/ember_helpers.rb +++ b/spec/support/ember_helpers.rb @@ -1,7 +1,7 @@ module SpecEmberHelpers def ember_store h = page.evaluate_script <<-SCRIPT - $s = Qsupplier.App.__container__.lookup('controller:application').store; + $s = App.__container__.lookup('controller:application').store; JSON.stringify({ lists: $s.all('list').invoke('serialize'), orders: $s.all('order').invoke('serialize'), diff --git a/wip.md b/wip.md index 25f80675..697ec616 100644 --- a/wip.md +++ b/wip.md @@ -27,6 +27,7 @@ Supplier - Settings checken - Event stream to ember? (After release!!!) - Add qr print functionality offering to send the stickers +- Supplier sidebar open/close message seems untranslated User ----