Rebrand to mozo.bar

This commit is contained in:
2014-08-06 12:58:16 +02:00
parent 99a9536c68
commit 15005f332f
38 changed files with 344 additions and 87 deletions
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

+275 -11
View File
@@ -23,7 +23,7 @@
sodipodi:docname="logo.svg"><metadata sodipodi:docname="logo.svg"><metadata
id="metadata47"><rdf:RDF><cc:Work id="metadata47"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs45"> id="defs45">
<defs <defs
id="defs23"> id="defs23">
@@ -117,6 +117,69 @@
x="0" x="0"
y="0" y="0"
width="8503.9404" width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="SVGID_2_-0-7"><use
id="use27-0-9"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3031"><use
id="use3033"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3035"><use
id="use3037"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3039"><use
id="use3041"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3043"><use
id="use3045"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3047"><use
id="use3049"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath><clipPath
id="clipPath3051"><use
id="use3053"
overflow="visible"
xlink:href="#SVGID_1_"
style="overflow:visible"
x="0"
y="0"
width="8503.9404"
height="8503.9404" /></clipPath></defs><sodipodi:namedview height="8503.9404" /></clipPath></defs><sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
bordercolor="#666666" bordercolor="#666666"
@@ -132,7 +195,7 @@
showgrid="false" showgrid="false"
inkscape:zoom="6.34" inkscape:zoom="6.34"
inkscape:cx="44.999074" inkscape:cx="44.999074"
inkscape:cy="30.642055" inkscape:cy="38.40409"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="0" inkscape:window-maximized="0"
@@ -145,8 +208,8 @@
<rect <rect
style="fill:#5f3110;fill-opacity:1;stroke:none" style="fill:#5f3110;fill-opacity:1;stroke:none"
id="rect3809" id="rect3809"
width="96.056786" width="97.882759"
height="32.492115" height="43.533123"
x="2.0504732" x="2.0504732"
y="47.003155" y="47.003155"
ry="0" /><text ry="0" /><text
@@ -166,6 +229,7 @@
<text <text
id="text7" id="text7"
x="12.23935" x="12.23935"
@@ -185,6 +249,7 @@
<text <text
font-size="9.4245" font-size="9.4245"
id="text19" id="text19"
@@ -202,6 +267,7 @@
<g <g
id="g3012" id="g3012"
inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png" inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
@@ -278,7 +344,7 @@
id="path41" id="path41"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:#231f20" /></g><g style="fill:#231f20" /></g><g
transform="matrix(0.33640333,0,0,0.33640333,-2.5434408,49.050237)" transform="matrix(0.28480773,0,0,0.28480773,-1.8388528,48.736267)"
inkscape:export-ydpi="413.97891" inkscape:export-ydpi="413.97891"
inkscape:export-xdpi="413.97891" inkscape:export-xdpi="413.97891"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
@@ -357,22 +423,23 @@
inkscape:export-ydpi="413.97891" inkscape:export-ydpi="413.97891"
inkscape:export-xdpi="413.97891" inkscape:export-xdpi="413.97891"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
style="font-size:20.05559921px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1" style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1"
y="69.109116" y="65.718628"
x="23.631485" x="20.321514"
id="text3033" id="text3033"
sodipodi:linespacing="140%"><tspan sodipodi:linespacing="140%"><tspan
style="font-size:15.75116634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.68085659px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'" style="font-size:13.33534336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.57643074px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
id="tspan3035" id="tspan3035"
font-size="9.4245" font-size="9.4245"
y="69.109116" y="65.718628"
x="23.631485" x="20.321514"
dx="0 0">Q<tspan dx="0 0">Q<tspan
style="fill:#ffffff;fill-opacity:1" style="fill:#ffffff;fill-opacity:1"
id="tspan3800">WAITE</tspan>R</tspan></text> id="tspan3800">WAITE</tspan>R</tspan></text>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans" style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
@@ -385,4 +452,201 @@
x="35.962147" x="35.962147"
y="74.290222" /></text> y="74.290222" /></text>
<g
id="g3013-3"
transform="matrix(0.48200257,0,0,0.48200257,26.923785,-2.880595)"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/screwed-qwaiter/app/assets/images/logo-big.png"
inkscape:export-xdpi="449.67291"
inkscape:export-ydpi="449.67291"><text
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
style="font-size:11.99999905px"
y="72.998604"
x="25.180241"
id="text7-8"><tspan
style="font-size:9px;fill:#231f20;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
id="tspan9-0"
font-size="9.4245"
y="72.998604"
x="25.180241">MOZO</tspan></text>
<text
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
y="72.998604"
x="52.053089"
style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
id="text19-2"
font-size="9.4245"><tspan
id="tspan3938-4"
style="font-size:9px;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">.BAR</tspan></text>
</g><g
id="g3012-8"
transform="matrix(0.53641805,0,0,0.53641805,25.074809,-5.264638)"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/screwed-qwaiter/app/assets/images/logo-big.png"
inkscape:export-xdpi="449.67291"
inkscape:export-ydpi="449.67291"><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
id="path29-3"
inkscape:connector-curvature="0"
style="fill:#ffffff" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
id="path31-9"
inkscape:connector-curvature="0"
style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
id="path33-0"
inkscape:connector-curvature="0"
style="fill:#634227" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
id="path35-5"
inkscape:connector-curvature="0"
style="fill:#634227" /><circle
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
stroke-miterlimit="10"
cx="4250.2969"
cy="4230.1689"
r="5.5359998"
id="circle37-2"
sodipodi:cx="4250.2969"
sodipodi:cy="4230.1689"
sodipodi:rx="5.5359998"
sodipodi:ry="5.5359998"
style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
id="path39-2"
inkscape:connector-curvature="0"
style="fill:#231f20" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0-7)"
d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
id="path41-7"
inkscape:connector-curvature="0"
style="fill:#231f20" /></g><g
id="g3086"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
inkscape:export-xdpi="413.97891"
inkscape:export-ydpi="413.97891"
transform="matrix(0.28480773,0,0,0.28480773,-1.7053156,68.232696)"><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
id="path3088"
inkscape:connector-curvature="0"
style="fill:#ffffff" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
id="path3090"
inkscape:connector-curvature="0"
style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
id="path3092"
inkscape:connector-curvature="0"
style="fill:#634227" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
id="path3094"
inkscape:connector-curvature="0"
style="fill:#634227" /><circle
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
stroke-miterlimit="10"
cx="4250.2969"
cy="4230.1689"
r="5.5359998"
id="circle3096"
sodipodi:cx="4250.2969"
sodipodi:cy="4230.1689"
sodipodi:rx="5.5359998"
sodipodi:ry="5.5359998"
style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
id="path3098"
inkscape:connector-curvature="0"
style="fill:#231f20" /><path
inkscape:export-ydpi="112.82128"
inkscape:export-xdpi="112.82128"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
transform="translate(-4208.3103,-4204.1921)"
clip-path="url(#SVGID_2_-0)"
d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
id="path3100"
inkscape:connector-curvature="0"
style="fill:#231f20" /></g><text
sodipodi:linespacing="140%"
id="text3102"
x="20.455051"
y="85.215057"
style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
inkscape:export-xdpi="413.97891"
inkscape:export-ydpi="413.97891"><tspan
x="20.455051"
y="85.215057"
font-size="9.4245"
id="tspan3104"
style="font-size:13.33534336px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.57643074px;writing-mode:lr-tb;text-anchor:start;fill:#7bb459;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
dx="0 0 0 0"><tspan
id="tspan3106"
style="fill:#ffffff;fill-opacity:1">MOZO</tspan>.BAR</tspan></text>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 30 KiB

