fixed conflic

app/assets/javascripts/BSBMaterial/admin.js

@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
 }
 //==========================================================================================================================
 
-$(document).on('turbolinks:load', function () {
+$(document).ready(function() {
     $.AdminBSB.browser.activate();
     $.AdminBSB.leftSideBar.activate();
     $.AdminBSB.rightSideBar.activate();

app/assets/javascripts/BSBMaterial/demo.js

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function() {
     skinChanger();
     activateNotificationAndTasksScroll();
 

app/assets/javascripts/BSBMaterial/pages/index.js

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function () {
+$(document).ready(function(){
     //Widgets count
     $('.count-to').countTo();
 

app/assets/javascripts/OQS.js

@@ -24,7 +24,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
 
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')

app/assets/javascripts/application.js

@@ -11,15 +11,15 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery.turbolinks
 //= require jquery_ujs
-//= require turbolinks
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_nested_form
 //= require cable
-//= require settings/processing_items
+//= require tether
+//= require bootstrap/js/popper.min
+//= require bootstrap/js/bootstrap-material-design.min
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
@@ -30,16 +30,24 @@
 //= require autosize/autosize.js
 //= require jquery-countto/jquery.countTo.js
 //= require raphael/raphael.min
-//= require morrisjs/morris.js
 //= require chartjs/Chart.bundle.js
 //= require fileinput.min
+//= require settings/processing_items
 //= require BSBMaterial/admin.js
-//= require BSBMaterial/pages/index.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
 
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
+  $('.count-to').countTo();
+
+  //Sales count to
+  $('.sales-count-to').countTo({
+      formatter: function (value, options) {
+          return '$' + value.toFixed(2).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, ' ').replace('.', ',');
+      }
+  });
+
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
       clearButton: true,

app/assets/javascripts/custom.js

@@ -1,6 +1,6 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
   $('body').bootstrapMaterialDesign();
-  
+
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
 
   $('#custom-slimscroll').slimScroll({
@@ -40,8 +40,10 @@ $(document).on('turbolinks:load', function() {
             type: method,
             url: url ,            
             success: function(data) {
+              // console.log(data.url);
+              location.href = data.url;
             }
-         }); 
+         });          
         } else {
             swal("Cancelled", "Your imaginary file is safe :)", "error");
         }

app/assets/javascripts/login.js

@@ -15,7 +15,6 @@
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require turbolinks
 //= require node-waves/waves.js
 //= require BSBMaterial/admin.js
 //= require bootstrap-notify/bootstrap-notify.js

app/assets/javascripts/origami.js

@@ -1,42 +1,40 @@
 //= require jquery
 //= require tether
+//= require jquery_ujs
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_ujs
-//= require turbolinks
-//= require cable
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
+//= require cable
+//= require turbolinks
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-
 $(document).on('turbolinks:load', function() {
-  $('.datetimepicker').bootstrapMaterialDatePicker({
+	$('.datetimepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY - HH:mm',
+	  format: 'DD-MM-YYYY - HH:mm',
-      clearButton: true,
+	  clearButton: true,
-      weekStart: 1
+	  weekStart: 1
-  });
+	});
 
-  $('.datepicker').bootstrapMaterialDatePicker({
+	$('.datepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY',
+	  format: 'DD-MM-YYYY',
-      clearButton: true,
+	  clearButton: true,
-      weekStart: 1,
+	  weekStart: 1,
-      time: false
+	  time: false
-  });
+	});
+
+	$('.timepicker').bootstrapMaterialDatePicker({
+	  format: 'HH:mm',
+	  clearButton: true,
+	  date: false
+	});
 
-  $('.timepicker').bootstrapMaterialDatePicker({
-      format: 'HH:mm',
-      clearButton: true,
-      date: false
-  });
-});
-$(document).ready(function(){
 	// For selected order return
 	var order_status = "";
 	order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();

app/assets/javascripts/settings/processing_items.js

@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
   $(".processitems").click(function(event){
     event.preventDefault();
     console.log($(this).data("id"));

app/assets/stylesheets/application.scss

@@ -12,6 +12,8 @@
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
 
+/*@import "bootstrap-select/css/bootstrap-select.min";*/
+
 /*----- Order Processing Items -----*/
 .opi_ul {
   display:block;

app/assets/stylesheets/login.scss

@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
 @import "animate-css/animate";

app/controllers/home_controller.rb

@@ -84,7 +84,8 @@ class HomeController < ApplicationController
     # clear in employee session
     Employee.logout(session[:session_token])
     session[:session_token] = nil
-    redirect_to root_path
+    # redirect_to root_path
+    render :json => {:status=> "Success", :url => root_path }.to_json
   end
 
   private

app/controllers/origami/void_controller.rb

@@ -19,13 +19,14 @@ class Origami::VoidController < BaseOrigamiController
       sale.sale_status = 'void'
       sale.save
 
-      bookings = sale.bookings
+      # No Need
-      bookings.each do |booking|
+      # bookings = sale.bookings
-        orders = booking.orders
+      # bookings.each do |booking|
-        orders.each do |order|
+      #   orders = booking.orders
-          # order.status = 'void'
+      #   orders.each do |order|
-        end
+      #     # order.status = 'void'
-      end
+      #   end
+      # end
 
       table_avaliable = true
       table = sale.bookings[0].dining_facility

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

@@ -4,14 +4,14 @@
     <%= f.hidden_field :id, :class => "form-control " %>   
 
     <div class="form-group">
-      <label>Salutation :</label><br>
+      <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
-       <label>Mr</label>
+       <label><%= t("views.right_panel.detail.mr") %></label>
         <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
-        <label>Miss</label>
+        <label><%= t("views.right_panel.detail.miss") %></label>
         <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
-        <label>Mrs</label>
+        <label><%= t("views.right_panel.detail.mrs") %></label>
         <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
-        <label>Mdm</label>
+        <label><%= t("views.right_panel.detail.mdm") %></label>
         <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>    
    </div>
   
@@ -27,11 +27,11 @@
     </div>
 
     <div class="form-group">
-      <label>Gender :</label><br>
+      <label><%= t("views.right_panel.detail.gender") %> :</label><br>
-      <label>Male</label>
+      <label><%= t("views.right_panel.detail.male") %></label>
       <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
-        <label>Female</label>
+      <label><%= t("views.right_panel.detail.female") %></label>
-        <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
+      <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
    </div>
     
     <div class="form-group">
@@ -75,7 +75,7 @@
     </div>
 
     <div class="form-group">
-    <label>Sr.No</label>
+    <label><%= t("views.right_panel.detail.sr_no") %></label>
     <div class="form-line disabled">
     <input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
     </div>
@@ -83,12 +83,12 @@
    </div>
 
     <div class="form-group">
-    <label>Date Of Birth</label>
+    <label><%= t("views.right_panel.detail.date_of_birth") %></label>
      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
    </div>    
 
     <div class="form-group">
-    <label>Select Customer Type</label>
+    <label><%= t("views.right_panel.detail.select_customer_type") %></label>
       <select class="form-control col-md-12 selectpicker  show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
         <%  Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
            <option value="<%= ct.value %>">
@@ -112,7 +112,7 @@
     </div>
 
     <div class="form-group">
-      <label>Paypar Account No:</label>
+      <label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
       <div class="-group">            
         <input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
         <div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
@@ -120,9 +120,9 @@
     </div>
 
    <div class="form-group">
-   <label>Select Member Group</label>
+   <label><%= t("views.right_panel.detail.select_membership_group") %></label>
         <select class="form-control col-md-12 selectpicker  show-tick"  name="member_group_id"  style="height: " >
-          <option value="">Select Membership Group</option>
+          <option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
             <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
                <option value="<%= member.value %>">
               <%= member.name %></option>
@@ -132,15 +132,17 @@
   </div>
   
   <div class="form-group">
-        <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
+        <!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
-        <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %>
+        <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
-        <button type="button" class="btn btn-danger" id="reset">Reset</button>
+        <button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
+        <button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
+        <button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
   </div>
  <%end%>
 
 
 <div id="sxModal">
-    <div id="sxModal-Content"><h3>Card Tap</h3></div>
+    <div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
 </div>
 <!-- The modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">

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

@@ -39,10 +39,10 @@
                       <input type="hidden" name="type" id="type" value="">
                 </div>
                 <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
-                  <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;">Search</button>
+                  <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
                 <!-- </div> -->
-                  <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">Member Card</button>
+                  <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
-                  <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">QR CODE</button>
+                  <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
               </div>
               <% end %>
 

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

@@ -5,13 +5,13 @@
     <ul class="nav nav-tabs tab-nav-right" role="tablist">
       
       <li role="presentation" class="active nav-item">
-        <a class="nav-link" data-toggle="tab" href="#customer" >Customer Details</a>
+        <a class="nav-link" data-toggle="tab" href="#customer" ><%= t :customer_details %></a>
       </li>
       <li role="presentation" class="nav-item" >
-        <a class="nav-link" data-toggle="tab" href="#order" >Order Details</a>
+        <a class="nav-link" data-toggle="tab" href="#order" ><%= t :order_details %></a>
       </li>
       <li role="presentation" class="nav-item" >
-        <a class="nav-link" data-toggle="tab" href="#sale" >Sale Details</a>
+        <a class="nav-link" data-toggle="tab" href="#sale" ><%= t :sale_details %></a>
       </li>
     </ul>
     <!-- Nav tabs - End -->
@@ -24,15 +24,15 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Card No</th>
+                <th><%= t("views.right_panel.detail.card_no") %></th>
-                <th>Name</th>
+                <th><%= t("views.right_panel.detail.name") %></th>
-                <th>Company</th>
+                <th><%= t("views.right_panel.detail.company") %></th>
-                <th>Contact no</th>
+                <th><%= t("views.right_panel.detail.contact_no") %></th>
-                <th>Email</th>
+                <th><%= t("views.right_panel.detail.email") %></th>
-                <th>NRC/Passport No</th>
+                <th><%= t("views.right_panel.detail.nrc_passport_no") %></th>
-                <th>Address</th>
+                <th><%= t("views.right_panel.detail.address") %></th>
-                <th>DOB</th>
+                <th><%= t("views.right_panel.detail.dob") %></th>
-                <th>Membership Type</th>
+                <th><%= t("views.right_panel.detail.membership_type") %></th>
               </tr>
             </thead>
 
@@ -65,13 +65,13 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Date</th>
+                <th><%= t("views.right_panel.detail.date") %></th>
                 <!-- <th>Redeem</th> -->
-                <th>Discount Amount</th>
+                <th><%= t("views.right_panel.detail.discount_amount") %></th>
                 <!-- <th>Balance</th> -->
-                <th>From Account</th>
+                <th><%= t("views.right_panel.detail.from_account") %></th>
-                <th>Status</th>
+                <th><%= t("views.right_panel.detail.status") %></th>
-                <th>Receipt No</th>
+                <th><%= t("views.right_panel.detail.receipt_no") %></th>
               </tr>
             </thead>
             <tbody>
@@ -97,16 +97,17 @@
 
       <div class="tab-pane" id="order" role="tabpanel" style="min-height:670px; max-height:670px; ">
 
-        <h3>Order Details</h3>
+        <h3><%= t :order_details %></h3>
         <div class="table-responsive">
           <table class="table table-striped">           
             <thead>
               <tr>
-                <th>Order ID </th>
+                <th><%= t("views.right_panel.detail.order_id") %></th>
-                <th>Type</th>
+                <th><%= t("views.right_panel.detail.type") %></th>
-                <th>Order status</th>
+                <th><%= t("views.right_panel.detail.type") %></th>
-                <th>Order date</th>
+                <th><%= t("views.right_panel.detail.order_status") %></th>
-                <th>Items Count</th>
+                <th><%= t("views.right_panel.detail.order_date") %></th>
+                <th><%= t("views.right_panel.detail.items_count") %></th>
               </tr>
             </thead>
 
@@ -127,18 +128,18 @@
       </div>
 
       <div class="tab-pane" id="sale" role="tabpanel" style="min-height:670px; max-height:670px; ">
-          <h3>Sale Details</h3>
+          <h3><%= t :sale_details %></h3>
                 <div class="table-responsive">
                   <table class="table table-striped">           
                     <thead>
                       <tr>
-                        <th>Sale Id </th>
+                        <th><%= t("views.right_panel.detail.sale_id") %></th>
-                        <th>Receipt no </th>
+                        <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th>Grand total</th>
+                        <th><%= t("views.right_panel.detail.grand_total") %></th>
-                        <th>Tax amount</th>
+                        <th><%= t("views.right_panel.detail.tax_amount") %></th>
-                        <th>Cashier</th>
+                        <th><%= t :cashier %></th>
-                        <th>Sales status</th>
+                        <th><%= t("views.right_panel.detail.sales_status") %></th>
-                        <th>Receipt Date</th>
+                        <th><%= t("views.right_panel.detail.receipt_date") %></th>
                       </tr>
                     </thead>
 
@@ -166,7 +167,7 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
     <br><br>
         <a href="<%= crm_customers_path%>" class="btn btn-primary btn-lg">
-        <i class="fa fa-arrow-left fa-lg"></i> Back
+        <i class="fa fa-arrow-left fa-lg"></i> <%= t("views.btn.back") %>
        </a>
     </div>
 

app/views/inventory/inventory_definitions/index.html.erb

@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <p id="notice"><%= notice %></p>
 
-<h1>Inventory Definitions</h1>
+<h1><%= t :inventory_definitions %></h1>
 
 <table>
   <thead>

app/views/inventory/inventory_definitions/new.html.erb

@@ -1,7 +1,7 @@
 <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"><a href="<%= inventory_path %>"><%= t("views.right_panel.detail.product") %> <%= t :inventory %></a></li>
+    <li class="breadcrumb-item"><a href="<%= inventory_path %>"><%= t :inventory %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>

app/views/inventory/stock_checks/show.html.erb

@@ -1,8 +1,8 @@
 <div class="page-header">
  <ol class="breadcrumb">
-  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>">Home</a></li>
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>"><%= t("views.right_panel.button.home") %></a></li>
-  <li class="breadcrumb-item"><a href="<%=inventory_stock_checks_path%>"></a>Stock Check</li>
+  <li class="breadcrumb-item"><a href="<%=inventory_stock_checks_path%>"></a><%= t("views.right_panel.detail.stock_check") %></li>
-  <li class="breadcrumb-item active">Detail</li>
+  <li class="breadcrumb-item active"><%= t :details %></li>
   <span class="float-right">
     <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
   </span>
@@ -16,7 +16,7 @@
         <div class="p-l-20 p-t-15">
            <div class="row">
             <div class="col-md-2">
-              Check by
+              <%= t("views.right_panel.detail.check_by") %>
             </div>
             <div class="col-md-8">
               <%= Employee.find(@check.check_by).name rescue '' %>
@@ -24,7 +24,7 @@
           </div>
           <div class="row">
             <div class="col-md-2">
-              Check At
+              <%= t("views.right_panel.detail.check_at") %>
             </div>
             <div class="col-md-8">
               <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %>
@@ -32,7 +32,7 @@
           </div>
           <div class="row">
               <div class="col-md-2">
-                Reason
+                <%= t("views.right_panel.detail.reason") %>
               </div>
               <div class="col-md-8">
                 <%= @check.reason %>
@@ -44,11 +44,11 @@
               <table class="table table-striped col-md-12">
                 <tr>
                   <th>#</th>
-                  <th>Product</th>
+                  <th><%= t("views.right_panel.detail.product") %></th>
-                  <th>Stock Count</th>
+                  <th><%= t("views.right_panel.detail.stock_count") %></th>
-                  <th>Stock Balance</th>
+                  <th><%= t("views.right_panel.detail.stock_balance") %></th>
-                  <th>Different</th>
+                  <th><%= t("views.right_panel.detail.different") %></th>
-                  <th>Remark</th>
+                  <th><%= t("views.right_panel.detail.remark") %></th>
                 </tr>
                 <%
                 count = 0
@@ -79,8 +79,8 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
 
       <div class="body">
-              <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
+              <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> <%= t("views.right_panel.button.save_to_journal") %></button>
-              <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
+              <button id="print" type="button" class="btn btn-block btn-primary"> <%= t :print %></button>
       </div>
 
   </div>

app/views/layouts/application.html.erb

@@ -4,14 +4,14 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">    
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
     <!-- Favicon-->
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'application', media: 'all' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
+    <%= javascript_include_tag 'application' %> 
 </head>
 
 <body class="theme-indigo">

app/views/layouts/login.html.erb

@@ -10,9 +10,9 @@
   <!-- Favicon-->
   <link rel="icon" href="favicon.ico" type="image/x-icon">
 
-  <!-- Google Fonts -->
+    <!-- Google Fonts -->
-  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
 
   <!-- Bootstrap Core Css -->
   <!-- <link href="plugins/bootstrap/css/bootstrap.css" rel="stylesheet"> -->
@@ -88,6 +88,7 @@
             <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
           </div>              
         </div>
+<<<<<<< HEAD
         <div class="card-content">
           <div class='col-md-12'>
             <div class='row bottom'>
@@ -134,6 +135,61 @@
           event.preventDefault();
           var item = $(this).data("formid");
           $(item).submit();
+=======
+            <%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
+                <div class="card padding-10">
+                  <div class="card-header">
+                    <div class="form-group">
+                      <%= f.input :emp_id, as: :hidden, required: false, class: "form-control" %>
+
+                      <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
+                    </div>              
+                  </div>
+                  <div class="card-content">
+                    <div class='col-md-12'>
+                      <div class='row bottom'>
+                        <div class="pin_pad " data-value="1">1</div>
+                        <div class="pin_pad left" data-value="2">2</div>
+                        <div class="pin_pad left" data-value="3">3</div>
+                      </div>
+                      <div class='row bottom'>
+                        <div class="pin_pad" data-value="4">4</div>
+                        <div class="pin_pad left" data-value="5">5</div>
+                        <div class="pin_pad left" data-value="6">6</div>
+                      </div>
+                      <div class='row bottom'>
+                        <div class="pin_pad" data-value="7">7</div>
+                        <div class="pin_pad left" data-value="8">8</div>
+                        <div class="pin_pad left" data-value="9">9</div>
+                      </div>
+                      <div class='row bottom'>
+                        <div class="pin_pad bg-grey" data-value="CLR">CLR</div>
+                        <div class="pin_pad left" data-value="0">0</div>
+                        <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div>
+                      </div>                      
+                    </div>
+                  </div>
+            <% end %>
+    </div>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#login_form_password").focus();
+
+            $(".pin_pad").click(function (event) {
+                event.preventDefault();                
+                var value = $(this).data("value");
+
+                if (value == "CLR") {
+                    $("#login_form_password").val("");
+                } else if (value == "ENT") {
+                    $("#new_login_form").submit();
+                } else {
+                    var old_value = $("#login_form_password").val();
+                    $("#login_form_password").val(old_value + value);
+                }
+            });
+           
+>>>>>>> e3b536d58c98873e6f043a19ec1b4eb4545736a1
         });
 
       });

app/views/layouts/login_dashboard.html.erb

@@ -38,7 +38,23 @@
             <p>Please wait...</p>
         </div>
     </div>
-    
+     <% flash.each do |type, message| %>
+          <%  
+          if type == "notice" 
+               color = "alert-success"
+            elsif type == "error"
+                color = "alert-danger"
+            elsif type == "warning"
+                color = "alert-warning"
+            else
+                color = "bg-black"
+            end %>
+            
+            <p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+                data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+            </p>
+   <% end %>  
+
     <!-- #END# Page Loader -->
     <div class="container">
     	<div class="row">
@@ -140,7 +156,7 @@
 </html>
 
 <script>   
-    $(document).on('turbolinks:load', function () {
+    $(document).ready(function () {
 
          // for Notificaiotn message
 

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

@@ -37,7 +37,7 @@
               <!--- Panel 1 - Table Orders -->
               <div class="tab-pane dining active " id="tables" role="tabpanel">
                 <div class="card-columns">
-                  <% @tables.each do |table| %>
+                  <% @tables.each do |table| %>                  
                       <% if table.status == 'occupied' %>
 
                           <% if table.get_booking.nil? %>
@@ -316,8 +316,8 @@
 
           <button type="button" class="btn btn-block btn-default waves-effect" id='back'><i class="fa fa-arrow-left"></i> Back</button>
           <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
-          <% if @dining.bookings.length >= 1 %>
+          <% if @dining.status != "available" %> 
-              <% if @status_order == 'order' && @status_sale != 'sale' %>
+              <% if @status_order == 'order' %>
                   <button type="button" id="customer" class="btn btn-block btn- bg-blue waves-effect" disabled>Customer</button>
                   <button type="button" class="btn btn-block btn- bg-blue waves-effect" disabled>Edit</button>
                   <button type="button" id="discount" class="btn btn-block btn- bg-blue waves-effect" disabled>Discount</button>
@@ -327,7 +327,8 @@
                   <button type="button" id="first_bill" class="btn btn-block btn- bg-blue waves-effect" disabled>First Bill</button>
                   <button type="button" id="pay" class="btn btn-block btn- bg-blue waves-effect" disabled>Pay</button>
                   <button type="button" class="btn btn-block btn- bg-blue waves-effect" disabled> Void</button>
-              <% else %>
+              <% end %>
+              <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block btn- bg-blue waves-effect">Customer</button>
                   <button type="button" class="btn btn-block btn- bg-blue waves-effect" id='edit'>Edit</button>
                   <button type="button" id="discount" class="btn btn-block btn- bg-blue waves-effect">Discount</button>
@@ -583,8 +584,18 @@
             confirmButtonColor: "#DD6B55",
             confirmButtonText: "Yes, void it!",
             closeOnConfirm: false
-        }, function () {
+        }, function (isConfirm) {
-            window.location.href = '/origami/';
+          if (isConfirm) {
+            var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+                type: 'POST',
+                url: ajax_url,
+                success: function () {
+                    window.location.href = '/origami/';
+                }
+            });
+          }
         });
     });
 

app/views/reports/commission/_commission_report_filter.html.erb

@@ -13,15 +13,15 @@
         </div> -->
         <div class="col-lg-3 col-md-3 col-sm-3">          
         <!-- <label class="">Select Shift Period</label> -->
-        <label class="font-14">From</label>
+        <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
         <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
       </div>
       <div class="col-lg-3 col-md-3 col-sm-3">
-        <label class="font-14">To</label>
+        <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
         <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
       </div>
         <div class="col-lg-2 col-md-2 col-sm-2">
-          <label class="font-14">Commissioner</label>
+          <label class="font-14"><%= t :commissioner %></label>
           <select class="form-control" name="commissioner" id="commissioner">
             <option value=""></option>
             <% @commissioner.each do |c| %>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Commission Report</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.commission_report") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -18,8 +18,7 @@
 <!-- <div class="container"> -->
   <!-- <div class="row"> -->
     <div class="text-right">
-      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-info wave-effects">Export to
+      <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
-        Excel</a>
     </div>
   <!-- </div> -->
 <!-- </div> -->
@@ -30,17 +29,17 @@
       <table class="table table-striped">
         <thead>
         <tr>
-          <th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+          <th colspan="9"> <%= 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>
         <tr>
-          <th>Sale</th>
+          <th><%= t :sale %></th>
-          <th>Sale Item</th>
+          <th><%= t :sale %> <%= t("views.right_panel.detail.item") %></th>
-          <th>Commissioner Name</th>
+          <th><%= t :commissioner %> <%= t("views.right_panel.detail.name") %></th>
-          <th>Product Name</th>
+          <th><%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name") %></th>
-          <th>Qty</th>
+          <th><%= t("views.right_panel.detail.qty") %></th>
-          <th>Commission Price</th>
+          <th><%= t("views.right_panel.detail.commission_price") %></th>
-          <th>Commission Amount</th>
+          <th><%= t("views.right_panel.detail.commission_amount") %></th>
-          <th>Date</th>
+          <th><%= t("views.right_panel.detail.date") %></th>
         </tr>
         </thead>
         <tbody>

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

@@ -3,9 +3,9 @@
 		<% if period_type != false %>
 			<div class="row">
 				<div class="form-group col-md-2">
-					<label class="font-20">Select Period</label>
+					<label class="font-20"><%= t("views.right_panel.detail.select_period") %></label>
 					<select name="period" id="sel_period" class="form-control">
-						<option value="">Select Period</option>
+						<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 						<option value="0">Today</option>
 						<option value="1">Yesterday</option>
 						<option value="2">This week</option>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
 	<ol class="breadcrumb">
-		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-		<li class="breadcrumb-item active">Credit Payment Report</li>
+		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.credit_payment_report") %></li>
 		<span class="float-right">
 			<%= link_to 'Back', dashboard_path %>
 		</span>
@@ -16,7 +16,7 @@
  <!-- <div class="container"> -->
 	<!-- <div class="row"> -->
 		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+			<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
 		</div>	  			
 	<!-- </div> -->
    <!--  </div>  -->
@@ -29,15 +29,15 @@
 			  <thead>
 				<% if !params[:from].blank?%>
 			    <tr>
-			        <th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
+			        <th colspan="7"><%= t("views.right_panel.detail.from_date") %> : <%= params[:from]  rescue '-'%>	,	<%= t("views.right_panel.detail.to_date") %> : <%= params[:to]  rescue '-'%></th>
 				</tr>
 				<% end %>		  
 				<tr>
-					<th> Shift Name </th>
+					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
-				  	<th> Receipt No</th>
+				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
-				   	<th> Cashier Name</th>
+				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-				  	<th> Customer Name</th>		   
+				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>		   
-				  	<th> Credit Amount </th>
+				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
 				</tr>
 			  </thead>
 			  <tbody>

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

@@ -4,9 +4,9 @@
 	<% if period_type != false %>
 		<div class="row">
 			<div class="col-lg-2 col-md-2 col-sm-2">
-				<label class="font-14">Select Period</label>
+				<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
 				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
+					<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 					<option value="0">Today</option>
 					<option value="1">Yesterday</option>
 					<option value="2">This week</option>
@@ -23,11 +23,11 @@
 
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="font-14">From</label>
+				<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
-				<label class="font-14">To</label>
+				<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">

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

@@ -1,8 +1,8 @@
 
 <div class="page-header">
 	<ol class="breadcrumb">
-		<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+		<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-		<li class="breadcrumb-item active">Daily Sale Report</li>
+		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.daily_sale_report") %></li>
 		<span class="float-right">
 			<%= link_to 'Back', dashboard_path %>
 		</span>
@@ -15,7 +15,7 @@
 		:locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
 		<hr />
 		<div class=" text-right">
-		<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+		<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
 		</div>	  			
 
 		<div class="row">
@@ -25,24 +25,24 @@
 						<table class="table table-bordered">
 							<thead> 
 								<tr>
-									<th colspan="15"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+									<th colspan="15"> <%= 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>
 								<tr>
-									<th style='text-align:center;'>Sr</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
-									<th style='text-align:center;'>Date</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
-									<th style='text-align:center;'>Void Amount</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
-									<th style='text-align:center;'>Mpu Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
-									<th style='text-align:center;'>Master Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
-									<th style='text-align:center;'>Visa Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
-									<th style='text-align:center;'>Jcb Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
-									<th style='text-align:center;'>Redeem Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
-									<th style='text-align:center;'>Cash Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
-									<th style='text-align:center;'>Credit Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
-									<th style='text-align:center;'>FOC Sales</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
-									<th style='text-align:center;'>(Discount)</th>
+									<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
-									<th style='text-align:center;'>Grand Total + <br/> Rounding Adj.</th>     
+									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th>     
-									<th style='text-align:center;'>Rounding Adj.</th>
+									<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-									<th style='text-align:center;'>Grand Total</th>     	        
+									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>     	        
 								</tr>
 							</thead>
 							<% unless @sale_data.empty? %>
@@ -126,7 +126,7 @@
 								<% end %>
 								<% net = total - total_tax %>
 								<tr style="font-weight:600;">
-									<td colspan="12" style='text-align:right;'>Net Amount</td>
+									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
 									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>	
 								</tr>

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

@@ -3,9 +3,9 @@
 	<% if period_type != false %>
 	<div class="row">
 		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">Select Period</label>
+			<label class="font-14"><%= t("views.right_panel.detail.select_period") %><%= t("views.right_panel.detail.select_period") %></label>
 			<select name="period" id="sel_period" class="form-control">
-				<option value="">Select Period</option>
+				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 				<option value="0">Today</option>
 				<option value="1">Yesterday</option>
 				<option value="2">This week</option>
@@ -20,21 +20,21 @@
 		</div>
 		<% if defined? payments %>
 		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">Select Payments</label>
+			<label class="font-14"><%= t("views.right_panel.detail.select_payments") %></label>
 			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
 		</div>
 		<% end %>
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <label class="">Select Shift Period</label> -->
-			<label class="font-14">From</label>
+			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">To</label>
+			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">All Shift</label>
+			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
 			<select class="form-control select" name="shift_name" id="shift_name" >
 			</select>
 		</div>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Recript No Report</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.receipt_no_report") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+				<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
 			</div>	  			
 		<!-- </div> -->
 		<!-- </div> --> 
@@ -30,30 +30,30 @@
 					<thead>
 
 						<tr>
-							<th colspan="9"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							<th colspan="9"> <%= 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="9">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 						</tr>
 						<% end %>	 
 
 						<tr>
-							<th>Recipt No</th>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th>Cashier Name</th>		
+							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
-							<th>Total Amount</th>
+							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
-							<th>Discount Amount </th>
+							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
 							<% @sale_taxes.each do |tax| %>
 							<th><%= tax.tax_name %></th>		
 							<% end %>
 							<!-- <th>Other Amount</th> -->
-							<th>Grand Total</th>
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
-							<th>Rounding Adj.</th>
+							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-							<th>Grand Total +<br/>
+							<th><%= t("views.right_panel.detail.grand_total") %> +<br/>
-								Rounding Adj.
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
 							</th>
 						</tr>
 					</thead>
@@ -106,15 +106,15 @@
 						</tr>
 						<tr>
 							<td colspan="2">&nbsp;</td>
-							<td>Total Amount</td>
+							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-							<td>Discount Amount</td>
+							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 							<% @sale_taxes.each do |tax| %>
 							<td><%= tax.tax_name %></td>
 							<% end %>
-							<td>Grand Total</td>
+							<td><%= t("views.right_panel.detail.grand_total") %></td>
-							<td>Rounding Adj.</td>
+							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
-							<td>Grand Total +<br/>
+							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
-								Rounding Adj.
+								<%= t("views.right_panel.detail.rnd_adj_sh") %>
 							</td>
 						</tr>
 						<%end%>

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

@@ -3,9 +3,9 @@
 	<% if period_type != false %>
 	<div class="row">
 		<div class="col-lg-2 col-md-2 col-sm-2">
-			<label class="font-14">Select Period</label>
+			<label class="font-14">Select Period<%= t("views.right_panel.detail.select_period") %></label>
 			<select name="period" id="sel_period" class="form-control">
-				<option value="">Select Period</option>
+				<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 				<option value="0">Today</option>
 				<option value="1">Yesterday</option>
 				<option value="2">This week</option>
@@ -21,11 +21,11 @@
 		<!-- <input type="hidden" name="report_type" value="sale_item" id="sel_sale_type"> -->		
 		<div class="col-lg-3 col-md-3 col-sm-3">					
 			<!-- <label class="">Select Shift Period</label> -->
-			<label class="font-14">From</label>
+			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date">
 		</div>
 		<div class="col-lg-3 col-md-3 col-sm-3">
-			<label class="font-14">To</label>
+			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Sale Item Report</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>
@@ -20,7 +20,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 			<div class="text-right">
-				<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects ">Export to Excel</a>
+				<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> -->
 		<!-- </div> -->
@@ -34,24 +34,24 @@
 						<thead>
 
 							<tr>
-								<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+								<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">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 							</tr>
 							<% end %>
 							<tr>
 								<th>&nbsp;</th>
-								<th>Menu Category</th>
+								<th><%= t("views.right_panel.header.menu_category") %></th>
-								<th>Code</th>
+								<th><%= t("views.right_panel.detail.code") %></th>
-								<th>Product</th>
+								<th><%= t("views.right_panel.detail.product") %></th>
-								<th>Total Item</th>
+								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th>Unit Price</th>
+								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th>Revenue</th>
+								<th><%= t("views.right_panel.detail.revenue") %></th>
 							</tr>	
 						</thead>
 						<tbody>
@@ -76,7 +76,7 @@
 							<tr>
 								<td><b><%= sale.account_name %></b></td>
 								<td colspan="4">&nbsp;</td>
-								<td>Total Price By <%= sale.account_name %></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 %>
@@ -114,7 +114,7 @@
 							<% if count == value %>	
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Sub Total</td>
+								<td><%= t("views.right_panel.detail.sub_total") %></td>
 								<td ><span class="underline"><%= sub_total %></span></td>
 
 							</tr>
@@ -130,41 +130,41 @@
 
 							<tr style="border-top:2px solid grey;">
 								<td colspan="3">&nbsp;</td>
-								<td>Total Item</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
-								<td>Total Amount</td>
+								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 								<td><span><%= grand_total%></span></td> 
 							</tr>
 							<% end %>
 
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Cash Received</td>
+								<td><%= t("views.right_panel.detail.cash_received") %></td>
 								<td><span><%= @cash_data - @change_amount %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Card Sales</td>
+								<td><%= t("views.right_panel.detail.card_sales") %></td>
 								<td><span><%= @card_data %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Credit Sales</td>
+								<td><%= t("views.right_panel.detail.credit_sales") %></td>
 								<td><span><%= @credit_data %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>FOC Sales</td>
+								<td><%= t("views.right_panel.detail.foc_sales") %></td>
 								<td><span><%= @foc_data %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Discount Amount</td>
+								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 								<td><span><%= @discount_data %></span></td>
 							</tr>		
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td>Grand Total</td>
+								<td><%= t("views.right_panel.detail.grand_total") %></td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
 								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
 							</tr>

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

@@ -3,7 +3,7 @@
 		<% if period_type != false %>
 			<div class="row">
 				<div class="col-lg-2 col-md-2 col-sm-2">
-					<label class="font-14">Select Period</label>
+					<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
 					<select name="period" id="sel_period" class="form-control">
 						<option value="0">Today</option>
 						<option value="1">Yesterday</option>
@@ -20,15 +20,15 @@
 				
 				<div class="col-lg-3 col-md-3 col-sm-3">					
 					<!-- <label class="font-14">Select Shift Period</label> -->
-					<label class="font-14">From</label>
+					<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
 					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
 				</div>
 				<div class="col-lg-3 col-md-3 col-sm-3">
-					<label class="font-14">To</label>
+					<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
 					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2">
-					<label class="font-14">All Shift</label>
+					<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
 					<select class="form-control select" name="shift_name" id="shift_name" >
 					</select>
 				</div>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Shift Sale Report</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.shift_sale_report") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -19,7 +19,7 @@
 		<!-- <div class="container"> -->
 			<!-- <div class="row"> -->
 			<div class="text-right">
-					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
+					<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
 				</div>	  			
 			<!-- </div> -->
 		<!-- </div> -->
@@ -33,8 +33,8 @@
 			<table class="table table-striped">
 				<thead>
 					<tr>
-						<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  
+						<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  
-							- To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
+							- <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%>
 
 						</th>
 					</tr>
@@ -43,23 +43,23 @@
 						<% if @shift_data.employee %>		
 						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
 						<% end %>			
-						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+						<th colspan="7"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 					</tr>
 					<% end %>	  
 					<tr>
-						<th>Cashier Station</th>
+						<th><%= t("views.right_panel.detail.cashier_station") %></th>
-						<th>Cashier Name</th>
+						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-						<th>Shift Name</th>		
+						<th><%= t("views.right_panel.detail.shift_name") %></th>		
 						<!-- <th>Void Amount</th> -->
-						<th>Cash Payment</th>
+						<th><%= t("views.right_panel.detail.cash_payment") %></th>
 						<!-- <th>Credit Charges</th> -->
-						<th>Credit Payment</th>
+						<th><%= t("views.right_panel.detail.credit_payment") %></th>
 						<!-- <th>FOC Payment</th> -->
-						<th>Other Payment</th>
+						<th><%= t("views.btn.other_payment") %></th>
 					<!-- <th>Grand Total 
 					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
-					<th>Grand Total</th>		
+					<th><%= t("views.right_panel.detail.grand_total") %></th>		
 				</tr>
 			</thead>
 			<tbody>

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

@@ -3,9 +3,9 @@
 	<% if period_type != false %>
 		<div class="row">
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">
-				<label class="font-20">Select Period</label>
+				<label class="font-20"><%= t("views.right_panel.detail.select_period") %><%= t("views.right_panel.detail.select_period") %></label>
 				<select name="period" id="sel_period" class="form-control">
-					<option value="">Select Period</option>
+					<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 					<option value="0">Today</option>
 					<option value="1">Yesterday</option>
 					<option value="2">This week</option>
@@ -21,15 +21,15 @@
 
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">					
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="font-20">From</label>
+				<label class="font-20"><%= t("views.right_panel.detail.from") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date">
 			</div>
 			<div class="form-group col-lg-2 col-md-2 col-sm-2">
-				<label class="font-20">To</label>
+				<label class="font-20"><%= t("views.right_panel.detail.to") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date">
 			</div>
 			<div class="form-group col-lg-3 col-md-3 col-sm-3">
-				<label class="font-20">All Shift</label>
+				<label class="font-20"><%= t("views.right_panel.detail.all_shift") %></label>
 				<select class="form-control select" name="shift_name" id="shift_name" >
 				</select>
 			</div>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"> Void Sale Report</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.void_sale_report") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -18,7 +18,7 @@
 		<!-- <div class="container"> -->
 		<!-- <div class="row"> -->
 		<div class="col-md-12 text-right">
-			<a href="javascript:export_to('<%=reports_void_sale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+			<a href="javascript:export_to('<%=reports_void_sale_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
 		</div>	  			
 		<!-- </div> -->
 		<!-- </div>  -->
@@ -30,7 +30,7 @@
 					<thead>
 						<% if !params[:from].blank?%>
 						<tr>
-							<th colspan="7">From Date : <%= params[:from]  rescue '-'%>	,	To Date : <%= params[:to]  rescue '-'%></th>
+							<th colspan="7"><%= t("views.right_panel.detail.from_date") %> : <%= params[:from]  rescue '-'%>	,	<%= t("views.right_panel.detail.to_date") %> : <%= params[:to]  rescue '-'%></th>
 						</tr>
 						<% end %>
 						<% if @shift_from %>
@@ -38,16 +38,16 @@
 							<% if @shift %>		
 							<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
 							<% end %>	
-							<th colspan="3">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
+							<th colspan="3"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
 						</tr>
 						<% end %>		  
 						<tr>
-							<th>Receipt No</th>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th>Sale Date</th>
+							<th><%= t("views.right_panel.detail.sale_date") %></th>
-							<th>Total Amount</th>
+							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
-							<th>Grand Total</th>
+							<th><%= t("views.right_panel.detail.grand_total") %></th>
-							<th>Rounding Adj.</th>
+							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-							<th>Grand Total + <br/>Rounding Adj.</th>			
+							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>			
 							<!-- <th>Sale Status</th> -->
 						</tr>
 					</thead>

app/views/settings/cashier_terminals/_form.html.erb

@@ -54,8 +54,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/commissioners/_form.html.erb

@@ -55,11 +55,3 @@
     </div>  
   </div>
 </div>
-
-<script type="text/javascript">
-$(document).on('page:load', function() {
-
-  // $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/commissions/_form.html.erb

@@ -43,10 +43,3 @@
   </div>  
 </div>
 </div>
-
-<script type="text/javascript">
-
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/item_sets/_form.html.erb

@@ -40,8 +40,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/lookups/_form.html.erb

@@ -28,8 +28,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/membership_actions/_form.html.erb

@@ -30,8 +30,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/membership_settings/_form.html.erb

@@ -32,8 +32,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/menu_categories/_form.html.erb

@@ -44,8 +44,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/menu_item_attributes/_form.html.erb

@@ -36,8 +36,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/menu_item_options/_form.html.erb

@@ -37,8 +37,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/menu_item_sets/_form.html.erb

@@ -26,8 +26,4 @@
 		</div>  
 	</div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/menus/_form.html.erb

@@ -66,8 +66,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/order_queue_stations/_form.html.erb

@@ -59,8 +59,4 @@ div.form-inputs span{
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/payment_method_settings/_form.html.erb

@@ -46,8 +46,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/processing_items/_form.html.erb

@@ -85,8 +85,4 @@
 </div>
 
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/products/_form.html.erb

@@ -20,8 +20,7 @@
               <% if f.object.image_path? %>
                 <p><%= f.object.name %></p>
                 <%= image_tag f.object.image_path.url, :class => "img-thumbnail" %>
-              <% else %>
+              <% else %>                
-                <p>Sample Image</p>
                 <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %>
               <% end %>          
             </div>
@@ -63,8 +62,4 @@
   </div>
 </div>
  
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/promotion_products/_form.html.erb

@@ -45,8 +45,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/rooms/_form.html.erb

@@ -77,8 +77,4 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/set_menu_items/_form.html.erb

@@ -91,8 +91,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/simple_menu_items/_form.html.erb

@@ -81,8 +81,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/tables/_form.html.erb

@@ -72,8 +72,4 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

app/views/settings/tax_profiles/_form.html.erb

@@ -41,9 +41,5 @@
   </div>
 </div>
 
-<script type="text/javascript">
+ 
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>
 

app/views/settings/zones/_form.html.erb

@@ -35,8 +35,3 @@
     </div>  
   </div>
 </div>
-<script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
-  $('body').bootstrapMaterialDesign();
-});
-</script>

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

@@ -11,8 +11,8 @@
 </div> -->
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Credit Note</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.credit_note") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -29,13 +29,13 @@
                     <%= form_tag transactions_credit_notes_path, :method => :get do %>
                        <div class="row clearfix">
                          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                           <label class="font-14">Enter Keywords</label>
+                           <label class="font-14"><%= t("views.right_panel.detail.enter_keyboards") %></label>
                            <input type="text" name="receipt_no" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
                          </div>
                          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                          <label class="font-14">Select Customer</label>
+                          <label class="font-14"><%= t("views.right_panel.detail.select_customer") %></label>
                            <select class="selectpicker form-control col-md-12 " name="customer"  style="height: 40px" >
-                            <option value="">Select Customer</option>
+                            <option value=""><%= t("views.right_panel.detail.select_customer") %></option>
                               <%  @customers.each do |customer| %>
                                  <option value="<%= customer.customer_id %>">
                                 <%= customer.name %></option>
@@ -43,11 +43,11 @@
                             </select>   
                         </div>
                          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                           <label class="font-14">From</label>
+                           <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
                            <input class="form-control datepicker m-t-3" name="from" id="date" type="text" placeholder="From date">
                         </div>
                         <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                          <label class="font-14">To</label>
+                          <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
                           <input class="form-control datepicker m-t-3" name="to" id="date" type="text" placeholder="To date">
                         </div>
                         
@@ -70,12 +70,12 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Sale Id </th>
+                <th><%= t("views.right_panel.detail.sale_id") %></th>
-                <th>Receipt no </th>
+                <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                <th>Credit Amount</th>
+                <th><%= t("views.right_panel.detail.credit_amount") %></th>
-                <th>Cashier</th>
+                <th><%= t :cashier %></th>
-                <th>Customer Name</th>
+                <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
-                <th>Receipt Date</th>
+                <th><%= t("views.right_panel.detail.receipt_date") %></th>
               </tr>
             </thead>
 
@@ -95,7 +95,7 @@
                     </tr>
                   <% end %>
               <% else %>
-                    <tr><td colspan="8"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
+                    <tr><td colspan="8"><strong><p style="text-align: center"><%= t("views.right_panel.detail.no_data_txt") %>....</p></strong></td></tr>
               <% end %>
             </tbody>
           </table>

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

@@ -1,8 +1,8 @@
 
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Order</li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.order") %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -14,7 +14,7 @@
        <%= form_tag transactions_orders_path, :method => :get do %>
             <div class="row clearfix">
               <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                <label class="form-control-label">Search Keyword</label>
+                <label class="form-control-label"><%= t("views.right_panel.button.search_keyboard") %></label>
                  <input type="text" name="filter" placeholder="Order ID" class="form-control input-md">
             </div>
             <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
@@ -27,11 +27,11 @@
                
             </div> -->
             <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> 
-                <label class="form-control-label">From</label>
+                <label class="form-control-label"><%= t("views.right_panel.detail.from") %></label>
              <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
             </div>
             <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-              <label class="form-control-label">To</label>
+              <label class="form-control-label"><%= t("views.right_panel.detail.to") %></label>
               <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
             </div>
             
@@ -47,12 +47,12 @@
             <thead>
               
               <tr>
-                <th>Order ID </th>
+                <th><%= t("views.right_panel.detail.order_id") %></th>
-                <th>Type</th>
+                <th><%= t("views.right_panel.detail.type") %></th>
-                <th>Customer</th>
+                <th><%= t :customer %></th>
-                <th>Order status</th>
+                <th><%= t("views.right_panel.detail.order_status") %></th>
-                <th>Order date</th>
+                <th><%= t("views.right_panel.detail.order_date") %></th>
-                <th>Items Count</th>
+                <th><%= t("views.right_panel.detail.items_count") %></th>
               </tr>
             </thead>
 

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

@@ -1,8 +1,8 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item"><a href="<%= transactions_orders_path %>">Order</a></li>
+    <li class="breadcrumb-item"><a href="<%= transactions_orders_path %>"><%= t("views.right_panel.detail.order") %></a></li>
-    <li class="breadcrumb-item active">Details</li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">
       <%= link_to 'Back', transactions_orders_path %>
     </span>
@@ -17,11 +17,11 @@
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Type</th>
+                <th><%= t("views.right_panel.detail.type") %></th>
-                <th>Customer</th>
+                <th><%= t :customer %></th>
-                <th>Order status</th>
+                <th><%= t("views.right_panel.detail.order_status") %></th>
-                <th>Order date</th>
+                <th><%= t("views.right_panel.detail.order_date") %></th>
-                <th>Order By</th>
+                <th><%= t("views.right_panel.detail.order_by") %></th>
               </tr>
             </thead>
 
@@ -35,18 +35,18 @@
                 </tr>             
             </tbody>
           </table>
-          <h3>Order Items</h3>
+          <h3><%= t("views.right_panel.detail.order_items") %></h3>
           <table class="table table-striped">
             <thead>
               <tr>
-                <th>Item Name</th>
+                <th><%= t("views.right_panel.detail.item") +" "+ t("views.right_panel.detail.name") %></th>
-                <th>Qty</th>
+                <th><%= t("views.right_panel.detail.qty") %></th>
-                <th> Unit Price</th>
+                <th><%= t("views.right_panel.detail.unit_price") %></th>
-                <th>Total Price</th>
+                <th><%= t("views.right_panel.detail.total_price") %></th>
                <!--  <th>Option</th> -->
-                 <th>Status</th>
+                 <th><%= t("views.right_panel.detail.status") %></th>
-                <th>Order By</th>
+                <th><%= t("views.right_panel.detail.order_by") %></th>
-                <th>Created at</th>
+                <th><%= t("views.right_panel.detail.created_at") %></th>
 
               </tr>
             </thead>

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

@@ -1,7 +1,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active">Sale</li>
+    <li class="breadcrumb-item active"><%= t :sale %></li>
     <span class="float-right">
       <%= link_to 'Back', dashboard_path %>
     </span>
@@ -18,15 +18,15 @@
                     <%= form_tag transactions_sales_path, :method => :get do %>
                     <div class="row clearfix">
                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
-                         <label>Enter Keywords</label>
+                         <label><%= t("views.right_panel.detail.enter_keyboards") %></label>
                          <input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
                        </div>
                        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> 
-                         <label class="">From</label>
+                         <label class=""><%= t("views.right_panel.detail.from") %></label>
                          <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
                       </div>
                       <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
-                        <label class="">To</label>
+                        <label class=""><%= t("views.right_panel.detail.to") %></label>
                         <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
                       </div>
                       
@@ -51,13 +51,13 @@
             <thead>
              
               <tr>
-                <th>Sale Id </th>
+                <th><%= t("views.right_panel.detail.sale_id") %></th>
-                <th>Receipt no </th>
+                <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                <th>Grand total</th>
+                <th><%= t("views.right_panel.detail.grand_total") %></th>
-                <th>Tax amount</th>
+                <th><%= t("views.right_panel.detail.tax_amount") %></th>
-                <th>Cashier</th>
+                <th><%= t :cashier %></th>
-                <th>Sales status</th>
+                <th><%= t("views.right_panel.detail.sales_status") %></th>
-                <th>Receipt Date</th>
+                <th><%= t("views.right_panel.detail.receipt_date") %></th>
               </tr>
             </thead>
 

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

@@ -1,27 +1,27 @@
 <p id="notice"><%= notice %></p>
 
-<h1>Transactions Sales</h1>
+<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
 
 <table>
   <thead>
     <tr>
-      <th>Cashier</th>
+      <th><%= t :cashier %></th>
-      <th>Cashier name</th>
+      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th>Requested by</th>
+      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th>Requested at</th>
+      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th>Receipt no</th>
+      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th>Receipt date</th>
+      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th>Customer</th>
+      <th><%= t :customer %></th>
-      <th>Payment status</th>
+      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th>Sale status</th>
+      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th>Total amount</th>
+      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th>Total discount</th>
+      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th>Total tax</th>
+      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th>Tax type</th>
+      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th>Grand total</th>
+      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th>Rounding adjustment</th>
+      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th>Amount received</th>
+      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th>Amount changed</th>
+      <th><%= t("views.right_panel.detail.amt_changed") %></th>
       <th colspan="3"></th>
     </tr>
   </thead>

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

@@ -1,9 +1,9 @@
 
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item"><a href="<%= transactions_sales_path %>">Sales</a></li>
+    <li class="breadcrumb-item"><a href="<%= transactions_sales_path %>"><%= t :sale %></a></li>
-    <li class="breadcrumb-item active">Details</li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
     <span class="float-right">
       <%= link_to 'Back', transactions_sales_path %>
     </span>
@@ -16,16 +16,16 @@
         <!-- Nav tabs -->
         <ul class="nav nav-tabs" role="tablist">
             <li class="nav-item">
-                <a class="nav-link active" data-toggle="tab" href="#queue" role="tab">Sale Details </a>
+                <a class="nav-link active" data-toggle="tab" href="#queue" role="tab"><%= t :sale_details %> </a>
             </li>
             <li class="nav-item">
-                <a class="nav-link " data-toggle="tab" href="#booking" role="tab">Orders Details</a>
+                <a class="nav-link " data-toggle="tab" href="#booking" role="tab"><%= t :order_details %></a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#customer" role="tab">Customer Details</a>
+                <a class="nav-link" data-toggle="tab" href="#customer" role="tab"><%= t :customer_details %></a>
             </li>
              <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#sale_audit" role="tab">Sale Audits</a>
+                <a class="nav-link" data-toggle="tab" href="#sale_audit" role="tab"><%= t :sale_audits %></a>
             </li>
         </ul>
         <!-- Nav tabs - End -->
@@ -38,11 +38,11 @@
                       <thead>
                        
                         <tr>
-                          <th>Receipt Date </th>
+                          <th><%= t("views.right_panel.detail.receipt_date") %></th>
-                          <th>Receipt no</th>
+                          <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                          <th>Cashier</th>
+                          <th><%= t :cashier %></th>
-                          <th>Sales status</th>
+                          <th><%= t("views.right_panel.detail.sales_status") %></th>
-                          <th>Receipt generated at</th>
+                          <th><%= t("views.right_panel.detail.receipt_generated_at") %></th>
                         </tr>
                       </thead>
 
@@ -55,11 +55,11 @@
                             <td> <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %> </td>
                           </tr> 
                           <tr style="border-top:2px solid #000">
-                            <th>Sale item name</th>
+                            <th><%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %></th>
-                            <th> Qty</th>
+                            <th><%= t("views.right_panel.detail.qty") %></th>
-                            <th>Unit price</th>
+                            <th><%= t("views.right_panel.detail.unit_price") %></th>
-                            <th>Total pirce </th>
+                            <th><%= t("views.right_panel.detail.total_price") %></th>
-                            <th>Created at</th>
+                            <th><%= t("views.right_panel.detail.created_at") %></th>
                           </tr>   
                           <% @sale.sale_items.each do |s| %>
 
@@ -73,12 +73,12 @@
                           <% end %>  
                           <tr style="border-top:2px solid #000">
                               <td colspan=2 style="text-align:center"></td>
-                              <td>Total</td>    
+                              <td><%= t("views.right_panel.detail.total") %></td>    
                               <td colspan="2"><%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                           </tr>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td>Discount</td>
+                            <td><%= t("views.right_panel.detail.discount") %></td>
                             <td colspan="2"><%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <% @sale.sale_taxes.each do |r|%>
@@ -90,13 +90,13 @@
                           <% end %> 
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td>Grand Total</td>
+                            <td><%= t("views.right_panel.detail.grand_total") %></td>
                             <td colspan="2"><%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <tr><td colspan="5">&nbsp;<td></tr>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td>Total Pay Amount</td>
+                            <td><%= t("views.right_panel.detail.total_pay_amount") %></td>
                             <td colspan="2"><%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           
@@ -113,7 +113,7 @@
 
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td>Change</td>
+                            <td><%= t("views.right_panel.detail.change") %></td>
                             <td colspan="2"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
                           </tr>
 
@@ -128,14 +128,14 @@
                     <table class="table table-striped">
                       <thead>
                         <tr>
-                          <th>Order ID</th>
+                          <th><%= t("views.right_panel.detail.order_id") %></th>
-                          <th>Menu Item</th>
+                          <th><%= t("views.right_panel.header.menu_item") %></th>
-                          <th>QTY</th>
+                          <th><%= t("views.right_panel.detail.qty") %></th>
-                          <th>Unit Price </th>
+                          <th><%= t("views.right_panel.detail.unit_price") %></th>
-                          <th>Option</th>
+                          <th><%= t("views.right_panel.detail.option") %></th>
-                          <th>Status</th>
+                          <th><%= t("views.right_panel.detail.status") %></th>
-                          <th>Waiter</th>
+                          <th><%= t("views.right_panel.detail.waiter") %></th>
-                          <th>Created at </th>
+                          <th><%= t("views.right_panel.detail.created_at") %></th>
                         </tr>
                       </thead>
 
@@ -163,14 +163,14 @@
                   <table class="table table-striped">
                   <thead>
                     <tr>
-                      <th>Card No</th>
+                      <th><%= t("views.right_panel.detail.card_no") %></th>
-                      <th>Name</th>
+                      <th><%= t("views.right_panel.detail.name") %></th>
-                      <th>Company</th>
+                      <th><%= t("views.right_panel.detail.company") %></th>
-                      <th>Contact no</th>
+                      <th><%= t("views.right_panel.detail.contact_no") %></th>
-                      <th>Email</th>
+                      <th><%= t("views.right_panel.detail.email") %></th>
-                      <th>NRC/Passport No</th>
+                      <th><%= t("views.right_panel.detail.nrc_passport_no") %></th>
-                      <th>Address</th>
+                      <th><%= t("views.right_panel.detail.address") %></th>
-                      <th>DOB</th>
+                      <th><%= t("views.right_panel.detail.dob") %></th>
                     </tr>
                   </thead>
 
@@ -187,16 +187,16 @@
                     </tr>
                     <tr></tr>
                     <tr>
-                      <th colspan="5">Membership Transactions</th>
+                      <th colspan="5"><%= t("views.right_panel.detail.membership_transactions") %></th>
                     </tr>
                     <tr>
-                      <th>Date</th>
+                      <th><%= t("views.right_panel.detail.date") %></th>
-                      <th>Redeem</th>
+                      <th><%= t("views.right_panel.detail.redeem") %></th>
-                      <th>Rebate</th>
+                      <th><%= t("views.right_panel.detail.rebate") %></th>
-                      <th>Balance</th>
+                      <th><%= t("views.right_panel.detail.balance") %></th>
-                      <th>From Account</th>
+                      <th><%= t("views.right_panel.detail.from_account") %></th>
-                      <th>Status</th>
+                      <th><%= t("views.right_panel.detail.status") %></th>
-                      <th>Receipt No</th>
+                      <th><%= t("views.right_panel.detail.receipt_no") %></th>
                     </tr>
                     
                     <% 
@@ -225,10 +225,10 @@
                   <table class="table table-striped">
                   <thead>
                     <tr>
-                      <th>Action </th>
+                      <th><%= t("views.right_panel.detail.action") %></th>
-                      <th>Action At</th>
+                      <th><%= t("views.right_panel.detail.action_at") %></th>
-                      <th>Approved At</th>
+                      <th><%= t("views.right_panel.detail.approved_at") %></th>
-                      <th>Remark</th>
+                      <th><%= t("views.right_panel.detail.remark") %></th>
                     </tr>
                   </thead>
 

config/initializers/assets.rb

@@ -48,3 +48,4 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
+

config/locales/en.yml

@@ -21,6 +21,7 @@ en:
   products: "Products"
   promotions: "Promotions"
   commissions: "Commissions"
+  commissioner: "Commissioner"
   commissioners: "Commissioners"
   printer: "Printer"
   logout: "Logout"
@@ -59,6 +60,12 @@ en:
   shift_started_at: "Shift Started At"
   cashier_name: "Cashier Name"
   closing_balance: "Closing Balance"
+  card_tap: "Card Tap"
+  customer_details: "Customer Details"
+  order_details: "Order Details"
+  sale_details: "Sale Details"
+  inventory_definitions: "Inventory Definitions"
+  sale_audits: "Sale Audits"
 
   views:
     btn:
@@ -142,6 +149,7 @@ en:
         order_queue_stations: "Order Queue Stations"
         cashier_terminal: "Cashier Terminal"
         print_settings: "Print Settings"
+        transaction_sales: "Transactions Sales"
       button:
         new: "NEW"
         create: "CREATE"
@@ -168,6 +176,8 @@ en:
         queue: "QUEUE"
         save: "SAVE"
         finish: "FINISH"
+        save_to_journal: "Save to Journal"
+        search_keyboard: "Search Keyword"
       detail:
         name: "Name"
         type: "Type"
@@ -180,6 +190,7 @@ en:
         created_at: "Created at"
         updated_at: "Updated at"
         action: "Action"
+        action_at: "Action At"
         actions: "Actions"
         item_code: "Item code"
         unit_price: "Unit price"
@@ -308,6 +319,108 @@ en:
         level: "Level"
         balance: "Balance"
         set_stock_check_reason: "Set Stock Check Reason"
+        salutation: "Salutation"
+        mr: "Mr"
+        miss: "Miss"
+        mrs: "Mrs"
+        mdm: "Mdm"
+        gender: "Gender"
+        male: "Male"
+        female: "Female"
+        sr_no: "Sr.No"
+        date_of_birth: "Date Of Birth"
+        select_customer_type: "Select Customer Type"
+        paypar_account_no: "Paypar Account No"
+        select_membership_group: "Select Membership Group"
+        company: "Company"
+        nrc_passport_no: "NRC/Passport No"
+        address: "Address"
+        dob: "DOB"
+        membership_type: "Membership Type"
+        discount_amount: "Discount Amount"
+        from_account: "From Account"
+        receipt_no: "Receipt No"
+        order_id: "Order ID"
+        order_date: "Order date"
+        sale_id: "Sale ID"
+        grand_total: "Grand Total"
+        tax_amount: "Tax Amount"
+        sales_status: "Sales Status"
+        receipt_date: "Receipt Date"
+        check_by: "Check By"
+        check_at: "Check At"
+        reason: "Reason"
+        stock_count: "Stock Count"
+        stock_balance: "Stock Balance"
+        different: "Different"
+        order: "Order"
+        from: "From"
+        to: "To"
+        order_status: "Order Status"
+        order_items: "Order Items"
+        total_price: "Total price"
+        enter_keyboards: "Enter Keywords"
+        receipt_generated_at: "Receipt generated at"
+        total: "Total"
+        total_pay_amount: "Total Pay Amount"
+        change: "Change"
+        option: "Option"
+        waiter: "Waiter"
+        membership_transactions: "Membership Transactions"
+        redeem: "Redeem"
+        approved_at: "Approved At"
+        credit_note: "Credit Note"
+        requested_by: "Requested by"
+        requested_at: "Requested at"
+        payment_status: "Payment status"
+        sale_status: "Sale status"
+        total_amount: "Total amount"
+        total_discount: "Total discount"
+        total_tax: "Total tax"
+        tax_type: "Tax type"
+        rnd_adj: "Rounding adjustment"
+        amt_received: "Amount received"
+        amt_changed: "Amount changed"
+        select_customer: "Select Customer"
+        credit_amount: "Credit Amount"
+        daily_sale_report: "Daily Sale Report"
+        from_date: "From Date"
+        to_date: "To Date"
+        sr: "Sr"
+        void_amount: "Void Amount"
+        mpu_sales: "MPU Sales"
+        master_sales: "Master Sales"
+        visa_sales: "Visa Sales"
+        jcb_sales: "JCB Sales"
+        redeem_sales: "Redeem Sales"
+        cash_sales: "Cash Sales"
+        credit_sales: "Credit Sales"
+        foc_sales: "FOC Sales"
+        net_amount: "Net Amount"
+        sale_item_report: "Sale Item Report"
+        select_period: "Select Period"
+        shift_name: "Shift Name"
+        code: "Code"
+        item: "Item"
+        revenue: "Revenue"
+        total_price_by: "Total Price By"
+        sub_total: "Sub Total"
+        cash_received: "Cash Received"
+        card_sales: "Card Sales"
+        select_payments: "Select Payments"
+        all_shift: "All Shift"
+        receipt_no_report: "Receipt No Report"
+        rnd_adj_sh: "Rounding Adj."
+        shift_sale_report: "Shift Sale Report"
+        cashier_station: "Cashier Station"
+        cash_payment: "Cash Payment"
+        credit_payment: "Credit Payment"
+        credit_payment_report: "Credit Payment Report"
+        void_sale_report: "Void Sale Report"
+        sale_date: "Sale Date"
+        commission_report: "Commission Report"
+        commission_price: "Commission Price"
+        commission_amount: "Commission Amount"
         
         code_txt: "code "
         charge_txt: "charge"
@@ -464,6 +577,7 @@ en:
         stock_check_reason_txt: "stock check reason"
         stock_check_txt: "stock check"
         detail_txt: "detail"
+        no_data_txt: "There is no data for search"
 
         assign_txt: "to assign "
         remove_txt: "to remove "
@@ -477,6 +591,7 @@ en:
         edit_btn_txt: "to edit "
         delete_btn_txt: "to delete "
         update_btn_txt: "to update "
+
   helpers:
     page_entries_info:
       one_page:

config/locales/mm.yml

@@ -38,7 +38,7 @@ mm:
   category: "အမျိုးအစား"
   processed: "လုပ်ဆောင်ခဲ့ပြီး"
   completed: "ဆောင်ရွက်ပြီးစီး"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
   payment_methods: "Payment Methods"
   accounts: "Accounts"