diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index fbf641df..7fbd7d8f 100644
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -198,11 +198,11 @@ $(document).ready(function(){
var url = "origami/"+customer_id+"/get_customer/"
}
- $('.customer_detail').removeClass('hide');
-
+ $('.customer_detail').removeClass('hide');
+
//Start Ajax
- $.ajax({
- type: "GET",
+ $.ajax({
+ type: "GET",
url: url,
data: {},
dataType: "json",
@@ -212,15 +212,15 @@ $(document).ready(function(){
if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
var balance = data["response_data"]["data"][i]["balance"];
if (data["response_data"]["status"]==true) {
- $('.rebate_amount').removeClass('hide');
+ $('.rebate_amount').removeClass('hide');
console.log(balance);
- row =
+ row =
'
' + data["response_data"]["data"][i]["accountable_type"] +' | '
- +'' + balance + ' | ';
+ +'' + balance + ' | ';
$(".rebate_amount").append(row);
}
-
+
}
});
}
diff --git a/app/assets/javascripts/payment.js b/app/assets/javascripts/payment.js
new file mode 100644
index 00000000..b7aadf05
--- /dev/null
+++ b/app/assets/javascripts/payment.js
@@ -0,0 +1,40 @@
+// number key pad
+$(document).on('click', '.cashier_number', function(event){
+ event.stopPropagation();
+ event.preventDefault();
+ if(event.handled !== true) {
+ var original_value;
+ original_value = $('#amount').text();
+
+ var input_value = $(this).attr("data-value");
+
+ var input_type = $(this).attr("data-type");
+ switch (input_type) {
+ case 'num':
+ if (original_value == "0.0"){
+ $('#amount').text(input_value);
+ }else{
+ $('#amount').append(input_value);
+ }
+ break;
+
+ case 'add':
+ var input_value = $(this).attr("data-value");
+ amount = parseInt(input_value) + parseInt(original_value);
+ $('#amount').html(amount);
+
+ break;
+ case 'clr':
+ $('#amount').html("0.0");
+ break;
+ case 'del' :
+ var cash=$('#amount').text();
+ $('#amount').text(cash.substr(0,cash.length-1));
+ break;
+
+ }
+ event.handled = true;
+ } else {
+ return false;
+ }
+});
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 4ac519b0..a9437736 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -37,7 +37,7 @@ class Origami::PaymentsController < BaseOrigamiController
'Accept' => 'application/json'
}
)
-
+
@balance = 0.00
@accountable_type = ''
if response["data"]==true
@@ -45,10 +45,10 @@ class Origami::PaymentsController < BaseOrigamiController
if res["accountable_type"] == "RebateAccount"
@balance = res["balance"]
@accountable_type = res["accountable_type"]
- end
+ end
end
end
-
+
#end customer amount
@sale_data.sale_payments.each do |spay|
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index a0760b38..723b387d 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -1,19 +1,25 @@
+
+
-
+
-
-
-
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index a0760b38..d8a4faa0 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -1,19 +1,25 @@
+
+
-
+
-
-
-
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 3d9d1024..6ef6d279 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -1,19 +1,25 @@
+
+
-
+
-
-
-
-
-
-
-
MPU
-
-
-Amount :
-
-
-
-