remove name from cashier/customer title

app/views/crm/customers/show.html.erb

@@ -217,7 +217,7 @@
           <thead>
             <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
             <th><%= t("views.right_panel.detail.receipt_no") %></th>
-            <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>      
+            <th> <%= t :cashier %></th>      
             <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
           </thead>
           <tbody>

app/views/origami/credit_sales/show.html.erb

@@ -181,8 +181,8 @@
             <thead>
               <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
               <th><%= t("views.right_panel.detail.receipt_no") %></th>
-              <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+              <th> <%= t :cashier %></th>
-              <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+              <th> <%= t :customer %></th>       
               <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
             </thead>
             <tbody class="tbd_credit_lists"></tbody>

app/views/origami/home/index.html.erb

@@ -159,8 +159,8 @@
           <thead>
             <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
             <th><%= t("views.right_panel.detail.receipt_no") %></th>
-            <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+            <th> <%= t :cashier %></th>
-            <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+            <th> <%= t :customer %></th>
             <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
           </thead>
           <tbody class="tbd_credit_lists"></tbody>

app/views/origami/home/show.html.erb

@@ -178,8 +178,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                        <th> <%= t :cashier %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                        <th> <%= t :customer %></th>
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>

app/views/origami/orders/show.html.erb

@@ -167,8 +167,8 @@
         <thead>
           <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
           <th><%= t("views.right_panel.detail.receipt_no") %></th>
-          <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+          <th> <%= t :cashier %></th>
-          <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+          <th> <%= t :customer %></th>
           <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
         </thead>
         <tbody class="tbd_credit_lists"></tbody>

app/views/origami/pending_order/completed_sale.html.erb

@@ -73,8 +73,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                        <th> <%= t :cashier %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                        <th> <%= t :customer %></th>       
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>

app/views/origami/pending_order/credit_sale.html.erb

@@ -70,8 +70,8 @@
                     <thead>
                       <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                       <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                      <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                      <th> <%= t :cashier %></th>
-                      <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                      <th> <%= t :customer %></th>       
                       <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                     </thead>
                     <tbody class="tbd_credit_lists"></tbody>

app/views/origami/pending_order/index.html.erb

@@ -74,8 +74,8 @@
                             <thead>
                               <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                               <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                              <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                              <th> <%= t :cashier %></th>
-                              <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                              <th> <%= t :customer %></th>       
                               <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                             </thead>
                             <tbody class="tbd_credit_lists"></tbody>

app/views/origami/pending_order/show.html.erb

@@ -72,8 +72,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                        <th> <%= t :cashier %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                        <th> <%= t :customer %></th>       
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>

app/views/origami/rooms/show.html.erb

@@ -199,8 +199,8 @@
                 <thead>
                   <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                   <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                  <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                  <th> <%= t :cashier %></th>
-                  <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                  <th> <%= t :customer %></th>       
                   <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                 </thead>
                 <tbody class="tbd_credit_lists"></tbody>

app/views/origami/sales/show.html.erb

@@ -188,8 +188,8 @@
               <thead>
                 <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                 <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+                <th> <%= t :cashier %></th>
-                <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                <th> <%= t :customer %></th>       
                 <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
               </thead>
               <tbody class="tbd_credit_lists"></tbody>

app/views/origami/shifts/show.html.erb

@@ -13,7 +13,7 @@
           <td><%= @shift.shift_started_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></td>
         </tr>
         <tr>
-          <td><%= t :cashier_name %></td>
+          <td><%= t :cashier %></td>
           <td><%= @shift.employee.name rescue ''%></td>
         </tr>
 

app/views/reports/credit_payment/_shift_sale_report_filter.html.erb

@@ -20,7 +20,7 @@
 				</div>
 
 				<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-					<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+					<label class="font-14"><%= t :customer_name %></label>
 					<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 				</div>
 

app/views/reports/credit_payment/index.html.erb

@@ -36,14 +36,13 @@
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 				  	<th><%= t("views.right_panel.detail.order_source") %></th>
-				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+				   	<th> <%= t :cashier %></th>
-				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+				  	<th> <%= t :customer %></th>
 				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.shift_name") %></th>
-				  		<%= t("views.right_panel.detail.shift_name") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.receipt_date") %></th>
-				  	<th> <%= t :credit %> <%= t("views.right_panel.detail.receipt_date") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t :cashier %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br> <%= t :cashier_name %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.amount") %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <%= t("views.right_panel.detail.amount") %></th>
 				</tr>
 			  </thead>
 			  <tbody>

