diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js index c62b3f87..f670db1f 100755 --- a/app/assets/javascripts/BSBMaterial/admin.js +++ b/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(); diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js index 87f67674..6121099e 100755 --- a/app/assets/javascripts/BSBMaterial/demo.js +++ b/app/assets/javascripts/BSBMaterial/demo.js @@ -1,4 +1,4 @@ -$(document).on('turbolinks:load', function () { +$(document).ready(function() { skinChanger(); activateNotificationAndTasksScroll(); diff --git a/app/assets/javascripts/BSBMaterial/pages/index.js b/app/assets/javascripts/BSBMaterial/pages/index.js index 7c3c3a39..5db70e5c 100755 --- a/app/assets/javascripts/BSBMaterial/pages/index.js +++ b/app/assets/javascripts/BSBMaterial/pages/index.js @@ -1,4 +1,4 @@ -$(document).on('turbolinks:load', function () { +$(document).ready(function(){ //Widgets count $('.count-to').countTo(); diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 620e7490..4d66cfab 100755 --- a/app/assets/javascripts/OQS.js +++ b/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') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 296d51c7..c886fec3 100755 --- a/app/assets/javascripts/application.js +++ b/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, diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 0bedd12a..d18a4726 100644 --- a/app/assets/javascripts/custom.js +++ b/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"); } diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js index 18d50be5..92005cdb 100755 --- a/app/assets/javascripts/login.js +++ b/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 \ No newline at end of file diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index d6ad05e6..84799a93 100755 --- a/app/assets/javascripts/origami.js +++ b/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({ - format: 'DD-MM-YYYY - HH:mm', - clearButton: true, - weekStart: 1 - }); + $('.datetimepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY - HH:mm', + clearButton: true, + weekStart: 1 + }); - $('.datepicker').bootstrapMaterialDatePicker({ - format: 'DD-MM-YYYY', - clearButton: true, - weekStart: 1, - time: false - }); + $('.datepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY', + clearButton: true, + weekStart: 1, + 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(); diff --git a/app/assets/javascripts/settings/processing_items.js b/app/assets/javascripts/settings/processing_items.js index 60c53ba4..73d8f66a 100755 --- a/app/assets/javascripts/settings/processing_items.js +++ b/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")); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a032998a..b7bcb027 100755 --- a/app/assets/stylesheets/application.scss +++ b/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; diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 29ef2e6e..030b0fe1 100755 --- a/app/assets/stylesheets/login.scss +++ b/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"; diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 24c4aceb..71ed8d07 100755 --- a/app/controllers/home_controller.rb +++ b/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 diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 2ea211fa..27e18e39 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -19,13 +19,14 @@ class Origami::VoidController < BaseOrigamiController sale.sale_status = 'void' sale.save - bookings = sale.bookings - bookings.each do |booking| - orders = booking.orders - orders.each do |order| - # order.status = 'void' - end - end + # No Need + # bookings = sale.bookings + # bookings.each do |booking| + # orders = booking.orders + # orders.each do |order| + # # order.status = 'void' + # end + # end table_avaliable = true table = sale.bookings[0].dining_facility diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb index 0d6fe012..300603a3 100755 --- a/app/views/crm/customers/_new_form.html.erb +++ b/app/views/crm/customers/_new_form.html.erb @@ -4,14 +4,14 @@ <%= f.hidden_field :id, :class => "form-control " %>
-
- +
+ <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%> - + <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%> - + <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%> - + <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
@@ -27,11 +27,11 @@
-
- +
+ <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%> - - <%= 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"%>
@@ -75,7 +75,7 @@
- +
@@ -83,12 +83,12 @@
- + <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
- +
@@ -120,9 +120,9 @@
- +
- + - - + + <% end %> diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 4527f7cf..640e8ef6 100755 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -5,13 +5,13 @@ @@ -24,15 +24,15 @@ - - - - - - - - - + + + + + + + + + @@ -65,13 +65,13 @@
Card NoNameCompanyContact noEmailNRC/Passport NoAddressDOBMembership Type<%= t("views.right_panel.detail.card_no") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.company") %><%= t("views.right_panel.detail.contact_no") %><%= t("views.right_panel.detail.email") %><%= t("views.right_panel.detail.nrc_passport_no") %><%= t("views.right_panel.detail.address") %><%= t("views.right_panel.detail.dob") %><%= t("views.right_panel.detail.membership_type") %>
- + - + - - - + + + @@ -97,16 +97,17 @@
-

Order Details

+

<%= t :order_details %>

Date<%= t("views.right_panel.detail.date") %> Discount Amount<%= t("views.right_panel.detail.discount_amount") %> From AccountStatusReceipt No<%= t("views.right_panel.detail.from_account") %><%= t("views.right_panel.detail.status") %><%= t("views.right_panel.detail.receipt_no") %>
- - - - - + + + + + + @@ -127,18 +128,18 @@
-

Sale Details

+

<%= t :sale_details %>

Order ID TypeOrder statusOrder dateItems Count<%= t("views.right_panel.detail.order_id") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.order_status") %><%= t("views.right_panel.detail.order_date") %><%= t("views.right_panel.detail.items_count") %>
- - - - - - - + + + + + + + @@ -166,7 +167,7 @@


- Back + <%= t("views.btn.back") %>
diff --git a/app/views/inventory/inventory_definitions/index.html.erb b/app/views/inventory/inventory_definitions/index.html.erb index e13d1359..943f47cf 100755 --- a/app/views/inventory/inventory_definitions/index.html.erb +++ b/app/views/inventory/inventory_definitions/index.html.erb @@ -1,7 +1,7 @@

<%= notice %>

-

Inventory Definitions

+

<%= t :inventory_definitions %>

Sale Id Receipt no Grand totalTax amountCashierSales statusReceipt Date<%= t("views.right_panel.detail.sale_id") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.tax_amount") %><%= t :cashier %><%= t("views.right_panel.detail.sales_status") %><%= t("views.right_panel.detail.receipt_date") %>
diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb index e4a752cc..08dd4239 100755 --- a/app/views/inventory/inventory_definitions/new.html.erb +++ b/app/views/inventory/inventory_definitions/new.html.erb @@ -1,7 +1,7 @@
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.product") %> <%= t :inventory %>
    3. +
  3. <%= t :inventory %>
  4. <%= t("views.btn.new") %>
    5. <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %> diff --git a/app/views/inventory/stock_checks/show.html.erb b/app/views/inventory/stock_checks/show.html.erb index fca98c9b..a6c45b7e 100755 --- a/app/views/inventory/stock_checks/show.html.erb +++ b/app/views/inventory/stock_checks/show.html.erb @@ -1,8 +1,8 @@
      -
    1. Home
      2. -
    2. Stock Check
      3. -
    3. Detail
      4. +
    4. <%= t("views.right_panel.button.home") %>
      5. +
    5. <%= t("views.right_panel.detail.stock_check") %>
      6. +
    6. <%= t :details %>
      7. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -16,7 +16,7 @@
      - Check by + <%= t("views.right_panel.detail.check_by") %>
      <%= Employee.find(@check.check_by).name rescue '' %> @@ -24,7 +24,7 @@
      - Check At + <%= t("views.right_panel.detail.check_at") %>
      <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %> @@ -32,7 +32,7 @@
      - Reason + <%= t("views.right_panel.detail.reason") %>
      <%= @check.reason %> @@ -44,11 +44,11 @@
- - - - - + + + + + <% count = 0 @@ -79,8 +79,8 @@
- - + +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index eb89e4f4..24197c5a 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,14 +4,14 @@ - + SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_include_tag 'application' %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index b6c2807b..e6cf13ce 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -10,9 +10,9 @@ - - - + + @@ -88,6 +88,7 @@ <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> +<<<<<<< HEAD
@@ -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| %> +
+
+
+ <%= f.input :emp_id, as: :hidden, required: false, class: "form-control" %> + + <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> +
+
+
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
CLR
+
0
+
ENT
+
+
+
+ <% end %> +
+ \ No newline at end of file + \ No newline at end of file diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb index dc7e1f69..30be6ae5 100755 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -55,11 +55,3 @@
- - diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index 7c5427a9..d48d0e8d 100755 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -43,10 +43,3 @@ - - diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb index c26e9b1d..ab600e6d 100755 --- a/app/views/settings/item_sets/_form.html.erb +++ b/app/views/settings/item_sets/_form.html.erb @@ -40,8 +40,4 @@ - + diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb index 4beb4ba4..8196a906 100755 --- a/app/views/settings/lookups/_form.html.erb +++ b/app/views/settings/lookups/_form.html.erb @@ -28,8 +28,4 @@ - + diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index 6938dcb4..b2524a1c 100755 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -30,8 +30,4 @@ - + diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb index d81025ea..19361bb4 100755 --- a/app/views/settings/membership_settings/_form.html.erb +++ b/app/views/settings/membership_settings/_form.html.erb @@ -32,8 +32,4 @@ - + diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb index b40e2579..a0a0137f 100755 --- a/app/views/settings/menu_categories/_form.html.erb +++ b/app/views/settings/menu_categories/_form.html.erb @@ -44,8 +44,4 @@ - + diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb index a6eecce6..71ba75bf 100755 --- a/app/views/settings/menu_item_attributes/_form.html.erb +++ b/app/views/settings/menu_item_attributes/_form.html.erb @@ -36,8 +36,4 @@ - + diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb index f6ff0721..266be9e5 100755 --- a/app/views/settings/menu_item_options/_form.html.erb +++ b/app/views/settings/menu_item_options/_form.html.erb @@ -37,8 +37,4 @@ - + diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb index 35178914..31688a80 100755 --- a/app/views/settings/menu_item_sets/_form.html.erb +++ b/app/views/settings/menu_item_sets/_form.html.erb @@ -26,8 +26,4 @@ - + diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb index 458b4baf..5b103395 100755 --- a/app/views/settings/menus/_form.html.erb +++ b/app/views/settings/menus/_form.html.erb @@ -66,8 +66,4 @@ - + diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 3aca6ff0..97792930 100755 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -59,8 +59,4 @@ div.form-inputs span{ - + diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index db1a2aca..43804214 100755 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -46,8 +46,4 @@ - + diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 3faa3dc4..48b45dfc 100755 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -85,8 +85,4 @@ - + diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb index 1bbd2c7f..a1a448ba 100755 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -20,8 +20,7 @@ <% if f.object.image_path? %>

<%= f.object.name %>

<%= image_tag f.object.image_path.url, :class => "img-thumbnail" %> - <% else %> -

Sample Image

+ <% else %> <%= image_tag "/image/menu_images/default.png", :class => "img-thumbnail" %> <% end %> @@ -63,8 +62,4 @@ - + diff --git a/app/views/settings/promotion_products/_form.html.erb b/app/views/settings/promotion_products/_form.html.erb index 299c9631..267d23a5 100755 --- a/app/views/settings/promotion_products/_form.html.erb +++ b/app/views/settings/promotion_products/_form.html.erb @@ -45,8 +45,4 @@ - + diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb index 7567e786..a9f0ff57 100755 --- a/app/views/settings/rooms/_form.html.erb +++ b/app/views/settings/rooms/_form.html.erb @@ -77,8 +77,4 @@ - + diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb index 24c4cf06..6f08b811 100755 --- a/app/views/settings/set_menu_items/_form.html.erb +++ b/app/views/settings/set_menu_items/_form.html.erb @@ -91,8 +91,4 @@ - + diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 925372ee..e5ca90c1 100755 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -81,8 +81,4 @@ - + diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb index 233a28b7..d3701079 100755 --- a/app/views/settings/tables/_form.html.erb +++ b/app/views/settings/tables/_form.html.erb @@ -72,8 +72,4 @@ - + diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb index 718d6811..5f2f3347 100755 --- a/app/views/settings/tax_profiles/_form.html.erb +++ b/app/views/settings/tax_profiles/_form.html.erb @@ -41,9 +41,5 @@ - + diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index 5ae4132b..0c80e661 100755 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -35,8 +35,3 @@ - \ No newline at end of file diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index 3250fd2d..0886565f 100755 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -11,8 +11,8 @@ -->
    -
  1. Home
    2. -
  2. Credit Note
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.credit_note") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -29,13 +29,13 @@ <%= form_tag transactions_credit_notes_path, :method => :get do %>
    - +
    - +
    - +
    - +
    @@ -70,12 +70,12 @@
#ProductStock CountStock BalanceDifferentRemark<%= t("views.right_panel.detail.product") %><%= t("views.right_panel.detail.stock_count") %><%= t("views.right_panel.detail.stock_balance") %><%= t("views.right_panel.detail.different") %><%= t("views.right_panel.detail.remark") %>
- - - - - - + + + + + + @@ -95,7 +95,7 @@ <% end %> <% else %> - + <% end %>
Sale Id Receipt no Credit AmountCashierCustomer NameReceipt Date<%= t("views.right_panel.detail.sale_id") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.credit_amount") %><%= t :cashier %><%= t :customer %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.receipt_date") %>

There is no data for search....

<%= t("views.right_panel.detail.no_data_txt") %>....
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index e3f0f91d..0633f8e8 100755 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -1,8 +1,8 @@
    -
  1. Home
    2. -
  2. Order
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.order") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -14,7 +14,7 @@ <%= form_tag transactions_orders_path, :method => :get do %>
    - +
    - +
    - +
    @@ -47,12 +47,12 @@ - Order ID - Type - Customer - Order status - Order date - Items Count + <%= t("views.right_panel.detail.order_id") %> + <%= t("views.right_panel.detail.type") %> + <%= t :customer %> + <%= t("views.right_panel.detail.order_status") %> + <%= t("views.right_panel.detail.order_date") %> + <%= t("views.right_panel.detail.items_count") %> diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb index 4820a4e1..1675649a 100755 --- a/app/views/transactions/orders/show.html.erb +++ b/app/views/transactions/orders/show.html.erb @@ -1,8 +1,8 @@
      -
    1. Home
      2. -
    2. Order
      3. -
    3. Details
      4. +
    4. <%= t("views.right_panel.button.home") %>
      5. +
    5. <%= t("views.right_panel.detail.order") %>
      6. +
    6. <%= t :details %>
      7. <%= link_to 'Back', transactions_orders_path %> @@ -17,11 +17,11 @@ - - - - - + + + + + @@ -35,18 +35,18 @@
      TypeCustomerOrder statusOrder dateOrder By<%= t("views.right_panel.detail.type") %><%= t :customer %><%= t("views.right_panel.detail.order_status") %><%= t("views.right_panel.detail.order_date") %><%= t("views.right_panel.detail.order_by") %>
      -

      Order Items

      +

      <%= t("views.right_panel.detail.order_items") %>

      - - - - + + + + - - - + + + diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index 6a534715..d5a39ace 100755 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -1,7 +1,7 @@
        -
      1. Home
        2. -
      2. Sale
        3. +
      3. <%= t("views.right_panel.button.home") %>
        4. +
      4. <%= t :sale %>
        5. <%= link_to 'Back', dashboard_path %> @@ -18,15 +18,15 @@ <%= form_tag transactions_sales_path, :method => :get do %>
        - +
        - +
        - +
        @@ -51,13 +51,13 @@
      - - - - - - - + + + + + + + diff --git a/app/views/transactions/sales/indexback.html.erb b/app/views/transactions/sales/indexback.html.erb index 52e975d1..fe8c820a 100755 --- a/app/views/transactions/sales/indexback.html.erb +++ b/app/views/transactions/sales/indexback.html.erb @@ -1,27 +1,27 @@

      <%= notice %>

      -

      Transactions Sales

      +

      <%= t("views.right_panel.header.transactions_sales") %>

      Item NameQty Unit PriceTotal Price<%= t("views.right_panel.detail.item") +" "+ t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.qty") %><%= t("views.right_panel.detail.unit_price") %><%= t("views.right_panel.detail.total_price") %> StatusOrder ByCreated at<%= t("views.right_panel.detail.status") %><%= t("views.right_panel.detail.order_by") %><%= t("views.right_panel.detail.created_at") %>
      Sale Id Receipt no Grand totalTax amountCashierSales statusReceipt Date<%= t("views.right_panel.detail.sale_id") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.tax_amount") %><%= t :cashier %><%= t("views.right_panel.detail.sales_status") %><%= t("views.right_panel.detail.receipt_date") %>
      - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 4aa9a4b8..ce7a466a 100755 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -1,9 +1,9 @@
        -
      1. Home
        2. -
      2. Sales
        3. -
      3. Details
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t :sale %>
        6. +
      6. <%= t :details %>
        7. <%= link_to 'Back', transactions_sales_path %> @@ -16,16 +16,16 @@ @@ -38,11 +38,11 @@
      - - - - - + + + + + @@ -55,11 +55,11 @@ - - - - - + + + + + <% @sale.sale_items.each do |s| %> @@ -73,12 +73,12 @@ <% end %> - + - + <% @sale.sale_taxes.each do |r|%> @@ -90,13 +90,13 @@ <% end %> - + - + @@ -113,7 +113,7 @@ - + @@ -128,14 +128,14 @@
      CashierCashier nameRequested byRequested atReceipt noReceipt dateCustomerPayment statusSale statusTotal amountTotal discountTotal taxTax typeGrand totalRounding adjustmentAmount receivedAmount changed<%= t :cashier %><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %><%= t("views.right_panel.detail.requested_by") %><%= t("views.right_panel.detail.requested_at") %><%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.receipt_date") %><%= t :customer %><%= t("views.right_panel.detail.payment_status") %><%= t("views.right_panel.detail.sale_status") %><%= t("views.right_panel.detail.total_amount") %><%= t("views.right_panel.detail.total_discount") %><%= t("views.right_panel.detail.total_tax") %><%= t("views.right_panel.detail.tax_type") %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj") %><%= t("views.right_panel.detail.amt_received") %><%= t("views.right_panel.detail.amt_changed") %>
      Receipt Date Receipt noCashierSales statusReceipt generated at<%= t("views.right_panel.detail.receipt_date") %><%= t("views.right_panel.detail.receipt_no") %><%= t :cashier %><%= t("views.right_panel.detail.sales_status") %><%= t("views.right_panel.detail.receipt_generated_at") %>
      <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %>
      Sale item name QtyUnit priceTotal pirce Created at<%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %><%= t("views.right_panel.detail.qty") %><%= t("views.right_panel.detail.unit_price") %><%= t("views.right_panel.detail.total_price") %><%= t("views.right_panel.detail.created_at") %>
      Total<%= t("views.right_panel.detail.total") %> <%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%>
      Discount<%= t("views.right_panel.detail.discount") %> <%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%>
      Grand Total<%= t("views.right_panel.detail.grand_total") %> <%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%>
       
      Total Pay Amount<%= t("views.right_panel.detail.total_pay_amount") %> <%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%>
      Change<%= t("views.right_panel.detail.change") %> <%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%>
      - - - - - - - - + + + + + + + + @@ -163,14 +163,14 @@
      Order IDMenu ItemQTYUnit Price OptionStatusWaiterCreated at <%= t("views.right_panel.detail.order_id") %><%= t("views.right_panel.header.menu_item") %><%= t("views.right_panel.detail.qty") %><%= t("views.right_panel.detail.unit_price") %><%= t("views.right_panel.detail.option") %><%= t("views.right_panel.detail.status") %><%= t("views.right_panel.detail.waiter") %><%= t("views.right_panel.detail.created_at") %>
      - - - - - - - - + + + + + + + + @@ -187,16 +187,16 @@ - + - - - - - - - + + + + + + + <% @@ -225,10 +225,10 @@
      Card NoNameCompanyContact noEmailNRC/Passport NoAddressDOB<%= t("views.right_panel.detail.card_no") %><%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.company") %><%= t("views.right_panel.detail.contact_no") %><%= t("views.right_panel.detail.email") %><%= t("views.right_panel.detail.nrc_passport_no") %><%= t("views.right_panel.detail.address") %><%= t("views.right_panel.detail.dob") %>
      Membership Transactions<%= t("views.right_panel.detail.membership_transactions") %>
      DateRedeemRebateBalanceFrom AccountStatusReceipt No<%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.redeem") %><%= t("views.right_panel.detail.rebate") %><%= t("views.right_panel.detail.balance") %><%= t("views.right_panel.detail.from_account") %><%= t("views.right_panel.detail.status") %><%= t("views.right_panel.detail.receipt_no") %>
      - - - - + + + + diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index f0799d68..973000b4 100755 --- a/config/initializers/assets.rb +++ b/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 ) + diff --git a/config/locales/en.yml b/config/locales/en.yml index ee597fa6..f8146589 100755 --- a/config/locales/en.yml +++ b/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: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 52faa938..54239960 100755 --- a/config/locales/mm.yml +++ b/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"
      Action Action AtApproved AtRemark<%= t("views.right_panel.detail.action") %><%= t("views.right_panel.detail.action_at") %><%= t("views.right_panel.detail.approved_at") %><%= t("views.right_panel.detail.remark") %>