fixed conflict

app/assets/javascripts/origami.js

@@ -143,7 +143,7 @@ $(document).ready(function(){
 	});
 
 	// Payment for Bill
-	$('#pay').click(function() {
+	$('#pay-bill').click(function() {
 		var sale_id=$(".selected-item").find(".orders-id").text();
 		if(sale_id!=""){
 			window.location.href = '/origami/sale/'+ sale_id  + "/payment"
@@ -160,10 +160,9 @@ $(document).ready(function(){
 		window.location.href = '/crm/customers/'+ sale_id  + "/assign_sale_id"
 		return false;
 	});
-});
 
 	/* For Receipt - Calculate discount or tax */
-$(document).on('click', '.cashier_number', function(event){
+	$('.cashier_number').on('click', function(event){
 	    if(event.handled !== true) {
 	        var original_value=0;
 	        original_value = $('#discount-amount').val();
@@ -208,6 +207,8 @@ $(document).on('click', '.cashier_number', function(event){
 	    }
 	});
 
+});
+
 /* Button Control by Status */
 function control_button(order_status){		
 	if(order_status=="billed"){

app/assets/javascripts/origami/payment.js

@@ -1,113 +0,0 @@
-// $(document).on('touchstart click', '.keypad', function(event){
-//         event.stopPropagation();
-//         event.preventDefault();
-//         if(event.handled !== true) {
-//
-//             // Do your magic here.
-//             var input_value = $(this).attr("data-value");
-//             switch (input_value) {
-//
-//                 case 'delete':
-//                     process_delete_payment();
-//                     break;
-//
-//                 case 'foc':
-//                     remove_input_action();
-//                     $(".foc").attr("data-action","true");
-//                     if(customerName.toString() != " "){ //if already chosen customer
-//                         if($("#foc_reason_lists").attr("foc_reason") == ' '){
-//                             alert("Please! Choose or Add FOC reason");
-//                             foc_additional_form();
-//                         }
-//                         else{
-//                             process_foc_payment();
-//                         }
-//                     }
-//                     else{
-//                         alert("Please! Choose or Save Customer");
-//                         foc_additional_form();
-//                     }
-//                     break;
-//
-//                 case 'nett':
-//                     remove_input_action();
-//                     $(".nett").attr("data-action","true");
-//                     if($(".credit_note_payment").hasClass("payment_selected")){
-//                         if(customerName == " "){
-//                             alert("Please! Choose or Save Customer");
-//                             showCustomer();
-//                         }
-//                         else{
-//                             $("#accept_payment_btn").attr("data-payment","credit");
-//                             process_nett_payment();
-//                         }
-//                     }
-//                     else{
-//                             process_nett_payment();
-//                     }
-//                     break;
-//
-//                 case 'edit':
-//                     process_edit_invoice();
-//                     break;
-//
-//                 case 'cancel':
-//                     remove_input_action();
-//                     var status = $("#label_amountdue").attr("data-status");
-//                     if (status != 'completed' && status != 'void'){
-//                         $(".cancel").attr("data-action","true");
-//                         var message = confirm("Are you sure to void? Please, add reason!");
-//                         if (message == true) {
-//                             $(".additional_form").hide();
-//                             $("#void_sale_additional_form").show();
-//                             process_cancel_payment();
-//                         }
-//                     }
-//                     else{
-//                         $(".cancel").addClass("dim");
-//                     }
-//                     break;
-//
-//                 case 'ent':
-//                     amount_due = parseFloat($("#label_amountdue").attr("data-original"));
-//                     other_amt = parseFloat($("#label_cash_amount").attr("data-value"));
-//                     credit_amount = parseFloat($("#label_credit_note").text());
-//                     if ($(".credit_note_payment").hasClass("payment_selected") && credit_amount > 0){
-//                         if(customerName.toString() != " "){
-//                             if(credit_amount > (amount_due - other_amt)){
-//                                 alert("You shouldn't exceed the amount due.");
-//                             }
-//                             else{
-//                                 $("#accept_payment_btn").attr("data-payment","credit");
-//                                 update_balance_due();
-//                             }
-//                         }
-//                         else{
-//                             alert("Please! Choose or Save Customer");
-//                         }
-//                     }
-//                     else{
-//                         update_balance_due();
-//                     }
-//
-//                     break;
-//                 case 'clear':
-//                     process_clear_payment();
-//                     break;
-//
-//                 default:
-//
-//                     var existing_value = $(".payment_selected span").text();
-//
-//                     if (existing_value == "0" || existing_value == "0.00") { existing_value = ""; }
-//                     existing_value = existing_value + input_value;
-//                     $(".payment_selected span").text(existing_value);
-//
-//             }
-//
-//
-//             event.handled = true;
-//         } else {
-//             return false;
-//         }
-// });

app/assets/javascripts/origami/paypar.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/origami/request_bills.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/origami/paypar.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the origami/paypar controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/origami/request_bills.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the origami/RequestBills controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

app/models/sale_payment.rb

@@ -207,7 +207,9 @@ class SalePayment < ApplicationRecord
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
+
     self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
+
     if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"

app/views/layouts/_header.html.erb

@@ -20,6 +20,7 @@
               <li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
               <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
+              <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
 
@@ -30,9 +31,14 @@
             <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
-        <!-- <li class="navbar-nav mr-auto">
+        <li class="navbar-nav mr-auto dropdown">
-          Reports
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Reports</a>
-        </li> -->
+          <ul class="dropdown-menu">
+            <li><%= link_to "Daily Sale Report", origami_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Sales Item Report", origami_root_path, :tabindex =>"-1" %></li>
+            <li><%= link_to "Receipt Report", origami_root_path, :tabindex =>"-1" %></li>
+          </ul>
+        </li>
      </ul>
 
    </div>

app/views/origami/home/index.html.erb

@@ -219,9 +219,9 @@
     <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
     <!-- Cashier Buttons -->
     <button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>
-    <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button>
+    <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
 
-    <button type="button" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
+    <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" >Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>

app/views/origami/payments/show.html.erb

@@ -165,12 +165,7 @@
 
 <script>
 $(document).on('click', '.cashier_number', function(event){
-        //
+  if(event.handled !== true) {
-        // event.stopPropagation();
-        // event.preventDefault();
-        console.log( event.handled );
-        if(event.handled == true) {
-
       var original_value;
       original_value = $('#cash').text();
 
@@ -187,14 +182,17 @@ $(document).on('click', '.cashier_number', function(event){
           update_balance();
         }
         break;
-
         case 'add':
           var input_value = $(this).attr("data-value");
           amount = parseInt(input_value) + parseInt(original_value);
           $('#cash').text(amount);
           update_balance();
         break;
-
+        case 'del' :
+          var cash=$('#cash').text();
+          $('#cash').text(cash.substr(0,cash.length-1));
+          update_balance();
+        break;
         case 'clr':
            $('#cash').text("0.0");
            update_balance();
@@ -236,7 +234,6 @@ $( document ).ready(function() {
           alert("THANK YOU")
         }
       });
-
    }
  });