diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index c14ec832..df9c0950 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -1,8 +1,8 @@
-
SALE COUNT
+
<%= t :sale_count %>
@@ -22,7 +22,7 @@ attach_money
-
TOTAL SALE
+
<%= t :total_sale %>
@@ -34,7 +34,7 @@ person_add
-
TOTAL CREDIT
+
<%= t :total_credit %>
@@ -45,7 +45,7 @@ credit_card
-
TOTAL CARD
+
<%= t :total_card %>
diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb index bd5f5c38..ff6ccd5d 100755 --- a/app/views/inventory/inventory/_inventory_list.html.erb +++ b/app/views/inventory/inventory/_inventory_list.html.erb @@ -2,11 +2,11 @@ - - - - - + + + + + <% count = 0 diff --git a/app/views/inventory/inventory/index.html.erb b/app/views/inventory/inventory/index.html.erb index ab6b3855..ee62697c 100755 --- a/app/views/inventory/inventory/index.html.erb +++ b/app/views/inventory/inventory/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Inventory
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t :inventory %>
    5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -12,9 +12,9 @@
    - - +
    @@ -25,18 +25,21 @@
    -
    list BUTTON LISTS
    +
    list <%= t("views.right_panel.header.button_lists") %>

    - 1) <%= t("views.btn.new") + " " + (t :inventory) %> - to create new inventory
    + 1) <%= t("views.btn.new") + " " + (t :inventory) %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %>

    - 2) New Stock Taking - to create new Stock Taking
    + 2) <%= t("views.btn.new") + " " + t("views.right_panel.detail.stock_taking") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_taking_txt") %>

    - 3) Stock Check Report - to go Stock Check Report List
    + 3) <%= t("views.right_panel.detail.stock_check_report") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.stock_check_report_txt") %>

    -
    list LINK LISTS
    -

    1) Home / Back - go to dashboard

    +
    list <%= t("views.right_panel.header.link_lists") %>
    +

    + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
    + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %>
    +

    diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index e7f3198d..07db604b 100755 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -57,23 +57,23 @@
    -
    list INPUT LISTS
    +
    view_headline <%= t("views.right_panel.header.page_detail") %>

    - 1) Select Item - select to create for new inventory
    + 1) <%= t("views.right_panel.detail.select_item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %>
    + 2) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.item_code_txt2") %>
    + 3) <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_order_level_txt") %>
    + 4) <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.level") %> - <%= t("views.right_panel.detail.write_txt") %><%= t("views.right_panel.detail.max_stock_level_txt") %>

    -

    - 2) Min Order Level - to write minimun number with type Integer/Numeric
    -

    -

    - 3) Max Stock Level - to write minimun number with type Integer/Numeric for check stock
    -

    -
    list BUTTON LISTS
    +
    list <%= t("views.right_panel.header.button_lists") %>

    - 1) <%= t("views.btn.submit") %> - to create new inventory
    + 1) <%= t("views.btn.submit") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %>

    -
    list LINK LISTS
    -

    1) Home / Back - go to dashboard

    +
    list <%= t("views.right_panel.header.link_lists") %>
    +

    + 1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %>
    + 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.home_txt") %>
    +

    diff --git a/app/views/inventory/inventory_definitions/edit.html.erb b/app/views/inventory/inventory_definitions/edit.html.erb index b6d6a7bb..ccc9da73 100755 --- a/app/views/inventory/inventory_definitions/edit.html.erb +++ b/app/views/inventory/inventory_definitions/edit.html.erb @@ -1,9 +1,9 @@
    <%= render 'form', inventory: @inventory_definition %> diff --git a/app/views/inventory/inventory_definitions/new.html.erb b/app/views/inventory/inventory_definitions/new.html.erb index db699913..e4a752cc 100755 --- a/app/views/inventory/inventory_definitions/new.html.erb +++ b/app/views/inventory/inventory_definitions/new.html.erb @@ -1,8 +1,8 @@
      -
    1. Home
      2. -
    2. Product Inventory
      3. -
    3. New
      4. +
    4. <%= t("views.right_panel.button.home") %>
      5. +
    5. <%= t("views.right_panel.detail.product") %> <%= t :inventory %>
      6. +
    6. <%= t("views.btn.new") %>
      7. <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %> diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb index 8d133815..318e7c1b 100755 --- a/app/views/inventory/stock_checks/index.html.erb +++ b/app/views/inventory/stock_checks/index.html.erb @@ -1,7 +1,7 @@
        -
      1. Home
        2. -
      2. Stock Check
        3. +
      3. <%= t("views.right_panel.button.home") %>
        4. +
      4. <%= t("views.right_panel.detail.stock_check") %>
        5. <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> @@ -60,9 +60,9 @@
