+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/foodcourt/second_display/_second_display.html.erb b/app/views/foodcourt/second_display/_second_display.html.erb
new file mode 100644
index 00000000..c09d6c4c
--- /dev/null
+++ b/app/views/foodcourt/second_display/_second_display.html.erb
@@ -0,0 +1,67 @@
+
+
+
+
+
+ <% @display_images.each do |p| %>
+ <%= image_tag "#{p.image}", :alt => "rss feed"%>
+ <% break %>
+ <% end %>
+
+
+
+
+
diff --git a/app/views/foodcourt/second_display/_slider.html.erb b/app/views/foodcourt/second_display/_slider.html.erb
new file mode 100644
index 00000000..71f463b7
--- /dev/null
+++ b/app/views/foodcourt/second_display/_slider.html.erb
@@ -0,0 +1,20 @@
+<%= stylesheet_link_tag 'wow_style', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'wowslider', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
+
+
+
+
+
+ <% @display_images.each do |p| %>
+
+ <%= image_tag "#{p.image}", :alt => "rss feed"%>
+
+ <% end %>
+
+
+
+
+
+
+
diff --git a/app/views/foodcourt/second_display/index.html.erb b/app/views/foodcourt/second_display/index.html.erb
new file mode 100644
index 00000000..5b4ad7f0
--- /dev/null
+++ b/app/views/foodcourt/second_display/index.html.erb
@@ -0,0 +1,20 @@
+
+
Reload
+
+ <%= render 'slider' %>
+
+
+
+ <%= render 'second_display' %>
+
+
+
diff --git a/app/views/foodcourt/shifts/create.json.jbuilder b/app/views/foodcourt/shifts/create.json.jbuilder
new file mode 100755
index 00000000..08bf292c
--- /dev/null
+++ b/app/views/foodcourt/shifts/create.json.jbuilder
@@ -0,0 +1 @@
+json.status true
diff --git a/app/views/foodcourt/shifts/edit.html.erb b/app/views/foodcourt/shifts/edit.html.erb
new file mode 100755
index 00000000..60d5c6d8
--- /dev/null
+++ b/app/views/foodcourt/shifts/edit.html.erb
@@ -0,0 +1 @@
+
Close Cashier
diff --git a/app/views/foodcourt/shifts/index.html.erb b/app/views/foodcourt/shifts/index.html.erb
new file mode 100755
index 00000000..ebec0301
--- /dev/null
+++ b/app/views/foodcourt/shifts/index.html.erb
@@ -0,0 +1,2 @@
+
Origami::Shifts#index
+
Find me in app/views/origami/shifts/index.html.erb
diff --git a/app/views/foodcourt/shifts/new.html.erb b/app/views/foodcourt/shifts/new.html.erb
new file mode 100755
index 00000000..eb02d644
--- /dev/null
+++ b/app/views/foodcourt/shifts/new.html.erb
@@ -0,0 +1,126 @@
+
+
Open Cashier
+
+
+
+
+
+
+
+
+
+
+
+
Clr
+
Calculate
+
Open Cashier
+
+
+
+
+
+
+
+
diff --git a/app/views/foodcourt/shifts/sale_summary.html.erb b/app/views/foodcourt/shifts/sale_summary.html.erb
new file mode 100755
index 00000000..321a3941
--- /dev/null
+++ b/app/views/foodcourt/shifts/sale_summary.html.erb
@@ -0,0 +1,201 @@
+
+
+
+
Sales Summary Quick View
+
+
+
+ Cashier
+ Cashier Terminal
+ Opening Date
+ Opening float
+ Received Amount
+ Cast In
+ Cast Out
+ Total Receipt
+ Dining Count
+ Takeaway Count
+ Total Void
+
+
+ <%= @shift.employee.name%>
+ <%=@shift.cashier_terminal.name%>
+ <%= @shift.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %>
+
+ <%=@shift.opening_balance %>
+ <%=@shift.closing_balance %>
+ <%=@shift.cash_in %>
+ <%=@shift.cash_out %>
+ <%= @shift.total_receipt %>
+ <%= @shift.dining_count %>
+ <%= @shift.takeaway_count %>
+ (<%= @shift.total_void.round(2) %>)
+
+
+
+
+
+ <% @total_amount_by_account.each do |amount| %>
+
+ Total <%= amount.account_name %> Amount
+ <%= amount.total_price.round(2) %>
+
+ <%end%>
+
+ Net Sales
+ <%=@shift.nett_sales %>
+
+
+ <% @total_discount_by_account.each do |amount| %>
+
+ Total <%= amount.account_name %> Discount
+ <%= amount.total_price.round(2) %>
+
+ <%end%>
+
+ <% if !@total_member_discount[0].member_discount.nil?
+ @member_discount = @total_member_discount[0].member_discount rescue 0.0
+ @overall = @shift.total_discounts - @member_discount
+ %>
+
+ Total Member Discount
+ <%= @member_discount %>
+
+ <%else @overall = @shift.total_discounts %>
+
+ <%end%>
+
+ Total Overall Discount
+ <%= @overall %>
+
+
+ Total Discount
+ <%= @shift.total_discounts %>
+
+
+ <% @sale_taxes.each do |tax| %>
+
+ <%= tax.tax_name %>
+ <%= tax.st_amount.round(2) %>
+
+ <%end%>
+
+ Total Tax
+ <%=@shift.total_taxes %>
+
+
+ Rounding Adj
+ <%= @shift.total_rounding.round(2) %>
+
+
+ Grand Total
+ <%= @shift.grand_total.round(2) %>
+
+
+
+
+
+
+ Cash Payment
+ <%=@shift.cash_sales %>
+
+
+ Credit Payment
+ <%=@shift.credit_sales %>
+
+ <% @total_amount = 0
+
+ @other_payment.each do |other| %>
+
+ Other Payment Detail
+
+
+ MPU Payment
+ <%=other.mpu_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.mpu_amount rescue 0.0 %>
+
+
+ VISA Payment
+ <%=other.visa_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.visa_amount rescue 0.0 %>
+
+
+ JCB Payment
+ <%=other.master_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.master_amount rescue 0.0 %>
+
+
+ Master Payment
+ <%=other.jcb_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %>
+
+
+ Reedem Payment
+ <%=other.paypar_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %>
+
+
+ FOC <%=other.foc_amount.round(2) rescue 0.0 %>
+ <% @total_amount = @total_amount+other.foc_amount rescue 0.0 %>
+
+ <%end%>
+
+
+ Total Other Payment
+ <%=@shift.other_sales %>
+
+
+ Total Payment
+ <%= @total_amount+@shift.cash_sales+@shift.credit_sales %>
+
+
+
+
+
+
+
+
+
+
+
+ Close Cashier
+
+
+
+
+
diff --git a/app/views/foodcourt/shifts/show.html.erb b/app/views/foodcourt/shifts/show.html.erb
new file mode 100755
index 00000000..e2f2275c
--- /dev/null
+++ b/app/views/foodcourt/shifts/show.html.erb
@@ -0,0 +1,282 @@
+
+
+
+
+
+
<%= t :close_cashier %>
+
+
+
+ <%= t :shift_started_at %>
+ <%= @shift.shift_started_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %>
+
+
+ <%= t :cashier_name %>
+ <%= @shift.employee.name rescue ''%>
+
+
+
+
+
+
+ <%= t :closing_balance %>
+
+
+
+
+
+ reply <%= t("views.btn.back") %> <%= t("views.btn.close_cashier") %>
+ <% if @bank_integration == '1' && @cashier_type!="ordering" %>
+ <%= t("views.btn.card_settle") %>
+ <% end %>
+
+
+
+
+
+
diff --git a/app/views/foodcourt/shifts/update_shift.json.jbuilder b/app/views/foodcourt/shifts/update_shift.json.jbuilder
new file mode 100755
index 00000000..08bf292c
--- /dev/null
+++ b/app/views/foodcourt/shifts/update_shift.json.jbuilder
@@ -0,0 +1 @@
+json.status true
diff --git a/app/views/foodcourt/surveys/_form.html.erb b/app/views/foodcourt/surveys/_form.html.erb
new file mode 100755
index 00000000..c0ed9f59
--- /dev/null
+++ b/app/views/foodcourt/surveys/_form.html.erb
@@ -0,0 +1,534 @@
+
+
+
+
+ <%= simple_form_for(@survey, :url => foodcourt_create_surveys_path) do |f| %>
+ <%= f.error_notification %>
+
+ <% if !@survey_data.nil? %>
+
+
+
+ <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyChild(this.value);" }%>
+
+
+
+
+ <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyAdult(this.value);" }%>
+
+
+
+
+
+
+ <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyMale(this.value);" }%>
+
+
+
+
+ <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyFemale(this.value);" }%>
+
+
+
+ <%= f.input :total_customer, input_html: { value:@survey_data.total_customer , :readonly => true, class: 'col-md-11'} %>
+ <%= f.input :local , input_html: { value: @survey_data.local, class: 'col-md-11', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyLocal(this.value);" }%>
+
+
+
+ Foreigner
+
+
+
+ Foreigner
+
+
+ <% Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
+
+ <%= ct.name %>
+ <%end %>
+
+
+
+
+
+ Add
+
+
+
+
+ <% else %>
+
+
+
+ <%= f.input :child , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyChild(this.value);" }%>
+
+
+
+
+ <%= f.input :adult , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyAdult(this.value);" }%>
+
+
+
+
+
+
+ <%= f.input :male , input_html: { min:'1',class: 'col-md-10' , :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyMale(this.value);" }%>
+
+
+
+
+ <%= f.input :female , input_html: { min:'1',class: 'col-md-10' , :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyFemale(this.value);" }%>
+
+
+
+ <%= f.input :total_customer, input_html: { :readonly => true,min:'1', class: 'col-md-11'} %>
+ <%= f.input :local , input_html: { min:'1',class: 'col-md-11', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyLocal(this.value);" }%>
+
+
+ Foreigner
+
+
+
+ Foreigner
+
+
+ <% Lookup.where("lookup_type = ? and shop_code='#{@shop.shop_code}'", "country" ).each do |ct| %>
+
+ <%= ct.name %>
+ <%end %>
+
+
+
+
+
+ Add
+
+
+
+
+ <% end %>
+
+ <%if !@dining_facility.nil? %>
+
+
+ <%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
+ <%else%>
+
+
+ <%= f.input :dining_name, :as => :hidden, :input_html => { :value => 0 } %>
+ <%end%>
+
+
+
+ <% if !@survey_data.nil? %>
+
/>
+ <% else %>
+
+ <% end %>
+
+
+ <%= f.input :created_by, :as => :hidden, :input_html => { :value => current_login_employee.name } %>
+ <%= f.input :receipt_no, :as => :hidden, :input_html => { :value => @receipt_no} %>
+ <%= f.input :total_amount, :as => :hidden, :input_html => { :value => @grand_total } %>
+
+
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+
+ <% end %>
+
+
+
+
+
+
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+
+ 1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.title_txt") %>
+
list <%= t("views.right_panel.header.button_lists") %>
+
+ 1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
+
list <%= t("views.right_panel.header.link_lists") %>
+
+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+
+
+
+
+ reply Back
+
+
+
+
+
+
diff --git a/app/views/foodcourt/surveys/_survey.json.jbuilder b/app/views/foodcourt/surveys/_survey.json.jbuilder
new file mode 100755
index 00000000..1a0e4aa8
--- /dev/null
+++ b/app/views/foodcourt/surveys/_survey.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! settings_account, :id, :title, :account_type, :created_at, :updated_at
+json.url settings_account_url(settings_account, format: :json)
diff --git a/app/views/foodcourt/surveys/edit.html.erb b/app/views/foodcourt/surveys/edit.html.erb
new file mode 100755
index 00000000..96fca006
--- /dev/null
+++ b/app/views/foodcourt/surveys/edit.html.erb
@@ -0,0 +1,12 @@
+
+
+ <%= render 'form', settings_account: @settings_account %>
diff --git a/app/views/foodcourt/surveys/index.html.erb b/app/views/foodcourt/surveys/index.html.erb
new file mode 100755
index 00000000..c3d9cdfa
--- /dev/null
+++ b/app/views/foodcourt/surveys/index.html.erb
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+ <%= t("views.right_panel.detail.title") %>
+ <%= t("views.right_panel.detail.account_type") %>
+ <%= t("views.right_panel.detail.discount") %>
+ <%= t("views.right_panel.detail.point") %>
+ <%= t("views.right_panel.detail.bonus") %>
+ <%= t("views.right_panel.detail.rebate") %>
+ <%= t("views.right_panel.detail.actions") %>
+
+
+
+
+ <% @settings_accounts.each do |account| %>
+
+ <%= account.title %>
+ <%= account.account_type == 1 ? "Expense" : "Income"%>
+ <%= account.discount %>
+ <%= account.point %>
+ <%= account.bonus %>
+ <%= account.rebate %>
+
+ <%= link_to t("views.btn.show"), settings_account_path(account),:class => 'btn btn-info btn-sm waves-effect' %>
+ <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %>
+
+
+ <% end %>
+
+
+
+
+
+
+
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+
+ 1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %>
+
list <%= t("views.right_panel.header.button_lists") %>
+
+ 1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
+
list <%= t("views.right_panel.header.link_lists") %>
+
+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+
+
+
+
+ reply Back
+
+
+
diff --git a/app/views/foodcourt/surveys/index.json.jbuilder b/app/views/foodcourt/surveys/index.json.jbuilder
new file mode 100755
index 00000000..10158c29
--- /dev/null
+++ b/app/views/foodcourt/surveys/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @settings_accounts, partial: 'settings_accounts/settings_account', as: :settings_account
diff --git a/app/views/foodcourt/surveys/new.html.erb b/app/views/foodcourt/surveys/new.html.erb
new file mode 100755
index 00000000..ee4d9a57
--- /dev/null
+++ b/app/views/foodcourt/surveys/new.html.erb
@@ -0,0 +1,3 @@
+
+
+ <%= render 'form', survey: @survey %>
diff --git a/app/views/foodcourt/surveys/show.html.erb b/app/views/foodcourt/surveys/show.html.erb
new file mode 100755
index 00000000..4c28f27c
--- /dev/null
+++ b/app/views/foodcourt/surveys/show.html.erb
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
Account
+
+
+
+ <%= t("views.right_panel.detail.title") %>
+ <%= t("views.right_panel.detail.account_type") %>
+
+ <%= t("views.right_panel.detail.can_get_points") %>
+
+ <%= t("views.right_panel.detail.can_rebate") %>
+ <%= t("views.right_panel.detail.actions") %>
+
+
+
+
+
+ <%= @settings_account.title %>
+ <%= @settings_account.account_type %>
+
+ <%= @settings_account.point %>
+
+ <%= @settings_account.rebate %>
+
+ <%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
+
+ <%= t("views.btn.delete") %>
+
+
+
+ Are you sure you want to delete this row ?
+ This action can't be undo.
+
+
+
+
+
+
+
+
+
+
+
+
+
view_headline <%= t("views.right_panel.header.page_detail") %>
+
+ 1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %>
+
list <%= t("views.right_panel.header.button_lists") %>
+
+ 1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %>
+
list <%= t("views.right_panel.header.link_lists") %>
+
+ 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
+
+
+
+
+
diff --git a/app/views/foodcourt/surveys/show.json.jbuilder b/app/views/foodcourt/surveys/show.json.jbuilder
new file mode 100755
index 00000000..e9673454
--- /dev/null
+++ b/app/views/foodcourt/surveys/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "settings_accounts/settings_account", settings_account: @settings_account
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index d8a5a9c8..71f7398a 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -67,24 +67,16 @@
<%
if !@from.nil? && @from != ""
- from_date = DateTime.parse(@from).utc.getlocal.strftime("%d-%m-%Y")
+ from_date = @from.strftime("%d-%m-%Y")
+ from_time = @from.strftime("%H:%M") if @from.strftime("%H:%M") != "00:00"
else
- from_date = Time.now.utc.getlocal.strftime('%d-%m-%Y')
+ from_date = Time.now.strftime('%d-%m-%Y')
end
if !@to.nil? && @to != ""
- to_date = DateTime.parse(@to).utc.getlocal.strftime("%d-%m-%Y")
+ to_date = @to.strftime("%d-%m-%Y")
+ to_time = @to.strftime("%H:%M") if @to.strftime("%H:%M") != "23:59"
else
- to_date = Time.now.utc.getlocal.strftime('%d-%m-%Y')
- end
- if !@from_time.nil?
- from_time = @from_time
- else
- from_time = ''
- end
- if !@to_time.nil?
- to_time = @to_time
- else
- to_time = ''
+ to_date = Time.now.strftime('%d-%m-%Y')
end
%>
@@ -199,49 +191,48 @@
<% revenue = @summ_sale.total_amount - @summ_sale.total_discount%>
<%= t("views.right_panel.detail.sale") %> <%= t :revenue %> :
- <%= number_with_precision( revenue, precision: @precision.to_i ,delimiter: @delimiter) %>
+
+ <%= number_format( revenue, precision: precision.to_i ,delimiter: delimiter) %>
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> :
- <%= number_with_precision( @summ_sale.total_discount, precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
+ <%= number_format( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> :
- <%= number_with_precision( @summ_sale.total_tax , precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
+ <%= number_format( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
<%= t("views.right_panel.detail.total_sale") %> :
- <%= number_with_precision( @summ_sale.grand_total , precision: @precision.to_i ,delimiter: @delimiter)%>
+ <%= number_format( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%>
<% if !(@total_payment_methods.nil?) %>
<% @total_payment_methods.each do |payment| %>
- <% if !@sale_data[0].empty? %>
- <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
-
- <% if payment.payment_method == 'paypar' %>
- Redeem Sale :
- <% else %>
- <%= payment.payment_method.to_s.capitalize %> Sale :
- <% end %>
-
- <% @sale_data.each do |data| %>
- <% pay_mth = payment.payment_method %>
- <%= number_with_precision(data[""+pay_mth+""], precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
- <% end %>
-
-
- <% end %>
+
+ <% if payment.payment_method != 'card' %>
+
+ <% if payment.payment_method == 'paypar' %>
+ Redeem Sale :
+ <% else %>
+ <%= payment.payment_method.to_s.capitalize %> Sale :
+ <% end %>
+
+ <%= number_format(@sale_data.find {|x| x.key?(payment.payment_method) }[payment.payment_method], precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
+
+
<% end %>
<% end %>
- <% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
+ <% total_card = @sale_data.find {|x| x.key?("card") } %>
<% if !total_card.nil? %>
<%= t("views.right_panel.detail.other_payment") %> :
- <%= number_with_precision(total_card["card"], precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
+
+ <%= number_format(total_card["card"], precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
+
<% end %>
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb
index 955abc98..f41f96f3 100755
--- a/app/views/layouts/CRM.html.erb
+++ b/app/views/layouts/CRM.html.erb
@@ -36,32 +36,36 @@
<%= render 'layouts/header' %>
-
- <%= render 'layouts/left_sidebar' %>
- <%= render 'layouts/right_sidebar' %>
+
+ <%if current_login_employee.role == "foodcourt_cashier" %>
+ <%= render 'layouts/foodcourt_left_sidebar' %>
+ <% else %>
+ <%= render 'layouts/left_sidebar' %>
+ <%end%>
+ <%= render 'layouts/right_sidebar' %>
-
+
<% flash.each do |type, message| %>
<% if !flash["errors"]%>
- <%
+ <%
if type == "notice"
color = "alert-success"
end
if type == "error"
color = "alert-danger"
- end
+ end
%>
<% if flash["error"] || flash["notice"]%>
<% end %>
- <% end %>
- <% end %>
- <%= yield %>
+ <% end %>
+ <% end %>
+ <%= yield %>