supplier improvements
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,219 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:ooo="http://xml.openoffice.org/svg/export"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.2"
|
||||
width="210mm"
|
||||
height="297mm"
|
||||
viewBox="0 0 21000 29700"
|
||||
preserveAspectRatio="xMidYMid"
|
||||
fill-rule="evenodd"
|
||||
clip-path="url(#presentation_clip_path)"
|
||||
stroke-width="28.222"
|
||||
stroke-linejoin="round"
|
||||
xml:space="preserve"
|
||||
id="svg2"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="location-balloon.svg"><metadata
|
||||
id="metadata89"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1432"
|
||||
inkscape:window-height="771"
|
||||
id="namedview87"
|
||||
showgrid="false"
|
||||
inkscape:zoom="1.4941487"
|
||||
inkscape:cx="273.18572"
|
||||
inkscape:cy="568.54313"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="g49" />
|
||||
<defs
|
||||
class="ClipPathGroup"
|
||||
id="defs4">
|
||||
<clipPath
|
||||
id="presentation_clip_path"
|
||||
clipPathUnits="userSpaceOnUse">
|
||||
<rect
|
||||
x="0"
|
||||
y="0"
|
||||
width="21000"
|
||||
height="29700"
|
||||
id="rect7" />
|
||||
</clipPath>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</defs>
|
||||
<defs
|
||||
class="TextShapeIndex"
|
||||
id="defs9">
|
||||
<g
|
||||
ooo:slide="id1"
|
||||
ooo:id-list="id3"
|
||||
id="g11" />
|
||||
</defs>
|
||||
<defs
|
||||
class="EmbeddedBulletChars"
|
||||
id="defs13">
|
||||
<g
|
||||
id="bullet-char-template(57356)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"
|
||||
id="path16" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(57354)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"
|
||||
id="path19" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(10146)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"
|
||||
id="path22" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(10132)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"
|
||||
id="path25" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(10007)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"
|
||||
id="path28" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(10004)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"
|
||||
id="path31" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(9679)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"
|
||||
id="path34" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(8226)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"
|
||||
id="path37" />
|
||||
</g>
|
||||
<g
|
||||
id="bullet-char-template(8211)"
|
||||
transform="scale(0.00048828125,-0.00048828125)">
|
||||
<path
|
||||
d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"
|
||||
id="path40" />
|
||||
</g>
|
||||
</defs>
|
||||
<defs
|
||||
class="TextEmbeddedBitmaps"
|
||||
id="defs42" />
|
||||
<g
|
||||
id="g44">
|
||||
<g
|
||||
id="id2"
|
||||
class="Master_Slide">
|
||||
<g
|
||||
id="bg-id2"
|
||||
class="Background" />
|
||||
<g
|
||||
id="bo-id2"
|
||||
class="BackgroundObjects" />
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
class="SlideGroup"
|
||||
id="g49">
|
||||
<path
|
||||
style="fill:#ffffff;stroke:none"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path59"
|
||||
d="m 7388.007,10723.32 c -814,0 -1628,415 -1628,831 l 0,622 0,623 0,848 0,623 0,622 c 0,416 814,832 1628,832 l -3736.9999,1936 6179,-1936 1659.9999,0 1221,0 1221,0 c 814,0 1629,-416 1629,-832 l 0,-622 0,-623 0,-848 0,-623 0,-622 c 0,-416 -815,-831 -1629,-831 l -1221,0 -1221,0 -1659.9999,0 -1221,0 -1221.0001,0 z m -1628,0 0,0 z m 9801,5001 0,0 z" /><path
|
||||
style="fill:none;stroke:#faa732;stroke-width:64.91110992;stroke-miterlimit:4;stroke-dasharray:none"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path61"
|
||||
d="m 7388.007,10723.32 c -814,0 -1628,415 -1628,831 l 0,622 0,623 0,848 0,623 0,622 c 0,416 814,832 1628,832 0,0 -257.6153,652.507 -500.6945,891.35 -675.1155,663.349 -2499.654,1346.866 -2499.654,1346.866 0,0 1937.451,-380.518 2845.1246,-752.656 922.8078,-378.343 2597.224,-1485.56 2597.224,-1485.56 l 1659.9999,0 1221,0 1221,0 c 814,0 1629,-416 1629,-832 l 0,-622 0,-623 0,-848 0,-623 0,-622 c 0,-416 -815,-831 -1629,-831 l -1221,0 -1221,0 -1659.9999,0 -1221,0 z"
|
||||
sodipodi:nodetypes="ssccccscacacccssccccssccccs" /><text
|
||||
id="text63"
|
||||
class="TextShape"
|
||||
x="-339.99295"
|
||||
y="623.32043"><tspan
|
||||
style="font-size:1128px;font-weight:400;font-family:'Arial, sans-serif'"
|
||||
id="tspan65"
|
||||
font-weight="400"
|
||||
font-size="1128px"
|
||||
class="TextParagraph"><tspan
|
||||
id="tspan67"
|
||||
y="12358.32"
|
||||
x="6772.0068"
|
||||
class="TextPosition"><tspan
|
||||
style="fill:#000000;stroke:none"
|
||||
id="tspan69">Klik op de kaart</tspan></tspan></tspan><tspan
|
||||
style="font-size:1128px;font-weight:400;font-family:'Arial, sans-serif'"
|
||||
id="tspan71"
|
||||
font-weight="400"
|
||||
font-size="1128px"
|
||||
class="TextParagraph"><tspan
|
||||
id="tspan73"
|
||||
y="13615.32"
|
||||
x="7338.0068"
|
||||
class="TextPosition"><tspan
|
||||
style="fill:#000000;stroke:none"
|
||||
id="tspan75"> </tspan><tspan
|
||||
style="fill:#000000;stroke:none"
|
||||
id="tspan77">om je locatie</tspan></tspan></tspan><tspan
|
||||
style="font-size:1128px;font-weight:400;font-family:'Arial, sans-serif'"
|
||||
id="tspan79"
|
||||
font-weight="400"
|
||||
font-size="1128px"
|
||||
class="TextParagraph"><tspan
|
||||
id="tspan81"
|
||||
y="14872.32"
|
||||
x="7242.0068"
|
||||
class="TextPosition"><tspan
|
||||
style="fill:#000000;stroke:none"
|
||||
id="tspan83"> </tspan><tspan
|
||||
style="fill:#000000;stroke:none"
|
||||
id="tspan85">aan te geven</tspan></tspan></tspan></text>
|
||||
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 7.3 KiB |
@@ -1,6 +1,8 @@
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery-ui
|
||||
//= require jquery.ui.datepicker-en
|
||||
//= require jquery.ui.datepicker-nl
|
||||
// require bootstrap-transition
|
||||
// require bootstrap-affix
|
||||
// require bootstrap-alert
|
||||
@@ -43,15 +45,3 @@ function redirect_to(mapping, variables){
|
||||
function currency(num) {
|
||||
return Qwaiter.currency(num);
|
||||
}
|
||||
$(function(){
|
||||
//$locale = Qstorage.getItem('locale') || 'en';
|
||||
if(Qstorage.getItem('message')){
|
||||
var container = $('.alert-success');
|
||||
var msg_finder = Qstorage.getItem('message');
|
||||
if(msg_finder.indexOf('.') == -1) msg_finder = 'messages.'+msg_finder;
|
||||
container.find('div').text(t(msg_finder));
|
||||
container.show();
|
||||
Qstorage.removeItem('message');
|
||||
}
|
||||
setTranslations();
|
||||
});
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
$( ->
|
||||
week_days_container = $('#week_days-group')
|
||||
$('.week-day-select').each( (i)->
|
||||
select = $(this)
|
||||
toggle = $('<button type="button" class="btn"></button>')
|
||||
toggle.attr('data-t', 'product_category.week_days.abbreviation.'+select.data('day'))
|
||||
toggle.addClass('active') if select.val() == '1'
|
||||
week_days_container.append(toggle)
|
||||
toggle.click( -> select.val(Math.abs(select.val() - 1)))
|
||||
)
|
||||
$('.week-day-toggle').each ->
|
||||
select = $('#week-day-select-'+$(@).data('day'))
|
||||
$(@).addClass('active') if select.val() == '1'
|
||||
$(@).click( -> select.val(Math.abs(select.val() - 1)))
|
||||
|
||||
$('#full_day-controller').each ->
|
||||
control = $('#product_category_full_day')
|
||||
@@ -24,10 +19,22 @@ $( ->
|
||||
$(@).removeClass 'icon-white'
|
||||
$('#sub-day-container').addClass('hide')
|
||||
|
||||
if Qstorage.getItem('message')
|
||||
container = $('.alert-success');
|
||||
msg_finder = Qstorage.getItem('message');
|
||||
msg_finder = 'messages.'+msg_finder if msg_finder.indexOf('.') == -1
|
||||
container.find('div').text(t(msg_finder))
|
||||
container.show()
|
||||
Qstorage.removeItem('message')
|
||||
|
||||
$('.datepicker').datepicker(window.datepicker_options)
|
||||
|
||||
setTranslations()
|
||||
|
||||
# GOOGLE LOCATION PICKER
|
||||
$("input.location_picker").each( (i)->
|
||||
#return if typeof(google) == 'undefined'
|
||||
iconBase = 'https://maps.google.com/mapfiles/kml/'
|
||||
location_input = $(this)
|
||||
map_div = $('<div>').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 = $('<input type="text">')
|
||||
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('<div><strong>' + place.name + '</strong><br>' + address + '</div>')
|
||||
infowindow.open(map, search_marker)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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])
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user