From 23f922b5d1a31498d965c901e90ddc1f2156c59f Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Fri, 27 Dec 2019 15:19:46 +0630 Subject: [PATCH 1/3] fixed daily sale ui --- .../origami/payments_controller.rb | 2 -- app/views/reports/dailysale/index.html.erb | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 40d549b7..2138aeed 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -206,8 +206,6 @@ class Origami::PaymentsController < BaseOrigamiController #end end - logger.debug 'saleObj++++++++++++++++++++++++++' - logger.debug saleObj.to_json if !saleObj.nil? # InventoryJob.perform_now(self.id) # InventoryDefinition.calculate_product_count(saleObj) diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 2540401b..13b315de 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -73,12 +73,12 @@ Income Outgoing - live_help - live_help + live_help + live_help <% if @tax.blank? %> - live_help + live_help + live_help <% end %> - live_help <%= t("views.right_panel.detail.sr") %> @@ -132,8 +132,8 @@ <%= t("views.right_panel.detail.total_sales") %> <% if @tax.blank? %> <%= t("views.right_panel.detail.tax") %> - <% end %> <%= t("views.right_panel.detail.net_sales") %> + <% end %> @@ -241,8 +241,8 @@ <%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% if @tax.blank? %> <%= number_format(sale[:tax], precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <% end %> <%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> <% count = count + 1 %> @@ -329,8 +329,10 @@ <%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_format(gross_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_format(total_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_format(tax, precision:precision.to_i,delimiter:delimiter) rescue '-'%> - <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% if @tax.blank? %> + <%= number_format(tax, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <% end %> @@ -342,20 +344,20 @@ <% @tax.each do |tax| total_tax += tax.tax_amount.to_f %> - <%= tax.tax_name rescue '-'%> - <%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> + <%= tax.tax_name rescue '-'%> + <%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% end %> <% net = grand_total %> <% net = net - rounding_adj%> <% net = net - total_tax %> - <%= t("views.right_panel.detail.net_amount") %> + <%= t("views.right_panel.detail.net_amount") %> <%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% else %> - <%= t("views.right_panel.detail.net_amount") %> + <%= t("views.right_panel.detail.net_amount") %> <%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%> <% end %> From 9ac6749efba3bf0bc16b49b71efde15ebd12fc5c Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Fri, 27 Dec 2019 19:45:40 +0630 Subject: [PATCH 2/3] fixed duplicate other payment --- app/models/sale_payment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index da482303..a837196e 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -662,7 +662,7 @@ class SalePayment < ApplicationRecord is_credit = sale.sale_payments.any? { |x| x.payment_method == "creditnote" } is_foc = sale.sale_payments.any? { |x| x.payment_method == "foc" } - if (sale.grand_total <= all_received_amount) + if sale.grand_total <= all_received_amount && sale.sale_status == "new" sale.payment_status = "paid" if is_credit sale.payment_status = "outstanding" From 4d99f0bc3b6aed4114a729460a66cc9250342701 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Fri, 27 Dec 2019 19:54:07 +0630 Subject: [PATCH 3/3] fix broken input label --- app/assets/stylesheets/application.scss | 4 ++++ app/assets/stylesheets/induties/assign_in_duties.scss | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3440afbe..ee797cf8 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -232,3 +232,7 @@ i.logout_icon{ color: rgba(0, 0, 0, 0.54); padding: 10px; } + +.input-group-addon { + margin-bottom: 20px; +} diff --git a/app/assets/stylesheets/induties/assign_in_duties.scss b/app/assets/stylesheets/induties/assign_in_duties.scss index f51fbcff..a72ac818 100644 --- a/app/assets/stylesheets/induties/assign_in_duties.scss +++ b/app/assets/stylesheets/induties/assign_in_duties.scss @@ -29,7 +29,6 @@ } .bmd-form-group { position: relative; - padding-top: 0 !important; } .btn_create_induty{ display: inline; @@ -93,4 +92,4 @@ .add_to_charges{ width:100%; padding:1rem; -} \ No newline at end of file +}