The order object within associate_user may be current_order as well, not just @order
The order object within associate_user may be current_order as well, not just @order

Fixes #2187

softr8/spree,azranel/spree,project-eutopia/spree,jimblesm/spree,karlitxo/spree,APohio/spree,reinaris/spree,ramkumar-kr/spree,JDutil/spree,vmatekole/spree,alejandromangione/spree,LBRapid/spree,xuewenfei/solidus,azclick/spree,dafontaine/spree,progsri/spree,Engeltj/spree,RatioClothing/spree,DynamoMTL/spree,siddharth28/spree,patdec/spree,hoanghiep90/spree,jspizziri/spree,CiscoCloud/spree,Senjai/spree,Mayvenn/spree,camelmasa/spree,woboinc/spree,Senjai/solidus,jsurdilla/solidus,firman/spree,robodisco/spree,carlesjove/spree,derekluo/spree,yiqing95/spree,vinsol/spree,ujai/spree,FadliKun/spree,alejandromangione/spree,thogg4/spree,richardnuno/solidus,shaywood2/spree,hifly/spree,rajeevriitm/spree,AgilTec/spree,pervino/solidus,ramkumar-kr/spree,vcavallo/spree,dandanwei/spree,StemboltHQ/spree,jhawthorn/spree,gregoryrikson/spree-sample,ujai/spree,surfdome/spree,derekluo/spree,trigrass2/spree,priyank-gupta/spree,yushine/spree,rajeevriitm/spree,reidblomquist/spree,JuandGirald/spree,yomishra/pce,imella/spree,freerunningtech/spree,dandanwei/spree,JDutil/spree,azranel/spree,TimurTarasenko/spree,knuepwebdev/FloatTubeRodHolders,Senjai/solidus,pervino/spree,adaddeo/spree,scottcrawford03/solidus,raow/spree,CiscoCloud/spree,Migweld/spree,reidblomquist/spree,maybii/spree,ahmetabdi/spree,HealthWave/spree,quentinuys/spree,net2b/spree,forkata/solidus,njerrywerry/spree,Ropeney/spree,DarkoP/spree,quentinuys/spree,piousbox/spree,hoanghiep90/spree,tancnle/spree,pjmj777/spree,Senjai/spree,joanblake/spree,Kagetsuki/spree,judaro13/spree-fork,njerrywerry/spree,jordan-brough/solidus,kitwalker12/spree,patdec/spree,assembledbrands/spree,jordan-brough/solidus,berkes/spree,codesavvy/sandbox,JDutil/spree,urimikhli/spree,jspizziri/spree,CiscoCloud/spree,jhawthorn/spree,ayb/spree,beni55/spree,vcavallo/spree,APohio/spree,woboinc/spree,tesserakt/clean_spree,alvinjean/spree,priyank-gupta/spree,calvinl/spree,alepore/spree,jhawthorn/spree,pulkit21/spree,hoanghiep90/spree,HealthWave/spree,thogg4/spree,omarsar/spree,lsirivong/solidus,brchristian/spree,athal7/solidus,robodisco/spree,alepore/spree,radarseesradar/spree,fahidnasir/spree,odk211/spree,priyank-gupta/spree,Senjai/solidus,locomotivapro/spree,sfcgeorge/spree,edgward/spree,xuewenfei/solidus,Nevensoft/spree,Ropeney/spree,cutefrank/spree,sideci-sample/sideci-sample-spree,jparr/spree,jsurdilla/solidus,tesserakt/clean_spree,wolfieorama/spree,softr8/spree,rakibulislam/spree,moneyspyder/spree,rakibulislam/spree,StemboltHQ/spree,shioyama/spree,jasonfb/spree,firman/spree,biagidp/spree,imella/spree,NerdsvilleCEO/spree,dandanwei/spree,lyzxsc/spree,bjornlinder/Spree,orenf/spree,grzlus/spree,shekibobo/spree,TrialGuides/spree,azranel/spree,tancnle/spree,edgward/spree,jimblesm/spree,calvinl/spree,firman/spree,jspizziri/spree,Ropeney/spree,ramkumar-kr/spree,PhoenixTeam/spree_phoenix,edgward/spree,odk211/spree,camelmasa/spree,piousbox/spree,gregoryrikson/spree-sample,jspizziri/spree,vulk/spree,vulk/spree,jaspreet21anand/spree,DarkoP/spree,jaspreet21anand/spree,lyzxsc/spree,pulkit21/spree,jeffboulet/spree,azclick/spree,PhoenixTeam/spree_phoenix,tesserakt/clean_spree,jparr/spree,agient/agientstorefront,archSeer/spree,ckk-scratch/solidus,mleglise/spree,kitwalker12/spree,richardnuno/solidus,FadliKun/spree,robodisco/spree,bjornlinder/Spree,tailic/spree,quentinuys/spree,sideci-sample/sideci-sample-spree,joanblake/spree,kewaunited/spree,NerdsvilleCEO/spree,bonobos/solidus,adaddeo/spree,Engeltj/spree,vinsol/spree,volpejoaquin/spree,berkes/spree,Ropeney/spree,jordan-brough/solidus,karlitxo/spree,tailic/spree,SadTreeFriends/spree,edgward/spree,beni55/spree,njerrywerry/spree,pjmj777/spree,abhishekjain16/spree,lyzxsc/spree,joanblake/spree,lsirivong/spree,caiqinghua/spree,Migweld/spree,KMikhaylovCTG/spree,cutefrank/spree,pervino/spree,joanblake/spree,net2b/spree,berkes/spree,Machpowersystems/spree_mach,DynamoMTL/spree,tomash/spree,pervino/solidus,Antdesk/karpal-spree,Machpowersystems/spree_mach,Lostmyname/spree,Kagetsuki/spree,ckk-scratch/solidus,camelmasa/spree,archSeer/spree,RatioClothing/spree,raow/spree,forkata/solidus,yiqing95/spree,urimikhli/spree,scottcrawford03/solidus,project-eutopia/spree,rbngzlv/spree,nooysters/spree,dotandbo/spree,mindvolt/spree,LBRapid/spree,shioyama/spree,ckk-scratch/solidus,kewaunited/spree,Hates/spree,cutefrank/spree,groundctrl/spree,KMikhaylovCTG/spree,Hates/spree,jordan-brough/solidus,ahmetabdi/spree,groundctrl/spree,FadliKun/spree,ayb/spree,kewaunited/spree,jasonfb/spree,CJMrozek/spree,alejandromangione/spree,TimurTarasenko/spree,adaddeo/spree,NerdsvilleCEO/spree,sliaquat/spree,nooysters/spree,carlesjove/spree,ujai/spree,mindvolt/spree,project-eutopia/spree,builtbybuffalo/spree,caiqinghua/spree,LBRapid/spree,cutefrank/spree,freerunningtech/spree,useiichi/spree,pervino/spree,alepore/spree,trigrass2/spree,alvinjean/spree,sfcgeorge/spree,richardnuno/solidus,Hates/spree,AgilTec/spree,omarsar/spree,lsirivong/solidus,keatonrow/spree,madetech/spree,Antdesk/karpal-spree,grzlus/solidus,trigrass2/spree,ayb/spree,jeffboulet/spree,biagidp/spree,zamiang/spree,Mayvenn/spree,patdec/spree,piousbox/spree,gautamsawhney/spree,jasonfb/spree,reinaris/spree,TrialGuides/spree,adaddeo/spree,pulkit21/spree,judaro13/spree-fork,welitonfreitas/spree,tomash/spree,shekibobo/spree,calvinl/spree,volpejoaquin/spree,Arpsara/solidus,woboinc/spree,firman/spree,bonobos/solidus,wolfieorama/spree,DarkoP/spree,codesavvy/sandbox,reidblomquist/spree,mleglise/spree,welitonfreitas/spree,Lostmyname/spree,devilcoders/solidus,karlitxo/spree,grzlus/solidus,progsri/spree,delphsoft/spree-store-ballchair,PhoenixTeam/spree_phoenix,CJMrozek/spree,dotandbo/spree,fahidnasir/spree,assembledbrands/spree,degica/spree,urimikhli/spree,grzlus/solidus,sliaquat/spree,builtbybuffalo/spree,builtbybuffalo/spree,sideci-sample/sideci-sample-spree,hifly/spree,bricesanchez/spree,karlitxo/spree,moneyspyder/spree,locomotivapro/spree,forkata/solidus,reidblomquist/spree,miyazawatomoka/spree,jsurdilla/solidus,assembledbrands/spree,fahidnasir/spree,Senjai/spree,shekibobo/spree,jordan-brough/spree,shaywood2/spree,SadTreeFriends/spree,StemboltHQ/spree,sunny2601/spree,Boomkat/spree,sunny2601/spree,watg/spree,jeffboulet/spree,vmatekole/spree,jparr/spree,miyazawatomoka/spree,net2b/spree,gautamsawhney/spree,scottcrawford03/solidus,DynamoMTL/spree,vulk/spree,Hawaiideveloper/shoppingcart,vmatekole/spree,sunny2601/spree,sunny2601/spree,DynamoMTL/spree,miyazawatomoka/spree,vinsol/spree,AgilTec/spree,siddharth28/spree,yomishra/pce,siddharth28/spree,TrialGuides/spree,locomotivapro/spree,yushine/spree,Lostmyname/spree,rakibulislam/spree,quentinuys/spree,lsirivong/solidus,wolfieorama/spree,watg/spree,Hawaiideveloper/shoppingcart,pjmj777/spree,HealthWave/spree,zaeznet/spree,Hates/spree,zamiang/spree,biagidp/spree,vcavallo/spree,dandanwei/spree,codesavvy/sandbox,keatonrow/spree,Migweld/spree,jasonfb/spree,rbngzlv/spree,surfdome/spree,pervino/solidus,KMikhaylovCTG/spree,jsurdilla/solidus,Arpsara/solidus,zaeznet/spree,useiichi/spree,jaspreet21anand/spree,ckk-scratch/solidus,knuepwebdev/FloatTubeRodHolders,groundctrl/spree,abhishekjain16/spree,siddharth28/spree,beni55/spree,vinayvinsol/spree,devilcoders/solidus,AgilTec/spree,sliaquat/spree,shekibobo/spree,dotandbo/spree,derekluo/spree,FadliKun/spree,maybii/spree,CJMrozek/spree,RatioClothing/spree,zamiang/spree,calvinl/spree,agient/agientstorefront,agient/agientstorefront,Senjai/solidus,ahmetabdi/spree,omarsar/spree,athal7/solidus,vulk/spree,bricesanchez/spree,rbngzlv/spree,yomishra/pce,madetech/spree,carlesjove/spree,Antdesk/karpal-spree,welitonfreitas/spree,groundctrl/spree,brchristian/spree,camelmasa/spree,pervino/spree,shioyama/spree,vinayvinsol/spree,odk211/spree,kewaunited/spree,alvinjean/spree,gautamsawhney/spree,rbngzlv/spree,tancnle/spree,yiqing95/spree,Hawaiideveloper/shoppingcart,Hawaiideveloper/shoppingcart,Engeltj/spree,mleglise/spree,Boomkat/spree,CiscoCloud/spree,JuandGirald/spree,welitonfreitas/spree,lsirivong/spree,grzlus/solidus,gregoryrikson/spree-sample,lsirivong/spree,Arpsara/solidus,Nevensoft/spree,kitwalker12/spree,maybii/spree,orenf/spree,caiqinghua/spree,forkata/solidus,bonobos/solidus,bonobos/solidus,DarkoP/spree,jaspreet21anand/spree,nooysters/spree,zaeznet/spree,nooysters/spree,madetech/spree,locomotivapro/spree,Boomkat/spree,gregoryrikson/spree-sample,archSeer/spree,watg/spree,priyank-gupta/spree,maybii/spree,gautamsawhney/spree,radarseesradar/spree,APohio/spree,zamiang/spree,tancnle/spree,caiqinghua/spree,devilcoders/solidus,vinayvinsol/spree,softr8/spree,jordan-brough/spree,alejandromangione/spree,rakibulislam/spree,jimblesm/spree,TimurTarasenko/spree,lyzxsc/spree,Kagetsuki/spree,ahmetabdi/spree,abhishekjain16/spree,rajeevriitm/spree,archSeer/spree,zaeznet/spree,SadTreeFriends/spree,grzlus/spree,tailic/spree,volpejoaquin/spree,delphsoft/spree-store-ballchair,xuewenfei/solidus,shaywood2/spree,JuandGirald/spree,ayb/spree,shaywood2/spree,sliaquat/spree,piousbox/spree,lzcabrera/spree-1-3-stable,dotandbo/spree,Mayvenn/spree,SadTreeFriends/spree,Arpsara/solidus,patdec/spree,progsri/spree,carlesjove/spree,azclick/spree,dafontaine/spree,Nevensoft/spree,trigrass2/spree,jordan-brough/spree,TimurTarasenko/spree,Machpowersystems/spree_mach,useiichi/spree,delphsoft/spree-store-ballchair,vinsol/spree,grzlus/spree,athal7/solidus,odk211/spree,ramkumar-kr/spree,project-eutopia/spree,PhoenixTeam/spree_phoenix,degica/spree,APohio/spree,radarseesradar/spree,agient/agientstorefront,wolfieorama/spree,Engeltj/spree,reinaris/spree,softr8/spree,vinayvinsol/spree,azranel/spree,lzcabrera/spree-1-3-stable,CJMrozek/spree,alvinjean/spree,orenf/spree,keatonrow/spree,Boomkat/spree,azclick/spree,abhishekjain16/spree,judaro13/spree-fork,rajeevriitm/spree,imella/spree,omarsar/spree,Mayvenn/spree,JuandGirald/spree,tesserakt/clean_spree,raow/spree,yushine/spree,hoanghiep90/spree,lsirivong/spree,dafontaine/spree,keatonrow/spree,KMikhaylovCTG/spree,bjornlinder/Spree,tomash/spree,miyazawatomoka/spree,NerdsvilleCEO/spree,athal7/solidus,xuewenfei/solidus,pervino/solidus,progsri/spree,moneyspyder/spree,Migweld/spree,sfcgeorge/spree,useiichi/spree,volpejoaquin/spree,thogg4/spree,grzlus/spree,JDutil/spree,moneyspyder/spree,knuepwebdev/FloatTubeRodHolders,richardnuno/solidus,degica/spree,surfdome/spree,radarseesradar/spree,thogg4/spree,net2b/spree,mleglise/spree,brchristian/spree,vmatekole/spree,pulkit21/spree,freerunningtech/spree,codesavvy/sandbox,derekluo/spree,mindvolt/spree,dafontaine/spree,berkes/spree,madetech/spree,jimblesm/spree,scottcrawford03/solidus,tomash/spree,devilcoders/solidus,jeffboulet/spree,yiqing95/spree,fahidnasir/spree,vcavallo/spree,bricesanchez/spree,reinaris/spree,delphsoft/spree-store-ballchair,jparr/spree,Lostmyname/spree,lsirivong/solidus,njerrywerry/spree,builtbybuffalo/spree,hifly/spree,raow/spree,Kagetsuki/spree,hifly/spree,Nevensoft/spree,surfdome/spree,brchristian/spree,TrialGuides/spree,mindvolt/spree,beni55/spree,orenf/spree,robodisco/spree,lzcabrera/spree-1-3-stable,sfcgeorge/spree,yushine/spree