app/views/reports/credit_payment/index.xls.erb

@@ -20,14 +20,13 @@
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 				  	<th><%= t("views.right_panel.detail.order_source") %></th>
-				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+				   	<th> <%= t :cashier %></th>
-				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+				  	<th> <%= t :customer %></th>
 				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br>
+            <th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.shift_name") %></th>
-				  		<%= t("views.right_panel.detail.shift_name") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.receipt_date") %></th>
-				  	<th> <%= t :credit %> <%= t("views.right_panel.detail.receipt_date") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t :cashier %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br> <%= t :cashier_name %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.amount") %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <%= t("views.right_panel.detail.amount") %></th>
 				</tr>
 			  </thead>
 			  <tbody>

app/views/reports/payment_method/index.html.erb

@@ -80,7 +80,7 @@
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t :cashier %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>

app/views/reports/payment_method/index.xls.erb

@@ -66,7 +66,7 @@
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t :cashier %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>

app/views/reports/receipt_no/_shift_sale_report_filter.html.erb

@@ -20,7 +20,7 @@
 		</div>
 
 		<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-			<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+			<label class="font-14"><%= t :customer_name %></label>
 			<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 		</div>
 

app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb

@@ -20,7 +20,7 @@
 		</div>
 
 		<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-			<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+			<label class="font-14"><%= t :customer_name %></label>
 			<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 		</div>
 

app/views/reports/receipt_no_detail/index.html.erb

@@ -37,7 +37,7 @@
 				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
 									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
 									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t :cashier %></b></th>
 									<th><b><%= t("views.right_panel.detail.table") %></b></th>
 					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
@@ -181,8 +181,8 @@
 											<td>&nbsp;</td>
 										</tr>
 									<% end %>
+									<tr><td colspan="6">&nbsp;</td></tr>
 								<% end %>
-
 						    <% end %>
 							<tr style="border-top:4px double #666;">
 								<td>&nbsp;</td>
@@ -192,7 +192,6 @@
 								<td><b>Total Nett</b> - <b><%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></b></td>
 								<td>&nbsp;</td>
 							</tr>
-
 						  </tbody>
 						</table>
 				</div>

app/views/reports/receipt_no_detail/index.xls.erb

@@ -28,7 +28,7 @@
 				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
 									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
 									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t :cashier %></b></th>
 									<th><b><%= t("views.right_panel.detail.table") %></b></th>
 					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
@@ -75,7 +75,7 @@
 									</tr>
 								<% end %>
 
-								<tr><td colspan="5">&nbsp;</td></tr>
+								<tr><td colspan="6">&nbsp;</td></tr>
 
 								<%survey = Survey.find_by_receipt_no(result.receipt_no)%>
 								<% if !survey.nil?%>
@@ -173,8 +173,8 @@
 											<td>&nbsp;</td>
 										</tr>
 									<% end %>
+                  <tr><td colspan="6">&nbsp;</td></tr>
 								<% end %>
-
 						    <% end %>
 							<tr style="border-top:4px double #666;">
 								<td>&nbsp;</td>
@@ -184,10 +184,8 @@
 								<td><b>Total Nett</b> - <b><%= grand_total %></b></td>
 								<td>&nbsp;</td>
 							</tr>
-
 						  </tbody>
 						</table>
-
 				</div>
 			</div>
 		</div>

app/views/reports/saleitem/indexbackup.html.erb

