fixed conflict request_bill_con and origami index

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

@@ -0,0 +1 @@
+hello Credit

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

@@ -190,13 +190,13 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
    <!--  <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button> -->
-    <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">
+    <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>
       Req.Bill
     </button>
     <!-- Cashier Buttons -->
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Discount</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" class="btn btn-primary btn-lg btn-block" disabled >Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
@@ -217,12 +217,14 @@ function callOrderDetails(sale_order_id){
     order_id = sale_order_id.split("_")[1]
     url =  "origami/"+sale_order_id.split("_")[1]
     data_val =   { sale_id: sale_order_id.split("_")[1]}
-
+    $("#pay").prop('disabled',false);
+    $("#request_bills").prop('disabled',true);
   }else{
     order_id = sale_order_id.split("_")[1]
     url =  "origami/"+order_id
     data_val =  { order_id: sale_order_id.split("_")[1]}
-
+    $("#request_bills").prop('disabled',false);
+    $("#pay").prop('disabled',true);
   }
 
   table_or_order_id = order_id
@@ -314,14 +316,16 @@ $( document ).ready(function() {
       window.location.href = '/origami/request_bills/'+ table_or_order_id
       return false;
   });
+
+
+  $('#pay').click(function() {
+     window.location.href = '/origami/sale/'+ pay_sale_id  + "/payment"
+     return false;
+ });
+
 });
 
-$( document ).ready(function() {
-   $('#pay').click(function() {
-      window.location.href = '/origami/sale/'+pay_sale_id +"/payment"
-      return false;
-  });
-});
+
 
 </script>
 <style type="text/css">

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

@@ -0,0 +1 @@
+Hello Card Payment

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

@@ -5,8 +5,9 @@
       <div class="card-header">
         <div id="order-title">
         	<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
-          <span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
+          <span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
         	<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
+          <span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
         </div>
       </div>
       <div class="card-block">
@@ -61,38 +62,38 @@
               </tr>
             </tfooter>
           </table>
-        </div> 
+        </div>
         <div style='text-align:center;margin-top:20px'>
-          <INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
-        <INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/>
+          <!-- <INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
+        <INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
         </div>
       </div>
     </div>
   </div>
   <div class="col-lg-5 col-md-5 col-sm-3">
     <div class="row">
-      <div class="col-md-8">AMOUNT DUE</div>
-      <div class="col-md-4"><%= @sale_data.grand_total %></div>
+      <div class="col-md-8"><strong>AMOUNT DUE</strong></div>
+      <div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div>
     </div>
     <hr>
     <div class="row">
       <div class="col-md-8">CASH</div>
-      <div class="col-md-4">0.0</div>
+      <div class="col-md-4" id="cash" >0.0</div>
     </div>
     <hr>
-    <div class="row">
+    <div class="row" id="credit_payment">
       <div class="col-md-8">CREDIT</div>
       <div class="col-md-4">0.0</div>
     </div>
       <hr>
-    <div class="row">
-      <div class="col-md-8">CARD</div>
+    <div class="row" id="card_payment">
+      <div class="col-md-8">OTHERS PAYMENT</div>
       <div class="col-md-4">0.0</div>
     </div>
       <hr>
     <div class="row">
       <div class="col-md-8">BALANCE</div>
-      <div class="col-md-4">0.0</div>
+      <div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
     </div>
       <hr>
     <div class="row">
@@ -100,61 +101,61 @@
          <div class="row">
            <div class="col-md-7">
               <div class="row">
-                 <div class="col-md-3 cashier_number" data-value="1">1</div>
-                 <div class="col-md-3 cashier_number">2</div>
-                 <div class="col-md-3 cashier_number">3</div>
+                 <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
+                 <div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
+                 <div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
               </div>
             </div>
            <div class="col-md-5">
-              <div class="col-md-12 cashier_number long">1000</div>
+              <div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div>
            </div>
          </div>
          <div class="row">
            <div class="col-md-7">
              <div class="row">
-                <div class="col-md-3 cashier_number">4</div>
-                <div class="col-md-3 cashier_number">5</div>
-                <div class="col-md-3 cashier_number">6</div>
+                <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
+                <div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
+                <div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
              </div>
            </div>
            <div class="col-md-5">
-             <div class="col-md-12 cashier_number long">5000</div>
+             <div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div>
            </div>
          </div>
          <div class="row">
             <div class="col-md-7">
               <div class="row">
-                 <div class="col-md-3 cashier_number">7</div>
-                 <div class="col-md-3 cashier_number">8</div>
-                 <div class="col-md-3 cashier_number">9</div>
+                 <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
+                 <div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
+                 <div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
               </div>
             </div>
             <div class="col-md-5">
-                <div class="col-md-12 cashier_number long">10000</div>
+                <div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
             </div>
           </div>
           <div class="row">
              <div class="col-md-7">
                <div class="row">
-                  <div class="col-md-3 cashier_number">0</div>
-                  <div class="col-md-3 cashier_number">.</div>
-                  <div class="col-md-3 cashier_number">00</div>
+                  <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
+                  <div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
+                  <div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
                </div>
              </div>
              <div class="col-md-5">
-                <div class="col-md-12 cashier_number long">50000</div>
+                <div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
              </div>
           </div>
           <div class="row">
              <div class="col-md-7">
                <div class="row">
                  <div class="col-md-3 cashier_number"></div>
-                 <div class="col-md-3 cashier_number">DEL</div>
-                 <div class="col-md-3 cashier_number">CLR</div>
+                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
+                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
                </div>
              </div>
              <div class="col-md-5">
-                <div class="col-md-12 cashier_number long">ENTER</div>
+                <div class="col-md-12 cashier_number long purple " id="pay">PAY</div>
              </div>
            </div>
       </div>
@@ -167,13 +168,84 @@ $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
         if(event.handled !== true) {
-            var input_value = $(this).attr("data-value");
-            switch (input_value) {
+            var original_value;
+            original_value = $('#cash').text();
 
-            }
-            event.handled = true;
+            var input_type = $(this).attr("data-type");
+            
+            switch (input_type) {
+              case 'num':
+              var input_value = $(this).attr("data-value");
+              if (original_value == "0.0"){
+                $('#cash').text(input_value);
+                update_balance();
+              }else{
+                $('#cash').append(input_value);
+                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 'clr':
+                 $('#cash').text("0.0");
+                 update_balance();
+              break;
+          }
+          event.handled = true;
         } else {
             return false;
         }
 });
+
+$( document ).ready(function() {
+  $('#credit_payment').click(function() {
+    var sale_id = $('#sale_id').text();
+     window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+     return false;
+ });
+
+ $('#card_payment').click(function() {
+   var sale_id = $('#sale_id').text();
+    window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+    return false;
+ });
+
+ $('#pay').click(function() {
+
+   if($('#balance').text() > 0){
+      alert(" Insufficient Amount!")
+   }else{
+    //  payment
+    var cash = $('#cash').text();
+    var credit = $('#credit').text();
+    var card = $('#card').text();
+    var sale_id = $('#sale_id').text();
+    $.ajax({type: "POST",
+      url: "<%= origami_payment_process_path %>",
+      data: "cash="+ cash + "&sale_id=" + sale_id,
+      success:function(result){
+        alert("THANK YOU")
+      }
+    });
+
+   }
+ });
+
+});
+
+function update_balance(){
+  var cash = $('#cash').text();
+  var credit = $('#credit').text();
+  var card = $('#card').text();
+  var amount_due = $('#amount_due').text();
+  var total = cash + credit + card
+  var result = amount_due - total
+  $('#balance').text(result);
+}
 </script>