#ProductMin OrderMax StockCreated byCreated Time<%= t("views.right_panel.detail.product") %><%= t("views.right_panel.detail.min_order") %><%= t("views.right_panel.detail.max_stock") %><%= t("views.right_panel.detail.created_by") %><%= t("views.right_panel.detail.created_time") %>
- - - + + + <%= link_to 'Back', dashboard_path %> diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb index 405286d3..2d63d8ae 100755 --- a/app/views/origami/cash_ins/new.html.erb +++ b/app/views/origami/cash_ins/new.html.erb @@ -1,42 +1,42 @@
-

Cash In

+

<%= t :cash_in %>


ProductBalance<%= t("views.right_panel.detail.product") %><%= t("views.right_panel.detail.balance") %>
- - - - -
Payment Reference + <%= t :payment_reference %>
Remark + <%= t("views.right_panel.detail.remark") %>
Payment Method + <%= t :payment_method %> - - - - + + + +
Reference Number + <%= t :reference_number %>
Amount + <%= t("views.right_panel.detail.amount") %> @@ -46,8 +46,8 @@
- - + +
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb index c503f4dc..e90337bf 100755 --- a/app/views/origami/cash_outs/new.html.erb +++ b/app/views/origami/cash_outs/new.html.erb @@ -1,26 +1,26 @@
-

Cash Out

+

<%= t :cash_out %>

- + - + - +
Payment Reference <%= t :payment_reference %>
Remark <%= t("views.right_panel.detail.remark") %>
Amount <%= t("views.right_panel.detail.amount") %>


- - + +
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 5e565f6b..b6a83f30 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -6,16 +6,16 @@ @@ -106,14 +106,14 @@
- - + + - + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %> - <%end%> diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb index be924d4c..c805ff48 100755 --- a/app/views/origami/shifts/show.html.erb +++ b/app/views/origami/shifts/show.html.erb @@ -1,15 +1,15 @@
-

Close Cashier

+

<%= t :close_cashier %>


