From 5912b00d4349c779e5362c07f9bcf16dd5b50e2e Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 27 Oct 2017 18:15:34 +0630 Subject: [PATCH 01/13] add localization text for other modules --- app/views/crm/customers/index.html.erb | 16 +++--- app/views/home/dashboard.html.erb | 8 +-- .../inventory/_inventory_list.html.erb | 10 ++-- app/views/inventory/inventory/index.html.erb | 23 +++++---- .../inventory_definitions/_form.html.erb | 24 ++++----- .../inventory_definitions/edit.html.erb | 6 +-- .../inventory_definitions/new.html.erb | 6 +-- .../inventory/stock_checks/index.html.erb | 33 ++++++++---- app/views/oqs/home/index.html.erb | 4 +- app/views/origami/cash_ins/new.html.erb | 24 ++++----- app/views/origami/cash_outs/new.html.erb | 12 ++--- app/views/origami/home/index.html.erb | 16 +++--- app/views/origami/shifts/show.html.erb | 12 ++--- app/views/print_settings/show.html.erb | 2 +- app/views/settings/accounts/show.html.erb | 2 +- .../settings/cashier_terminals/show.html.erb | 2 +- .../settings/commissioners/show.html.erb | 2 +- app/views/settings/commissions/show.html.erb | 2 +- app/views/settings/employees/show.html.erb | 2 +- app/views/settings/item_sets/show.html.erb | 2 +- .../settings/menu_categories/show.html.erb | 2 +- .../menu_item_attributes/show.html.erb | 2 +- .../menu_item_instances/show.html.erb | 2 +- .../settings/menu_item_options/show.html.erb | 2 +- app/views/settings/menus/show.html.erb | 2 +- .../order_queue_stations/show.html.erb | 2 +- .../payment_method_settings/show.html.erb | 2 +- app/views/settings/products/show.html.erb | 2 +- app/views/settings/promotions/show.html.erb | 2 +- .../settings/simple_menu_items/show.html.erb | 2 +- app/views/settings/tax_profiles/show.html.erb | 2 +- app/views/settings/zones/show.html.erb | 2 +- config/locales/en.yml | 50 +++++++++++++++++-- 33 files changed, 170 insertions(+), 112 deletions(-) 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") %>
- - - - - - - - - - - + + + + + + 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 @@
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 " From ae5dfaf19251f8b93590989f6cabde7878bd7954 Mon Sep 17 00:00:00 2001 From: Yan Date: Sun, 29 Oct 2017 14:20:24 +0630 Subject: [PATCH 02/13] test for no work js,it cause by turbolink --- app/assets/javascripts/BSBMaterial/admin.js | 2 +- app/assets/javascripts/BSBMaterial/demo.js | 2 +- .../javascripts/BSBMaterial/pages/index.js | 2 +- app/assets/javascripts/application.js | 18 +++++++++++++----- app/assets/javascripts/custom.js | 4 ++-- app/views/settings/zones/_form.html.erb | 5 ----- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js index c62b3f87..e93b0186 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..85f632ea 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/application.js b/app/assets/javascripts/application.js index 050231d3..b0c67ce0 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,9 +16,6 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_nested_form //= require jquery_ujs -//= require turbolinks -//= require cable -//= require settings/processing_items //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require multi-select/js/jquery.multi-select.js @@ -32,12 +29,23 @@ //= require morrisjs/morris.js //= require chartjs/Chart.bundle.js //= require fileinput.min +//= require turbolinks +//= require cable +//= 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 0a089be7..18e16e8d 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({ 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 From 8d12acb530db11777ec38260b8944743d6815426 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 30 Oct 2017 10:09:22 +0630 Subject: [PATCH 03/13] test for select --- app/assets/javascripts/application.js | 1 - app/assets/stylesheets/application.scss | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b0c67ce0..6c2b2c4d 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,7 +29,6 @@ //= require morrisjs/morris.js //= require chartjs/Chart.bundle.js //= require fileinput.min -//= require turbolinks //= require cable //= require settings/processing_items //= require BSBMaterial/admin.js diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 70824f58..7bb2d879 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; From 74e90c98d39315d45bd927809079662d67258705 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 30 Oct 2017 10:27:54 +0630 Subject: [PATCH 04/13] add localization text for inventory --- app/views/crm/customers/_new_form.html.erb | 40 ++++++------ app/views/crm/customers/index.html.erb | 6 +- app/views/crm/customers/show.html.erb | 65 ++++++++++--------- .../inventory_definitions/index.html.erb | 2 +- .../inventory_definitions/new.html.erb | 2 +- config/locales/en.yml | 34 ++++++++++ 6 files changed, 93 insertions(+), 56 deletions(-) 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 @@
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 ''%>
- - - - - - - - - + + + + + + + + + @@ -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/config/locales/en.yml b/config/locales/en.yml index ee597fa6..a24d6355 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -59,6 +59,11 @@ 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" views: btn: @@ -308,6 +313,35 @@ 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" + receipt_no: "Receipt No" + grand_total: "Grand Total" + tax_amount: "Tax Amount" + sales_status: "Sales Status" + receipt_date: "Receipt Date" code_txt: "code " charge_txt: "charge" From 8169da4d52349163743e41b96ec37dffd4debda3 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 30 Oct 2017 10:29:02 +0630 Subject: [PATCH 05/13] edit product form --- app/views/settings/products/_form.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb index 1bbd2c7f..c972bca5 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 %>
From 4c6c503e15434e1e9e19c9252f682247c946de24 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 30 Oct 2017 11:48:44 +0630 Subject: [PATCH 06/13] add localization text for Transactions tab --- .../inventory/stock_checks/show.html.erb | 26 ++--- .../transactions/credit_notes/index.html.erb | 28 ++--- app/views/transactions/orders/index.html.erb | 22 ++-- app/views/transactions/orders/show.html.erb | 32 +++--- app/views/transactions/sales/index.html.erb | 24 ++--- .../transactions/sales/indexback.html.erb | 36 +++---- app/views/transactions/sales/show.html.erb | 100 +++++++++--------- config/locales/en.yml | 43 +++++++- 8 files changed, 176 insertions(+), 135 deletions(-) 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/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 TypeCustomerOrder statusOrder dateItems 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") %>
- - - - - + + + + + @@ -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/locales/en.yml b/config/locales/en.yml index a24d6355..cef1a83b 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -64,6 +64,7 @@ en: order_details: "Order Details" sale_details: "Sale Details" inventory_definitions: "Inventory Definitions" + sale_audits: "Sale Audits" views: btn: @@ -147,6 +148,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" @@ -173,6 +175,8 @@ en: queue: "QUEUE" save: "SAVE" finish: "FINISH" + save_to_journal: "Save to Journal" + search_keyboard: "Search Keyword" detail: name: "Name" type: "Type" @@ -185,6 +189,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" @@ -337,11 +342,46 @@ en: order_id: "Order ID" order_date: "Order date" sale_id: "Sale ID" - receipt_no: "Receipt No" 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" code_txt: "code " charge_txt: "charge" @@ -498,6 +538,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 " From 94268345414d3271b2b1ea7af86b775f2dca836b Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 30 Oct 2017 14:23:00 +0630 Subject: [PATCH 07/13] add localization text for all report --- .../_commission_report_filter.html.erb | 6 +-- app/views/reports/commission/index.html.erb | 25 ++++++----- .../_shift_sale_report_filter.html.erb | 4 +- .../reports/credit_payment/index.html.erb | 18 ++++---- .../_shift_sale_report_filter.html.erb | 8 ++-- app/views/reports/dailysale/index.html.erb | 40 +++++++++--------- .../_shift_sale_report_filter.html.erb | 12 +++--- app/views/reports/receipt_no/index.html.erb | 38 ++++++++--------- .../_shift_sale_report_filter.html.erb | 8 ++-- app/views/reports/saleitem/index.html.erb | 42 +++++++++---------- .../_shift_sale_report_filter.html.erb | 8 ++-- app/views/reports/shiftsale/index.html.erb | 26 ++++++------ .../_shift_sale_report_filter.html.erb | 10 ++--- app/views/reports/void_sale/index.html.erb | 22 +++++----- config/locales/en.yml | 40 ++++++++++++++++++ 15 files changed, 173 insertions(+), 134 deletions(-) diff --git a/app/views/reports/commission/_commission_report_filter.html.erb b/app/views/reports/commission/_commission_report_filter.html.erb index bb04b4f5..0e2f71f8 100755 --- a/app/views/reports/commission/_commission_report_filter.html.erb +++ b/app/views/reports/commission/_commission_report_filter.html.erb @@ -13,15 +13,15 @@ -->
- +
- +
- +
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") %>
- + - - - - - - - - + + + + + + + + diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb index 9423e4b5..6fb6dbf9 100755 --- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb +++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb @@ -3,9 +3,9 @@ <% if period_type != false %>
- +
<% if !params[:from].blank?%> - + <% end %> - - - - - + + + + + diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index d2625750..7e82f397 100755 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -4,9 +4,9 @@ <% if period_type != false %>
- +
- +
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index cc5de623..6b5177c2 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -1,8 +1,8 @@
    -
  1. Home
    2. -
  2. Daily Sale Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.daily_sale_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -15,7 +15,7 @@ :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -25,24 +25,24 @@
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.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 '-' %>
SaleSale ItemCommissioner NameProduct NameQtyCommission PriceCommission AmountDate<%= t :sale %><%= t :sale %> <%= t("views.right_panel.detail.item") %><%= t :commissioner %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.qty") %><%= t("views.right_panel.detail.commission_price") %><%= t("views.right_panel.detail.commission_amount") %><%= t("views.right_panel.detail.date") %>
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%><%= t("views.right_panel.detail.from_date") %> : <%= params[:from] rescue '-'%> , <%= t("views.right_panel.detail.to_date") %> : <%= params[:to] rescue '-'%>
Shift Name Receipt No Cashier Name Customer Name Credit Amount <%= t("views.right_panel.detail.shift_name") %> <%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.credit_amount") %>
- + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> @@ -126,7 +126,7 @@ <% end %> <% net = total - total_tax %> - + diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb index 1f5f4e2c..33409ae7 100755 --- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -3,9 +3,9 @@ <% if period_type != false %>
- +
- +
- +
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index a526d205..395dd3ce 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Recript No Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.receipt_no_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -19,7 +19,7 @@
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -30,30 +30,30 @@
- + <% if @shift_from %> <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% end %> - + <% end %> - - - - + + + + <% @sale_taxes.each do |tax| %> <% end %> - - - + + @@ -106,15 +106,15 @@ - - + + <% @sale_taxes.each do |tax| %> <% end %> - - - + + <%end%> diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb index 52ff9036..b6dfe98f 100755 --- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb +++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb @@ -3,9 +3,9 @@ <% if period_type != false %>
- +
- +
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 485ea3ed..13b8f598 100755 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Sale Item Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.sale_item_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -20,7 +20,7 @@
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -34,24 +34,24 @@
- + <% if @shift_from %> <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% end %> - + <% end %> - - - - - - + + + + + + @@ -76,7 +76,7 @@ - + - + @@ -130,41 +130,41 @@ - + - + <% end %> - + - + - + - + - + - + diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb index 5e44051e..34b324a6 100755 --- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb @@ -3,7 +3,7 @@ <% if period_type != false %>
- +
- +
- +
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 3b37708a..97330404 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Shift Sale Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.shift_sale_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -19,7 +19,7 @@
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -33,8 +33,8 @@
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.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 '-'%>
SrDateVoid AmountMpu SalesMaster SalesVisa SalesJcb SalesRedeem SalesCash SalesCredit SalesFOC Sales(Discount)Grand Total +
Rounding Adj.		Rounding Adj.Grand Total<%= t("views.right_panel.detail.sr") %><%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.void_amount") %><%= t("views.right_panel.detail.mpu_sales") %><%= t("views.right_panel.detail.master_sales") %><%= t("views.right_panel.detail.visa_sales") %><%= t("views.right_panel.detail.jcb_sales") %><%= t("views.right_panel.detail.redeem_sales") %><%= t("views.right_panel.detail.cash_sales") %><%= t("views.right_panel.detail.credit_sales") %><%= t("views.right_panel.detail.foc_sales") %>(<%= t("views.right_panel.detail.discount") %>)<%= t("views.right_panel.detail.grand_total") %> +
<%= t("views.right_panel.detail.rnd_adj_sh") %>		<%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %>
Net Amount<%= t("views.right_panel.detail.net_amount") %> <%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%>  
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.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 '-'%>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )<%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
Recipt NoCashier NameTotal AmountDiscount Amount <%= t("views.right_panel.detail.receipt_no") %><%= t :cashier %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> <%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
- Rounding Adj. + 		<%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
 Total AmountDiscount Amount<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %><%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
