From d8668115ed702a120a7db6f7831f14e8223869d7 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Wed, 25 Mar 2015 06:12:38 +0100 Subject: [PATCH] fixed bugs with address in incognito and NaN in delivery costs and total --- .DS_Store | Bin 6148 -> 0 bytes back-office/.DS_Store | Bin 6148 -> 0 bytes back-office/app/assets/images/.DS_Store | Bin 6148 -> 0 bytes back-office/public/.DS_Store | Bin 6148 -> 0 bytes front-api/.DS_Store | Bin 6148 -> 0 bytes front-api/models/delivery_destination.rb | 4 ++-- front-ui/.DS_Store | Bin 6148 -> 0 bytes front-ui/app/.DS_Store | Bin 6148 -> 0 bytes front-ui/app/components/.DS_Store | Bin 6148 -> 0 bytes front-ui/app/components/items/.DS_Store | Bin 6148 -> 0 bytes front-ui/app/components/shared/.DS_Store | Bin 6148 -> 0 bytes front-ui/app/models/place.js | 3 ++- 12 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 .DS_Store delete mode 100644 back-office/.DS_Store delete mode 100644 back-office/app/assets/images/.DS_Store delete mode 100644 back-office/public/.DS_Store delete mode 100644 front-api/.DS_Store delete mode 100644 front-ui/.DS_Store delete mode 100644 front-ui/app/.DS_Store delete mode 100644 front-ui/app/components/.DS_Store delete mode 100644 front-ui/app/components/items/.DS_Store delete mode 100644 front-ui/app/components/shared/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a71d2505740636f56fa7fae51ed42b297bdfd59f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~L2uJA6vv;pY)iHw^@22sOT>x8I%S>EE*wJDAvhqRbtWvSR2 zx9mcNx<`{Ty23A}UM1Qz7y^dCzeYgL-5m-kz>NJwf6m{_S4q|jlPpApTpnJaJVCK$ zGt{+N;W!^~)?GMA;=J&@pJHv@+SuH(?QMJa;yg~HY~0R9X_UY1_Oo#}jxNJs_)hsn zP>k|+FjPHnf})Qe<)39)0{?=e&*P}*zi&L6Oqz!+&)avKt)td--<=#EQ5=MIg<7gS8IAw^N46zb_?-5o; zv_#0EQ#zsN)S=hV1NuzS;vY@?l8k1`;LVL^fxRDQw1L}gic4h%W*zysa27k#X;jWRx> zi~~%Nha8B`w}#F`Tw{ubRZwCYu|;o_eG;;%qNM%;^Dxh9Z{{WB&0;M^^v0|z_CXYz zPD62`-fUKpjvAz8#S7 zL&_qUd8{4UPX{Y|1R%E9Y=hVK&p$Dh24d#1cE}cnaj8U?YWxwy__Kp?>Fm!uzjo-- zVeHHt$Iop13B~xMhe<6RCUdB@I-m}O4kYfjC;R{C_w#?4q<89oI`FR?Fs(}Cve%|8_bd{^s~y@DR(?CS7qS(fvDjc=Di_4eW9^VF4E-ZuZO}>`*sB9yqF%(g diff --git a/back-office/app/assets/images/.DS_Store b/back-office/app/assets/images/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0r~N+phY29M$a{03%igW@Dy zQH6FZdt7_R>zy=q4Zuvc*%>eb&}R|s9K(le|b8-rAuG zr~8CZj^Z`;7c*GqZaNo*!uQ86B4DyzEWz;pJ=2%wt z48}C`+6>K@+ZyAe#u)mTFU+W51jb-%6S8b>Z6)w$4LRDUm5ehDEN&l8KOuv#w;QPH)?#~!fg9TQcM4p~# z()PreaWLHgbIfp#DXxiQE+nfhmd`6-h%9QmuYmj}X#Jr>tyKY4Ko$5=K=y}-MKJbQ zI<#8{D|-bXcG+!>Z8Cn+({N=;=$j0AL zjE&CuBkK+mJJebgPz6E-_T1Nzod2`m@Bbl5zo`PMz`s(!bf-7d2~+ZCYa=;1Ya^Ch q7BTTF9a;)2e;nI}9K|Or);JbPgBW`(9kPd}e*~-yTB!nms=ybeP^{$u diff --git a/front-api/models/delivery_destination.rb b/front-api/models/delivery_destination.rb index 5a36183..95437dc 100644 --- a/front-api/models/delivery_destination.rb +++ b/front-api/models/delivery_destination.rb @@ -3,8 +3,8 @@ class DeliveryDestination < ActiveRecord::Base belongs_to :user def self.create_from_last(anonymous_id, user_id) - dd = DeliveryDestination.where(user_id: user_id).order("id desc").first - dd ||= DeliveryDestination.where(anonymous_id_string: anonymous_id).order("id desc").first + dd = DeliveryDestination.where(["user_id is not null and user_id = ?", user_id]).order("id desc").first + dd ||= DeliveryDestination.where(["anonymous_id_string is not null and anonymous_id_string = ?", anonymous_id]).order("id desc").first dd ||= DeliveryDestination.new({user_id: user_id, anonymous_id_string: anonymous_id }) attributes = dd.as_json attributes.delete("id") diff --git a/front-ui/.DS_Store b/front-ui/.DS_Store deleted file mode 100644 index 04afe536c3d80071403b836a12a9910b1c321d5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO>fgc5PjRE;FKcef`rtI#i@rja#NvRID{xIa6m#$r5-3Mb{!gnv7^`~hbY2; z5PyN+!SCRV_&4G02U3lT#0ep~Bh9|qota(Fv)1bcAo@kP1GE7+REfORdR@ z8IevQ=Sa_jI1Sj7(^;_$SO)%e2ISstz{doWM{#BU9?-K%70ab6!bAnLY+`o#mtYb{ zS?+n?#7d*NdhNR7tU2o^$59fdvwm76VfJ)5PG`d?90mULnX+>~FS5QrRh}n)KBh<6 zM`;?ajtm6Tuj7^Z^ zg~}MAgO|vvdE&5^mmo!m5l-=1Sp`=c)$+dA@+N#gXL!Z-obhTc<|ozlAm7*L3(wiY zA@*?}13V^nxaMV*UCiJFR;~~OW|ufOu29XkRLg*6;LjM4-v^f}v1hQgS*6$^l}}V5yNK6rodzI#rk}hA?*rq0{N_nfOwpPKQt{a~`v@FgFxot{%cw z;SfEIwzUjc2C57+bhjYx15FIyZx(Of31qq4Eic=45m8L?y^bn$g;D$)09w>s{Y}71T;wZZzNKwQB zLi~mP4t@t`#J>q|#tzz$lA3wO+a zS^ri2-gLTu*laZR{Qc%pbGGMCkB{;2;HWX1RjXdL{?)s4|KQ}wS@0qM`02BZn-tHO zjU_DF7d)(0;$3GnNc7+m?aZx;TG%k5Qm|I5pYSS5UjifjQ&CxvScL$Q zyVR#1jm)OJSOxly$VJX=_`HWVJTa1h5_$-JOb7I4r9bBK3YLGb;3fPug~ChMab(r6 zz$sZy1#gMQID25)17k5Z#j`Gst%@NA$V50)OKln(DEsME9**cKP6#!U9wHV6$)4&|xV#{J~5G^oes6azi z_KKkl9reETYgx<<8agR^`B1iJWp5}-dPjU;+)1?zy4)$?6j)ZEWFG5${y*A$|6eA# zC#Qf@;J;Epl}|gTZA{6Ytt*q`v(`s?jl{-&xj~^Iv&XR%_$a=MB!)Jh3&57e+#qUT P?ngjmaG6u!uPX2hZ-CD0 diff --git a/front-ui/app/components/.DS_Store b/front-ui/app/components/.DS_Store deleted file mode 100644 index 44861fde263e9b3537012f7de1fcd2d737e5f082..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~&x_MQ6vyA}cGsjT^dbmeg7^bucgc2~L2nCP*n=yYn9@dKrZlNNlwwrG zzrw43fEWK0|DE;wW}eU=>&1hp%qwrcFEj5o%!kZOLPV-FN%x6bMC8F)8%;Fl7>~2B z*@pD^P-Xt3q>Kt0JjwOTwQSen2si?N8v$Os9wjs;O;cJ}ze%nWjPb_s1%3m5^Xv>Q z(H2&DMSXfrC9m{_%q~XnU^95Io|#O`kz{^NMtN3NVfbBbY&N#GFL++lyL5Vz6{((f z^rT43r@f(`_Oi5}#N%fsuHtG^cH*%aIf|9=_ZD)a^K$=rj!QFN zA?brkWvEni1RYR+g-r%Fx8a|K4MJzXNkE=`R|c*LL?hAKDn?++mO^c*l1~g}%h4Z5UL;yuwdJJDo$)_%XC+@K%G@3O zfl0?9YSp!lfFrO>VAEc<`22tL>+k>NB6sBoI0F9_0oCaCx*beO&epZb@mU+dU%=To nueNGR(8zIY0zQhb!i`}p-~bwl)>hF2b1wo0gKHdtKT6;SmA|pz diff --git a/front-ui/app/components/items/.DS_Store b/front-ui/app/components/items/.DS_Store deleted file mode 100644 index 1534571799e1209c64ecb323979df2d09b0453a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T2rB=`oQM4@0o@Zi<{Q6tfaN$+_KAIb;tZSiH>4TmI40D7e&r-D7W2HABST(~Yxwz>8X{q3mVbk&L@ZDJC+h>5?=99@!F;NmKb=qerb)p=ySCO1ed~M*WVf zyVf!CGt9gObJgh5!Bkb+_b1A@xdN_$E3oehV9gdA3?q8$3b+EUK%;h@UIl$etMUVaZ9$g?%bTLwE_MB7n8g? lVnacoOEGd~DL#d(VLV6xObqLY7=ihZfXd*FEAXcZd;>|HVTJ$z diff --git a/front-ui/app/components/shared/.DS_Store b/front-ui/app/components/shared/.DS_Store deleted file mode 100644 index 1938026054e582c15274886df37d18e1cd53d705..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF-`+P3>-s>NHi%^Zb^m24^AN|km&dTN=N|;T%-&Ab@?2Bg0a0IPA3o*1sY4< z+4Xt6xhc*u09(A=Ujj1#Q@SILzKqSEyN~RoMvO>jjR&-NMu!{jerL{|ld;7HhXKFi z`HJfg70#ZN75hX+XqHrBQmu{{mUPBT&1)+5 ziAjgW&8$;zwmP9$+|GE3bXb$9RSHOfp#rCQoO%CW(Z8Ahha{b(fE4&w3fN?MyIk;< zYHuCAocG#7zoUN`b0eKgv|?hkVjjE|&%fjq-}8A>u}=&-<3T6tkAUkUlLCLCz&l2@ BAv*v7 diff --git a/front-ui/app/models/place.js b/front-ui/app/models/place.js index 9fa24ab..0abd06b 100644 --- a/front-ui/app/models/place.js +++ b/front-ui/app/models/place.js @@ -12,7 +12,8 @@ var Place = Backbone.Model.extend({ }, url: function() { - return Globals.ApiUrl + '/place/' + this.postalCode.trim(); + var postalCode = this.postalCode || "00000"; + return Globals.ApiUrl + '/place/' + postalCode.trim(); } });