+2 -2
View File
@@ -26,7 +26,7 @@ class DashboardController < ApplicationController
def table_qr_image def table_qr_image
@table = Table.find(params[:table_id]) @table = Table.find(params[:table_id])
#code = [get_the_app_url, {table_id: @table.id}.to_json].join('?') #code = [get_the_app_url, {table_id: @table.id}.to_json].join('?')
code = "q.qwaiter.com/s?t=#{@table.id}" code = "q.mozo.bar/s?t=#{@table.id}"
size = RQRCode.minimum_qr_size_from_string(code) size = RQRCode.minimum_qr_size_from_string(code)
respond_to do |format| respond_to do |format|
format.html format.html
@@ -46,7 +46,7 @@ class DashboardController < ApplicationController
end end
def qr def qr
code = 'qwaiter.com' code = 'mozo.bar'
respond_to do |format| respond_to do |format|
format.html format.html
format.png { render qrcode: code, level: :h, unit: 10, size: 7} format.png { render qrcode: code, level: :h, unit: 10, size: 7}
+1 -1
View File
@@ -1,5 +1,5 @@
class SupplierMailer < ActionMailer::Base class SupplierMailer < ActionMailer::Base
default from: "Qwaiter <service@qwaiter.com>" default from: "Qwaiter <service@mozo.bar>"
layout 'mail' layout 'mail'
def creation(supplier) def creation(supplier)
+6 -6
View File
@@ -2,22 +2,22 @@
= image_tag 'icons/logo-big.png', style: 'float: right' = image_tag 'icons/logo-big.png', style: 'float: right'
p p
| |
Qwaiter is een systeem om bestellingen te doen met je smartphone. Mozo.bar een systeem om bestellingen te doen met je smartphone.
Als je wel eens op een terras of een afgelegen deel van een horeca gelegenheid Als je wel eens op een terras of een afgelegen deel van een horeca gelegenheid
hebt gezeten en vond dat het te lang duurde voordat er iemand aan je kwam vragen hebt gezeten en vond dat het te lang duurde voordat er iemand aan je kwam vragen
wat je wil bestellen dan weet je dat er nog veel te verbeteren is. wat je wil bestellen dan weet je dat er nog veel te verbeteren is.
p p
| |
Om horeca gelegenheden te helpen de vraag van klanten beter te kunnen verwerken Om horeca gelegenheden te helpen de vraag van klanten beter te kunnen verwerken
is Qwaiter ontstaan. Qwaiter is een toevoeging voor horeca gelegenheden om klanten is mozo.bar ontstaan. mozo.bar is een toevoeging voor horeca gelegenheden om klanten
met hun smartphone te laten bestellen. Dit is de focus van Qwaiter! Om het gemak met hun smartphone te laten bestellen. Dit is de focus van mozo.bar! Om het gemak
en de sfeer waar mensen aan gewend zijn te handhaven integreert Qwaiter zo goed en de sfeer waar mensen aan gewend zijn te handhaven integreert mozo.bar zo goed
mogelijk met de ervaring van mensen. Klanten kunnen gewoon op een lijstje bestellen mogelijk met de ervaring van mensen. Klanten kunnen gewoon op een lijstje bestellen
en bij ondersteunde systemen komt de bestelling gewoon achter de bar of in de keuken en bij ondersteunde systemen komt de bestelling gewoon achter de bar of in de keuken
uitgeprint. uitgeprint.
p p
' '
Qwaiter is gratis om in gebruik te nemen en in een handomdraai toegevoegd als extra dienst. Mozo.bar is gratis om in gebruik te nemen en in een handomdraai toegevoegd als extra dienst.
Maak als horeca gelegenheid een Maak als horeca gelegenheid een
=' link_to 'account', new_supplier_registration_path =' link_to 'account', new_supplier_registration_path
| |
@@ -26,6 +26,6 @@ p
' '
Heb je een ervaring of idee waardoor we de ervaring voor zowel de horeca bezoeker als Heb je een ervaring of idee waardoor we de ervaring voor zowel de horeca bezoeker als
de horeca gelegenheid kunnen verbeteren mail dit dan naar: de horeca gelegenheid kunnen verbeteren mail dit dan naar:
=' mail_to 'ervaringe@qwaiter.com' =' mail_to 'experiance@mozo.bar'
| |
dan kunnen wij ervoor zorgen dat het gaan naar een horeca gelegenheid leuk en makkelijk wordt! dan kunnen wij ervoor zorgen dat het gaan naar een horeca gelegenheid leuk en makkelijk wordt!
@@ -2,9 +2,9 @@
.right= image_tag 'site/tablet-screenshot.png' .right= image_tag 'site/tablet-screenshot.png'
p p
| |
Qwaiter is niet alleen handig voor de gebruiker die met zijn of haar smartphone makkelijk kan bestellen. Mozo.bar is niet alleen handig voor de gebruiker die met zijn of haar smartphone makkelijk kan bestellen.
Ook voor de bar of restauranthouder is het een ware toevoeging. Door tevreden klanten en minder en efficientere Ook voor de bar of restauranthouder is het een ware toevoeging. Door tevreden klanten en minder en efficientere
Handelingen wordt er veel bespaard en gaat alles een stuk sneller. Een tablet of ander apparaat met Handelingen wordt er veel bespaard en gaat alles een stuk sneller. Een tablet of ander apparaat met
internet verbinding is voldoende om Qwaiter in gebruik te nemen. internet verbinding is voldoende om mozo.bar in gebruik te nemen.
h3= link_to 'Log in als bar of restaurant', supplier_root_path h3= link_to 'Log in als bar of restaurant', supplier_root_path
h3= link_to 'Meld je aan als bar of restaurant', new_supplier_registration_path h3= link_to 'Meld je aan als bar of restaurant', new_supplier_registration_path
+2 -3
View File
@@ -5,14 +5,14 @@
3 => "Lets order a beer with my phone in stead! Much faster!", \ 3 => "Lets order a beer with my phone in stead! Much faster!", \
4 => "Now I can do things I like!!!!!", \ 4 => "Now I can do things I like!!!!!", \
5 => "Relaxt, I get my beer as ordered", \ 5 => "Relaxt, I get my beer as ordered", \
6 => "Qwaiter rocks!!!!" \ 6 => "Mozo.bar rocks!!!!" \
}, nl: {\ }, nl: {\
1 => "Ik heb zin in een pilsje!!", \ 1 => "Ik heb zin in een pilsje!!", \
2 => "Waar is de ober?", \ 2 => "Waar is de ober?", \
3 => "Laten we dan maar met mijn mobiel bestellen, dat is veel sneller!!", \ 3 => "Laten we dan maar met mijn mobiel bestellen, dat is veel sneller!!", \
4 => "Nu kan ik tenminste dingen doen die ik leuk vind!!!!!", \ 4 => "Nu kan ik tenminste dingen doen die ik leuk vind!!!!!", \
5 => "Relaxt, ik krijg mijn pilsje zoals besteld!", \ 5 => "Relaxt, ik krijg mijn pilsje zoals besteld!", \
6 => "Qwaiter rocks!!!!" \ 6 => "Mozo.bar rocks!!!!" \
}\ }\
} }
ul#cartoon ul#cartoon
@@ -21,4 +21,3 @@ ul#cartoon
.cartoon-image= image_tag "cartoon/qwaiter-cartoon-#{i}.png" .cartoon-image= image_tag "cartoon/qwaiter-cartoon-#{i}.png"
.cartoon-text= cartoon_text[I18n.locale][i] .cartoon-text= cartoon_text[I18n.locale][i]
.clearing .clearing
+2 -2
View File
@@ -2,11 +2,11 @@
.right= image_tag 'site/phone-screenshot.png' .right= image_tag 'site/phone-screenshot.png'
p p
| |
Qwaiter is een app voor je telefoon die het bestellen van drankjes en hapjes in bars en restaurant snel en eenvoudig maakt. Mozo.bar is een app voor je telefoon die het bestellen van drankjes en hapjes in bars en restaurant snel en eenvoudig maakt.
Scan een QR code, kies wat je wilt hebben, en krijg je bestelling. Zo simpel is het! Scan een QR code, kies wat je wilt hebben, en krijg je bestelling. Zo simpel is het!
p p
| |
Qwaiter is momenteel nog in een opstartfase. Om de gebruikerservaring zo optimaal mogelijk te krijgen vragen we je om de Mozo.bar is momenteel nog in een opstartfase. Om de gebruikerservaring zo optimaal mogelijk te krijgen vragen we je om de
= link_to t('menu.enquete'), enquete_path = link_to t('menu.enquete'), enquete_path
| in te vullen. Dit kost je 2 minuten en wij zijn er erg blij mee. | in te vullen. Dit kost je 2 minuten en wij zijn er erg blij mee.
.clearing .clearing
+2 -2
View File
@@ -1,4 +1,4 @@
- title t('menu.contact') - title t('menu.contact')
p p
|Qwaiter is in een alpha fase. Dit houdt in dat hij nog niet officieel is en er nog veel onvolkomenheden in zitten. Heb je echter al vragen of opmerkingen stuur deze dan naar: |Mozo.bar is in een alpha fase. Dit houdt in dat hij nog niet officieel is en er nog veel onvolkomenheden in zitten. Heb je echter al vragen of opmerkingen stuur deze dan naar:
= mail_to 'info@qwaiter.com' = mail_to 'info@mozo.bar'
+1 -1
View File
@@ -65,7 +65,7 @@ html lang="en"
hr hr
ul.side-nav ul.side-nav
li.heading Links li.heading Links
li= link_to "Qwaiter website", root_path li= link_to "Mozo.bar website", root_path
li= link_to "Companytools", 'http://www.companytools.nl/' li= link_to "Companytools", 'http://www.companytools.nl/'
= yield :sidebar = yield :sidebar
footer footer
+2 -2
View File
@@ -28,9 +28,9 @@ html lang="en"
#header #header
#header-right #header-right
.social .social
a.wsite-social-facebook href="https://www.facebook.com/Qwaiter" target=:_blank a.wsite-social-facebook href="https://www.facebook.com/mozo.bar" target=:_blank
span.wsite-social-inner span.wsite-social-inner
a.wsite-social-twitter href="https://twitter.com/qwaiter" target=:_blank a.wsite-social-twitter href="https://twitter.com/mozo.bar" target=:_blank
span.wsite-social-inner span.wsite-social-inner
a.wsite-social-linkedin href="http://www.linkedin.com/company/579750" target=:_blank a.wsite-social-linkedin href="http://www.linkedin.com/company/579750" target=:_blank
span.wsite-social-inner span.wsite-social-inner
+2 -7
View File
@@ -11,22 +11,18 @@ html lang="en"
/[if lt IE 9] /[if lt IE 9]
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "user/wood1/application", :media => "all" = stylesheet_link_tag "user/wood1/application", :media => "all"
link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
link href="/favicon.ico" rel="shortcut icon" link href="/favicon.ico" rel="shortcut icon"
- if ENV['QWAITER_MOBILE_EXPORT'] == 'yes' - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
javascript: javascript:
var QMobile, Qwaiter, Quser; var QMobile, Qwaiter, Quser;
var data_host = 'http://data.qwaiter.com'; var data_host = 'http://data.mozo.bar';
var event_host = '#{Qwaiter.event_host}'; var event_host = '#{Qwaiter.event_host}';
var $asset_path = '##assets_path##'; var $asset_path = '##assets_path##';
var Qstorage = localStorage; var Qstorage = localStorage;
- else - else
javascript: javascript:
var QMobile, Qwaiter, Quser; var QMobile, Qwaiter, Quser;
var data_host = 'http://data.qwaiter.com'; var data_host = 'http://data.mozo.bar';
var event_host = '#{Qwaiter.event_host}'; var event_host = '#{Qwaiter.event_host}';
var $asset_path = '/assets/'; var $asset_path = '/assets/';
var Qstorage = localStorage; var Qstorage = localStorage;
@@ -42,7 +38,6 @@ html lang="en"
this.authentication_string_storage = 'auth_token='+token; this.authentication_string_storage = 'auth_token='+token;
this.authentication_object_storage = '{"auth_token": "'+token+'"}' this.authentication_object_storage = '{"auth_token": "'+token+'"}'
}, },
root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets/user'},
root_url: function(){return '/user'}, root_url: function(){return '/user'},
goHome: function(){ redirect_to('user_root')}, goHome: function(){ redirect_to('user_root')},
connection_problem: function(){alert('There is a problem connecting to the server')}, connection_problem: function(){alert('There is a problem connecting to the server')},
+1 -1
View File
@@ -59,4 +59,4 @@ html lang="en"
.footer-shadow .footer-shadow
.container .container
.footer-content= render 'footer' .footer-content= render 'footer'
.footer-bottom &copy; Qwaiter 2014 .footer-bottom &copy; mozo.bar 2014
+1 -1
View File
@@ -54,5 +54,5 @@ html lang="en"
.footer-shadow .footer-shadow
.container .container
.footer-content= render 'footer' .footer-content= render 'footer'
.footer-bottom &copy; Qwaiter 2013 .footer-bottom &copy; mozo.bar 2014
= javascript_include_tag "theme1/application" = javascript_include_tag "theme1/application"
+2 -2
View File
@@ -12,11 +12,11 @@ html lang="en"
- if ENV['QWAITER_MOBILE_EXPORT'] == 'yes' - if ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
javascript: javascript:
var QMobile, Qwaiter, Quser; var QMobile, Qwaiter, Quser;
var $data_host = 'http://data.qwaiter.com'; var $data_host = 'http://data.mozo.bar';
var $event_host = '#{Qwaiter.event_host}'; var $event_host = '#{Qwaiter.event_host}';
var $asset_path = '##assets_path##'; var $asset_path = '##assets_path##';
var Qstorage = localStorage; var Qstorage = localStorage;
var $root_url = 'http://www.qwaiter.com/user'; var $root_url = 'http://www.mozo.bar/user';
- else - else
javascript: javascript:
var QMobile, Qwaiter, Quser; var QMobile, Qwaiter, Quser;
+1 -2
View File
@@ -16,5 +16,4 @@ p
br br
| Qwaiter | Qwaiter
br br
= link_to 'www.Qwaiter.com', root_url, style: "color:#FAA732" = link_to 'mozo.bar', root_url, style: "color:#FAA732"
+2 -2
View File
@@ -88,8 +88,8 @@ for action in uc.action_methods
android_view.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"></script><script type="text/javascript" src="cordova-2.6.0rc1.js"></script><script type="text/javascript" src="barcodescanner.js"></script>' android_view.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"></script><script type="text/javascript" src="cordova-2.6.0rc1.js"></script><script type="text/javascript" src="barcodescanner.js"></script>'
android_view.gsub! '##assets_path##', 'file:///android_asset/assets/' android_view.gsub! '##assets_path##', 'file:///android_asset/assets/'
if testhost = ENV['TEST_HOST'].presence if testhost = ENV['TEST_HOST'].presence
android_view.gsub! /data.qwaiter.com|www.qwaiter.com/, "#{testhost}:3000" android_view.gsub! /data.mozo.bar|www.mozo.bar/, "#{testhost}:3000"
android_view.gsub! /events.qwaiter.com/, "#{testhost}:9296" android_view.gsub! /events.mozo.bar/, "#{testhost}:9296"
end end
# write to android path # write to android path
File.open(File.join(android_root, "#{action}.html"), 'w'){|f| f.puts android_view} File.open(File.join(android_root, "#{action}.html"), 'w'){|f| f.puts android_view}
+5 -5
View File
@@ -4,9 +4,9 @@
# is considered to be the first unless any hosts have the primary # is considered to be the first unless any hosts have the primary
# property set. Don't declare `role :all`, it's a meta role. # property set. Don't declare `role :all`, it's a meta role.
role :app, %w{root@deploy.qwaiter.com} role :app, %w{root@deploy.mozo.bar}
role :web, %w{root@deploy.qwaiter.com} role :web, %w{root@deploy.mozo.bar}
role :db, %w{root@deploy.qwaiter.com} role :db, %w{root@deploy.mozo.bar}
# Extended Server Syntax # Extended Server Syntax
@@ -15,7 +15,7 @@ role :db, %w{root@deploy.qwaiter.com}
# server list. The second argument is a, or duck-types, Hash and is # server list. The second argument is a, or duck-types, Hash and is
# used to set extended properties on the server. # used to set extended properties on the server.
server 'deploy.qwaiter.com', user: 'root', roles: %w{web app}, my_property: :my_value server 'deploy.mozo.bar', user: 'root', roles: %w{web app}, my_property: :my_value
# Custom SSH Options # Custom SSH Options
@@ -33,7 +33,7 @@ server 'deploy.qwaiter.com', user: 'root', roles: %w{web app}, my_property: :my_
# #
# And/or per server (overrides global) # And/or per server (overrides global)
# ------------------------------------ # ------------------------------------
# server 'qwaiter.com', # server 'mozo.bar',
# user: 'user_name', # user: 'user_name',
# roles: %w{web app}, # roles: %w{web app},
# ssh_options: { # ssh_options: {
+1 -1
View File
@@ -61,7 +61,7 @@ Qwaiter::Application.configure do
# Disable delivery errors, bad email addresses will be ignored # Disable delivery errors, bad email addresses will be ignored
config.action_mailer.raise_delivery_errors = false config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = { config.action_mailer.default_url_options = {
host: 'www.qwaiter.com' host: 'www.mozo.bar'
} }
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
address: "smtp.gmail.com", address: "smtp.gmail.com",
+1 -1
View File
@@ -36,7 +36,7 @@ Qwaiter::Application.configure do
# The :test delivery method accumulates sent emails in the # The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.
config.action_mailer.default_url_options = { config.action_mailer.default_url_options = {
host: 'www.qwaiter.com' host: 'www.mozo.bar'
} }
config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :test
+1 -1
View File
@@ -10,7 +10,7 @@ Devise.setup do |config|
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class # note that it will be overwritten if you use your own mailer class
# with default "from" parameter. # with default "from" parameter.
config.mailer_sender = 'service@qwaiter.com' config.mailer_sender = 'service@mozo.bar'
# Configure the class responsible to send e-mails. # Configure the class responsible to send e-mails.
# config.mailer = 'Devise::Mailer' # config.mailer = 'Devise::Mailer'
+1 -1
View File
@@ -1,4 +1,4 @@
Qwaiter.event_host = "http://#{Rails.env.production? ? 'events.qwaiter.com' : 'localhost'}:9296/faye" Qwaiter.event_host = "http://#{Rails.env.production? ? 'events.mozo.bar' : 'localhost'}:9296/faye"
Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new
# use the connection from couchbase-structures/documents # use the connection from couchbase-structures/documents
@@ -3,7 +3,7 @@ require 'spec_helper'
describe <%= controller_class_name %> do describe <%= controller_class_name %> do
before :each do before :each do
@administrator = Administrator.find_by_email('administrator@qwaiter.com') || Administrator.create(email: 'administrator@qwaiter.com', password: 'secret') @administrator = Administrator.find_by_email('administrator@mozo.bar') || Administrator.create(email: 'administrator@mozo.bar', password: 'secret')
sign_in @administrator sign_in @administrator
end end
+2 -2
View File
@@ -1,7 +1,7 @@
step "there is a fresh database with a user and supplier" do step "there is a fresh database with a user and supplier" do
CouchPotato.couchrest_database.recreate! CouchPotato.couchrest_database.recreate!
create_confirmed_supplier 'supplier@qwaiter.com' create_confirmed_supplier 'supplier@mozo.bar'
create_user 'user@qwaiter.com' create_user 'user@mozo.bar'
end end
step "I click on translation :translation" do |translation_key| step "I click on translation :translation" do |translation_key|
@@ -1,5 +1,5 @@
step 'there is a confirmed and open supplier' do step 'there is a confirmed and open supplier' do
@supplier_password = 'secret1' @supplier_password = 'secret1'
@supplier = create :supplier, email: 'supplier@qwaiter.com', password: @supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true @supplier = create :supplier, email: 'supplier@mozo.bar', password: @supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true
@section = create :section, title: 'Room', supplier: @supplier, width: 8, height: 8 @section = create :section, title: 'Room', supplier: @supplier, width: 8, height: 8
end end
@@ -1,5 +1,5 @@
step "I provide a new supplier email address" do step "I provide a new supplier email address" do
find('.supplier-email').set 'new-supplier-mail@qwaiter.com' find('.supplier-email').set 'new-supplier-mail@mozo.bar'
end end
step "the supplier submits the supplier settings form" do step "the supplier submits the supplier settings form" do
@@ -9,20 +9,20 @@ end
step "the supplier email should not have been changed" do step "the supplier email should not have been changed" do
@supplier.reload @supplier.reload
@supplier.email.should == 'supplier@qwaiter.com' @supplier.email.should == 'supplier@mozo.bar'
end end
step "the supplier unconfirmed email should have been set to the new supplier email" do step "the supplier unconfirmed email should have been set to the new supplier email" do
@supplier.reload @supplier.reload
@supplier.unconfirmed_email.should == 'new-supplier-mail@qwaiter.com' @supplier.unconfirmed_email.should == 'new-supplier-mail@mozo.bar'
end end
step "an email should have been sent to the original supplier email with email confirmation instructions" do step "an email should have been sent to the original supplier email with email confirmation instructions" do
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
mail.to.should == ['supplier@qwaiter.com'] mail.to.should == ['supplier@mozo.bar']
mail.body.should include I18n.t('devise.mailer.confirmation_instructions.supplier.salutation', email: @supplier.email) mail.body.should include I18n.t('devise.mailer.confirmation_instructions.supplier.salutation', email: @supplier.email)
mail.body.should_not include 'translation' # indicating a translation issue mail.body.should_not include 'translation' # indicating a translation issue
confirmation_link_match = mail.body.match(/http:\/\/www.qwaiter.com(\/suppliers\/confirmation[^"]+)"/) confirmation_link_match = mail.body.match(/http:\/\/www.mozo.bar(\/suppliers\/confirmation[^"]+)"/)
confirmation_link_match.should be_present confirmation_link_match.should be_present
@confirmation_link = confirmation_link_match[1] @confirmation_link = confirmation_link_match[1]
end end
@@ -37,7 +37,7 @@ end
step "the supplier email is the new email and the unconfirmed email is empty" do step "the supplier email is the new email and the unconfirmed email is empty" do
@supplier.reload @supplier.reload
@supplier.email.should == 'new-supplier-mail@qwaiter.com' @supplier.email.should == 'new-supplier-mail@mozo.bar'
@supplier.unconfirmed_email.should be_blank @supplier.unconfirmed_email.should be_blank
end end
+1 -1
View File
@@ -3,7 +3,7 @@ require 'spec_helper'
describe SupplierController, type: :controller do describe SupplierController, type: :controller do
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || Supplier.create(name: 'Supplier', email: 'supplier@qwaiter.com', password: 'secret') @supplier = Supplier.find_by_email('supplier@mozo.bar') || Supplier.create(name: 'Supplier', email: 'supplier@mozo.bar', password: 'secret')
sign_in @supplier sign_in @supplier
end end
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Suppliers::ListsController, type: :controller do describe Suppliers::ListsController, type: :controller do
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed)
ActionController::Parameters.permit_all_parameters = false ActionController::Parameters.permit_all_parameters = false
#controller.stub(:list_params){ controller.params.require(:list).permit! } # allow all parameters since cross parameter injection is tested #controller.stub(:list_params){ controller.params.require(:list).permit! } # allow all parameters since cross parameter injection is tested
sign_in @supplier sign_in @supplier
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Suppliers::ProductCategoriesController, type: :controller do describe Suppliers::ProductCategoriesController, type: :controller do
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed)
sign_in @supplier sign_in @supplier
end end
@@ -11,7 +11,7 @@ describe Suppliers::ProductsController, type: :controller do
end end
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed)
sign_in @supplier sign_in @supplier
end end
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Suppliers::SectionsController, type: :controller do describe Suppliers::SectionsController, type: :controller do
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed)
sign_in @supplier sign_in @supplier
end end
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Suppliers::TablesController, type: :controller do describe Suppliers::TablesController, type: :controller do
before :each do before :each do
@supplier = Supplier.find_by_email('supplier@qwaiter.com') || create(:supplier, :confirmed) @supplier = Supplier.find_by_email('supplier@mozo.bar') || create(:supplier, :confirmed)
#controller.stub(:table_params){ controller.params.require(:table).permit! } # allow all parameters since cross parameter injection is tested #controller.stub(:table_params){ controller.params.require(:table).permit! } # allow all parameters since cross parameter injection is tested
sign_in @supplier sign_in @supplier
end end
+1 -1
View File
@@ -1,7 +1,7 @@
FactoryGirl.define do FactoryGirl.define do
factory :supplier do factory :supplier do
sequence(:name){|i| "Supplier #{i}"} sequence(:name){|i| "Supplier #{i}"}
email 'supplier@qwaiter.com' email 'supplier@mozo.bar'
password 'secret' password 'secret'
trait :confirmed do trait :confirmed do
+1 -1
View File
@@ -4,7 +4,7 @@ require 'spec_helper'
describe List do describe List do
let(:supplier) { create :supplier } let(:supplier) { create :supplier }
let(:supplier_password){'secret1'} let(:supplier_password){'secret1'}
let(:supplier) { create :supplier, email: 'supplier@qwaiter.com', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } let(:supplier) { create :supplier, email: 'supplier@mozo.bar', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true }
let(:user) { create :user } let(:user) { create :user }
let(:section) { create :section, supplier: supplier} let(:section) { create :section, supplier: supplier}
let(:table) { create :table, supplier: supplier} let(:table) { create :table, supplier: supplier}
+1 -1
View File
@@ -4,7 +4,7 @@ require 'spec_helper'
describe List do describe List do
let(:supplier) { create :supplier } let(:supplier) { create :supplier }
let(:supplier_password){'secret1'} let(:supplier_password){'secret1'}
let(:supplier) { create :supplier, email: 'supplier@qwaiter.com', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true } let(:supplier) { create :supplier, email: 'supplier@mozo.bar', password: supplier_password, confirmation_token: 'abc', confirmed_at: Time.now.utc, open: true }
let(:user) { create :user } let(:user) { create :user }
let(:section) { create :section, supplier: supplier} let(:section) { create :section, supplier: supplier}
let(:table) { create :table, supplier: supplier} let(:table) { create :table, supplier: supplier}