bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress and cleanup code

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-18 15:41:14 +02:00
parent 34877d4b8b
commit bfa6bb66b0
14 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/supplier/app/templates/_list_content.emblem
+1 -1
View File
@@ -14,7 +14,7 @@ if list.closed_at
.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"
=user.facebook_image_tag
if list.sorted_orders
.list-orders-container
each order in list.sorted_orders
app/assets/javascripts/supplier/app/views/section_table_view.js.coffee
-11
View File
@@ -55,14 +55,3 @@ App.SectionTableView = Ember.View.extend DragNDrop.Draggable,
@$el.on 'click', =>
# duplication of .table-actions because variable gets unshadowed
@$('.table-actions').toggle() if @$el.hasClass('occupied') and not @get('controller.editmode')
#@$el.qtip
#content:
#text: content
#title: title.html()
#style:
#classes: 'qtip-wiki qtip-light qtip-shadow'
#show: 'click'
#hide:
#fixed: true
#delay: 500
#prerender: true
app/assets/javascripts/supplier/foundation1/application.js.erb
+13 -8
View File
@@ -1,28 +1,28 @@
//= require modernizr
//= require jquery
//= require jquery_ujs
//= require jquery-ui/sortable
//= require modernizr
// require foundation FOUNDATION 5 JAVASCRIPT IMPLEMENTATIONS AND EMBER ARE NOT COMPATIBLE, FOUNDATION IS TOO SIMPLISTIC AT THE MOMENT AND DESTROYS DOM EVENTS
//= require js-routes
//= require moment
//= require translations
//= require qwaiter
// require qwaiter
//= require ./qsupplier
//= require handlebars
//= require faye
//= require ./base
//= require qtip
// require qtip # was used for table actions in section view, now done by EMBER
//= require pickdate
//= require_directory .
//= require_self
//= require moment
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);
}
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 %>;
window.countries = <%= IsoCountryCodes.all.map{|cc| {name: cc.name}}.to_json.html_safe %>;
@@ -41,7 +41,12 @@ function redirect_to(mapping, variables){
window.location = path_mapping[mapping] + '?' + vars.join('&')
}
function currency(num) {
return Qwaiter.currency(num);
// num = 0.0 if isNaN(num) || num == '' || num == null
// '&euro;&nbsp;' + parseFloat(num).toFixed(2)
if (isNaN(num) || num === '' || num === null) {
num = 0.0;
}
return '&euro;&nbsp;' + parseFloat(num).toFixed(2);
}
Handlebars.registerHelper('t', function(tlocation) {
app/assets/stylesheets/supplier/foundation1/_menu_side.css.sass
+1
View File
@@ -14,3 +14,4 @@ aside.side-menu
.supplier-close-shop
+alert($bg: $alert-color, $radius: true)
padding: 3px
margin-right: 20px
app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass
+1 -1
View File
@@ -3,7 +3,7 @@ $side-spacing: 0px
+alert($bg: $secondary-color)
.close
+alert-close
.open-supplier-button
.supplier-open-shop
+button($padding: $button-tny)
margin: 0
margin-left: 20px
app/assets/stylesheets/supplier/foundation1/components/_products_preview.css.sass
+2 -2
View File
@@ -7,13 +7,13 @@
float: left
margin-left: 10px
select
width: 50px
width: 70px
&:after
content: " :"
.products_preview-minute
float: left
margin-left: 10px
select
width: 50px
width: 70px
#products-table
width: 100%
app/views/layouts/tablet.html.slim
+4 -2
View File
@@ -32,9 +32,11 @@ html lang="en"
a.close data-dismiss="alert" &#215;
- if current_supplier.closed?
.supplier-is-closed
= t('supplier.you_are_currently_closed_alert')
span data-t="supplier.you_are_currently_closed_alert"
= form_tag supplier_mark_as_open_path do
= submit_tag t('supplier.mark_as_open_button'), class: ['open-supplier-button']
/ = submit_tag t('supplier.mark_as_open_button'), class: ['open-supplier-button']
a.supplier-open-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()"
span data-t="supplier.open_for_orders"
a.close{data-dismiss="alert"} &times;
.row
.span12
app/views/layouts/user/foundation.html.slim
+3 -3
View File
@@ -1,9 +1,9 @@
doctype html
html lang="en"
head
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"
meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi"
meta name="msapplication-tap-highlight" content="no"
title= application_title
= javascript_include_tag "vendor/modernizr"
= stylesheet_link_tag "user/foundation/application"
app/views/suppliers/application/_top_menu.html.slim
+2 -1
View File
@@ -29,7 +29,8 @@ aside.side-menu
- if current_supplier.open?
li
= form_tag supplier_mark_as_closed_path do
= submit_tag t('supplier.close'), class: 'supplier-close-shop', onClick: %|$(this).parents('form').submit()|
a.supplier-close-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()"
span data-t="supplier.close_for_orders"
li= link_to 'Settings', supplier_settings_path, class: 'supplier-settings-link'
li= link_to 'Logout', destroy_supplier_session_path, method: :delete, class: 'supplier-sign-out-link'
/.navbar.navbar-fixed-top.navbar-inverse
config/initializers/simple_form.rb
+1 -1
View File
@@ -55,7 +55,7 @@ SimpleForm.setup do |config|
config.boolean_style = :nested
# Default class for buttons
config.button_class = 'btn'
config.button_class = 'button'
# Method used to tidy up errors. Specify any Rails Array method.
# :first lists the first message for each field.
config/locales/supplier.en.yml
+4 -3
View File
@@ -13,9 +13,10 @@ en:
active_orders:
title: Active orders
price: Price
close: Close the shop
you_are_currently_closed_alert: 'You are currently closed and not able to take orders'
mark_as_open_button: 'Open up the place!'
supplier:
close_for_orders: Close the shop
open_for_orders: 'Open up the place!'
you_are_currently_closed_alert: 'You are currently closed and not able to take orders'
table_number: Table
tables:
qr_codes:
config/locales/supplier.nl.yml
+4 -3
View File
@@ -13,9 +13,10 @@ nl:
active_orders:
title: Actieve orders
price: Prijs
close: De zaak afsluiten voor bestellingen
you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen'
mark_as_open_button: 'Open de zaak!'
supplier:
close_for_orders: De zaak afsluiten voor bestellingen
open_for_orders: 'Open de zaak!'
you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen'
table_number: Tafel
tables:
qr_codes:
notes.js.coffee
-25
View File
@@ -1,25 +0,0 @@
build_product_list_as_modal: ->
wrapper = $('<div class="modal"></div>')
callback_wrapper = ->
wrapper.modal('hide')
callback()
header = $('<div class="modal-header"></div>')
.append('<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>')
.append('<h3>Product list</h3>').appendTo(wrapper)
body = $('<div class="modal-body"></div>')
table = $('<table class="table"></table>').appendTo(body)
tbody = $('<tbody></tbody>').appendTo(table)
for product_id, info of window.active_products_list
row = $('<tr></tr>').appendTo(tbody)
row.append('<td>'+info.product.name+'</td>')
row.append('<td>'+info.number+'</td>')
row.append('<td>'+Qwaiter.currency(info.product.price * info.number)+'</td>')
body.appendTo(wrapper)
footer = $('<div class="modal-footer"></div>')
.append($('<a href="#" class="btn">Close</a>').click(-> wrapper.modal('hide')))
.append($('<a href="#" class="btn btn-primary">Yes</a>').click(callback_wrapper))
.appendTo(wrapper)
wrapper.modal()
wip.md
+12 -7
View File
@@ -4,20 +4,14 @@ Release
Supplier
--------
- better product listing with time of day in products overview
- english emails
- https://github.com/buytruckload/geonames_api
- website calls to action
- Side menu
- Open shop button nice
- Close shop button nice
- Title mooi en zichtbaar
- Product category looks for foundation
- form action button looks (Roos)
- Dashboard
- Empty state
- Section table view
- add order vinkjes management (post release)
- Add qr print functionality offering to send the stickers
- Supplier sidebar open/close message seems untranslated
@@ -36,7 +30,6 @@ Bugs
----
- Dragging supplier table from one section to the other fails
- supplier main board section selector selects first section option and not the supplier name, which is added using prompt thingy. Maybe setting ApplicationController.active_section in stead of IndexController.active_section for scope locking
Post release
============
@@ -44,12 +37,24 @@ Post release
- Chromecast app Waiter app Users can disable their own help request (maak ongedaan?) Users can disable their own bill request (maak ongedaan?) Think about extra confirmation box for these requests Supplier section 100% on ember :)
- Do not destroy tables with active list
- Test list view when table is destroyed
- Test a whole bunch of destroy actions (soft delete? DestoyedTable model?)
Website
-------
- website calls to action
Supplier
--------
- Counters display similar to users
- Add image to products
- tables#index Make table actions available
- Products to ember
- Product categories to ember
- Event stream to ember
- Section view, add go to list button right next to edit section button
- Replace product categories jquery sortable by ember version
- https://github.com/buytruckload/geonames_api
- Section view
- add order vinkjes (active, delivered) management to table actions (post release)