From b480f8cd61fea214a604771f8f5c0bc3ce93b57b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 16:47:41 +0630
Subject: [PATCH 1/3] update payment detail show

---
 app/views/origami/payments/show.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 78660997..97c4d216 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -313,8 +313,8 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        console.log(payment_type)
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -457,9 +457,9 @@
             var credit = $('#credit').text();
             var card   = $('#card').text();
 
-           if (credit <= 0) {
-            calculate_member_discount(sale_id);
-           }
+            if (credit <= 0) {
+              calculate_member_discount(sale_id);
+            }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",

From fb989572b1c89bad7b3612df17898478af2e6372 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 17:48:35 +0630
Subject: [PATCH 2/3] update room for first bill

---
 app/controllers/origami/void_controller.rb |  3 ++
 app/views/origami/home/show.html.erb       |  2 +-
 app/views/origami/rooms/show.html.erb      | 60 +++++++++++++---------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index a0c4a23b..0d368224 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -63,6 +63,7 @@ class Origami::VoidController < BaseOrigamiController
 
       member_info   = nil
       rebate_amount = nil
+      current_balance = nil
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
@@ -87,7 +88,9 @@ class Origami::VoidController < BaseOrigamiController
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
           rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
+
         # get printer info
         print_settings=PrintSetting.find_by_unique_code(unique_code)
         # Calculate Food and Beverage Total
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fc1a5b20..372efa83 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -576,7 +576,7 @@
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
           }else{
-                  swal("Opps","You are not authorized for void","warning")
+                  swal("Opps","You are not authorized for Discount","warning")
           }
             return false;
         });
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index f8dc69f0..00350f1b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -367,17 +367,21 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
-        <button type="button" id="discount" class="btn bg-blue btn-block" >Discount</button>
+        <button type="button" id="discount" class="btn bg-blue btn-block" active="<%= can? :index, :discount %>" >Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
-        <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
          <!-- first bill not used in cloud -->
-        <% if ENV["SERVER_MODE"] != "cloud" %>
-          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-        <% end %>
+         <% if ENV["SERVER_MODE"] == "cloud" %>
+         <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <% else %>
+         <%if @membership.discount && @obj_sale.customer.membership_id %>
+            <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+         <%else%>
+            <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <%end%>
+         <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
@@ -393,6 +397,7 @@
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
+                             <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
                                 <%= pay.payment_method %>
@@ -535,25 +540,29 @@ $(document).ready(function(){
     return false;
   });
 
-  
   // Discount for Payment
-  $('#discount').click(function() {
-    var sale = $('#sale_id').val();
-    if (sale!="") {
-      var sale_id = sale
+  $('#discount').click(function () {
+
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').val();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').attr('data-order');
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + '/discount'
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
     }else{
-      var sale_id = $('#save_order_id').attr('data-order');
+      swal("Opps","You are not authorized for Discount","warning")
     }
-
-    if(sale_id!=""){
-      window.location.href = '/origami/' + sale_id + '/discount'
-    }
-    else {
-      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
-    }
-
     return false;
   });
+  // Discount for Payment
 
   // Add Other Charges
   $('#other-charges').click(function() {
@@ -595,11 +604,17 @@ $("#first_bill").on('click', function(){
 
 $(".choose_payment").on('click', function () {
   $( "#loading_wrapper").show();
+
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
+  if(parseInt(jQuery.inArray("Credit", type)) == -1){
+    if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+      calculate_member_discount(sale_id,"Card");
 
-  calculate_member_discount(sale_id,type);
-
+    }else{
+      calculate_member_discount(sale_id,"Cash");
+    }         
+  }
   var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
   $.ajax({
     type: "GET",
@@ -609,7 +624,6 @@ $(".choose_payment").on('click', function () {
       receipt_no = ($("#receipt_no").html()).trim();
       if((receipt_no!=undefined) && (receipt_no!=""))
         createReceiptNoInFirstBillData(receipt_no,type);
-      
       location.reload();
     }
   });  

From fe846ea89a66a88236cc13fce97bfa4d643326cc Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 09:40:29 +0630
Subject: [PATCH 3/3] update secrets yml

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 48ad8e2c..99360dad 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L