- Rounding Adj. + 		<%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
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.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 '-'%>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
 Menu CategoryCodeProductTotal ItemUnit PriceRevenue<%= t("views.right_panel.header.menu_category") %><%= t("views.right_panel.detail.code") %><%= t("views.right_panel.detail.product") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %><%= t("views.right_panel.detail.unit_price") %><%= t("views.right_panel.detail.revenue") %>
<%= sale.account_name %>  Total Price By <%= sale.account_name %><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %> <% @totalByAccount.each do |account, total| %> <% if sale.account_id == account %> @@ -114,7 +114,7 @@ <% if count == value %>
 Sub Total<%= t("views.right_panel.detail.sub_total") %> <%= sub_total %>
 Total Item<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %> <%= total_qty%>Total Amount<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= grand_total%>
 Cash Received<%= t("views.right_panel.detail.cash_received") %> <%= @cash_data - @change_amount %>
 Card Sales<%= t("views.right_panel.detail.card_sales") %> <%= @card_data %>
 Credit Sales<%= t("views.right_panel.detail.credit_sales") %> <%= @credit_data %>
 FOC Sales<%= t("views.right_panel.detail.foc_sales") %> <%= @foc_data %>
 Discount Amount<%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> <%= @discount_data %>
 Grand Total<%= t("views.right_panel.detail.grand_total") %> <%= @grand_total - @change_amount%>
