diff --git a/app/views/reports/receipt_no_detail/index.html.erb b/app/views/reports/receipt_no_detail/index.html.erb index 9f5841a2..c766108b 100755 --- a/app/views/reports/receipt_no_detail/index.html.erb +++ b/app/views/reports/receipt_no_detail/index.html.erb @@ -136,23 +136,24 @@ <% sale_payments = result.sale_payments %> <% if sale_payments.length > 0%> <% sale_payments.each do |rec| %> - <% next if rec.payment_method == 'credit_note' && result.payments_for_credits_amount < rec.payment_amount %> - -   -   - Payment <%= rec.payment_method.upcase %> - <%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> ( <%= rec.payment_status %> ) -   - - - <% if !rec.payment_reference.nil? %> + <% if rec.payment_amount > 0 %>     - Payment Ref. - <%= rec.payment_reference %> + Payment <%= rec.payment_method.upcase %> + <%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> ( <%= rec.payment_status %> )   + + <% if !rec.payment_reference.nil? %> + +   +   + Payment Ref. + <%= rec.payment_reference %> +   + + <% end %> <% end %> <% end %> <% if result.amount_changed != 0 %> diff --git a/app/views/reports/receipt_no_detail/index.xls.erb b/app/views/reports/receipt_no_detail/index.xls.erb index 603d59e2..bd10e73b 100755 --- a/app/views/reports/receipt_no_detail/index.xls.erb +++ b/app/views/reports/receipt_no_detail/index.xls.erb @@ -9,7 +9,7 @@
-
+
@@ -18,9 +18,9 @@ <% if @shift_from %> - <% if @shift_data.employee %> + <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> + <% end %> <% end %> @@ -28,9 +28,9 @@ - + - + @@ -47,7 +47,7 @@ - + @@ -66,8 +66,8 @@ <% if item.price.to_i < 0.to_i %> <% if item.qty.to_i < 0.to_i%> [PROMO QTY]<%= item.product_name rescue '-' %> - <% else %> - [PROMO PRICE]<%= item.product_name rescue '-' %> + <% else %> + [PROMO PRICE]<%= item.product_name rescue '-' %> <% end %> <% else %> <%= item.product_name rescue '-' %> @@ -76,71 +76,71 @@ - + <% end %> - + <%survey = Survey.find_by_receipt_no(result.receipt_no)%> <% if !survey.nil?%> - + - - - <% end %> - + + + <% end %> + <% if !result.total_amount.nil?%> - + - - + + <% end %> <% if result.total_discount.to_f > 0 %> - + - - + + <% end %> - + <% if !result.total_tax.nil? %> - + - + <% end %> - - <% sale_payments = SalePayment.get_sale_payments(result) %> - <% if sale_payments.length > 0%> + + <% sale_payments = result.sale_payments %> + <% if sale_payments.length > 0%> <% sale_payments.each do |rec| %> <%if rec.payment_amount.to_f > 0 %> - + - + - <% if !rec.payment_reference.nil? %> + <% if !rec.payment_reference.nil? %> - + @@ -148,10 +148,10 @@ <% end %> <% end %> <% end %> - <% if result.amount_changed != 0 && !result.amount_changed.nil? %> + <% if result.amount_changed != 0 && !result.amount_changed.nil? %> - + @@ -160,32 +160,32 @@ <% if !result.customer_id.nil?%> - + - <% end %> <% end %> - + <% end %> - + - +
<%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
<%= 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 :cashier %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.revenue") %>  
<%= @shift_from %> - <%= @shift_to %> <%= table_type %> - <%= table_name %> <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.cashier_name rescue '-' %> <%=result.grand_total%>
<%= item.qty rescue '-' %> <%= item.unit_price rescue '-' %> <%= item.price rescue '-' %><%=l item.created_at.utc.getlocal, :format => :short rescue '-' %> <%=l item.created_at.utc.getlocal, :format => :short rescue '-' %>
 
    No. of Guest <%= survey.total_customer rescue '-' %> 
 
    <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> <%= result.total_amount %> 
 
    <%= t("views.right_panel.detail.total") %> - <%= t("views.right_panel.detail.discount") %> + <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> - <%= result.total_discount %>  
 
    Tax Amount <%= result.total_tax %>   
    Payment <%= rec.payment_method.upcase %> <%= rec.payment_amount %> ( <%= rec.payment_status %> )  
    Payment Ref. <%= rec.payment_reference %>  
    <%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %> <%= result.amount_changed %>  
    Customer<%= result.customer.name rescue '-'%> + <%= result.customer.name rescue '-'%> (<%= result.customer.company rescue '-' %>)  
      Total Nett - <%= grand_total %>  
- +
- \ No newline at end of file +