From 41572d5360f463ae80ca125ca1141d1609dd06d7 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 15 Jun 2017 11:12:50 +0630
Subject: [PATCH] add sale reason in seed

---
 app/controllers/home_controller.rb |  12 ------------
 db/seeds.rb                        |   6 ++++++
 dump.rdb                           | Bin 18813 -> 18786 bytes
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index f30297c7..29e9082a 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -10,7 +10,6 @@ class HomeController < ApplicationController
     @login_form.emp_id = params[:login_form][:emp_id]
     @login_form.password = params[:login_form][:password]
     @employee = Employee.login(@login_form.emp_id, @login_form.password)
-<<<<<<< HEAD
 
     if @employee != nil
       if @employee.role == "administrator"
@@ -25,17 +24,6 @@ class HomeController < ApplicationController
     else 
       redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
     end 
-=======
-    if @employee.role == "administrator"
-      session[:session_token] = @employee.token_session
-      redirect_to dashboard_path
-    elsif @employee.role == "cashier"
-      session[:session_token] = @employee.token_session
-      redirect_to origami_root_path
-    else
-       render :index
-    end
->>>>>>> 7dffd668eaee6ab82621fd4bae150525ded79df1
 
   end
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 458a0873..1245023d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -76,6 +76,12 @@ booking_status = Lookup.create([{lookup_type:'booking_status', name: 'Available'
 account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: 'income'},
                               {lookup_type:'account_type', name: 'Expense', value: 'expense'}])
 
+# sale void reason
+void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manager', value: 'Approve By Manager'},
+                                {lookup_type:'void_reason', name: 'Customer Mistake', value: 'Customer Mistake'},
+                                {lookup_type:'void_reason', name: 'Cashier Mistake', value: 'Cashier Mistake'},                                
+                                {lookup_type:'void_reason', name: 'Waiter Mistake', value: 'Waiter Mistake'}])
+
 #WALK CUSTOMER - Default CUSTOMER (take key 1)
 customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000"})
 customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111"})
diff --git a/dump.rdb b/dump.rdb
index 51fd78bbfa5f7ef4d3c5028eff3e25400d9ad2b5..2018ec7d7f770c1f04447d1f937992e3c354ad40 100644
GIT binary patch
delta 982
zcmbu7OH30%9L9HOfeJz`F=`ZKz!)^hGP^rZ0tsCWDjHugG2)>#v?!6bN=rOYA_(eL
zx?W96<fJEPJloO`#TXOBXq2E;FA@_qJ`S4r*lj6#@WyfenVIkR|Gw{M47`bfYsmH0
zsh|Ae=nwmS4FP{(+VOqN9kpNQ&Rb)tkF^yF7K|W;a!po=svreRrQwJ-($wwk>Gk_k
zAB;H=1UJUUH`*1Fx{^3muvBP!rh5#qe#E$4ey^g$dXA}(DMj#wL?ASRuB{hIF}%<d
zIRooL?r2RTsB6hM=96uy-r;uz$NXJT15Hgs#YKlgk+x8O(7o4Y$z?z+Iax?J5roBm
z0Z$jKhjS7ia!NfJAZMgh5yL`IJh)6vm?dlKQ=z2Yi~8Z}f!eNKZ#Z1rWGq$<Bpx~f
zz_y?t$+F&Ad*4-N-bI8mnIMk13agD#XGhCOM!IPirUN4W$?oYgd0;x8(@ahkQH=|#
z<t3S_XtFh8oTS|^^`q9`iMu7|fbF^7X&x>a(G9ch<(4TL#j>IjA~XhJNnc;6&lB*6
z!`{=aqh-58{k^_mT?BUb1bxs;|GG6;gR*WtG2IFbFBy+$Wh;nfq$!(*xqwrhzjMYs
zUNI(_f*CtkshWo*3<+6ff@7qn-A{Gh<Qh%H*PSS|z1ELsiTgH%0a!5Rs;(xwE2~PE
z;YW<Kn`herBk+KoU|Ho*2TWZZyfERxl$}tFm2t^p-v#IM?2XB33Bz=O5G(9lV=`8`
z>2o5w^9ulPjmetJ#+n_ox%8N7rYES`I5R!hwvIg`LlebVMvN<n!imn$%L&d%BG;S7
zWTKcNrU_2+8cbtmh=^g#&EDk8{H^}MzLnHC#hSLd#hbH>+bBXf{-4Z>G=cu@G8UR_
gjTpme_bY4Z#QTPWTflaM?{9IOkA@Z|W}1_K0IP*N6#xJL

delta 765
zcmZvaOGs2v7{~9K>vN`jwTP^tqd{Tf?c94__gKozL`8(XH$~#ybPCCF!g0VwftE?_
z(zCE#V<i*>1veK4fs?(4+T^y^C?U1U%#HMb?u>V&McV`4@B5wq|C<{De@4J{R2lGv
zPW&uM#3LOI(Ma@Z-|}$qLcxuh-}i=73pJHG5u74KIM;}v9O;TL-fQ(Xp0PT+A|0tO
zat3sRQ5p19gMRyz=WC(*A#_Nl{6qE=Zx@h@jYIaWvhzUw7&<Cvn=i`;YhG0-9M*a<
zH#LTkpr$DU8^Sva1T(QnE*7-4#}eJ}8I(bwbY_5-QEX_cg5rx+t_)?m#)RWyi0R<_
z(2*SYb;-*r2mHosVnZX;Gz^15D6g(PDF&x*7gCct`pNGuemYs6hkKYXprPdHI-yJ>
zOkjbS4XQFLADV5xBu6XKwLVUSDG<_higf7r_VmPh+M<zo+&UW=0EzCJy)so?YfYB!
zwoZ3N8e3u=2{<{mFLlmyFxC=oQuYK|p<m60mjMGAWlY7y6mTs3&GkwtygzUDu!tdp
zA+l<Q9W$LFtRrlHTK@}xS!vZ>k%e2+<ykL*2-AeY7_4^^Z4JV{<Q<hVLf~Ndhs%GS
z=kLfUkBTs-#NexZmYsLrgh8i+@7x;Ot2g=7&!OYFkmu{t+4i=$?O{qyEbkY$HuaAe
z6Af`wM+}aKm)vbH6m#V_xoskQKSq8V;yQ6!bo%FZblXz?LI&kreY(sEnP*F8hK>c7
zhj&@jxfSxC>zJ|~pT{bp|HR}>@*IH3g>~2Lw+#n2g3Z#uzp143=JMV7?Z+nm0@qFS
A#sB~S