- @@ -43,23 +43,23 @@ <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% end %> - + <% end %> - - - + + + - + - + - + - + diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb index bdce131e..46bf04eb 100755 --- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb @@ -3,9 +3,9 @@ <% if period_type != false %>
- +
- +
- +
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 61982279..649d422e 100755 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Void Sale Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.void_sale_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -18,7 +18,7 @@
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -30,7 +30,7 @@
<% if !params[:from].blank?%> - + <% end %> <% if @shift_from %> @@ -38,16 +38,16 @@ <% if @shift %> <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> <% end %> - + <% end %> - - - - - - + + + + + + diff --git a/config/locales/en.yml b/config/locales/en.yml index cef1a83b..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" @@ -382,6 +383,44 @@ en: 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" @@ -552,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: From 7beb4e75636995ed578d5d90a299b73597a13745 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 30 Oct 2017 14:33:05 +0630 Subject: [PATCH 08/13] test for turbolink --- app/assets/javascripts/BSBMaterial/admin.js | 2 +- app/assets/javascripts/BSBMaterial/demo.js | 2 +- app/assets/javascripts/OQS.js | 2 +- app/assets/javascripts/application.js | 7 ++-- app/assets/javascripts/custom.js | 2 +- app/assets/javascripts/origami.js | 42 ++++++++++----------- app/assets/stylesheets/login.scss | 1 + app/views/layouts/login.html.erb | 9 +++-- app/views/layouts/login_dashboard.html.erb | 7 +--- config/locales/mm.yml | 2 +- 10 files changed, 37 insertions(+), 39 deletions(-) diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js index e93b0186..50a3a8a2 100755 --- a/app/assets/javascripts/BSBMaterial/admin.js +++ b/app/assets/javascripts/BSBMaterial/admin.js @@ -444,7 +444,7 @@ $.AdminBSB.browser = { } //========================================================================================================================== -$(document).ready(function(){ +$(document).on('turbolinks:load', 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 85f632ea..bb09d5ac 100755 --- a/app/assets/javascripts/BSBMaterial/demo.js +++ b/app/assets/javascripts/BSBMaterial/demo.js @@ -1,4 +1,4 @@ -$(document).ready(function(){ +$(document).on('turbolinks:load', function() { skinChanger(); activateNotificationAndTasksScroll(); 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 6c2b2c4d..2fe04719 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,11 +11,12 @@ // about supported directives. // //= require jquery +//= require jquery.turbolinks //= require tether +//= require jquery_ujs //= require bootstrap/js/popper.min //= require bootstrap/js/bootstrap-material-design.min //= require jquery_nested_form -//= require jquery_ujs //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require multi-select/js/jquery.multi-select.js @@ -26,16 +27,16 @@ //= 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 cable +//= require turbolinks //= require settings/processing_items //= require BSBMaterial/admin.js //= require BSBMaterial/demo.js //= require custom.js -$(document).ready(function(){ +$(document).on('turbolinks:load', function() { $('.count-to').countTo(); //Sales count to diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 18e16e8d..7d37793c 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -1,4 +1,4 @@ -$(document).ready(function(){ +$(document).on('turbolinks:load', function() { $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); 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/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/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 7320edf9..213fe705 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -11,8 +11,8 @@ - - + @@ -101,9 +101,10 @@ \ 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 c123e434..efdcab31 100755 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -52,8 +52,4 @@ - + diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb index a1a2368a..85a3a27d 100755 --- a/app/views/settings/commissions/_form.html.erb +++ b/app/views/settings/commissions/_form.html.erb @@ -44,8 +44,4 @@ - + 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 c972bca5..a1a448ba 100755 --- a/app/views/settings/products/_form.html.erb +++ b/app/views/settings/products/_form.html.erb @@ -62,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/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 ) + From 35161aae91897e3400b53f38836da8154bb3ce5e Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 30 Oct 2017 18:51:05 +0630 Subject: [PATCH 10/13] remove turbolink in backend and update logout --- app/assets/javascripts/custom.js | 4 +++- app/assets/javascripts/login.js | 1 - app/controllers/home_controller.rb | 3 ++- app/views/layouts/login.html.erb | 2 +- app/views/layouts/login_dashboard.html.erb | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index e33ed566..91d4cc41 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -38,8 +38,10 @@ $(document).ready(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 db75a715..f2df2d03 100755 --- a/app/assets/javascripts/login.js +++ b/app/assets/javascripts/login.js @@ -15,6 +15,5 @@ //= 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 \ No newline at end of file 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/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 213fe705..e9be4a3f 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -100,7 +100,7 @@ <% end %>
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.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 '-'%>
Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )<%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
Cashier StationCashier NameShift Name<%= t("views.right_panel.detail.cashier_station") %><%= t :cashier %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.shift_name") %> Cash Payment<%= t("views.right_panel.detail.cash_payment") %> Credit Payment<%= t("views.right_panel.detail.credit_payment") %> Other Payment<%= t("views.btn.other_payment") %> Grand Total<%= t("views.right_panel.detail.grand_total") %>
From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%><%= t("views.right_panel.detail.from_date") %> : <%= params[:from] rescue '-'%> , <%= t("views.right_panel.detail.to_date") %> : <%= params[:to] rescue '-'%>
Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )<%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
Receipt NoSale DateTotal AmountGrand TotalRounding Adj.Grand Total +
Rounding Adj.		<%= t("views.right_panel.detail.receipt_no") %><%= t("views.right_panel.detail.sale_date") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
<%= t("views.right_panel.detail.rnd_adj_sh") %>