- + - + @@ -17,7 +17,7 @@
- Closing Balance + <%= t :closing_balance %>
@@ -25,8 +25,8 @@
- - + +
diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb index c1cf0ac3..a7fc38e2 100755 --- a/app/views/print_settings/show.html.erb +++ b/app/views/print_settings/show.html.erb @@ -2,7 +2,7 @@
  1. <%= t("views.right_panel.button.home") %>
  2. <%= t("views.right_panel.header.print_settings") %>
    3. -
  3. <%= t("en.details") %>
    4. +
  4. <%= t :details %>
    5. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index b51e0c61..4c28f27c 100755 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -3,7 +3,7 @@
    1. <%= t("views.right_panel.button.home") %>
    2. <%= t("views.right_panel.detail.account") %>
      3. -
    3. <%= t("en.details") %>
      4. +
    4. <%= t :details %>
      5. <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %> diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb index 84d454f6..aa0c6596 100755 --- a/app/views/settings/cashier_terminals/show.html.erb +++ b/app/views/settings/cashier_terminals/show.html.erb @@ -2,7 +2,7 @@
      1. <%= t("views.right_panel.button.home") %>
      2. <%= t("views.right_panel.header.cashier_terminal") %>
        3. -
      3. <%= t("en.details") %>
        4. +
      4. <%= t :details %>
        5. <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index 2bc0d39c..8f51b20c 100755 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -2,7 +2,7 @@
        1. <%= t("views.right_panel.button.home") %>
        2. <%= t("en.commissioners") %>
          3. -
        3. <%= t("en.details") %>
          4. +
        4. <%= t :details %>
          5. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %> diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb index a74fbc0a..00157854 100755 --- a/app/views/settings/commissions/show.html.erb +++ b/app/views/settings/commissions/show.html.erb @@ -2,7 +2,7 @@
          1. <%= t("views.right_panel.button.home") %>
          2. <%= t("en.commissions") %>
            3. -
          3. <%= t("en.details") %>
            4. +
          4. <%= t :details %>
            5. <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %> diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index a689767f..0b26b1bf 100755 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -11,7 +11,7 @@
            1. <%= t("views.right_panel.button.home") %>
            2. <%= t("views.right_panel.detail.employee") %>
              3. -
            3. <%= t("en.details") %>
              4. +
            4. <%= t :details %>
              5. <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb index 21be5639..2d269d08 100755 --- a/app/views/settings/item_sets/show.html.erb +++ b/app/views/settings/item_sets/show.html.erb @@ -3,7 +3,7 @@
              1. <%= t("views.right_panel.button.home") %>
              2. <%= t("views.right_panel.detail.item_set") %>
                3. -
              3. <%= t("en.details") %>
                4. +
              4. <%= t :details %>
                5. <%= link_to t("views.btn.back"), settings_item_sets_path %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 7f37342b..12a31e6b 100755 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -2,7 +2,7 @@
                1. <%= t("views.right_panel.button.home") %>
                2. <%= t("views.right_panel.detail.menu_category") %>
                  3. -
                3. <%= t("en.details") %>
                  4. +
                4. <%= t :details %>
                  5. <%= link_to 'Back', settings_menu_categories_path %> diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb index 5f356a4d..7d1b8590 100755 --- a/app/views/settings/menu_item_attributes/show.html.erb +++ b/app/views/settings/menu_item_attributes/show.html.erb @@ -2,7 +2,7 @@
                  1. <%= t("views.right_panel.button.home") %>
                  2. <%= t("views.right_panel.header.menu_item_attributes") %>
                    3. -
                  3. <%= t("en.details") %>
                    4. +
                  4. <%= t :details %>
                    5. <%= link_to 'Back', settings_menu_item_attributes_path %> diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 17718e38..41b9bd57 100755 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -14,7 +14,7 @@
                    1. <%= t("views.right_panel.button.home") %>
                    2. <%= t("views.right_panel.header.menu_item") %>
                      3. -
                    3. <%= t("en.details") %>
                      4. +
                    4. <%= t :details %>
                      5. <%= link_to 'Back', settings_menu_category_simple_menu_item_path(@category,@item) %> diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 170f8d75..9eb2face 100755 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -3,7 +3,7 @@
                      1. <%= t("views.right_panel.button.home") %>
                      2. <%= t("views.right_panel.header.menu_item_options") %>
                        3. -
                      3. <%= t("en.details") %>
                        4. +
                      4. <%= t :details %>
                        5. <%= link_to 'Back', settings_menu_item_options_path %> diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index e7f45f5b..d071069a 100755 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -2,7 +2,7 @@
                        1. <%= t("views.right_panel.button.home") %>
                        2. <%= t("en.menus") %>
                          3. -
                        3. <%= t("en.details") %>
                          4. +
                        4. <%= t :details %>
                          5. <%= link_to 'Back', settings_menus_path %> diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 0617476a..1c2fe292 100755 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -3,7 +3,7 @@
                          1. <%= t("views.right_panel.button.home") %>
                          2. <%= t("views.right_panel.header.order_queue_stations") %>
                            3. -
                          3. <%= t("en.details") %>
                            4. +
                          4. <%= t :details %>
                            5. <%= link_to t('.back', :default => t("views.btn.back")), settings_order_queue_stations_path %> diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb index 72ecafcf..7c0d4354 100755 --- a/app/views/settings/payment_method_settings/show.html.erb +++ b/app/views/settings/payment_method_settings/show.html.erb @@ -2,7 +2,7 @@
                            1. <%= t("views.right_panel.button.home") %>
                            2. <%= t("en.payment_methods") %>
                              3. -
                            3. <%= t("en.details") %>
                              4. +
                            4. <%= t :details %>
                              5. <%= link_to t('.back', :default => t("views.btn.back")), settings_payment_method_setting_path %> diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb index 701faa91..0e3d5aaf 100755 --- a/app/views/settings/products/show.html.erb +++ b/app/views/settings/products/show.html.erb @@ -2,7 +2,7 @@
                              1. <%= t("views.right_panel.button.home") %>
                              2. <%= t("views.right_panel.detail.product") %>
                                3. -
                              3. <%= t("en.details") %>
                                4. +
                              4. <%= t :details %>
                                5. <%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %> diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb index 277a4ab0..ebbd01ac 100755 --- a/app/views/settings/promotions/show.html.erb +++ b/app/views/settings/promotions/show.html.erb @@ -2,7 +2,7 @@
                                1. <%= t("views.right_panel.button.home") %>
                                2. <%= t("views.right_panel.detail.promotion") %>
                                  3. -
                                3. <%= t("en.details") %>
                                  4. +
                                4. <%= t :details %>
                                  5. <%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index ffdd037d..38814b69 100755 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -2,7 +2,7 @@
                                  1. <%= t("views.right_panel.button.home") %>
                                  2. <%= t("views.right_panel.header.menu_item") %>
                                    3. -
                                  3. <%= t("en.details") %>
                                    4. +
                                  4. <%= t :details %>
                                    5. <%= link_to 'Back', settings_menu_category_simple_menu_items_path(@category) %> diff --git a/app/views/settings/tax_profiles/show.html.erb b/app/views/settings/tax_profiles/show.html.erb index 821f16fc..77a503f2 100755 --- a/app/views/settings/tax_profiles/show.html.erb +++ b/app/views/settings/tax_profiles/show.html.erb @@ -2,7 +2,7 @@
                                    1. <%= t("views.right_panel.button.home") %>
                                    2. <%= t("en.tax_profile") %>
                                      3. -
                                    3. <%= t("en.details") %>
                                      4. +
                                    4. <%= t :details %>
                                      5. <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %> diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb index 0b73394d..5629e3ea 100755 --- a/app/views/settings/zones/show.html.erb +++ b/app/views/settings/zones/show.html.erb @@ -2,7 +2,7 @@
                                      • <%= t("views.right_panel.button.home") %>
                                      • <%= t("en.zones") %>
                                        • -
                                      • <%= t("en.details") %>
                                        • +
                                      • <%= t :details %>
                                        • <%= link_to t("views.btn.back"), settings_zones_path %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 82a3356d..ee597fa6 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,10 +39,26 @@ en: processed: "Processed" competed: "Completed" tax_profile: "Tax Profile" + payment_method: "Payment Method" payment_methods: "Payment Methods" accounts: "Accounts" details: "Details" menus: "Menus" + sale_count: "SALE COUNT" + total_sale: "TOTAL SALE" + total_credit: "TOTAL CREDIT" + total_card: "TOTAL CARD" + OQS: "OQS" + tables: "Tables" + rooms: "Rooms" + cash_in: "Cash In" + cash_out: "Cash Out" + close_cashier: "Close Cashier" + payment_reference: "Payment Reference" + reference_number: "Reference Number" + shift_started_at: "Shift Started At" + cashier_name: "Cashier Name" + closing_balance: "Closing Balance" views: btn: @@ -87,6 +103,9 @@ en: foc: "FOC" nett: "NETT" cash: "CASH" + mpu: "MPU" + jcb: "JCB" + visa: "VISA" credit: "CREDIT" other_payment: "Other Payment" percentage: "PERCENTAGE" @@ -147,6 +166,8 @@ en: assign_processing_items: "ASSIGN PROCESSING ITEMS" add_product: "ADD PRODUCT" queue: "QUEUE" + save: "SAVE" + finish: "FINISH" detail: name: "Name" type: "Type" @@ -158,6 +179,7 @@ en: created_by: "Created by" created_at: "Created at" updated_at: "Updated at" + action: "Action" actions: "Actions" item_code: "Item code" unit_price: "Unit price" @@ -208,6 +230,7 @@ en: font_size: "Font size" cut_per_print: "Cut per print" select_menu_items: "Select Menu Items" + select_item: "Select Item" employee: "Employee" role: "Role" employee_numeric_id: "Employee Numeric ID" @@ -266,12 +289,25 @@ en: qty: "Qty" date: "Date" queue_no: "Queue no" - contacct_no: "Contact no" + contact_no: "Contact no" remark: "Remark" can_get_points: "Can get Points" can_rebate: "Can rebate" is_available: "Is available" attribute_type: "Attribute type" + sr_no: "Sr.no" + card_no: "Card No" + email: "Email" + inventory: "inventory" + stock_taking: "Stock Taking" + stock_check: "Stock Check" + stock_check_report: "Stock Check Report" + min_order: "Min Order" + max_stock: "Max Stock" + created_time: "Created Time" + level: "Level" + balance: "Balance" + set_stock_check_reason: "Set Stock Check Reason" code_txt: "code " charge_txt: "charge" @@ -287,8 +323,8 @@ en: dashboard_txt: "dashboard" data_txt: " data" type_txt: "type" - home_txt: "go to dashboard" - back_txt: "go to " + home_txt: "to go dashboard" + back_txt: "to go" name_txt : " name / user can view" name_txt2: "name" is_active_txt : "is active or not" @@ -420,6 +456,14 @@ en: contacct_no_txt: "contact no" remark_txt: "remark" accounts_txt: "accounts" + stock_taking_txt: "stock taking" + stock_check_report_txt: "stock check report" + item_code_txt2: "item code" + min_order_level_txt: "minimum order level" + max_stock_level_txt: "maximum stock level" + stock_check_reason_txt: "stock check reason" + stock_check_txt: "stock check" + detail_txt: "detail" assign_txt: "to assign " remove_txt: "to remove "
Shift Started At<%= t :shift_started_at %> <%= @shift.shift_started_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %>
Cashier Name<%= t :cashier_name %> <%= @shift.employee.name rescue ''%>