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 "
        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") %>