diff --git a/app/assets/images/icons/orders-queue.svg b/app/assets/images/icons/orders-queue.svg index 7a417802..f559c1b9 100644 --- a/app/assets/images/icons/orders-queue.svg +++ b/app/assets/images/icons/orders-queue.svg @@ -14,7 +14,7 @@ height="528" id="svg2911" inkscape:version="0.48.2 r9819" - sodipodi:docname="paper-stacks.svg"> + sodipodi:docname="orders-queue.svg"> @@ -53,76 +53,115 @@ d="m 66.879135,466.48338 c -0.477933,-1.4249 2.17747,-6.91776 7.083393,-14.6524 1.543106,-2.43285 5.033764,-8.90202 7.757018,-14.37594 2.723253,-5.47391 7.215789,-13.68478 9.983414,-18.24638 6.194209,-10.20928 11.13184,-19.90514 10.13675,-19.90514 -0.40862,0 0.0227,-0.87085 0.95837,-1.93522 0.93572,-1.06438 2.8214,-4.17456 4.19039,-6.91151 1.369,-2.73696 2.88041,-5.23009 3.35869,-5.54029 0.47829,-0.3102 1.21459,-1.9385 1.63624,-3.61846 l 0.76661,-3.05445 -6.48461,0.64699 c -3.56654,0.35585 -11.895151,1.38825 -18.508038,2.29424 -6.612887,0.90597 -13.387739,1.34757 -15.055228,0.98133 -2.295238,-0.50412 -3.885585,0.0525 -6.546118,2.29122 -1.932876,1.6264 -3.790717,2.6807 -4.128537,2.34287 -0.33782,-0.33781 0.409635,-3.35071 1.661011,-6.69531 1.500021,-4.00916 1.863796,-6.21824 1.067678,-6.48362 -1.568926,-0.52297 1.811949,-7.19773 5.294286,-10.45235 1.672862,-1.56347 2.102417,-2.56385 1.226295,-2.85589 -1.007913,-0.33597 -0.88887,-1.40392 0.471362,-4.22865 1.000909,-2.07854 3.239068,-6.87568 4.973686,-10.66031 2.040992,-4.45308 3.816797,-6.89186 5.032646,-6.91151 2.006679,-0.0324 1.573035,1.61766 -3.129264,11.90729 -0.915865,2.0041 -1.421689,4.24343 -1.124054,4.97628 0.347593,0.85586 0.578636,0.73915 0.645945,-0.32631 0.05764,-0.91232 2.834637,-4.64453 6.171118,-8.29381 3.336481,-3.64927 6.878386,-8.34301 7.870901,-10.43052 0.992514,-2.08751 3.262691,-6.26846 5.04484,-9.29099 2.533306,-4.2965 2.923351,-5.69646 1.787725,-6.41662 -0.798904,-0.50661 -1.879001,-0.92874 -2.400239,-0.93805 -0.521228,-0.009 -0.638104,-0.8237 -0.259718,-1.80975 0.422254,-1.1004 -0.324852,-2.80564 -1.934418,-4.41521 -2.796805,-2.7968 -2.159997,-2.80122 -17.869155,0.12383 -1.824638,0.33975 -5.805667,0.92106 -8.846731,1.2918 -3.041064,0.37074 -6.331314,1.08378 -7.311668,1.58454 -1.098023,0.56087 -2.574313,0.33147 -3.844659,-0.59744 -1.958133,-1.43182 -1.658112,-2.30857 5.945374,-17.37415 10.146762,-20.10484 13.671201,-26.78261 14.502295,-27.47757 0.363677,-0.30411 2.272181,-3.78751 4.241121,-7.74089 3.815528,-7.6611 7.086936,-13.47136 8.094227,-14.37594 0.338637,-0.3041 1.287415,-2.2126 2.108396,-4.24109 0.820981,-2.02849 2.059359,-4.26781 2.751953,-4.97628 0.692593,-0.70847 3.914387,-6.51322 7.159548,-12.89945 3.24514,-6.38624 6.54613,-12.35778 7.33549,-13.2701 0.78937,-0.91232 1.43855,-1.90758 1.44263,-2.21168 0.0246,-1.83253 2.05688,-5.27117 4.39717,-7.44008 1.49106,-1.38187 2.08349,-2.5125 1.31652,-2.5125 -1.01624,0 -0.91006,-0.73936 0.39144,-2.72569 0.98228,-1.49914 1.78595,-3.42872 1.78595,-4.28796 0,-0.85925 0.74287,-2.1788 1.65082,-2.93233 0.90796,-0.75354 2.17526,-3.31763 2.81621,-5.69798 0.72571,-2.69506 1.6276,-4.04226 2.39049,-3.57077 0.70779,0.43745 0.91518,0.2557 0.49115,-0.43039 -0.40368,-0.65316 -0.007,-1.91488 0.88231,-2.80382 0.88895,-0.88895 1.37998,-1.85256 1.09118,-2.14135 -0.28879,-0.2888 0.97898,-3.38435 2.81727,-6.879 1.83829,-3.49464 3.34235,-7.04981 3.34235,-7.90037 0,-0.85056 0.43001,-1.54647 0.9556,-1.54647 0.52558,0 1.84071,-2.36373 2.92253,-5.25274 1.08181,-2.88901 3.38874,-7.39262 5.12652,-10.00801 1.73778,-2.61539 3.1596,-5.40264 3.1596,-6.19388 0,-1.65924 5.04242,-11.47415 7.15771,-13.93229 0.78508,-0.91232 1.77092,-2.78565 2.19076,-4.16296 0.41984,-1.37731 1.22513,-2.21879 1.78957,-1.86996 0.56442,0.34883 1.02622,0.0298 1.02622,-0.70894 0,-0.73876 1.25747,-2.99182 2.79439,-5.00682 1.85228,-2.42847 2.59442,-4.5142 2.20126,-6.18651 -0.87561,-3.72444 1.58563,-7.42003 6.92182,-10.39321 7.30503,-4.07017 11.64355,-3.34523 8.51897,1.42347 l -1.68813,2.57642 5.83117,0.0977 c 3.20714,0.0537 8.07048,0.25257 10.80744,0.44189 12.91071,0.89307 38.53735,1.86441 52.52746,1.99099 18.94732,0.17143 30.67441,-0.71152 48.98119,-3.68787 13.82584,-2.24782 20.19453,-3.62502 43.47003,-9.40017 6.44863,-1.60004 12.9178,-2.74054 14.37593,-2.53444 l 2.65115,0.37478 0.55292,44.23365 c 0.3041,24.32851 0.86974,44.73128 1.25696,45.3395 0.38724,0.60821 1.04944,4.58924 1.47158,8.84673 0.42213,4.25749 1.22497,10.17254 1.78409,13.14457 0.55912,2.97202 1.01658,7.56172 1.01658,10.19933 0,4.17049 5.82095,41.22168 7.19091,45.77118 0.91314,3.03249 -1.24031,4.51939 -7.12516,4.91969 -3.20317,0.2179 -6.32761,0.89983 -6.9432,1.51542 -0.75513,0.75513 -0.32873,3.3982 1.31063,8.12403 1.33643,3.85262 3.59366,10.9858 5.01606,15.8515 2.48504,8.50078 7.56416,21.01583 12.79067,31.51648 1.36228,2.73695 2.62646,7.59989 2.80929,10.80653 0.18284,3.20664 0.62841,6.30916 0.99016,6.89448 0.75772,1.22603 -5.77082,5.51135 -8.40573,5.51752 -0.97131,0.002 -2.9249,1.00922 -4.3413,2.23767 -2.51595,2.18206 -2.53169,2.31584 -0.68365,5.80567 3.33946,6.30622 9.07818,16.64352 13.30728,23.97074 8.2541,14.30083 10.06374,21.07044 5.63254,21.07044 -1.41563,0 -1.59751,0.77999 -0.96702,4.14691 0.42711,2.28079 1.48106,5.83469 2.3421,7.89755 2.5387,6.08215 0.64584,7.05386 -13.51432,6.93772 -11.48036,-0.0941 -29.943,2.72361 -34.76912,5.30645 -1.12916,0.60432 -8.48524,1.58826 -16.34683,2.18654 -7.86159,0.59827 -15.00526,1.33994 -15.87482,1.64813 -0.86955,0.3082 -3.58605,0.7836 -6.03667,1.05646 -5.35015,0.59567 -25.90747,5.50956 -35.90755,8.58309 -3.95338,1.21506 -9.42729,2.62851 -12.16425,3.14098 -4.68083,0.87645 -15.572,3.38246 -32.0694,7.37904 -3.95338,0.95772 -8.68086,1.935 -10.50549,2.17173 -1.82464,0.23673 -4.81041,0.89089 -6.63505,1.4537 -2.84647,0.87801 -13.97063,3.19589 -37.59861,7.83422 -3.04106,0.59697 -10.25668,1.34564 -16.0347,1.6637 -5.77802,0.31806 -15.23296,1.04482 -21.01098,1.61504 -13.16895,1.29958 -32.771251,2.6255 -41.469057,2.80498 -9.199796,0.18985 -8.920789,0.0829 -11.464809,4.39469 -2.295579,3.89071 -5.092637,5.05938 -5.955069,2.48814 z m 25.713689,-12.97957 c 5.169808,-0.59049 17.112896,-1.59718 26.540196,-2.23707 33.87558,-2.29938 42.01841,-2.97465 46.99826,-3.89751 1.82463,-0.33814 4.31278,-0.80179 5.5292,-1.03033 7.22142,-1.35678 34.81511,-7.44589 37.59861,-8.2969 1.82464,-0.55786 4.81041,-1.14815 6.63505,-1.31175 1.82464,-0.16361 3.81515,-0.645 4.42336,-1.06978 1.11415,-0.7781 15.95814,-4.08431 22.11683,-4.92608 1.82464,-0.24939 4.31278,-0.70041 5.52921,-1.00228 1.21642,-0.30186 4.78309,-1.17617 7.92594,-1.9429 3.14284,-0.76674 6.08715,-1.76696 6.5429,-2.2227 0.45575,-0.45575 2.20618,-0.82864 3.88986,-0.82864 1.68368,0 4.4621,-0.54537 6.17428,-1.21193 9.70562,-3.77842 34.11112,-8.3987 49.28246,-9.32978 6.53857,-0.40129 12.12233,-1.10824 12.40833,-1.57103 0.28602,-0.46277 3.64478,-1.45585 7.46391,-2.20683 3.81914,-0.75099 8.18795,-1.81755 9.70848,-2.37013 1.52053,-0.55259 7.49208,-1.20818 13.2701,-1.45687 5.77802,-0.2487 10.87871,-0.4973 11.33487,-0.55246 1.2774,-0.15444 0.98177,-4.29893 -0.36606,-5.13194 -0.65778,-0.40653 -0.89125,-1.95085 -0.51909,-3.43364 0.372,-1.48215 0.30916,-3.28896 -0.13963,-4.01512 -0.52778,-0.85396 -1.05737,-0.34778 -1.49942,1.43316 -0.57881,2.33195 -0.97829,1.73775 -2.60964,-3.88159 -2.41543,-8.32019 -6.67048,-19.19018 -10.60561,-27.09312 -1.66567,-3.34517 -3.87645,-8.67137 -4.91284,-11.83601 -1.12593,-3.43804 -2.68733,-6.00876 -3.8794,-6.38711 -1.09729,-0.34826 -5.47948,0.62369 -9.73823,2.15992 -8.81174,3.17857 -13.34099,3.53877 -14.26365,1.13435 -0.75787,-1.97497 -12.644,-2.27657 -19.75213,-0.50119 -12.71087,3.17477 -24.94049,4.92328 -53.18436,7.60398 -17.70734,1.68066 -25.22098,2.93613 -36.99139,6.18099 -8.12382,2.23957 -17.28316,4.3044 -20.35409,4.5885 -3.07092,0.2841 -11.55505,1.50943 -18.8536,2.72294 -7.29855,1.21352 -18.24638,2.66129 -24.32851,3.2173 -6.08213,0.55601 -12.30248,1.28543 -13.82302,1.62094 -1.52053,0.33553 -6.73378,1.12464 -11.58501,1.7536 -9.72773,1.2612 -10.90129,1.75711 -8.00023,3.38062 1.79679,1.00554 1.66112,1.48272 -1.62716,5.72272 -1.97306,2.54416 -4.97424,5.81757 -6.66927,7.27425 -1.69504,1.45669 -3.08188,3.3228 -3.08188,4.1469 0,0.82412 -0.45104,1.49839 -1.00232,1.49839 -0.55127,0 -0.72281,1.06881 -0.38119,2.37516 0.4138,1.58241 -1.52029,6.65736 -5.79486,15.20531 -3.528768,7.05659 -8.154261,16.31356 -10.278858,20.57105 -2.124596,4.25749 -5.286231,9.70503 -7.025857,12.10565 -3.191073,4.40356 -3.855085,6.14831 -2.333574,6.13167 0.45616,-0.006 5.059224,-0.49221 10.229033,-1.08271 z m 5.529206,-79.58149 c 7.60266,-0.65515 21.88747,-2.43129 31.74402,-3.94695 9.85655,-1.51567 21.55082,-2.97398 25.98727,-3.24068 4.43645,-0.26671 12.23112,-1.28915 17.32149,-2.27209 5.09037,-0.98292 9.8816,-1.54678 10.6472,-1.25299 0.76559,0.29379 1.82584,0.12208 2.35611,-0.38155 0.53029,-0.50363 3.45228,-1.22713 6.49335,-1.60777 9.52305,-1.19197 13.08398,-1.92558 19.35222,-3.98691 8.64088,-2.84157 23.60346,-5.21949 40.91613,-6.50255 15.80198,-1.17111 39.99759,-4.52977 51.97455,-7.21474 3.95338,-0.88627 11.16899,-1.93081 16.0347,-2.32123 10.60177,-0.85066 26.6121,-5.39328 27.54112,-7.81426 0.94381,-2.45955 0.84878,-2.64311 -1.00093,-1.93331 -0.91232,0.3501 -1.65876,0.075 -1.65876,-0.61133 0,-0.68633 -1.24408,-1.8147 -2.76461,-2.5075 -2.9333,-1.33651 -3.92171,-3.49093 -1.10584,-2.41038 0.91232,0.3501 1.65876,0.0857 1.65876,-0.58762 0,-0.67329 0.55087,-1.22415 1.22416,-1.22415 0.67328,0 0.93772,0.74644 0.58762,1.65876 -0.47348,1.23387 0.16587,1.65876 2.49605,1.65876 1.72292,0 6.27019,1.42427 10.10505,3.16505 10.73293,4.87205 13.26111,2.95716 8.88476,-6.72945 -1.1752,-2.60117 -2.40798,-5.61153 -2.73951,-6.68968 -0.51639,-1.6793 -0.92823,-1.75855 -2.87331,-0.55292 -3.00599,1.86321 -4.10981,0.092 -4.97493,-7.98278 -1.39762,-13.04482 -3.93512,-27.93643 -5.15089,-30.22834 -0.70121,-1.32192 -2.19122,-3.05376 -3.31113,-3.84851 -1.29381,-0.91818 -2.03618,-2.81323 -2.03618,-5.19779 0,-4.63911 -2.22407,-6.06899 -7.6057,-4.8898 -6.66292,1.45993 -31.28071,4.41834 -37.18088,4.46816 -12.9802,0.10959 -29.06711,3.25516 -64.69172,12.64954 -6.77865,1.78756 -21.95296,5.22634 -29.30479,6.64101 -4.86571,0.93628 -12.33013,2.61208 -16.58762,3.72399 -11.10987,2.90152 -22.08089,5.19082 -40.36321,8.42254 -29.42091,5.20065 -29.34681,5.18049 -28.97395,7.88391 0.27154,1.96888 -0.0957,2.28732 -2.04842,1.77664 -2.81022,-0.73488 -4.32356,1.17981 -4.34763,5.50063 -0.0127,2.28194 -0.56035,3.04107 -2.19391,3.04107 -1.57441,0 -1.98191,0.50833 -1.47223,1.83651 0.55761,1.45312 0.2088,1.70683 -1.67091,1.21527 -1.85792,-0.48585 -2.9061,0.23705 -4.80967,3.3171 -2.18734,3.53917 -2.52817,3.72422 -3.36279,1.8258 -0.75987,-1.72841 -0.83435,-1.62736 -0.40956,0.55572 0.50994,2.62068 -1.323747,6.29166 -12.890883,25.80714 -2.433356,4.10544 -4.816138,7.46443 -5.295071,7.46443 -0.478933,0 -1.39121,1.49289 -2.027283,3.31752 -0.636072,1.82464 -1.721479,3.31753 -2.412015,3.31753 -0.690536,0 -1.058543,0.59093 -0.817791,1.31318 0.24075,0.72225 -0.464223,2.21514 -1.566609,3.31753 -3.396038,3.39604 -2.476681,4.48257 3.248409,3.83908 2.889011,-0.32471 11.473104,-1.12642 19.075763,-1.78159 z m 231.12085,-54.10886 c 0,-0.60821 0.49762,-1.41338 1.10584,-1.78928 0.60821,-0.3759 1.10584,-0.18582 1.10584,0.4224 0,0.60821 -0.49763,1.41338 -1.10584,1.78928 -0.60822,0.3759 -1.10584,0.18582 -1.10584,-0.4224 z M 345.8305,279.385 c 0,-1.94245 0.66357,-2.22845 1.61153,-0.6946 0.34993,0.56619 0.13048,1.342 -0.48766,1.72402 -0.61813,0.38203 -1.12387,-0.0812 -1.12387,-1.02942 z M 76.405104,358.94031 c 0.350091,-0.91232 0.154517,-1.65876 -0.434608,-1.65876 -0.589123,0 -1.071134,0.74644 -1.071134,1.65876 0,0.91232 0.195573,1.65876 0.434608,1.65876 0.239034,0 0.721045,-0.74644 1.071134,-1.65876 z m 27.068626,-44.28569 c 2.18519,-4.79594 1.45588,-7.3261 -1.49418,-5.18378 -1.1741,0.85262 -1.56813,8.00042 -0.44105,8.00042 0.35854,0 1.22939,-1.26748 1.93523,-2.81664 z m -32.997734,-5.46959 c 2.128745,-0.35748 7.60266,-1.15364 12.164255,-1.76924 4.561596,-0.6156 12.772468,-2.12352 18.246379,-3.35092 5.47392,-1.2274 12.44072,-2.40979 15.48179,-2.62752 4.70169,-0.33663 21.35192,-3.30996 46.99825,-8.39277 3.34517,-0.66297 11.05842,-2.41762 17.14054,-3.89923 6.08213,-1.48159 12.30249,-2.93221 13.82302,-3.22359 1.52053,-0.29138 4.25749,-0.81575 6.08213,-1.16524 1.82464,-0.3495 5.55685,-1.02392 8.29381,-1.4987 5.97905,-1.0372 17.91876,-4.03225 27.32434,-6.85425 3.77645,-1.13307 7.79895,-2.06013 8.93888,-2.06013 1.13994,0 2.41877,-0.34615 2.84185,-0.76923 0.42307,-0.42308 1.37686,-0.87434 2.11952,-1.00281 0.74266,-0.12847 3.7464,-0.78694 6.67498,-1.46326 2.92858,-0.67632 5.74744,-0.9684 6.26414,-0.64905 0.5167,0.31933 1.10636,0.0854 1.31037,-0.51984 0.204,-0.60523 3.10786,-1.55876 6.45303,-2.11892 14.11156,-2.36307 23.03668,-3.59285 28.75188,-3.96166 8.41963,-0.54332 35.10855,-3.57082 39.81029,-4.51595 2.12874,-0.42791 4.96478,-1.76942 6.30232,-2.98113 1.65412,-1.4985 3.0688,-1.92537 4.42337,-1.33472 1.09531,0.47762 2.48911,0.73955 3.09733,0.58206 0.60821,-0.15748 2.26043,-0.42069 3.6716,-0.58493 4.10023,-0.47718 4.65525,-1.79949 3.5067,-8.35452 -3.07496,-17.54951 -5.48057,-35.5581 -5.53575,-41.44112 -0.0343,-3.64928 -0.87738,-11.11371 -1.87365,-16.58762 -1.43138,-7.86447 -1.86219,-18.59458 -2.05334,-51.14303 -0.13304,-22.65474 -0.50184,-41.86784 -0.81955,-42.69577 -0.64373,-1.67755 1.79963,-2.07401 -36.15338,5.86607 -25.72197,5.38123 -45.75849,7.37369 -72.52622,7.21208 -18.36674,-0.11088 -49.69389,-1.21412 -61.2367,-2.15654 -6.51278,-0.53176 -8.71629,0.7199 -8.16819,4.63976 l 0.4307,3.08022 -1.22918,-2.76461 -1.22916,-2.7646 -1.83554,2.73846 c -1.00955,1.50616 -3.07961,4.24311 -4.60014,6.08213 -1.52053,1.83901 -3.47563,4.58774 -4.34468,6.10827 -8.17603,14.3052 -10.25001,18.20604 -11.87323,22.33165 -1.03038,2.61879 -2.9385,6.50316 -4.24029,8.63191 -1.30177,2.12874 -3.51402,6.35858 -4.91609,9.39965 -5.83152,12.64835 -37.07905,74.84617 -42.222805,84.04394 -4.808586,8.59845 -10.125972,18.50574 -21.663537,40.36321 -11.337558,21.47857 -12.249767,23.81635 -8.847373,22.67376 0.740787,-0.24877 3.088587,-0.74479 5.217331,-1.10227 z" id="path3275" style="fill:#000000" - inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + inkscape:connector-curvature="0" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + style="fill:#000000;fill-opacity:1;stroke:none" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + y="355.30283" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + id="rect4011" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + sodipodi:nodetypes="cssssssssssssssssssssssscscssscsssssssc" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + sodipodi:nodetypes="cssssssssssssssssssssssscscssscsssssssc" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + sodipodi:nodetypes="cssssssssssssssssssssssscscssscsssssssc" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + style="fill:none;stroke:#000000;stroke-width:0.91732502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> + sodipodi:nodetypes="cssssssssssssssssssssssscscssscsssssssc" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-xdpi="3.6865311" + inkscape:export-ydpi="3.6865311" /> diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index ecf99f59..e0888c9e 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -202,8 +202,7 @@ class UserController < ApplicationController render json: json_response(list_active: false) return else - list_obj = list.as_json.merge(list_active: list.active? ).merge(list.join_requests_as_json) - render json: json_response(list_obj) + render json: json_response(list.serialized_with_status_join_requests_and_supplier_counters) end else render json: json_response(not_present: true) diff --git a/app/models/list.rb b/app/models/list.rb index c49ce6ba..7f8b7f6a 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -326,9 +326,18 @@ class List def with_orders_and_join_requests_and_supplier_info_as_json with_orders_and_join_requests_as_json.merge( supplier_name: supplier.name, - supplier_orders_in_process_count: supplier.orders_in_process_count, - supplier_orders_placed_count: supplier.orders_placed_count - ) + ).merge(supplier_counter_info) + end + + def serialized_with_status_join_requests_and_supplier_counters + as_json.merge(list_active: active? ).merge(join_requests_as_json).merge(supplier_counter_info) + end + + def supplier_counter_info + { + supplier_orders_in_process_count: Qwaiter::Counter.get(Supplier.orders_in_process_counter_key(supplier_id)), + supplier_orders_placed_count: Qwaiter::Counter.get(Supplier.orders_placed_counter_key(supplier_id)) + } end def has_active_orders? diff --git a/app/models/order.rb b/app/models/order.rb index 3d6540f8..66db8fe3 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -92,19 +92,16 @@ class Order end def is_delivered! - decrement_placed = placed? + decrement_counter = placed? ? 'placed' : 'in_process' self.state = 'delivered' if save - orders_in_process_count = supplier.decrement_orders_in_process_count! - orders_placed_count = supplier.decrement_orders_placed_count! if decrement_placed + reduced_count = supplier.public_send "decrement_orders_#{decrement_counter}_count!" for user_id in list.user_ids broadcast_user user_id, 'order_being_delivered', id: id, list_id: list_id - broadcast_user user_id, 'orders_in_process_count', count: orders_in_process_count - broadcast_user user_id, 'orders_placed_count', count: orders_placed_count if decrement_placed + broadcast_user user_id, "orders_#{decrement_counter}_count", count: reduced_count end broadcast_supplier supplier_id, 'order_being_delivered', id: id, list_id: list_id - broadcast_supplier supplier_id, 'orders_in_process_count', count: orders_in_process_count - broadcast_supplier supplier_id, 'orders_placed_count', count: orders_placed_count if decrement_placed + broadcast_supplier supplier_id, "orders_#{decrement_counter}_count", count: reduced_count end end diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 60cc3bf0..cceb1ac3 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -170,28 +170,37 @@ class Supplier true end + # COUNTER SECTION. Can be a concern in a future def increment_orders_in_process_count! - Qwaiter::Counter.incr "supplier_counter:#{id}:orders_in_process" + Qwaiter::Counter.incr self.class.orders_in_process_counter_key(id) end def increment_orders_placed_count! - Qwaiter::Counter.incr "supplier_counter:#{id}:orders_placed" + Qwaiter::Counter.incr self.class.orders_placed_counter_key(id) end def decrement_orders_in_process_count! - Qwaiter::Counter.decr "supplier_counter:#{id}:orders_in_process" + Qwaiter::Counter.decr self.class.orders_in_process_counter_key(id) end def decrement_orders_placed_count! - Qwaiter::Counter.decr "supplier_counter:#{id}:orders_placed" + Qwaiter::Counter.decr self.class.orders_placed_counter_key(id) end def orders_in_process_count - Qwaiter::Counter.get "supplier_counter:#{id}:orders_in_process" + Qwaiter::Counter.get self.class.orders_in_process_counter_key(id) end def orders_placed_count - Qwaiter::Counter.get "supplier_counter:#{id}:orders_placed" + Qwaiter::Counter.get self.class.orders_placed_counter_key(id) + end + + def self.orders_in_process_counter_key(id) + "supplier_counter:#{id}:orders_in_process" + end + + def self.orders_placed_counter_key(id) + "supplier_counter:#{id}:orders_placed" end def active_order_count diff --git a/spec/models/order_spec.rb b/spec/models/order_spec.rb index 225b8214..2af46dad 100644 --- a/spec/models/order_spec.rb +++ b/spec/models/order_spec.rb @@ -87,13 +87,13 @@ describe Order do end it 'decreases the orders_in_process count and communicates it to user' do - expect{ order.is_delivered! }.to broadcast_to_user(user.id).message( 'orders_in_process_count' ).with(count: 6) - supplier.orders_placed_count.should == 10 + expect{ order.is_delivered! }.to broadcast_to_user(user.id).message( 'orders_placed_count' ).with(count: 10) + supplier.orders_in_process_count.should == 7 # should not be reduced end it 'decreases the orders_in_process count and communicates it to supplier' do - expect{ order.is_delivered! }.to broadcast_to_supplier(supplier.id).message( 'orders_in_process_count' ).with(count: 6) - supplier.orders_placed_count.should == 10 + expect{ order.is_delivered! }.to broadcast_to_supplier(supplier.id).message( 'orders_placed_count' ).with(count: 10) + supplier.orders_in_process_count.should == 7 # should not be reduced end it 'does not decreases the placed orders count if the order is not placed' do