From b88c40be418f15fdc9214fa19423cc7459da0092 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 09:41:00 +0630 Subject: [PATCH 1/7] sale update --- .../_shift_sale_report_filter.html.erb | 211 ++++++++++++++++++ app/views/transactions/sales/show.html.erb | 2 +- app/views/transactions/sales/void.html.erb | 82 +++---- 3 files changed, 248 insertions(+), 47 deletions(-) create mode 100644 app/views/reports/receipt_no/_shift_sale_report_filter.html.erb diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..1b4082f5 --- /dev/null +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -0,0 +1,211 @@ +
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
+
+ + +
+
+ + +
+
+ + + +
+
+ + +
+
+ +
+
+ <% end %> + + + +
+
+ <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> + <% end %> + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% end %> +
+
+ + + + <% end %> +
+
+ + + + \ No newline at end of file diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 36994ec7..9c5a8b86 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -171,7 +171,7 @@ Back - + From 41572d5360f463ae80ca125ca1141d1609dd06d7 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 11:12:50 +0630 Subject: [PATCH 6/7] 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?W96Gk_k zAB;H=1UJUUH`*1Fx{^3muvBP!rh5#qe#E$4ey^g$dXA}(DMj#wL?ASRuB{hIF}%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{Gh2o5w^9ulPjmetJ#+n_ox%8N7rYES`I5R!hwvIg`LlebVMvN+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#V1veK4fs?(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& zOkjbS4XQFLADV5xBu6XKwLVUSDG<_higf7r_VmPh+Mk%e2+c7 zhj&@jxfSxC>zJ|~pT{bp|HR}>@*IH3g>~2Lw+#n2g3Z#uzp143=JMV7?Z+nm0@qFS A#sB~S From cca890ffdd2fcffc398b24f3c30feeb479458e40 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 15 Jun 2017 11:25:13 +0630 Subject: [PATCH 7/7] disable auto reload origami --- app/assets/javascripts/origami.js | 6 +++--- dump.rdb | Bin 18786 -> 18787 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 4a7e3d50..6ba2f15a 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -20,9 +20,9 @@ $(document).ready(function(){ // auto refresh every 60 seconds - setTimeout(function(){ - window.location.reload(1); - }, 60000); + // setTimeout(function(){ + // window.location.reload(1); + // }, 60000); // For selected order return var order_status = ""; diff --git a/dump.rdb b/dump.rdb index 2018ec7d7f770c1f04447d1f937992e3c354ad40..c1a940eb5a86063e47c769946f40c57019cc2bca 100644 GIT binary patch delta 287 zcmV+)0pR}Pk^$qA0gx~lP7*>{`UrJ%Wn?XFWo^QsiWLC<0Q(UElO9PIkzZZ|mth!@ z!1o(6GB`6XH8(UjIW;l>3v+Z~bUJ2XX>4U=!S9pO0d4`IlR*L+0f)0(0?i2n<3ekb z!5xN^pf$=*2Q@G;IWRFUGayL-I6xl-a&m8SUu_{)0byrAgbhP)b!=pACv+fYX>Md7 zVLJyPcWHEJASZ7@haoTlCq3W@)F5VHM!|A{^8!+3V<0n<1QtdDkqtCCHZwLgE;BGQ zI5sdcp#TA2V<0Rb(*QVt4*+T40xzJ!2Q)Z1FfceXeG)M=IX5*hHZeCeE;KkeFf}tV l!$I3ZP?O<4gR`#;XehH0HwzL0DU%&ZJqRPjgpq{e36CphTyOvY delta 261 zcmV+g0s8*qk^$n90gx~l^bbN=`UrJ%Wn?XFWo^O;`4a&C0Q(UElOIVJkzZZ|lsFHO z!1o(5HaIgbGBq+WFflX$3v+Z~bUJ2XX>4U=!S0jN0d4`ElR*L+0fw_&0?i4tBo6K< z1L8t#lK~V)ldu9nld=rT8x1r$IWsslE;BhXIXE>kARq;Da&K~9Z6Q|ylK~|Z8axLe zcWHEJASZ7@h#@fnCq3W@)xbu