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 @@ -->
- +
- +
- + - + diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 38afa734..9b72ba9b 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -1,7 +1,7 @@
    -
  1. Home
    2. -
  2. Credit Payment Report
    3. +
  3. <%= t("views.right_panel.button.home") %>
    4. +
  4. <%= t("views.right_panel.detail.credit_payment_report") %>
    5. <%= link_to 'Back', dashboard_path %> @@ -16,7 +16,7 @@
    - Export to Excel + <%= t("views.btn.exp_to_excel") %>
    @@ -29,15 +29,15 @@ <% if !params[:from].blank?%> - 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 '-'%> <% end %> - 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") %> 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 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <% 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") %>