diff --git a/README.md b/README.md
index 97f43595..8ec595bb 100755
--- a/README.md
+++ b/README.md
@@ -108,6 +108,31 @@ sudo cat /etc/sudoers
### cope and parse
%superuser ALL=(ALL) NOPASSWD: ALL
+<---- Extra Fields Script ----->
+DROP TABLE IF EXISTS `display_images`;
+CREATE TABLE `display_images` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `shop_id` int(11) DEFAULT NULL,
+ `image` blob,
+ `created_by` varchar(255) DEFAULT NULL,
+ `created_at` datetime NOT NULL,
+ `updated_at` datetime NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE customers
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE employees
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE commissioners
+ADD COLUMN image_path VARCHAR(255);
+
+ALTER TABLE sales
+ADD COLUMN equal_persons INT(11) after rebate_status;
+<---- Extra Fields Script ----->
+
* ToDo list
1. Migration
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index a9d23797..4e337e30 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -34,6 +34,8 @@ class Reports::SaleitemController < BaseReportController
@from = from
@to = to
+ puts "foc_data"
+ puts @foc_data
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index a9188f5d..10eab5a3 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -17,7 +17,7 @@ class Reports::StockCheckController < BaseReportController
@from = from_date
@to = to_date
# get printer info
- @print_settings = PrintSetting.get_precision_delimiter()
+ @print_settings = PrintSetting.get_precision_delimiter()
respond_to do |format|
format.html
format.xls
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 76438060..6dd1ebac 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -91,37 +91,37 @@
| <%= count %> |
<%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %> |
- <%= number_with_precision(sale[:void_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:mpu_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:master_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:visa_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:jcb_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:paypar_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision, delimiter: delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:credit_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:foc_amount], precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>) |
- <%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:rounding_adj].to_f, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale[:grand_total], precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% count = count + 1 %>
<% end %>
| Total |
- <%= number_with_precision(mpu , precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(master, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(mpu , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(jcb, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(paypar, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%> |
- (<%= number_with_precision(discount, precision:precision,delimiter:delimiter) rescue '-'%>) |
- <%= number_with_precision(total, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(rounding_adj, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(grand_total, precision:precision,delimiter:delimiter) rescue '-'%> |
+ (<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) |
+ <%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% total_tax = 0 %>
@@ -130,7 +130,7 @@
<% total_tax += tax.tax_amount.to_f %>
| <%= tax.tax_name rescue '-'%> |
- <%= number_with_precision(tax.tax_amount, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
|
@@ -138,7 +138,7 @@
<% net = total - total_tax %>
| <%= t("views.right_panel.detail.net_amount") %> |
- <%= number_with_precision(net, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
|
<% end %>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 387a97a5..3c03dec2 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -101,7 +101,7 @@
<% @totalByAccount.each do |account, total| %>
<% if sale.account_id == account %>
- <%= number_with_precision(total, precision:precision,delimiter:delimiter) %>
+ <%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %>
<% grand_total += total %>
<% end %>
<% end %>
@@ -120,8 +120,8 @@
| <%= sale.item_code rescue '-' %> |
<%= sale.product_name rescue '-' %> |
<%= sale.total_item rescue '-' %> |
- <%= number_with_precision(sale.unit_price , precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(sale.grand_total , precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale.unit_price , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(sale.grand_total , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
@@ -140,7 +140,7 @@
Total <%= sale.account_name %> Qty |
<%= sub_qty %> |
<%= t("views.right_panel.detail.sub_total") %> |
- <%= number_with_precision(sub_total , precision:precision,delimiter:delimiter)%> |
+ <%= number_with_precision(sub_total , precision:precision.to_i,delimiter:delimiter)%> |
<% sub_total = 0.0%>
<% sub_qty = 0 %>
@@ -168,8 +168,8 @@
<%= other.item_code rescue '-' %> |
<%= other.product_name rescue '-' %> |
<%= other.total_item rescue '-' %> |
- <%= number_with_precision(other.unit_price , precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(other.grand_total , precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(other.unit_price , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(other.grand_total , precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
@@ -179,7 +179,7 @@
| |
<%= t("views.right_panel.detail.sub_total") %> |
- <%= number_with_precision(other_sub_total , precision:precision,delimiter:delimiter)%> |
+ <%= number_with_precision(other_sub_total , precision:precision.to_i,delimiter:delimiter)%> |
<%end%>
@@ -188,29 +188,35 @@
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %> |
<%= total_qty%> |
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> |
- <%= number_with_precision(grand_total , precision:precision,delimiter:delimiter)%> |
+ <%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%> |
<% end %>
| |
<%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %> |
- <%= number_with_precision(total_item_foc , precision:precision,delimiter:delimiter) %> |
+ <%= number_with_precision(total_item_foc , precision:precision.to_i,delimiter:delimiter) %> |
| |
<%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %> |
- <%= number_with_precision(total_item_dis , precision:precision,delimiter:delimiter) %> |
+ <%= number_with_precision(total_item_dis , precision:precision.to_i,delimiter:delimiter) %> |
| |
<%= t("views.right_panel.detail.foc_sales") %> |
- <%= number_with_precision(@foc_data , precision:precision,delimiter:delimiter) %> |
+
+ <%= number_with_precision(@foc_data, precision:precision.to_i, delimiter:delimiter) %>
+ |
| |
<%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> |
- <%= number_with_precision(@discount_data , precision:precision,delimiter:delimiter) %> |
+
+
+ <%= number_with_precision(@discount_data , precision: precision.to_i,delimiter: delimiter) %>
+
+ |
<% @sale_taxes.each do |tax| %>
@@ -226,7 +232,7 @@
|
Net Amount |
- <%= number_with_precision(grand_total.to_f - @discount_data.to_f , precision:precision,delimiter:delimiter)%> |
+ <%= number_with_precision(grand_total.to_f - @discount_data.to_f , precision:precision.to_i,delimiter:delimiter)%> |
- <%= number_with_precision(result[:cash_sales].to_f, precision:precision,delimiter:delimiter) %> |
- <%= number_with_precision(result[:credit_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(result[:cash_sales].to_f, precision:precision.to_i,delimiter:delimiter) %> |
+ <%= number_with_precision(result[:credit_sales].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(result[:other_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(result[:other_sales].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(result[:foc_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(result[:foc_sales].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%>
|
- <%= number_with_precision(result[:grand_total].to_f, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(result[:grand_total].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<% grand_total = result[:grand_total].to_f %>
@@ -126,15 +126,15 @@
|
- <%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(card, precision:precision,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(card, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_with_precision(g_total, precision:precision,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(g_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
diff --git a/app/views/reports/stock_check/index.html.erb b/app/views/reports/stock_check/index.html.erb
index 1305abe5..e470a294 100755
--- a/app/views/reports/stock_check/index.html.erb
+++ b/app/views/reports/stock_check/index.html.erb
@@ -28,6 +28,18 @@
+ <% if @print_settings.precision.to_i > 0
+ precision = @print_settings.precision
+ else
+ precision = 0
+ end
+ #check delimiter
+ if @print_settings.delimiter
+ delimiter = ","
+ else
+ delimiter = ""
+ end
+ %>
@@ -63,7 +75,7 @@
<% end %>
| <%= result.stock_count rescue '-' %> |
- <%= result.stock_balance rescue '-' %> |
+ <%= number_with_precision(result.stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %> |
<%= result.different rescue '-' %> |
<%= result.remark rescue '-' %> |
<%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %> |
@@ -76,7 +88,7 @@
|
<%= total_stock_count rescue '-' %> |
- <%= total_stock_balance rescue '-' %> |
+ <%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %> |
<%= total_different rescue '-' %> |
|