don't inherit from spree base
don't inherit from spree base

use class_eval instead for included

update whitespace

Fixes #6614
Fixes #6625
Fixes #6581

Conflicts:
	core/app/models/spree/order/checkout.rb

grzlus/spree,jimblesm/spree,trigrass2/spree,sliaquat/spree,DarkoP/spree,robodisco/spree,groundctrl/spree,ramkumar-kr/spree,jasonfb/spree,karlitxo/spree,pervino/spree,pulkit21/spree,locomotivapro/spree,kewaunited/spree,CiscoCloud/spree,quentinuys/spree,lsirivong/spree,sliaquat/spree,CJMrozek/spree,lyzxsc/spree,vinayvinsol/spree,FadliKun/spree,TrialGuides/spree,odk211/spree,locomotivapro/spree,calvinl/spree,ahmetabdi/spree,vinsol/spree,pervino/spree,vcavallo/spree,orenf/spree,useiichi/spree,cutefrank/spree,softr8/spree,yiqing95/spree,vmatekole/spree,rajeevriitm/spree,volpejoaquin/spree,pulkit21/spree,vmatekole/spree,nooysters/spree,calvinl/spree,mindvolt/spree,raow/spree,trigrass2/spree,ayb/spree,njerrywerry/spree,Hawaiideveloper/shoppingcart,JuandGirald/spree,jaspreet21anand/spree,tancnle/spree,lsirivong/spree,brchristian/spree,shekibobo/spree,DarkoP/spree,CiscoCloud/spree,yiqing95/spree,caiqinghua/spree,Hawaiideveloper/shoppingcart,edgward/spree,jasonfb/spree,orenf/spree,tancnle/spree,CJMrozek/spree,berkes/spree,ayb/spree,dafontaine/spree,mindvolt/spree,piousbox/spree,hifly/spree,tomash/spree,pulkit21/spree,abhishekjain16/spree,vinayvinsol/spree,priyank-gupta/spree,raow/spree,Hawaiideveloper/shoppingcart,gregoryrikson/spree-sample,karlitxo/spree,JuandGirald/spree,yiqing95/spree,hifly/spree,zaeznet/spree,azranel/spree,priyank-gupta/spree,lyzxsc/spree,berkes/spree,groundctrl/spree,KMikhaylovCTG/spree,imella/spree,vinsol/spree,alvinjean/spree,gautamsawhney/spree,mleglise/spree,jimblesm/spree,karlitxo/spree,jparr/spree,fahidnasir/spree,robodisco/spree,JuandGirald/spree,beni55/spree,mindvolt/spree,DarkoP/spree,patdec/spree,KMikhaylovCTG/spree,tancnle/spree,mleglise/spree,grzlus/spree,fahidnasir/spree,gregoryrikson/spree-sample,TrialGuides/spree,progsri/spree,maybii/spree,maybii/spree,KMikhaylovCTG/spree,calvinl/spree,jparr/spree,imella/spree,brchristian/spree,pulkit21/spree,alvinjean/spree,beni55/spree,jaspreet21anand/spree,fahidnasir/spree,rajeevriitm/spree,patdec/spree,pervino/spree,edgward/spree,njerrywerry/spree,jimblesm/spree,njerrywerry/spree,jparr/spree,moneyspyder/spree,trigrass2/spree,volpejoaquin/spree,wolfieorama/spree,wolfieorama/spree,JDutil/spree,TimurTarasenko/spree,joanblake/spree,siddharth28/spree,hoanghiep90/spree,caiqinghua/spree,softr8/spree,caiqinghua/spree,hoanghiep90/spree,locomotivapro/spree,cutefrank/spree,zamiang/spree,patdec/spree,groundctrl/spree,alejandromangione/spree,firman/spree,JuandGirald/spree,welitonfreitas/spree,TimurTarasenko/spree,ramkumar-kr/spree,mleglise/spree,grzlus/spree,pervino/spree,omarsar/spree,azranel/spree,mleglise/spree,moneyspyder/spree,FadliKun/spree,gregoryrikson/spree-sample,jaspreet21anand/spree,jasonfb/spree,useiichi/spree,softr8/spree,nooysters/spree,CJMrozek/spree,vcavallo/spree,ayb/spree,imella/spree,rakibulislam/spree,vinayvinsol/spree,zaeznet/spree,berkes/spree,cutefrank/spree,alvinjean/spree,joanblake/spree,firman/spree,groundctrl/spree,FadliKun/spree,azranel/spree,quentinuys/spree,progsri/spree,brchristian/spree,ayb/spree,trigrass2/spree,hoanghiep90/spree,locomotivapro/spree,vmatekole/spree,odk211/spree,abhishekjain16/spree,brchristian/spree,ramkumar-kr/spree,CiscoCloud/spree,Hawaiideveloper/shoppingcart,edgward/spree,tomash/spree,zamiang/spree,jaspreet21anand/spree,DarkoP/spree,hoanghiep90/spree,AgilTec/spree,siddharth28/spree,njerrywerry/spree,gautamsawhney/spree,shekibobo/spree,calvinl/spree,zaeznet/spree,rajeevriitm/spree,jimblesm/spree,tomash/spree,ahmetabdi/spree,jasonfb/spree,vmatekole/spree,fahidnasir/spree,alvinjean/spree,quentinuys/spree,omarsar/spree,sliaquat/spree,ahmetabdi/spree,useiichi/spree,AgilTec/spree,ahmetabdi/spree,volpejoaquin/spree,lyzxsc/spree,alejandromangione/spree,siddharth28/spree,JDutil/spree,vinsol/spree,rakibulislam/spree,jparr/spree,moneyspyder/spree,shekibobo/spree,ramkumar-kr/spree,piousbox/spree,welitonfreitas/spree,moneyspyder/spree,maybii/spree,vinsol/spree,wolfieorama/spree,rajeevriitm/spree,rakibulislam/spree,joanblake/spree,welitonfreitas/spree,robodisco/spree,nooysters/spree,odk211/spree,omarsar/spree,caiqinghua/spree,FadliKun/spree,beni55/spree,zaeznet/spree,wolfieorama/spree,cutefrank/spree,volpejoaquin/spree,karlitxo/spree,abhishekjain16/spree,zamiang/spree,patdec/spree,KMikhaylovCTG/spree,berkes/spree,rakibulislam/spree,odk211/spree,CiscoCloud/spree,priyank-gupta/spree,kewaunited/spree,abhishekjain16/spree,zamiang/spree,vcavallo/spree,lyzxsc/spree,kewaunited/spree,TrialGuides/spree,gautamsawhney/spree,vcavallo/spree,orenf/spree,raow/spree,raow/spree,progsri/spree,joanblake/spree,lsirivong/spree,useiichi/spree,siddharth28/spree,TimurTarasenko/spree,beni55/spree,AgilTec/spree,gregoryrikson/spree-sample,sliaquat/spree,yiqing95/spree,firman/spree,mindvolt/spree,shekibobo/spree,maybii/spree,orenf/spree,dafontaine/spree,TrialGuides/spree,JDutil/spree,hifly/spree,dafontaine/spree,priyank-gupta/spree,piousbox/spree,piousbox/spree,tancnle/spree,grzlus/spree,quentinuys/spree,TimurTarasenko/spree,progsri/spree,softr8/spree,firman/spree,dafontaine/spree,edgward/spree,kewaunited/spree,azranel/spree,AgilTec/spree,JDutil/spree,tomash/spree,vinayvinsol/spree,welitonfreitas/spree,CJMrozek/spree,hifly/spree,omarsar/spree,robodisco/spree,nooysters/spree,lsirivong/spree,gautamsawhney/spree,alejandromangione/spree,alejandromangione/spree