Change style and redeem

app/assets/javascripts/cable.js

@@ -6,9 +6,9 @@
 //= require_tree ./channels
 
 // Temp Disable
-// (function() {
-//   this.App || (this.App = {});
+(function() {
+  this.App || (this.App = {});
 
-//   App.cable = ActionCable.createConsumer();
+  App.cable = ActionCable.createConsumer();
 
-// }).call(this);
+}).call(this);

app/assets/javascripts/origami.js

@@ -68,11 +68,12 @@ $(document).ready(function(){
         			// Receipt Header
         			receipt_no = result[i].receipt_no;
 			        cashier = result[i].cashier_name;
-			        receipt_date = result[i].receipt_date;
+			        receipt_date = new Date(result[i].receipt_date);
+			        show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' +  receipt_date.getHours()+ ':' +  receipt_date.getMinutes()
 
 			        $("#receipt_no").text(receipt_no);
 			        $("#cashier").text(cashier == null ? "" : cashier);
-			        $("#receipt_date").text(receipt_date);
+			        $("#receipt_date").text(show_date);
 
 
 			        //Receipt Charges
@@ -132,7 +133,8 @@ $(document).ready(function(){
 	});
 
 	// Pay Discount for Payment
-	$("#pay-discount").on('click', function(){
+	$("#pay-discount").on('click', function(e){
+		e.preventDefault();
 		var sale_id = $('#sale-id').text();
 		var sale_item_id = $('.selected-item').attr('id');
 		var sub_total = $('#order-sub-total').text();
@@ -140,10 +142,10 @@ $(document).ready(function(){
 		var discount_type = $('#discount-type').val();
 		var discount_value = $('#discount-amount').val();
 		var discount_amount = discount_value;
+		var ajax_url = "/origami/" + sale_id + "/discount";
 
-		if(sale_item_id == null){
-			alert('Please select item row to discount!');
-			return;
+		if(sale_item_id != null){
+			ajax_url = "/origami/" + sale_item_id + "/discount";
 		}
 
 		// For Percentage Discount
@@ -154,7 +156,7 @@ $(document).ready(function(){
 		var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount};
 		$.ajax({
 			type: "POST",
-		    url: "/origami/" + sale_item_id + "/discount",
+		    url: ajax_url,
 		    data: params,
 		    success:function(result){	}
 		});

app/assets/stylesheets/origami.scss

@@ -33,6 +33,10 @@
 	// cursor:pointer;
 }
 
+.del_cashier_number{
+	opacity:0.6,
+}
+
 .pay{
 	width: 98%;
   height:211px;