From 08cc58682dd7c128c6529bf7823a13715851e11c Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Wed, 15 Jan 2020 14:15:11 +0630 Subject: [PATCH] receipt no detail --- .../reports/receipt_no_detail_controller.rb | 1 - .../reports/receipt_no_detail/index.html.erb | 38 ++++++++++------- .../reports/receipt_no_detail/index.xls.erb | 42 ++++++++++++------- config/locales/en.yml | 5 ++- 4 files changed, 53 insertions(+), 33 deletions(-) diff --git a/app/controllers/reports/receipt_no_detail_controller.rb b/app/controllers/reports/receipt_no_detail_controller.rb index b6e8bb16..775b2651 100755 --- a/app/controllers/reports/receipt_no_detail_controller.rb +++ b/app/controllers/reports/receipt_no_detail_controller.rb @@ -37,7 +37,6 @@ authorize_resource :class => false @shift_data = sh end end - respond_to do |format| format.html format.xls diff --git a/app/views/reports/receipt_no_detail/index.html.erb b/app/views/reports/receipt_no_detail/index.html.erb index c766108b..72ba9c0a 100755 --- a/app/views/reports/receipt_no_detail/index.html.erb +++ b/app/views/reports/receipt_no_detail/index.html.erb @@ -33,11 +33,12 @@ <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) <% end %> - - <%= t("views.right_panel.detail.shift_name") %> - <%= t("views.right_panel.detail.table") %> - <%= t("views.right_panel.detail.receipt_no") %> + + <%= t("views.right_panel.detail.receipt_no") %> + <%= t("views.right_panel.detail.receipt_date") %> + <%= t("views.right_panel.detail.shift_name") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> + <%= t("views.right_panel.detail.table") %> <%= t("views.right_panel.detail.revenue") %>   @@ -53,24 +54,25 @@ end %> <% grand_total = grand_total + result.grand_total %> - <%= @shift_from %> - <%= @shift_to %> - <%= table_type %> - <%= table_name %> <%= result.receipt_no rescue '-' %> + <%=l result.receipt_date.getlocal, :format => :short rescue '-' %> + <%= @shift_from %> - <%= @shift_to %> <%= result.cashier_name rescue '-' %> + <%= table_type %> - <%= table_name %> <%= number_format(result.grand_total, precision: precision, delimiter: delimiter) %> - +   <%= t("views.right_panel.detail.product") %> <%= 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") %> + <%= t("views.right_panel.detail.total_price") %> <% result.sale_items.each do |item|%> +   <% if item.price < 0 %> <% if item.qty < 0 %> @@ -84,18 +86,18 @@ <%= item.qty rescue '-' %> <%= number_format(item.unit_price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %> - <%= number_format(item.price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %> - <%=l item.created_at.getlocal, :format => :short rescue '-' %> + <%= number_format(item.price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %> <% end %> -   +   <%survey = result.survey%> <% if !survey.nil?%>     +   No. of Guest <%= survey.total_customer rescue '-' %>   @@ -104,6 +106,7 @@ <% if !result.total_amount.nil?%> +       <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> @@ -114,6 +117,7 @@ <% if result.total_discount > 0 %> +       <%= t("views.right_panel.detail.total") %> @@ -126,6 +130,7 @@ <% if !result.total_tax.nil? %> +       Tax Amount @@ -140,13 +145,15 @@     - Payment <%= rec.payment_method.upcase %> - <%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> ( <%= rec.payment_status %> ) +   + Payment <%= rec.payment_method.upcase %> ( <%= rec.payment_status %> ) + <%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %>   <% if !rec.payment_reference.nil? %> +       Payment Ref. @@ -158,6 +165,7 @@ <% end %> <% if result.amount_changed != 0 %> +       <%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %> @@ -167,6 +175,7 @@ <% end %> <% if !result.customer_id.nil?%> +       Customer @@ -183,6 +192,7 @@       +   Total Nett - <%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %>   diff --git a/app/views/reports/receipt_no_detail/index.xls.erb b/app/views/reports/receipt_no_detail/index.xls.erb index bd10e73b..6fe33086 100755 --- a/app/views/reports/receipt_no_detail/index.xls.erb +++ b/app/views/reports/receipt_no_detail/index.xls.erb @@ -24,12 +24,13 @@ <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> ) <% end %> - - <%= t("views.right_panel.detail.shift_name") %> - <%= t("views.right_panel.detail.table") %> - <%= t("views.right_panel.detail.receipt_no") %> - <%= t :cashier %> <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.revenue") %> + + <%= t("views.right_panel.detail.receipt_no") %> + <%= t("views.right_panel.detail.receipt_date") %> + <%= t("views.right_panel.detail.shift_name") %> + <%= t :cashier %> <%= t("views.right_panel.detail.name") %> + <%= t("views.right_panel.detail.table") %> + <%= t("views.right_panel.detail.revenue") %>   @@ -43,25 +44,26 @@ table_type = table.type table_name = table.name end %> - - <%= @shift_from %> - <%= @shift_to %> - <%= table_type %> - <%= table_name %> + <%= result.receipt_no rescue '-' %> + <%=l result.receipt_date.getlocal, :format => :short rescue '-' %> + <%= @shift_from %> - <%= @shift_to %> <%= result.cashier_name rescue '-' %> - <%=result.grand_total%> - + <%= table_type %> - <%= table_name %> + <%= number_format(result.grand_total, precision: precision, delimiter: delimiter) %> - + +   <%= t("views.right_panel.detail.product") %> <%= 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") %> <% result.sale_items.each do |item|%> +   <% if item.price.to_i < 0.to_i %> <% if item.qty.to_i < 0.to_i%> @@ -76,7 +78,6 @@ <%= item.qty rescue '-' %> <%= item.unit_price rescue '-' %> <%= item.price rescue '-' %> - <%=l item.created_at.utc.getlocal, :format => :short rescue '-' %> <% end %> @@ -87,6 +88,7 @@     +   No. of Guest <%= survey.total_customer rescue '-' %>   @@ -97,6 +99,7 @@     +   <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= result.total_amount %>   @@ -107,6 +110,7 @@     +   <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> @@ -119,6 +123,7 @@     +   Tax Amount <%= result.total_tax %>   @@ -132,8 +137,9 @@     - Payment <%= rec.payment_method.upcase %> - <%= rec.payment_amount %> ( <%= rec.payment_status %> ) +   + Payment <%= rec.payment_method.upcase %>( <%= rec.payment_status %> ) + <%= rec.payment_amount %>   @@ -141,6 +147,7 @@     +   Payment Ref. <%= rec.payment_reference %>   @@ -152,6 +159,7 @@     +   <%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %> <%= result.amount_changed %>   @@ -161,6 +169,7 @@     +   Customer <%= result.customer.name rescue '-'%> (<%= result.customer.company rescue '-' %>) @@ -175,6 +184,7 @@       +   Total Nett - <%= grand_total %>   diff --git a/config/locales/en.yml b/config/locales/en.yml index 36cf661c..0097796b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -88,7 +88,7 @@ en: debit: "Debit" reservation: "Reservation" make_reservation: "Make Reservation" - + views: btn: create: "Create" @@ -443,6 +443,7 @@ en: sale_item_report: "Sale Item Report" select_period: "Select Period" shift_name: "Shift Name" + receipt_date: "Receipt Date" code: "Code" item: "Item" revenue: "Revenue" @@ -502,7 +503,7 @@ en: checked_by: "Checked By" order_source: "Order Source" paymal_transactions: "Paymal Transactions" - + code_txt: "code " charge_txt: "charge" time_txt: "time"