From 4c6c503e15434e1e9e19c9252f682247c946de24 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 30 Oct 2017 11:48:44 +0630 Subject: [PATCH 1/2] 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 - Type - Customer - Order status - Order date - Items Count + <%= t("views.right_panel.detail.order_id") %> + <%= t("views.right_panel.detail.type") %> + <%= t :customer %> + <%= t("views.right_panel.detail.order_status") %> + <%= t("views.right_panel.detail.order_date") %> + <%= t("views.right_panel.detail.items_count") %> diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb index 4820a4e1..1675649a 100755 --- a/app/views/transactions/orders/show.html.erb +++ b/app/views/transactions/orders/show.html.erb @@ -1,8 +1,8 @@
        -
      1. Home
        2. -
      2. Order
        3. -
      3. Details
        4. +
      4. <%= t("views.right_panel.button.home") %>
        5. +
      5. <%= t("views.right_panel.detail.order") %>
        6. +
      6. <%= t :details %>
        7. <%= link_to 'Back', transactions_orders_path %> @@ -17,11 +17,11 @@ - - - - - + + + + + @@ -35,18 +35,18 @@
        TypeCustomerOrder statusOrder dateOrder By<%= t("views.right_panel.detail.type") %><%= t :customer %><%= t("views.right_panel.detail.order_status") %><%= t("views.right_panel.detail.order_date") %><%= t("views.right_panel.detail.order_by") %>
        -

        Order Items

        +

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

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

        <%= notice %>

        -

        Transactions Sales

        +

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

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