@@ -1,354 +0,0 @@
-<div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
-</div>
-<div class="row">
-	<div class="col-md-12">
-		<%= render :partial=>'shift_sale_report_filter',
-		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
-
-		<hr />
-
-		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
-		</div>
-
-		<div class="margin-top-20">
-			<div class="card">
-				<div class="table-responsive">
-					<table class="table table-striped" id="items_table" border="0">
-						<thead>
-							<tr>
-								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-							</tr>
-							<% if @shift_from %>
-							<tr>
-								<% if @shift_data.employee %>
-								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-								<% end %>
-								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-							</tr>
-							<% end %>
-							<tr>
-								<th>&nbsp;</th>
-								<th><%= t("views.right_panel.header.menu_category") %></th>
-								<th><%= t("views.right_panel.detail.code") %></th>
-								<th><%= t("views.right_panel.detail.product") %></th>
-								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th><%= t("views.right_panel.detail.revenue") %></th>
-							</tr>
-						</thead>
-						<tbody>
-							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
-							<% cate_arr = Array.new %>
-
-							<% sub_qty = 0 %>
-							<% sub_total = 0 %>
-							<% other_sub_total = 0 %>
-							<% count = 0 %>
-							<% total_price = 0 %>
-							<% cate_count = 0 %>
-							<% acc_count = 0 %>
-							<% grand_total = 0 %>
-							<% total_qty = 0 %>
-							<% total_amount = 0 %>
-							<% discount = 0 %>
-							<% total_item_foc = 0 %>
-							<% total_item_dis = 0.0 %>
-							<% total_tax = 0 %>
-
-							<% @sale_data.each do |sale| %>
-							<!-- all total qty sum -->
-								<% if sale.status_type != "Discount" && sale.status_type != "foc"
-									total_qty += sale.total_item
-								end %>
-								<% if sale.status_type == "foc" && sale.price > 0
-									total_qty += sale.total_item
-								end %>
-							<!-- end all total qty -->
-								<% if sale.status_type == "foc" && sale.grand_total < 0
-									total_item_foc += sale.grand_total*(-1)
-								end %>
-
-								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
-									total_item_dis += sale.grand_total*(-1)
-								end %>
-
-								<% if !acc_arr.include?(sale.account_id) %>
-									<tr>
-										<td><b><%= sale.account_name %></b></td>
-										<td colspan="4">&nbsp;</td>
-										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
-										<td>
-											<% @totalByAccount.each do |account, total| %>
-											<% if sale.account_id == account %>
-											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
-											<% grand_total += total %>
-											<% end %>
-											<% end %>
-										</td>
-									</tr>
-								   <% acc_arr.push(sale.account_id) %>
-								<% end %>
-								<tr>
-									<td>&nbsp;</td>
-									<% if !cate_arr.include?(sale.menu_category_id) %>
-									<td><%= sale.menu_category_name %></td>
-									<% cate_arr.push(sale.menu_category_id) %>
-									<% else %>
-									<td>&nbsp;</td>
-									<% end %>
-									<td><%= sale.item_code rescue '-' %></td>
-									<td><%= sale.product_name rescue '-' %></td>
-									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								</tr>
-								<!-- sub total -->
-
-							<% @menu_cate_count.each do |key,value| %>
-								<% if sale.account_id == key %>
-								    <% count = count + 1 %>
-								    <% sub_total += sale.grand_total %>
-								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
-										sub_qty += sale.total_item
-									end %>
-
-									<% if count == value %>
-										<tr>
-											<td colspan="3">&nbsp;</td>
-											<td><b>Total <%= sale.account_name %> Qty </b> </td>
-											<td><b><%= sub_qty %></b></td>
-											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
-										</tr>
-										<% sub_total = 0.0%>
-										<% sub_qty = 0 %>
-										<% count = 0%>
-									<% end %>
-							    <% end %>
-							<% end %>
-							<!-- end sub total -->
-						<% end %>
-							<!--Other Charges -->
-							<% if @other_charges.present? %>
-							   <tr>
-									<td><b>Other Charges</b></td>
-									<td colspan="4">&nbsp;</td>
-									<td></td>
-								</tr>
-								<% @other_charges.each do |other| %>
-									<% if other.total_item > 0
-										total_qty += other.total_item
-									end %>
-									<% grand_total +=other.grand_total%>
-									<tr>
-									<td>&nbsp;</td>
-										<td>Other Charges</td>
-										<td><%= other.item_code rescue '-' %></td>
-										<td><%= other.product_name rescue '-' %></td>
-										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									</tr>
-									<!-- sub total -->
-
-									    <% other_sub_total += other.grand_total %>
-								    <!-- end sub total -->
-								<% end %>
-								<tr>
-									<td colspan="5">&nbsp;</td>
-									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
-								</tr>
-						    <%end%>
-							<!-- End Other Charges -->
-							<tr style="border-top:2px solid grey;">
-								<td colspan="3">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
-								<td><span><%= total_qty%></span></td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
-							</tr>
-							<% end %>
-
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_format(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_format(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td>
-									<span><%= number_format(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;">
-									<span>
-										<%= number_format(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
-									</span>
-								</td>
-							</tr>
-
-								<% @sale_taxes.each do |tax| %>
-								<!-- <tr>
-								    <td colspan="5">&nbsp;</td>
-									<td><%= tax.tax_name %></td>
-									<td><%= tax.st_amount.round(2) %>
-										<%total_tax += tax.st_amount%>
-									</td>
-								</tr> -->
-							<% end %>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-top:2px solid grey;">Net Amount</td>
-								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= number_format(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td>
-							</tr>
-							<!-- <tr>
-								<td colspan="5">&nbsp;</td>
-								<td>Grand Total</td>
-
-								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
-							</tr>	 -->
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-	$(function(){
-
-
-		var check_arr = [];
-
-		var search = '<%= params[:period_type] %>';
-
-		if(search){
-
-			if(parseInt(search) == 0){
-				search_by_period();
-			}
-			else{
-				search_by_date();
-			}
-		}else{
-			search_by_period();
-		}
-
-		$('#sel_period').change(function(){
-			search_by_period();
-		});
-
-		function search_by_period(){
-			var period = $('#sel_period').val();
-			var period_type = 0;
-			var from = "";
-			var to = "";
-
-			show_shift_name(period,period_type,from,to,'shift_item');
-		}
-
-		// OK button is clicked
-		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#from').val(from)
-			search_by_date();
-		});
-		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#to').val(to)
-			search_by_date();
-		});
-
-		function search_by_date(){
-			from = $("#from").val();
-	  		to   = $("#to").val();
-			var period = 0;
-			var period_type = 1;
-
-			if(to != '' && from != ''){
-				shift_name = from + ',' + to;
-
-				check_arr.push(to);
-
-				console.log(check_arr.length)
-				if(check_arr.length == 1){
-					show_shift_name(period,period_type,from,to,'shift_item');
-				}
-				if(check_arr.length == 3){
-					check_arr = [];
-				}
-			}
-
-		}
-
-		function show_shift_name(period,period_type,from,to,shift_item){
-			var shift = $('#shift_name');
-			if (from == '' && to == '') {
-				from = $("#from").val();
-	  		    to   = $("#to").val();
-			}
-			shift.empty();
-			var selected = '';
-			var str = '';
-			var param_shift = '<%= params[:shift_name]%>';
-
-			url = '<%= reports_get_shift_by_date_path %>';
-			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
-				console.log(data)
-
-				str = '<option value="0">--- All Shift ---</option>';
-				$(data.message).each(function(index){
-
-					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
-					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
-					var shift_id = data.message[index].shift_id ;
-
-					if(param_shift != ''){
-						if(shift_id == param_shift){
-							selected = 'selected = "selected"';
-						}
-						else{
-							selected = '';
-						}
-					}
-					else{
-						selected = '';
-					}
-
-
-					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
-
-			   // console.log(sh_date)
-			})
-				shift.append(str);
-			});
-		}
-
-	});
-</script>

