<%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
- <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 %>
+ <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 && @giftvouchercount == 0.0 %>
Balance
<%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
@@ -649,7 +660,8 @@ var customer_name = "<%= @customer.name %>";
parseInt(jQuery.inArray("PAYMAL", payment_type)) != -1 ||
parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) != -1 ||
parseInt(jQuery.inArray("Alipay", payment_type)) != -1 ||
- parseInt(jQuery.inArray("DINGA", payment_type)) != -1){
+ parseInt(jQuery.inArray("DINGA", payment_type)) != -1 ||
+ parseInt(jQuery.inArray("GiftVoucher", payment_type)) != -1){
$("#card_payment").show();
} else{
$("#card_payment").hide();
@@ -729,6 +741,8 @@ var customer_name = "<%= @customer.name %>";
swal("Oops","Please Pay with Paymal Payment","warning");
}else if(parseInt(jQuery.inArray("DINGA", payment_type)) != -1 && $('#dingacount').text()== 0 && sub_total != 0.0 && member){
swal("Oops","Please Pay with Dinga Payment","warning");
+ }else if(parseInt(jQuery.inArray("GiftVoucher", payment_type)) != -1 && $('#giftvouchercount').text()== 0 && sub_total != 0.0 && member){
+ swal("Oops","Please Pay with Gift Voucher","warning");
}else{
$( "#loading_wrapper").show();
@@ -978,7 +992,8 @@ var customer_name = "<%= @customer.name %>";
var alipay1 = $('#alipaycount').text();
var junctionpay1 = $('#junctionpaycount').text();
var dingapay1 = $('#dingacount').text();
- var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1) + parseFloat(paymal1) + parseFloat(dingapay1);
+ var giftvoucherpay1 = $('#giftvouchercount').text();
+ var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1) + parseFloat(paymal1) + parseFloat(dingapay1) + parseFloat(giftvoucherpay1);
var total = $('#amount_due').text();
var amt = 0;
<% if precision.to_i > 0 %>;
@@ -1010,8 +1025,10 @@ var customer_name = "<%= @customer.name %>";
var alipay = $('#alipaycount').text();
var junctionpay = $('#junctionpaycount').text();
var dinga = $('#dingacount').text();
+ var giftvoucher = $('#giftvouchercount').text();
var amount_due = $('#amount_due').text();
- var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay) + parseFloat(paymal) + parseFloat(dinga);
+ var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay) + parseFloat(paymal) + parseFloat(dinga) + parseFloat(giftvoucher);
+
var result = parseFloat(amount_due) - parseFloat(total);
<% if precision.to_i > 0 %>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 67f5002e..10f73260 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -43,6 +43,7 @@
<%= 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.giftvoucher_sales") %> |
(<%= t("views.right_panel.detail.discount") %>) |
<%= t("views.right_panel.detail.grand_total") %> |
@@ -75,6 +76,7 @@
<% paymal = 0 %>
<% dinga = 0 %>
<% junctionpay = 0 %>
+ <% giftvoucher = 0 %>
<% paypar = 0 %>
<% cash = 0 %>
<% credit = 0 %>
@@ -95,6 +97,7 @@
<% paymal += sale[:paymal_amount] %>
<% dinga += sale[:dinga_amount] %>
<% junctionpay += sale[:junctionpay_amount] %>
+ <% giftvoucher += sale[:giftvoucher_amount] %>
<% paypar += sale[:paypar_amount] %>
<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
<% credit += sale[:credit_amount] %>
@@ -121,6 +124,7 @@
<%= 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[:giftvoucher_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], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
@@ -129,12 +133,11 @@
<% count = count + 1 %>
<% end %>
-
| Total |
<%= 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(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
@@ -144,7 +147,8 @@
<%= 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(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <%= number_with_precision(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) |
<%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
@@ -157,7 +161,7 @@
<% @tax.each do |tax|
total_tax += tax.tax_amount.to_f %>
- | <%= tax.tax_name rescue '-'%> |
+ <%= tax.tax_name rescue '-'%> |
<%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
|
@@ -168,7 +172,7 @@
<% net = net - rounding_adj%>
<% net = net - total_tax %>
- | <%= t("views.right_panel.detail.net_amount") %> |
+ <%= t("views.right_panel.detail.net_amount") %> |
<%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
|
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index 8c9cccb6..094e4c80 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -31,6 +31,7 @@
<%= 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.giftvoucher_sales") %> |
(<%= t("views.right_panel.detail.discount") %>) |
<%= t("views.right_panel.detail.grand_total") %> |
@@ -63,6 +64,7 @@
<% paymal = 0 %>
<% dinga = 0 %>
<% junctionpay = 0 %>
+ <% giftvoucher = 0 %>
<% paypar = 0 %>
<% cash = 0 %>
<% credit = 0 %>
@@ -83,6 +85,7 @@
<% paymal += sale[:paymal_amount] %>
<% dinga += sale[:dinga_amount] %>
<% junctionpay += sale[:junctionpay_amount] %>
+ <% giftvoucher += sale[:giftvoucher_amount] %>
<% paypar += sale[:paypar_amount] %>
<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
<% credit += sale[:credit_amount] %>
@@ -109,6 +112,7 @@
<%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), delimiter: delimiter) rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]),delimiter => ',') rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]),delimiter => ',') rescue '-'%> |
+
<%= number_with_delimiter(sprintf("%.2f",sale[:giftvoucher_amount]),delimiter => ',') rescue '-'%> |
(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), delimiter => ',') rescue '-'%>) |
<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]),delimiter => ',') rescue '-'%> |
@@ -133,6 +137,7 @@
<%= number_with_delimiter(sprintf("%.2f",cash),delimiter => ',') rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",credit),delimiter => ',') rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",foc), delimiter => ',') rescue '-'%> |
+
<%= number_with_delimiter(sprintf("%.2f",giftvoucher), delimiter => ',') rescue '-'%> |
(<%= number_with_delimiter(discount,delimiter => ',') rescue '-'%>) |
<%= number_with_delimiter(sprintf("%.2f",grand_total),delimiter => ',') rescue '-'%> |
@@ -145,7 +150,7 @@
<% @tax.each do |tax|
total_tax += tax.tax_amount.to_f %>
- | <%= tax.tax_name rescue '-'%> |
+ <%= tax.tax_name rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",tax.tax_amount),delimiter => ',') rescue '-'%> |
|
@@ -156,7 +161,7 @@
<% net = net - rounding_adj%>
<% net = net - total_tax %>
- | <%= t("views.right_panel.detail.net_amount") %> |
+ <%= t("views.right_panel.detail.net_amount") %> |
<%= number_with_delimiter(sprintf("%.2f",net),delimiter => ',') rescue '-'%> |
|
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index c3a00a5d..23480521 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -53,6 +53,7 @@
<%= 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.giftvoucher_sales") %> |
<% if @print_settings.precision.to_i > 0
@@ -84,6 +85,7 @@
<%= 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[:giftvoucher_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> |
<% end %>
diff --git a/app/views/reports/payment_method/index.xls.erb b/app/views/reports/payment_method/index.xls.erb
index 73a53005..fa4ee81e 100755
--- a/app/views/reports/payment_method/index.xls.erb
+++ b/app/views/reports/payment_method/index.xls.erb
@@ -40,6 +40,7 @@
<%= 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.giftvoucher_sales") %> |
<% unless @sale_data.empty? %>
@@ -59,6 +60,7 @@
<%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%> |
<%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%> |
+
<%= number_with_delimiter(sprintf("%.2f",sale[:giftvoucher_amount]), :delimiter => ',') rescue '-'%> |
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1db778ca..f3596417 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -144,6 +144,7 @@ en:
check_in: "Check In"
card_settle: "CB CARD SETTLEMENT"
+ gift_voucher: "GiftVoucher"
pagination:
first: "« First"
@@ -423,6 +424,7 @@ en:
paymal_sales: "Paymal Sales"
dinga_sales: "Dinga Sales"
junctionpay_sales: "JunctionPay Sales"
+ gift_voucher_sales: "GiftVoucher Sales"
redeem_sales: "Redeem Sales"
cash_sales: "Cash Sales"
credit_sales: "Credit Sales"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 283a31f2..3f58eac9 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -138,6 +138,7 @@ mm:
exp_to_excel: "Excel သို့ ပို့ပြီးဆက်လက်လုပ်ဆောင်ရန်"
card_settle: "CB ကဒ် စာရင်းရှင်းတမ်း"
+ gift_voucher: "GiftVoucher"
pagination:
first: "« ပထမ"
last: "အဆံုး »"
@@ -418,6 +419,7 @@ mm:
paymal_sales: "Paymal ရောင်းရငွေ"
dinga_sales: "Dinga ရောင်းရငွေ"
junctionpay_sales: "JunctionPay ရောင်းရငွေ"
+ gift_voucher_sales: "GiftVoucher ရောင်းရငွေ"
redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
cash_sales: "ငွေသား ရောင်းရငွေ"
credit_sales: "အကြွေး ရောင်းရငွေ"
diff --git a/config/routes.rb b/config/routes.rb
index 8e97f8b7..8c6a5e0c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -199,6 +199,7 @@ scope "(:locale)", locale: /en|mm/ do
post 'payment/alipay' => 'alipay#create'
post 'payment/junctionpay' => 'junctionpay#create'
post 'payment/dinga' => 'dinga#create'
+ post 'payment/gift_voucher' => 'gift_voucher#create'
post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'}
@@ -215,6 +216,7 @@ scope "(:locale)", locale: /en|mm/ do
get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
get 'sale/:sale_id/:type/payment/others_payment/DINGA' => "dinga#index"
+ get 'sale/:sale_id/:type/payment/others_payment/GiftVoucher' => "gift_voucher#index"
#---------Void --------------#
post 'sale/:sale_id/:type/void' => 'void#overall_void'