From 20d580b2ab4257593c83ce0d23a7eafb4dd00b45 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 27 Nov 2017 13:54:21 +0630
Subject: [PATCH 1/2] update foc and void for authorized

---
 app/views/origami/home/show.html.erb     | 17 +++++++--
 app/views/origami/payments/show.html.erb | 48 ++++++++++++++----------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0fd7fa89..d18e0c8f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -374,14 +374,14 @@
               <% end %>
               <% if @status_sale == 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect">Customer</button>
-                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit'>Edit</button>
+                  <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' active="<%= can? :edit, :sale_edit %>">Edit</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">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" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect"> Void</button>
+                  <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
               <!-- Cashier Buttons -->
 
@@ -617,7 +617,12 @@
     $('#edit').on('click', function () {
         var dining_id = "<%= @dining.id %>"
         var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
-        window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+        if ($(this).attr('active')=== "true") {
+           window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+        }else{
+          swal("Opps","You are not authorized for void","warning")
+        }
+       
     });
 
     $('#commissions').on('click', function () {
@@ -632,6 +637,7 @@
     });
 
     $('#void').on('click', function () {
+      if ($(this).attr('active')=== "true") {
         swal({
             title: "Alert",
             text: "Are you sure want to Void?",
@@ -652,7 +658,10 @@
                 }
             });
           }
-        });
+        }); 
+      }else{
+        swal("Opps","You are not authorized for void","warning")
+      }
     });
 
     $('#add_order').on('click', function () {
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 291060de..db23f9ba 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -276,8 +276,8 @@
     <i class="material-icons">reply</i>
      Back
   </button>
-  <button type="button" class="btn bg-deep-purple btn-block" id="foc"> FOC </button>
-  <button type="button" class="btn bg-red btn-block" id="void"> Void </button>
+  <button type="button" class="btn bg-deep-purple btn-block" id="foc" active="<%= can? :foc, :payment %>"> FOC </button>
+  <button type="button" class="btn bg-red btn-block" id="void" active="<%= can? :overall_void, :void %>"> Void </button>
   <!-- Waiter Buttons -->
 </div>
 
@@ -431,20 +431,25 @@
       });
 
     $('#void').on('click',function () {
-      swal({
-       title: "Information!",
-       text: 'Are you sure want to Void !',
-      }, function () {
-        var sale_id = $('#sale_id').text();
-        var ajax_url = "/origami/sale/" + sale_id + '/void';
-        $.ajax({
-          type: 'POST',
-          url: ajax_url,
-          success: function () {
-            window.location.href = '/origami/';
-          }
-        })
-     });
+      if ($(this).attr('active') === "true") { 
+        swal({
+           title: "Information!",
+           text: 'Are you sure want to Void !',
+          }, function () {
+            var sale_id = $('#sale_id').text();
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+              type: 'POST',
+              url: ajax_url,
+              success: function () {
+                window.location.href = '/origami/';
+              }
+            })
+         });
+      }else{
+        swal("Opps","You are not authorized for void","warning")
+      }
+      
     });
   });
 
@@ -463,19 +468,21 @@
   }
 
   $('#foc').click(function() {
-    $( "#loading_wrapper" ).show();
+    //$( "#loading_wrapper" ).show();
         //  payment
         var cash = $('#amount_due').text();
         var sub_total = $('#sub-total').text();
         var sale_id = $('#sale_id').text();
         var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
 
-        $.ajax({type: "POST",
+        if ($(this).attr('active')=== "true") {  
+        $.ajax({
+          type: "POST",
           url: "<%= origami_payment_foc_path %>",
           data: params,
           success:function(result){          
 
-            $( "#loading_wrapper" ).hide();
+            //$( "#loading_wrapper" ).hide();
             
             if (cash > 0) {
               swal({
@@ -488,6 +495,9 @@
             
           }
         });
+        }else{
+          swal("Opps","You are not authorized for foc","warning")
+        }
       });
 
   function calculate_member_discount(sale_id) {

From 0c084a181677a2e5f79fd5b76031262fa970d8bc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 27 Nov 2017 14:24:34 +0630
Subject: [PATCH 2/2] credit payment fix when visa assign

---
 app/controllers/origami/credit_payments_controller.rb      | 2 +-
 app/controllers/settings/menu_item_instances_controller.rb | 2 +-
 app/views/origami/credit_payments/index.html.erb           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index a4978a6f..fde9d6f7 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -8,7 +8,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     @creditcount = 0
     others = 0
     sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "visa"
+        if sale_payment.payment_method == "creditnote"
           @creditcount = @creditcount + sale_payment.payment_amount
         else
           others = others + sale_payment.payment_amount
diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index f34dc5c5..a214ffec 100755
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -67,7 +67,7 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     respond_to do |format|
       if @settings_menu_item_instances.save
-        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
         @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item_instances }
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index e9ccc8c4..a3243b57 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -40,13 +40,13 @@
           <!-- </div> -->
           <% end %>
           <!-- <div class="row"> -->
-          <div class="row">
+          <!-- <div class="row">
            <div class="col-lg-5 col-md-5 col-sm-5">
              <label >Recent Credit Amount</label>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6">
             <input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value="">
-          </div>
+          </div> -->
         </div>
         <hr>
         <!-- </div> -->