From cd3177c6829ca2a5c36b1d63f94bc3eff729d2c2 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Mon, 19 Jun 2017 15:22:50 +0630
Subject: [PATCH] order

---
 app/assets/stylesheets/origami.scss |   4 ++++
 app/models/order.rb                 |   2 +-
 dump.rdb                            | Bin 18163 -> 17902 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 71a9915e..c96237fa 100644
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -95,6 +95,10 @@
 	background-color:#7a62d3;
 }
 
+.orange{
+	 background-color:#FF7F50;
+}
+
 .red {
 	background-color:#ff0000;
 }
diff --git a/app/models/order.rb b/app/models/order.rb
index 14fd8cda..96382c07 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -246,7 +246,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("sales.sale_status='completed'")
-                    .group("sales.sale_id")
+                    .group("sales.sale_id,bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                     # For PG
                     #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
diff --git a/dump.rdb b/dump.rdb
index 211fd505548a6a60b85596d4201ab6d1155b4f22..e6612cd4d745c3a266a4b581523a7577e82df134 100644
GIT binary patch
delta 571
zcmey|%lNLFae}12;V-VD)RfF(-K5Nt;sXx9Sd&XKb5jpJh;fhn#Zg+EnxdPVntN!1
z1V6(+hTlRAlM|W56-;!E3=SwTh!vM4mRO}FX6B@(SQ!}@n(G>v=^C0HkOwM~lmjvp
zu`4mKIFJfb!fI%G@D;=4>x?RFU=tZ8*D)zg)?_ka0jZdnWHhl%j?GNh!2CeqWJV_8
z&427Jvdc2D6_%!!rWP}?r=+GOmgbZ&=NA?;vlgY66jjP^erxf8k@>2V^W;Fjmd%?C
z(-<colyBSIZwh3*w`kie$ezKt`I78=M&^4?K|nRlo7W2!F*3%3nV+~a85wU*RuE~~
zd_X@Nq$C6^Zopi?$b8!=3Cv;C$Y<PqSpGFcW$WfCVnCHJ$^RU=jEr}HCbVwmRm)>!
zzU1Tr)YP(BMJ1V$@itieArDXq#FDwjIgFd-Mcy-R{xANDaq|L}*Nn^$fzA>XYuTJ2
zQ^Gj;qeaVR6D6RdZcNVC?ARP{o65+1*zp?JoGW}8jLeUmg29feHZNghzV75cxlprh
z^AqhfM&=t(=jKagF>cP&d<!ud<l$uNVo(S{)E*T`VPw7uc4hPC3%Z$%$~a;S7zO{=
Mw!N$RckQ+j0DjHSK>z>%

delta 735
zcmY+AO-vI}6oq>`Q!65<G>C{e<%tsGfc<Z0Vn`{5xRtmu{*-C^N(b6$nV)E*hJ}D8
z#z=YY(T!Vym$<dS+87B5CXyQ2Dg}b8N~%LKG45{8J?G}Tr~C|dpTl(PWubCJ#R*yK
zj>)=K3|DM%UC!Vo>(Bn1mBWUH6Wtk{S$frV+)}mtasY9{N!ArCUf&;x0%r<QJDGt~
zg^!0w2RO!k-5yubvbR^K&ff-$g>BADis*Oy1<{Ko!6yYhL07=bva*uQE{ETS-*FF6
zDy!*=l)*?urW^4{(<N2MiKwI_(argUV8G+?hC)4VpUdM5@hB%JQ0*v>bZOY>XSDk&
zc6wPu9hVf{*~`VVO59LYti<z3^!Rx+W?%zrNW6s-I4K#HbhxuQB@d^fIaSW8vYtnG
zc$Ai6*jza4Svi3fJ=`)>7#eN-4;(#WV}_P5TG$wt^d@(W&F>e4o{%62Zg)e#HfG3J
zw<V>th6}5mg*kgyqxp|6=G1H)Yi6N~#A-cs0AyvdW178&l-A8geXKiB>>vebFH}(j
zV^guN=DFp*Qsf4C(eRkgwdR11_k0I3UpGao$5KFdoV&oRMWW<u{{&rWHkG9dyFep>
zGSIEQO<+oq!CLl<Lj_{xCMbVNh6Qd1nAOODxf!4({x!g7($O|aXRnL^^X+e9+hqV;
zt%ZM_kbyedH-W}ITfnSD4&=M%69DT3xJf#4P64vxoT6{qvH;ii50erfrZc^!WsPk2
zJ*8Ak0$uOl0#ZHuguZVX1v*>52{UF|yqE^!XrH1@ji$#HssNp@EB`}z7}kIe`pRH-
kbD9k-E?CUAT9`nQql@s#zONn)74h$ldmlE+(;YAW0K#ksk^lez