app/views/reports/shiftsale/index.html.erb

@@ -48,7 +48,7 @@
 					<% end %>
 					<tr>
 						<th><%= t("views.right_panel.detail.cashier_station") %></th>
-						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+						<th><%= t :cashier %></th>
 						<th><%= t("views.right_panel.detail.shift_name") %></th>
 						<!-- <th>Void Amount</th> -->
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>

app/views/reports/shiftsale/index.xls.erb

@@ -32,7 +32,7 @@
 					<% end %>	  
 					<tr>
 						<th><%= t("views.right_panel.detail.cashier_station") %></th>
-						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+						<th><%= t :cashier %></th>
 						<th><%= t("views.right_panel.detail.shift_name") %></th>		
 						<!-- <th>Void Amount</th> -->
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>

app/views/transactions/bookings/indexback.html.erb

@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>

app/views/transactions/credit_notes/index.html.erb

@@ -95,7 +95,7 @@
                   <th><%= t("views.right_panel.detail.receipt_no") %></th>
                   <th><%= t("views.right_panel.detail.credit_amount") %></th>
                   <th><%= t :cashier %></th>
-                  <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                  <th><%= t :customer %></th>
                   <th><%= t("views.right_panel.detail.order_source") %></th>
                   <th><%= t("views.right_panel.detail.receipt_date") %></th>
                 </tr>

app/views/transactions/sales/indexback.html.erb

@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>

app/views/transactions/shift_sales/indexback.html.erb

@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>