diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index c4035ead..64ebc678 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -18,8 +18,6 @@
 //= require cable
 
 $(document).ready(function(){
-	
-
 
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
@@ -36,9 +34,7 @@ $(document).ready(function(){
        var oqs_id = $(this).find(".oqs-id").text();
        var url    = 'oqs/get_items/'+oqs_id;
       
-       show_details(url); 
-
-       
+       show_details(url);
 
     }); //End Click
  
diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index a394e468..6d79ca2a 100644
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -8,12 +8,6 @@ $(function(){
   }); 
   //End menu category Click
 
-  $("#set_change_qty").change(function(){
-    qty = $(this).val();
-    price = $("#set_total_price").text();
-    $("#set_total_price").text(qty*price);
-  }); 
-
   //show menu item list when click menu category
   function show_menu_item_list(url_item){ 
     var menu_list = $('.menu_items_list');
@@ -104,10 +98,10 @@ $(function(){
   }
   //end show list function
   //click item row for item set
-   $(document).on('click', '.set_item_box', function(event){ 
-     $(".instance-list").empty();
-     $(".options-list").empty();
-    
+  $(document).on('click', '.set_item_box', function(event){ 
+    $(".instance-list").empty();
+    $(".options-list").empty();
+    change_qty_plus_minus("set_count","set_plus","set_minus");
     data =  $(this).parent().children().children('.add_icon');
 
     instances          = $(this).data('instance');
@@ -152,8 +146,10 @@ $(function(){
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
     $('#set_item_code').text(data.attr('data-item-code'));
-    $('#set_total_price').text(data.attr('data-price'));
+    // $('#set_total_price').text(data.attr('data-price'));
+    $('#set_total_price').text(0);
     $('#set_unit_price').text(data.attr('data-price'));
+    // $('#set_unit_price').text(0);
   });
   // click instance for add item set 
   $(document).on('click', '.instance_box', function(event){ 
@@ -179,7 +175,8 @@ $(function(){
       sub_total       = $('#set_total_price').text();
       name            = $(this).data('name');
       price           = $(this).data('price');
-      qty             = $('#set_change_qty').val();
+      // qty             = $('#set_change_qty').val();
+      qty             = document.getElementById("set_count").value;
       total           = qty*price;
       var total_price = +sub_total - +total;
       $(this).removeClass('selected-instance');
@@ -187,21 +184,24 @@ $(function(){
       $(this).removeAttr('data-options');
       $('#instance_option').text('')
     }else {
+
       sub_total       = $('#set_total_price').text();
       name            = $(this).data('name');
       price           = $(this).data('price');
-      qty             = $('#set_change_qty').val();
+      // qty             = $('#set_change_qty').val();
+      qty             = document.getElementById("set_count").value;
       total           = qty*price;
       var total_price = +sub_total + +total;
       $(this).addClass('selected-instance');
     }
+    $('#set_unit_price').text(price);
     $('#set_total_price').text(total_price);
   }); //End selecct attribute buttom
 
   // click add order 
   $(document).on('click', '.set_order', function(event){ 
     total_price   = $('#set_total_price').text();
-    qty           = parseInt($('#set_change_qty').val());
+    qty           = parseInt($('#set_count').val());
     item_code     = $('#set_item_code').text();
     item_name     = $('#set_name').text();
 
@@ -253,6 +253,8 @@ $(function(){
     $('.add_to_order').removeAttr('data-attributes');
     $('.add_to_order').removeAttr('data-options');
 
+    change_qty_plus_minus("count","plus","minus");
+
     data =  $(this).parent().children().children('.add_icon');
 
     $('#total_price').text(data.attr('data-price'));
@@ -273,21 +275,44 @@ $(function(){
     for(var field in instances) { 
       value = instances[field].values;
       $(value).each(function(i){
-        options = value[i];
-        instance_attributes.push(options);
+         options = value[i];
+         instance_attributes.push(options);
+        // $.ajax({
+        //   type: "GET",
+        //   url: '../../api/restaurant/menu_item_attributes/'+value[i],
+        //   data: {id:value[i]},
+        //   success:function(result){
+
+        //     options = result["name"]; 
+        //     instance_attributes.push(options);
+        //   }
+        // });
       });
     }
 
+    // selected_arr = []
+    // $(selected_item).each(function(i){
+    //   $.ajax({
+    //     type: "GET",
+    //     url: '../../api/restaurant/menu_item_attributes/'+selected_item[i],
+    //     data: {id:selected_item[i]},
+    //     success:function(result){
+    //       name = result["name"]; 
+    //       selected_arr.push(name);
+    //     }
+    //   });
+    // });
+
+
     for(var field in attributes) { 
       value = attributes[field]["values"];
       type  = attributes[field]["type"]
-      row = "<h4>"+attributes[field]["type"]+"</h4>"
+      row = "<h4>"+attributes[field]["type"]+"</h4>";
+
       $(value).each(function(i){
         disabled = ""
         status ="";
-        
-        
-        if(parseInt(jQuery.inArray(value[i], selected_item))!== -1){
+        if(parseInt(jQuery.inArray(value[i], selected_item)) !== -1){
           status = "selected-attribute";
         }
         if(parseInt(jQuery.inArray(value[i], instance_attributes)) == -1){
@@ -326,6 +351,8 @@ $(function(){
 
   // click select option icon for add 
   $(document).on('click', '.attribute_btn', function(event){ 
+
+    $('.change_qty').val(1);
     value      = $(this).data('value');
     type       = $(this).data('type');
     instances  = $(this).data('instances');
@@ -345,7 +372,7 @@ $(function(){
     
     var selected_attr = get_selected_attributes('selected-attribute');
 
-    qty = $('#change_qty').val();
+    qty = $('.change_qty').val();
 
     for(var field in instances) { 
       item_attr = instances[field].values;
@@ -652,24 +679,72 @@ $(function(){
    } 
   }); 
 
-  var count   = 1;
-  var countEl = document.getElementById("count");
-  $("#plus").on("click", function(){
-    count++;
-    countEl.value = count;
+  // Get Selected Class
+  function change_qty_plus_minus(id,plus,minus) {
 
-    price = $("#unit_price").text();
-    $("#total_price").text(count*price);
-  });
-  $("#minus").on("click", function(){
-    if (count > 1) {
-      count--;
+    var count   = 1;
+    var countEl = document.getElementById(id);
+
+    $('#'+plus).on("click", function(){
+      
+      count++;
       countEl.value = count;
 
-      price = $("#unit_price").text();
-      $("#total_price").text(count*price);
-    }  
-  })
+
+      if (id == "count") {
+        price = $("#unit_price").text();
+        $("#total_price").text(count*price);
+      }else{
+        var item_row      = $('.selected-instance');
+        price             = $("#set_unit_price").text();
+        set_total_price   = $("#set_total_price").text();
+
+        if (item_row.length > 1) {
+          total = 0 ;
+          $(item_row).each(function(i){
+            total += count * $(item_row[i]).attr('data-price');
+            total_price = total;
+          });
+        }else{
+          total_price     = count*price;
+        }
+        
+        $("#set_total_price").text(total_price);
+      }
+    });
+
+    $('#'+minus).on("click", function(){
+      if (count > 1) {
+        count--;
+        countEl.value = count;
+
+        if (id=="count") {
+          price = $("#unit_price").text();
+          $("#total_price").text(count*price);
+        }else{
+          var item_row      = $('.selected-instance');
+          price             = $("#set_unit_price").text();
+          set_total_price   = $("#set_total_price").text();
+
+          if (item_row.length > 1) {
+            total = 0 ;
+            $(item_row).each(function(i){
+              total += count * $(item_row[i]).attr('data-price');
+              total_price = total;
+            });
+          }else{
+            total_price     = count*price;
+          }
+          $("#set_total_price").text(total_price);
+        }
+      }  
+    })
+  }
+  // $("#set_change_qty").change(function(){
+  //   qty = $(this).val();
+  //   price = $("#set_total_price").text();
+  //   $("#set_total_price").text(qty*price);
+  // }); 
 
  // $(".change_qty").change(function(){
   //   qty = $(this).val();
diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
index 1b6a48d4..37719c37 100644
--- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb
+++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb
@@ -1,9 +1,12 @@
 class Api::Restaurant::MenuItemAttributesController < Api::ApiController
-
+	skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id
   def index
     @menu_attributes = MenuItemAttribute.all
   end
+   def show
+    @attribute = MenuItemAttribute.find(params[:id])
+  end
 end
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 1f9d70f3..6c9127ae 100644
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -30,10 +30,19 @@ class Origami::AddordersController < BaseOrigamiController
     else
       @booking = nil
     end
-
-
   end
 
+  def get_menu_category ()
+    if (params[:id])
+      #Pull this menu
+      @menu = MenuCategory.find_by_id(params[:id])
+      return @menu
+    else
+      MenuCategory.current_menu
+    end
+  end
+  
+
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 1e14fbc5..8fddfa0f 100644
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -127,88 +127,91 @@ class Origami::DiscountsController < BaseOrigamiController
 
   # Member Discount
   def member_discount
-    sale_id = params[:sale_id]
-    # account_types = JSON.parse(params[:account_types])
-    account_types =  Account.where("discount=?",true)
-    sub_total = params[:sub_total]
-    sale      = Sale.find(sale_id)
-    price     = SaleItem.calculate_price_by_accounts(sale.sale_items)
-
-    arr = Array.new;
-
-    account_types.each do |at|
-      price.each do |pc|
-        if pc[:name] == at.title && pc[:price]>0
-           str={type:pc[:name],amount:pc[:price]}
-           arr.push(str)
-        end
-      end 
-    end
-
-    generic_customer_id = sale.customer.membership_id
-
-    receipt_no        = sale.receipt_no
-    membership        = MembershipSetting.find_by_membership_type("paypar_url")
-    memberaction      = MembershipAction.find_by_membership_type("member_discount")
-    merchant_uid      = memberaction.merchant_account_id.to_s
-    campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
-    auth_token        = memberaction.auth_token.to_s
-    url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
-    # Check for items for Paypar Cloud
-    if arr.length > 0
-      begin
-      response        = HTTParty.post(url, 
-                              :body => { account_no: nil,
-                                        generic_customer_id:generic_customer_id ,
-                                         campaign_type_id: campaign_type_id,
-                                         receipt_no: receipt_no,
-                                         merchant_uid:merchant_uid,
-                                         campaign_method:arr.to_json,
-                                         total_sale_transaction_amount: sale.grand_total,
-                                         auth_token:auth_token}.to_json,
-                              :headers => {
-                                  'Content-Type' => 'application/json',
-                                  'Accept'       => 'application/json'
-                       }, :timeout => 10)
-      rescue HTTParty::Error
-        response = {:status=> false, :message => "Can't open membership server " }
-
-      rescue Net::OpenTimeout
-        response = {:status=> false, :message => "Can't open membership server " }
-      rescue OpenURI::HTTPError
-        response = {:status=> false, :message => "Can't open membership server " }
-
-      rescue SocketError
-        response = {:status=> false, :message => "Can't open membership server " }
-      end
-    else 
-      response = {:status=> false, :message => "You have no selected discount item" }
-    end
-  
-    table_id = sale.bookings[0].dining_facility_id
-    table_type = DiningFacility.find(table_id).type
-
-    # Re-calc All Amount in Sale
-    if response["status"] == true
-        discount_amount = response["discount_earned"]
-        if response["discount_bonus_earned"]
-          discount_amount = discount_amount + response["discount_bonus_earned"]
-        end
-        sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
-        result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
-    end
-       
-    if response["status"] == "500"
-        result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
-    end 
-     if !response.nil?
-      if response[:status] == false
-        result = {:status=> response[:message],:title=>"Alert", :table_id => table_id,:table_type => table_type }
-      end
-     end
     
-    render :json => result.to_json
+    sale_id         = params[:sale_id]
+    is_card         = params[:is_card]
+    sub_total       = params[:sub_total]
+    sale            = Sale.find(sale_id)
+
+    # Check for Card Payment
+    is_card_payment = SaleItem.get_sale_payments_by_card(sale.sale_payments)
+   
+    if is_card_payment  != true
+      account_types =  Account.where("discount=?",true)
+      table_id      = sale.bookings[0].dining_facility_id
+      table_type    = DiningFacility.find(table_id).type
+
+      # Get Prices for each accounts (eg: food, beverage)
+      account_price = SaleItem.calculate_price_by_accounts(sale.sale_items)
+      acc_prices    = Array.new;
+
+      account_types.each do |at|
+        account_price.each do |pc|
+          if pc[:name] == at.title && pc[:price]>0
+             str={type:pc[:name],amount:pc[:price]}
+             acc_prices.push(str)
+          end
+        end 
+      end
+
+      generic_customer_id = sale.customer.membership_id
+      receipt_no          = sale.receipt_no
+      membership          = MembershipSetting.find_by_membership_type("paypar_url")
+      memberaction        = MembershipAction.find_by_membership_type("member_discount")
+      merchant_uid        = memberaction.merchant_account_id.to_s
+      campaign_type_id    = memberaction.additional_parameter["campaign_type_id"]
+      auth_token          = memberaction.auth_token.to_s
+      url                 = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+      # Check for items for Paypar Cloud
+      if acc_prices.length > 0
+          begin
+          response        = HTTParty.post(url, 
+                                  :body => { account_no: nil,
+                                            generic_customer_id:generic_customer_id ,
+                                             campaign_type_id: campaign_type_id,
+                                             receipt_no: receipt_no,
+                                             merchant_uid:merchant_uid,
+                                             campaign_method:acc_prices.to_json,
+                                             total_sale_transaction_amount: sale.grand_total,
+                                             is_card: is_card,
+                                             auth_token:auth_token}.to_json,
+                                  :headers => {
+                                      'Content-Type' => 'application/json',
+                                      'Accept'       => 'application/json'
+                           }, :timeout => 10)
+          rescue HTTParty::Error
+            response = {"status": false, "message": "Can't open membership server " }
+
+          rescue Net::OpenTimeout
+            response = {"status": false, "message": "Can't open membership server " }
+          rescue OpenURI::HTTPError
+            response = {"status": false, "message": "Can't open membership server " }
+
+          rescue SocketError
+            response = {"status": false, "message": "Can't open membership server " }
+          end
+      else 
+          response = {"status": false, "message": "You have no selected discount item" }
+      end
+      
+      # Re-calc All Amount in Sale
+      if response["status"] == true
+          discount_amount   = response["discount_earned"]
+          if response["discount_bonus_earned"]
+            discount_amount = discount_amount + response["discount_bonus_earned"]
+          end
+          sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
+          result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
+      elsif response["status"] == "500"
+          result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+      else
+        result = {:status=> response["message"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+      end
+
+      render :json => result.to_json
+
+    end #end Is Card Payment
   end
 
   #discount for selected order
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index 5bed3470..a8b77861 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -17,6 +17,9 @@ class Origami::JcbController < BaseOrigamiController
     end
     @can_jcb = total - @jcbcount - others
 
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 67107167..ba97cad9 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -16,6 +16,9 @@ class Origami::MasterController < BaseOrigamiController
         end
     end
     @can_master = total - @mastercount - others
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 3707d1f4..c9f707e3 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -5,9 +5,10 @@ class Origami::MpuController < BaseOrigamiController
 
     # limit mpu_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total     = sale_data.grand_total
     @mpucount = 0
-    others = 0
+    others    = 0
+
     sale_data.sale_payments.each do |sale_payment|
         if sale_payment.payment_method == "mpu"
           @mpucount = @mpucount + sale_payment.payment_amount
@@ -17,6 +18,9 @@ class Origami::MpuController < BaseOrigamiController
     end
     @can_mpu = total - @mpucount - others
 
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 109138a5..2a9fe5d9 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -75,6 +75,8 @@ class Origami::PaymentsController < BaseOrigamiController
 
   def show
     sale_id = params[:sale_id]
+
+    @member_discount = MembershipSetting.find_by_discount(1)
     
     if Sale.exists?(sale_id)
       @cash = 0.0
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 3cb8cabb..552d960b 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -16,6 +16,9 @@ class Origami::VisaController < BaseOrigamiController
         end
     end
     @can_visa = total - @visacount - others
+    @member_discount = MembershipSetting.find_by_discount(1)
+    @sub_total       = sale_data.total_amount
+    @membership_id   = sale_data.customer.membership_id
   end
 
   def create
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index b8ae456d..c4aae1fa 100644
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -107,7 +107,17 @@ class SaleItem < ApplicationRecord
     return price,type
   end
 
+  # Check for Card Payment
+  def self.get_sale_payments_by_card(sale_payments)
 
+      # Check for Card Payment
+      sale_payments.each do |sp|
+        if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
+          return true;
+        end
+      end
+      
+  end
   # def self.get_overall_discount(sale_id)
   #   price = 0.0
   #   item=SaleItem.where("product_code=?", sale_id)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 4719e546..5f97bcfc 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -263,6 +263,8 @@ class SalePayment < ApplicationRecord
   end
 
   def sale_update_payment_status(paid_amount)
+    puts paid_amount
+    puts "parid Masssssssssssssssssssssssssssssssssssssssss"
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.save!
diff --git a/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder b/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
new file mode 100644
index 00000000..e158f807
--- /dev/null
+++ b/app/views/api/restaurant/menu_item_attributes/show.json.jbuilder
@@ -0,0 +1,8 @@
+if(@attribute)
+  json.id @attribute.id
+  json.type @attribute.attribute_type
+  json.name @attribute.name
+  json.value @attribute.value
+else
+  json.success false
+end
\ No newline at end of file
diff --git a/app/views/origami/addorders/_menu_item.json.jbuilder b/app/views/origami/addorders/_menu_item.json.jbuilder
new file mode 100644
index 00000000..32451524
--- /dev/null
+++ b/app/views/origami/addorders/_menu_item.json.jbuilder
@@ -0,0 +1,117 @@
+# Format for attributes json
+attr_format = []
+# Format for attributes json 
+if item.item_attributes.count > 0   
+  item.item_attributes.each do|attr_id|      
+    menu_attr = MenuItemAttribute.find(attr_id)
+    if attr_format.count == 0
+      attr_format.push({ type: menu_attr.attribute_type, values: [menu_attr.name] })
+      next
+    end
+
+    attr_format.each do |af|
+      if menu_attr.attribute_type.in? attr_format.map {|k| k[:type]}
+        if menu_attr.attribute_type == af[:type]
+          af[:values].push(menu_attr.name)
+        end
+      else 
+        new_attr = {type: menu_attr.attribute_type, values: [ menu_attr.name ] }
+        attr_format.push(new_attr) 
+        break      
+      end          
+    end
+  end
+end
+
+# Format for option json
+opt_format = []
+# Format for attributes json 
+if item.item_options.count > 0   
+  item.item_options.each do|opt|      
+    menu_opt = MenuItemOption.find(opt)
+    if opt_format.count == 0
+      opt_format.push({ type: menu_opt.option_type, values: [menu_opt.name] })
+      next
+    end
+
+    opt_format.each do |of|
+      if menu_opt.option_type.in? opt_format.map {|k| k[:type]}
+        if menu_opt.option_type == of[:type]
+          of[:values].push(menu_opt.name)
+        end
+      else 
+        new_opt = {type: menu_opt.option_type, values: [ menu_opt.name ] }
+        opt_format.push(new_opt) 
+        break
+      end
+    end         
+  end
+end
+
+#Menu Item Information
+json.id           item.id
+json.code    item.item_code
+json.name         item.name
+json.alt_name     item.alt_name
+json.image        item.image_path.url
+json.description  item.description
+json.information  item.information
+json.type         item.type
+json.account_id   item.account_id
+json.min_qty      item.min_qty
+json.is_available item.is_available
+json.is_sub_item  item.is_sub_item
+json.unit         item.unit
+
+# Item Sets of Menu Item 
+json.item_sets item.item_sets do |its|
+  json.id                 its.id
+  json.name               its.name
+  json.alt_name           its.alt_name
+  json.min_selectable_qty its.min_selectable_qty
+  json.max_selectable_qty its.max_selectable_qty
+  json.instances its.menu_item_instances do |i|
+    json.id  i.id
+  end
+end 
+
+json.attributes attr_format
+json.options opt_format
+# json.min_selectable_item item.min_selectable_item
+# json.max_selectable_item item.max_selectable_item
+
+#Item instance
+# if item.menu_item_instances.count == 1 then
+#   item_instance = item.menu_item_instances[0]
+#   json.price = item_instance.price
+#   json.is_available = item_instance.is_available
+#   json.is_on_promotion = item_instance.is_on_promotion
+#   json.promotion_price = item_instance.promotion_price
+#   json.item_attributes = item_instance.item_attributes
+
+json.instances item.menu_item_instances do |is|
+  # Convert id to name for attributes
+  instance_attr = []
+  is.item_attributes.each do |ia|
+     mItemAttr = MenuItemAttribute.find(ia).name
+    instance_attr.push(mItemAttr)
+  end
+  
+    json.id is.id
+    json.code is.item_instance_code
+    json.name is.item_instance_name
+    json.price is.price
+    json.is_available is.is_available
+    json.is_default is.is_default
+    json.is_on_promotion is.is_on_promotion
+    json.promotion_price is.promotion_price
+    json.values instance_attr
+    # json.item_sets is.item_sets
+end
+
+#Child Menu items
+# if (item.children) then
+#   json.set_items item.children.each do |item|
+#     json.partial! 'api/restaurant/menu/menu_item', item: item
+#   end
+# end
\ No newline at end of file
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 4c32390b..34920a1d 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,7 +4,7 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
           <% @menu.each do |menu| %>
-          <li class="nav-item menu_category" data-ref="<%= api_restaurant_menu_category_path menu.id%>">
+          <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
             <p class="hidden menu-id"><%= menu.id  %></p> 
             <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
 
@@ -120,7 +120,7 @@
                                 <span class="glyphicon glyphicon-minus"></span>
                               </button>
                           </span>
-                          <input type="text" value="1" id="count" class="form-control col-md-12 ">
+                          <input type="text" value="1" id="count" class="change_qty form-control col-md-12 ">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-success btn-number" value="+" id="plus">
                                   <span class="glyphicon glyphicon-plus"></span>
@@ -171,10 +171,25 @@
                 <div class="row set-item">
                   <div class="col-md-4">
                   <p style="text-align: center;"> <%= image_tag "logo.png" ,width: '', height: '', :id => 'logo' %></p>
-                      <div class="form-group">
+                      <!-- <div class="form-group">
                         <label class="col-md-6" style="margin-top:5px">Quantity</label>
                         <input type="number" name="qty" class="form-control col-md-5 input-number change_qty" id="set_change_qty" value="" min="1" max="100">
-                      </div> 
+                      </div>  -->
+
+                      <div class="input-group">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-danger btn-number"  value="-" id="set_minus">
+                                <span class="glyphicon glyphicon-minus"></span>
+                              </button>
+                          </span>
+                          <input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 ">
+                          <span class="input-group-btn">
+                              <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
+                                  <span class="glyphicon glyphicon-plus"></span>
+                              </button>
+                          </span>
+                      </div>
+
                         <p class="hidden" id="set_unit_price"></p>
                         <p class="hidden" id="set_instance_code"></p>
                         <p class="hidden" id="set_instance_name"></p>
diff --git a/app/views/origami/addorders/get_menu_category.json.jbuilder b/app/views/origami/addorders/get_menu_category.json.jbuilder
new file mode 100644
index 00000000..8c96a6c7
--- /dev/null
+++ b/app/views/origami/addorders/get_menu_category.json.jbuilder
@@ -0,0 +1,5 @@
+if @menu.menu_items
+    json.menu_items @menu.menu_items do |item|
+		json.partial! 'origami/addorders/menu_item', item: item
+    end
+end
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 378bcbe3..55e649ed 100644
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -510,7 +510,7 @@ $(document).ready(function(){
 		    url: ajax_url,
 		    data: params,
 		    success:function(result){
-
+console.log(result)
 		    	if (result.status == "Success") {
 		    		type   = 'green'
 		    		btn_color = 'btn-green'
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index e9cc09fa..eaf1f07e 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -7,163 +7,197 @@
 				<h2>JCB</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_jcb %>" data-member-value="">
-						</div>
-						<hr>
+		<span class="hidden" id="membership_id"><%= @membership_id%></span>
+		<span class="hidden" id="member_discount"><%= @member_discount%></span>
+		<span class="hidden" id="sub-total"><%= @sub_total%></span>
+		<div class="card" style="margin-top:10px;padding-top:20px;">
+			<div class="rebate-form">
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+						<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_jcb %>" data-member-value="">
 					</div>
-					<% if @jcbcount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent JCB paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@jcbcount %>" data-member-value="">
-						</div>
-						<hr>
+					<hr>
+				</div>
+				<% if @jcbcount != 0 %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Recent JCB paid amount </label>
+						<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@jcbcount %>" data-member-value="">
 					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
+					<hr>
+				</div>
+				<% end %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+						<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+						<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+					</div>
+					<hr>
+				</div>
 			</div>
+		</div>
 	</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+	<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
 
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="jcb_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<div class="row">
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="1" data-type="num">1</div>
+					<div class=" cashier_number left" data-value="2" data-type="num">2</div>
+					<div class=" cashier_number left" data-value="3" data-type="num">3</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="4" data-type="num">4</div>
+					<div class=" cashier_number left" data-value="5" data-type="num">5</div>
+					<div class=" cashier_number left" data-value="6" data-type="num">6</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="7" data-type="num">7</div>
+					<div class=" cashier_number left" data-value="8" data-type="num">8</div>
+					<div class=" cashier_number left" data-value="9" data-type="num">9</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="0" data-type="num">0</div>
+					<div class=" cashier_number left" data-value="." data-type="num">.</div>
+					<div class=" cashier_number left" data-value="00" data-type="num">00</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number green" data-type="nett" >Nett</div>
+					<div class=" cashier_number red left" data-type="del">Del</div>
+					<div class=" cashier_number orange left" data-type="clr">Clr</div>
+				</div>
+			</div>
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+					<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				</div>
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+					<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				</div>
+				<div class="row bottom">
+					<div class="pay purple" id="jcb_pay">Pay</div>
+				</div>
+			</div>
 		</div>
+
+	</div>
+
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+	</div>
 </div>
 
 <script>
-$(document).ready(function() {
+	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
+			else {
+				$('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+	event.stopPropagation();
+	event.preventDefault();
+	if(event.handled !== true) {
+		var original_value;
+		original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+		var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+		var input_type = $(this).attr("data-type");
+		switch (input_type) {
+			case 'num':
+			if (original_value == "0.0"){
+				$('#amount').text(input_value);
+			}else{
+				$('#amount').append(input_value);
+			}
+			break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+			case 'add':
+			var input_value = $(this).attr("data-value");
+			amount = parseInt(input_value) + parseInt(original_value);
+			$('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+			break;
+			case 'clr':
+			$('#amount').html("0.0");
+			break;
+			case 'del' :
+			var cash=$('#amount').text();
+			$('#amount').text(cash.substr(0,cash.length-1));
+			break;
+			case 'nett':
+			var remain_amount = $('#validamount').val();
+			$('#amount').text(remain_amount);
+			break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+		}
+		event.handled = true;
+	} else {
+		return false;
+	}
 });
 
 
-  $('#jcb_pay').on('click',function(){
-    var amount = $('#amount').text();
-    var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+$('#jcb_pay').on('click',function(){
+	var amount = $('#amount').text();
+	var sale_id = "<%= @sale_id %>";
+	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+			//start member discount 5% by pay card	
+			var sub_total = $('#sub-total').text();
+			var member_id = $('#membership_id').text();
+			var member_discount = $('#member_discount').text();
+			if (member_id && member_discount) {
+				$.ajax({
+					type: "POST",
+					url: "/origami/" + sale_id + "/member_discount",
+					data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	              // success:function(result){           
+	              // }
+	          });
+			}
+	    //end member discount
 	    $.ajax({type: "POST",
-	      url: "<%= origami_payment_jcb_path  %>",
-	      data: "amount="+ amount + "&sale_id="+ sale_id,
-	      success:function(result){
-	        if(result){
-	          alert("Payment success")
-	          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	       }
-	      }
+	    	url: "<%= origami_payment_jcb_path  %>",
+	    	data: "amount="+ amount + "&sale_id="+ sale_id,
+	    	success:function(result){
+	    		if(result){
+	    			$.confirm({
+		              title: 'Infomation!',
+		              content: 'Payment Successfully',
+		              buttons: {
+		                confirm: {
+		                text: 'Ok',
+		                btnClass: 'btn-green',
+		                  action: function(){
+		                    window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                  }
+		                }
+		              }
+		            });
+	    		}
+	    	}
 	    });
-		}else{
-			alert("Paid Amount is over!");
-		}
-  })
+	}else{
+		$.alert({
+			title: 'Alert!',
+			content: "Paid Amount is over!",
+			type: 'red',
+			typeAnimated: true,
+			btnClass: 'btn-danger',
+		});
+	}
+})
 </script>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 6afc1081..ab396252 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -7,160 +7,194 @@
 				<h2>Master</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_master %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% if @mastercount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent Master paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mastercount %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
-			</div>
-	</div>
-
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="master_pay">Pay</div>
-           </div>
-         </div>
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card" style="margin-top:10px;padding-top:20px;">
+      <div class="rebate-form">
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_master %>" data-member-value="">
+        </div>
+        <hr>
       </div>
-
+      <% if @mastercount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">Recent Master paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mastercount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
     </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
 
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
-		</div>
+<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+
+ <div class="row">
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="1" data-type="num">1</div>
+       <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+       <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="4" data-type="num">4</div>
+       <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+       <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="7" data-type="num">7</div>
+       <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+       <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="0" data-type="num">0</div>
+       <div class=" cashier_number left" data-value="." data-type="num">.</div>
+       <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number green" data-type="nett" >Nett</div>
+       <div class=" cashier_number red left" data-type="del">Del</div>
+       <div class=" cashier_number orange left" data-type="clr">Clr</div>
+     </div>
+   </div>
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+     </div>
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+     </div>
+     <div class="row bottom">
+       <div class="pay purple" id="master_pay">Pay</div>
+     </div>
+   </div>
+ </div>
+
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+</div>
 </div>
 
 <script>
-$(document).ready(function() {
-		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+  $(document).ready(function() {
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
+     }
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+      var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
 });
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
-    $.ajax({type: "POST",
-      url: "<%= origami_payment_master_path  %>",
-      data: "amount="+ amount + "&sale_id="+ sale_id,
-      success:function(result){
-        if(result){
-          alert("Payment success")
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-       }
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+      //start member discount 5% by pay card  
+      var sub_total = $('#sub-total').text();
+      var member_id = $('#membership_id').text();
+      var member_discount = $('#member_discount').text();
+      if (member_id && member_discount) {
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+                // success:function(result){           
+                // }
+              });
       }
-    });
-	}else{
-		alert("Paid Amount is over!");
-	}
+      //end member discount
+      $.ajax({type: "POST",
+        url: "<%= origami_payment_master_path  %>",
+        data: "amount="+ amount + "&sale_id="+ sale_id,
+        success:function(result){
+          if(result){
+            $.confirm({
+                  title: 'Infomation!',
+                  content: 'Payment Successfully',
+                  buttons: {
+                    confirm: {
+                    text: 'Ok',
+                    btnClass: 'btn-green',
+                      action: function(){
+                        window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                      }
+                    }
+                  }
+                });
+          }
+        }
+      });
+    }else{
+      $.alert({
+        title: 'Alert!',
+        content: "Paid Amount is over!",
+        type: 'red',
+        typeAnimated: true,
+        btnClass: 'btn-danger',
+      });
+    }
   })
 </script>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index e8e25b2f..30d12d35 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -7,160 +7,195 @@
 				<h2>MPU</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-						      	<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_mpu %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-						<% if @mpucount != 0 %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Recent MPU paid amount </label>
-						      	<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mpucount %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-						<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
+		<span class="hidden" id="membership_id"><%= @membership_id%></span>
+		<span class="hidden" id="member_discount"><%= @member_discount%></span>
+		<span class="hidden" id="sub-total"><%= @sub_total%></span>
+		<div class="card" style="margin-top:10px;padding-top:20px;">
+			<div class="rebate-form">
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+						<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_mpu %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<% if @mpucount != 0 %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Recent MPU paid amount </label>
+						<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@mpucount %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<% end %>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+						<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+					</div>
+					<hr>
+				</div>
+				<div class="row">
+					<div class="form-group col-lg-12 col-md-12 col-sm-12">
+						<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+						<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+					</div>
+					<hr>
+				</div>
 			</div>
+		</div>
 	</div>
 
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+	<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
 
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="mpu_pay">Pay</div>
-           </div>
-         </div>
-      </div>
-
-    </div>
-
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+		<div class="row">
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="1" data-type="num">1</div>
+					<div class=" cashier_number left" data-value="2" data-type="num">2</div>
+					<div class=" cashier_number left" data-value="3" data-type="num">3</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="4" data-type="num">4</div>
+					<div class=" cashier_number left" data-value="5" data-type="num">5</div>
+					<div class=" cashier_number left" data-value="6" data-type="num">6</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="7" data-type="num">7</div>
+					<div class=" cashier_number left" data-value="8" data-type="num">8</div>
+					<div class=" cashier_number left" data-value="9" data-type="num">9</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number " data-value="0" data-type="num">0</div>
+					<div class=" cashier_number left" data-value="." data-type="num">.</div>
+					<div class=" cashier_number left" data-value="00" data-type="num">00</div>
+				</div>
+				<div class="row bottom">
+					<div class=" cashier_number green" data-type="nett" >Nett</div>
+					<div class=" cashier_number red left" data-type="del">Del</div>
+					<div class=" cashier_number orange left" data-type="clr">Clr</div>
+				</div>
+			</div>
+			<div class="col-lg-6 col-md-1 col-sm-1">
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+					<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+				</div>
+				<div class="row bottom">
+					<div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+					<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+				</div>
+				<div class="row bottom">
+					<div class="pay purple" id="mpu_pay">Pay</div>
+				</div>
+			</div>
 		</div>
+
+	</div>
+
+	<div class="col-lg-1 col-md-1 col-sm-1">
+		<button type="button" class="btn btn-primary  btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+	</div>
 </div>
 
 <script>
-$(document).ready(function() {
+	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+			else {
+				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
+			}
+		});
+	$(document).on('click', '.cashier_number', function(event){
+		event.stopPropagation();
+		event.preventDefault();
+		if(event.handled !== true) {
+			var original_value;
+			original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+			var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+			var input_type = $(this).attr("data-type");
+			switch (input_type) {
+				case 'num':
+				if (original_value == "0.0"){
+					$('#amount').text(input_value);
+				}else{
+					$('#amount').append(input_value);
+				}
+				break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+				case 'add':
+				var input_value = $(this).attr("data-value");
+				amount = parseInt(input_value) + parseInt(original_value);
+				$('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+				break;
+				case 'clr':
+				$('#amount').html("0.0");
+				break;
+				case 'del' :
+				var cash=$('#amount').text();
+				$('#amount').text(cash.substr(0,cash.length-1));
+				break;
+				case 'nett':
+				var remain_amount = $('#validamount').val();
+				$('#amount').text(remain_amount);
+				break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
-});
-  $('#mpu_pay').on('click',function(){
-    var amount = $('#amount').text();
-    var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
-	    $.ajax({type: "POST",
-	      url: "<%= origami_payment_mpu_path  %>",
-	      data: "amount="+ amount + "&sale_id="+ sale_id,
-	      success:function(result){
-	        if(result){
-	          alert("Payment success")
-	          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-	       }
-	      }
-	    });
-		}else{
-			alert("Paid Amount is over!")
+			}
+			event.handled = true;
+		} else {
+			return false;
 		}
-  })
-</script>
+	});
+	$('#mpu_pay').on('click',function(){
+		var amount = $('#amount').text();
+		var sale_id = "<%= @sale_id %>";
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+		//start member discount 5% by pay card	
+		var sub_total = $('#sub-total').text();
+		var member_id = $('#membership_id').text();
+		var member_discount = $('#member_discount').text();
+		if (member_id && member_discount) {
+			$.ajax({
+				type: "POST",
+				url: "/origami/" + sale_id + "/member_discount",
+				data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	              // success:function(result){           
+	              // }
+	          });
+		}
+	    //end member discount
+	         //Mpu Payment
+	         $.ajax({type: "POST",
+	         	url: "<%= origami_payment_mpu_path  %>",
+	         	data: "amount="+ amount + "&sale_id="+ sale_id,
+	         	success:function(result){
+	         		if(result){
+	    			$.confirm({
+		              title: 'Infomation!',
+		              content: 'Payment Successfully',
+		              buttons: {
+		                confirm: {
+		                text: 'Ok',
+		                btnClass: 'btn-green',
+		                  action: function(){
+		                    window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                  }
+		                }
+		              }
+		            });
+	    		}
+	         	}
+	         });
+	     }else{
+	     	$.alert({
+				title: 'Alert!',
+				content: "Paid Amount is over!",
+				type: 'red',
+				typeAnimated: true,
+				btnClass: 'btn-danger',
+			});
+	     }
+	 })
+	</script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 36c4cc0e..f0298e73 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -1,8 +1,8 @@
 <div id="loading_wrapper" style="display:none;">
-        <div id="loading"></div>
-      </div>
+  <div id="loading"></div>
+</div>
 <div class="row">
-<div class="col-lg-6 col-md-6 col-sm-3">
+  <div class="col-lg-6 col-md-6 col-sm-3">
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
@@ -17,6 +17,8 @@
             </tr>
             <tr>
               <td style="width:50%;"><strong>Customer :</strong> <%= @sale_data.customer.name%></td>
+              <span class="hidden" id="membership_id"><%= @sale_data.customer.membership_id%></span>
+              <span class="hidden" id="member_discount"><%= @member_discount%></span>
               <td style="width:50%;"><strong>Customer ID :</strong> <%= @sale_data.customer.customer_id%></td>
             </tr>
           </table>
@@ -26,82 +28,82 @@
         <div class="card-title">
           <table >
             <!-- <thead> -->
-              <tr>
-                <th style="width:5%">#</th>
-                <th style="width:76%;">Items</th>
-                <th style="width:20%;">QTY</td>
+            <tr>
+              <th style="width:5%">#</th>
+              <th style="width:76%;">Items</th>
+              <th style="width:20%;">QTY</td>
                 <th style="width:20%;">Price</td>
-              </tr>
-            <!-- </thead> -->
-          </table>
-        </div>
-        <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
-          <table class="table" id="append-table">
-            <tbody>
-            <% sub_total = 0
-                count = 0
-            %>
-            <% @sale_data.sale_items.each do |sale_item|
-                count += 1
-               %>
+                </tr>
+                <!-- </thead> -->
+              </table>
+            </div>
+            <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
+              <table class="table" id="append-table">
+                <tbody>
+                  <% sub_total = 0
+                  count = 0
+                  %>
+                  <% @sale_data.sale_items.each do |sale_item|
+                    count += 1
+                    %>
 
-                <% sub_total += sale_item.price%>
-                <tr>
+                    <% sub_total += sale_item.price%>
+                    <tr>
                       <td><%= count %></td>
                       <td style="width:60%; text-align:left">
-                         <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
-                      </td>
-                      <td style="width:20%; text-align:right">
-                        <span id="item-qty"><%=sale_item.qty%></span>
-                      </td>
-                      <td style="width:20%; text-align:right">
-                         <span id="item-total-price"><%=(sale_item.price)%></span>
-                      </td>
-                    </tr>
-              <%end %>
-            </tbody>
-          </table>
-        </div>
-        <div class="card-footer">
-          <table class="table" style="margin-bottom:0px">
-            <tfooter>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Sub Total</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
-              </tr>
-              <tr>
-                <%if @sale_data.discount_type == 'member_discount'%>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Member Discount:</strong></td>
-               <%else%>
-                <td style="width:80%; text-align:left; border-top:none"><strong>(Discount)</strong></td>
-               <%end%>
-                
-                <td style="width:20%; text-align:right; border-top:none"><strong><span>(<%=@sale_data.total_discount rescue 0%>)</span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Tax</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.total_tax rescue 0%></span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Rounding Adj:</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.rounding_adjustment rescue 0%></span></strong></td>
-              </tr>
-              <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong>Grand Total</strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
-              </tr>
-             <%if @balance > 0%>
-             <tr>
-                <td style="width:80%; text-align:left; border-top:none"><strong><%= @accountable_type %></strong></td>
-                <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@balance%></span></strong></td>
-              </tr>
-              <% end %>
-            </tfooter>
-          </table>
-        </div>
-        <div style='text-align:center;margin-top:20px'>
+                       <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
+                     </td>
+                     <td style="width:20%; text-align:right">
+                      <span id="item-qty"><%=sale_item.qty%></span>
+                    </td>
+                    <td style="width:20%; text-align:right">
+                     <span id="item-total-price"><%=(sale_item.price)%></span>
+                   </td>
+                 </tr>
+                 <%end %>
+               </tbody>
+             </table>
+           </div>
+           <div class="card-footer">
+            <table class="table" style="margin-bottom:0px">
+              <tfooter>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Sub Total</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span id="sub-total"><%=sub_total%></span></strong></td>
+                </tr>
+                <tr>
+                  <%if @sale_data.discount_type == 'member_discount'%>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Member Discount:</strong></td>
+                  <%else%>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>(Discount)</strong></td>
+                  <%end%>
+
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span>(<%=@sale_data.total_discount rescue 0%>)</span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Tax</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.total_tax rescue 0%></span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Rounding Adj:</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.rounding_adjustment rescue 0%></span></strong></td>
+                </tr>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong>Grand Total</strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
+                </tr>
+                <%if @balance > 0%>
+                <tr>
+                  <td style="width:80%; text-align:left; border-top:none"><strong><%= @accountable_type %></strong></td>
+                  <td style="width:20%; text-align:right; border-top:none"><strong><span><%=@balance%></span></strong></td>
+                </tr>
+                <% end %>
+              </tfooter>
+            </table>
+          </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="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
         </div>
       </div>
     </div>
@@ -123,159 +125,159 @@
       <div class="col-md-4" id="credit"><%= @credit %></div>
     </div>
     <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
-      <div class="row payment other-payment-color" id="card_payment" >
-        <div class="col-md-8">Other Payments</div>
-        <div class="col-md-4" id="others"><%= @other %></div>
-      </div>
+    <div class="row payment other-payment-color" id="card_payment" >
+      <div class="col-md-8">Other Payments</div>
+      <div class="col-md-4" id="others"><%= @other %></div>
+    </div>
     <% else %>
-      <div class="row payment other-payment-color" id="card_payment"  >
-        <div class="col-md-12">Other Payments</div>
-      </div>
+    <div class="row payment other-payment-color" id="card_payment"  >
+      <div class="col-md-12">Other Payments</div>
+    </div>
     <% end %>
 
-       <!-- mpu -->
-      <% if @other != 0.0 %>
-        <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others"><%= @other %></div>
-        </div>
-      <% else %>
-        <div class="row" style="display:none">
-          <div class="col-md-5"></div>
-          <div class="col-md-3">MPU</div>
-          <div class="col-md-4" id="others">0.0</div>
-        </div>
-      <% end %>
-      <!-- paypar -->
-      <% if @ppamount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Redeem</div>
-        <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Redeem</div>
-        <div class="col-md-4" id="ppamount">0.0</div>
-      </div>
-      <% end %>
-      <!-- Visa -->
-      <% if @visacount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Visa</div>
-        <div class="col-md-4" id="visacount"><%= @visacount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Visa</div>
-        <div class="col-md-4" id="visacount">0.0</div>
-      </div>
-      <% end %>
-      <!-- JCB -->
-      <% if @jcbcount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">JCB</div>
-        <div class="col-md-4" id="jcbcount"><%= @jcbcount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">JCB</div>
-        <div class="col-md-4" id="jcbcount">0.0</div>
-      </div>
-      <% end %>
-      <!-- Master -->
-      <% if @mastercount != 0.0 %>
-      <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Master</div>
-        <div class="col-md-4" id="mastercount"><%= @mastercount %></div>
-      </div>
-      <% else %>
-      <div class="row" style="display:none">
-        <div class="col-md-5"></div>
-        <div class="col-md-3">Master</div>
-        <div class="col-md-4" id="mastercount">0.0</div>
-      </div>
-      <% end %>
-      <br>
+    <!-- mpu -->
+    <% if @other != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">MPU</div>
+      <div class="col-md-4 mpu is_card" id="others"><%= @other %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">MPU</div>
+      <div class="col-md-4" id="others">0.0</div>
+    </div>
+    <% end %>
+    <!-- paypar -->
+    <% if @ppamount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Redeem</div>
+      <div class="col-md-4" id="ppamount"><%= @ppamount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Redeem</div>
+      <div class="col-md-4" id="ppamount">0.0</div>
+    </div>
+    <% end %>
+    <!-- Visa -->
+    <% if @visacount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Visa</div>
+      <div class="col-md-4 visa is_card" id="visacount"><%= @visacount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Visa</div>
+      <div class="col-md-4" id="visacount">0.0</div>
+    </div>
+    <% end %>
+    <!-- JCB -->
+    <% if @jcbcount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">JCB</div>
+      <div class="col-md-4 jcb is_card" id="jcbcount"><%= @jcbcount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">JCB</div>
+      <div class="col-md-4" id="jcbcount">0.0</div>
+    </div>
+    <% end %>
+    <!-- Master -->
+    <% if @mastercount != 0.0 %>
+    <div class="row payment other-payment-color"  style="line-height:30px;height: 30px;margin-bottom: 0px;">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Master</div>
+      <div class="col-md-4 master is_card" id="mastercount"><%= @mastercount %></div>
+    </div>
+    <% else %>
+    <div class="row" style="display:none">
+      <div class="col-md-5"></div>
+      <div class="col-md-3">Master</div>
+      <div class="col-md-4" id="mastercount">0.0</div>
+    </div>
+    <% end %>
+    <br>
     <div class="row">
       <div class="col-md-8"><strong style="font-size:18px;">Balance</strong></div>
       <div class="col-md-4"><strong style="font-size:18px;"><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
     </div>
     <br>
 
-      <div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett">Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="pay">Pay</div>
-           </div>
-         </div>
-      </div>
+    <div class="row">
+     <div class="col-lg-6 col-md-1 col-sm-1">
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="1" data-type="num">1</div>
+         <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+         <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="4" data-type="num">4</div>
+         <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+         <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="7" data-type="num">7</div>
+         <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+         <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number " data-value="0" data-type="num">0</div>
+         <div class=" cashier_number left" data-value="." data-type="num">.</div>
+         <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+       </div>
+       <div class="row bottom">
+         <div class=" cashier_number green" data-type="nett">Nett</div>
+         <div class=" cashier_number red left" data-type="del">Del</div>
+         <div class=" cashier_number orange left" data-type="clr">Clr</div>
+       </div>
+     </div>
+     <div class="col-lg-6 col-md-1 col-sm-1">
+       <div class="row bottom">
+         <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+         <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+       </div>
+       <div class="row bottom">
+         <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+         <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+       </div>
+       <div class="row bottom">
+         <div class="pay purple" id="pay">Pay</div>
+       </div>
+     </div>
+   </div>
 
-  </div>
-  <div class="col-lg-1 col-md-1 col-sm-1">
-    <!-- Waiter Buttons -->
+ </div>
+ <div class="col-lg-1 col-md-1 col-sm-1">
+  <!-- Waiter Buttons -->
 
-    <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
-    <button type="button" class="btn btn-primary btn-block" id="foc"> FOC </button>
-    <button type="button" class="btn btn-primary btn-block" id="void"> Void </button>
-  </div>
+  <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
+  <button type="button" class="btn btn-primary btn-block" id="foc"> FOC </button>
+  <button type="button" class="btn btn-primary btn-block" id="void"> Void </button>
+</div>
 
 
-  </div>
+</div>
 
 <script>
-$(document).ready(function(){
-  if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-  else {
-    $('#cash').text(localStorage.getItem("cash"));
-  }
-  update_balance();
-})
+  $(document).ready(function(){
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+      else {
+        $('#cash').text(localStorage.getItem("cash"));
+      }
+      update_balance();
+    })
 
-$(document).on('click', '.cashier_number', function(event){
-  if(event.handled !== true) {
+  $(document).on('click', '.cashier_number', function(event){
+    if(event.handled !== true) {
       var original_value;
       original_value = $('#cash').text();
 
@@ -293,79 +295,86 @@ $(document).on('click', '.cashier_number', function(event){
         }
         break;
         case 'add':
-          var input_value = $(this).attr("data-value");
-          amount = parseInt(input_value) + parseInt(original_value);
-          $('#cash').text(amount);
-          update_balance();
+        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();
-          if(cash.length == 1)
-            $('#cash').text("0.0");
-          else
-            $('#cash').text(cash.substr(0,cash.length-1));
-          update_balance();
+        var cash=$('#cash').text();
+        if(cash.length == 1)
+          $('#cash').text("0.0");
+        else
+          $('#cash').text(cash.substr(0,cash.length-1));
+        update_balance();
         break;
         case 'clr':
-           $('#cash').text("0.0");
-           update_balance();
+        $('#cash').text("0.0");
+        update_balance();
         break;
         case 'nett':
-          var credit1 = $('#credit').text();
-          var card1 = $('#others').text();
-          var paypar1 = $('#ppamount').text();
-          var visa1 = $('#visacount').text();
-          var jcb1 = $('#jcbcount').text();
-          var master1 = $('#mastercount').text();
-          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
-          var total = $('#amount_due').text();
-          var amt = parseFloat(total) - othertotal;
-          $('#cash').text(amt);
-          update_balance();
+        var credit1 = $('#credit').text();
+        var card1 = $('#others').text();
+        var paypar1 = $('#ppamount').text();
+        var visa1 = $('#visacount').text();
+        var jcb1 = $('#jcbcount').text();
+        var master1 = $('#mastercount').text();
+        var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
+        var total = $('#amount_due').text();
+        var amt = parseFloat(total) - othertotal;
+        $('#cash').text(amt);
+        update_balance();
         break;
-    }
+      }
       event.handled = true;
     } else {
-        return false;
+      return false;
     }
-});
+  });
 
-$( document ).ready(function() {
+  $( document ).ready(function() {
   // Disable click event cash to prevent
   $(".payment .cash-color").off('click');
 
   $('#credit_payment').click(function() {
     var sale_id = $('#sale_id').text();
-     window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
-     return false;
- });
+    window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+    return false;
+  });
 
- $('#card_payment').click(function() {
+  $('#card_payment').click(function() {
    localStorage.setItem("cash",$('#cash').text() );
    var sale_id = $('#sale_id').text();
-    window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
-    return false;
+   window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+   return false;
  });
 
- $('#pay').click(function() {
+  $('#pay').click(function() {
     $('#pay').text("Processing, Please wait!")
 
-      $( "#loading_wrapper" ).show();
+    $( "#loading_wrapper" ).show();
+
+    if($('#balance').text() > 0){
+      alert(" Insufficient Amount!")
+      $( "#loading_wrapper" ).hide();
+    }else{
+      var sale_id   = $('#sale_id').text();
+      var item_row  = $('.is_card');
+      if (item_row.length < 1) {
+        calculate_member_discount(sale_id);
+      }
 
-     if($('#balance').text() > 0){
-        alert(" Insufficient Amount!")
-        $( "#loading_wrapper" ).hide();
-     }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_cash_path %>",
           data: "cash="+ cash + "&sale_id=" + sale_id,
+          async: false,
           success:function(result){
+
             localStorage.removeItem("cash");             
             if (result.status) {
               var msg = result.message;
@@ -380,24 +389,23 @@ $( document ).ready(function() {
                 content: 'Changed amount  ' + $('#balance').text() * (-1),
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
                   }
                 }
               });
-            }
-            else{         
+            }else{         
               $('#pay').text("Pay")
               $.confirm({
                 title: 'Infomation!',
                 content: 'Thank you !',
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
@@ -408,75 +416,91 @@ $( document ).ready(function() {
           }
         });
       }
- });
+    });
 
-$('#void').on('click',function () {
+  $('#void').on('click',function () {
     var sure = confirm("Are you sure want to Void");
     if (sure == true) {
-        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/';
-            }
-        })
+      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 {
 
     }
-});
+  });
 
 });
 
-function update_balance(){
-  var cash = $('#cash').text();
-  var credit = $('#credit').text();
-  var card = $('#others').text();
-  var paypar = $('#ppamount').text();
-  var visa = $('#visacount').text();
-  var jcb = $('#jcbcount').text();
-  var master = $('#mastercount').text();
-  var amount_due = $('#amount_due').text();
-  var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
-  var result = amount_due - total;
-  $('#balance').text(result.toFixed(2));
-}
+  function update_balance(){
+    var cash = $('#cash').text();
+    var credit = $('#credit').text();
+    var card = $('#others').text();
+    var paypar = $('#ppamount').text();
+    var visa = $('#visacount').text();
+    var jcb = $('#jcbcount').text();
+    var master = $('#mastercount').text();
+    var amount_due = $('#amount_due').text();
+    var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
+    var result = amount_due - total;
+    $('#balance').text(result.toFixed(2));
+  }
 
-$('#foc').click(function() {
-
-      $( "#loading_wrapper" ).show();
+  $('#foc').click(function() {
+    $( "#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",
           url: "<%= origami_payment_foc_path %>",
           data: params,
           success:function(result){          
-          
+
             $( "#loading_wrapper" ).hide();
             
-              if (cash > 0) {
-                $.confirm({
+            if (cash > 0) {
+              $.confirm({
                 title: 'Infomation!',
                 content: 'Thank you !',
                 buttons: {
                   confirm: {
-                  text: 'Ok',
-                  btnClass: 'btn-green',
+                    text: 'Ok',
+                    btnClass: 'btn-green',
                     action: function(){
                       window.location.href = '/origami';
                     }
                   }
                 }
               });
-              }
+            }
             
           }
         });
+  });
+  
+  function calculate_member_discount(sale_id) {
+   var sub_total = $('#sub-total').text();
+   var member_id = $('#membership_id').text();
+   var member_discount = $('#member_discount').text();
 
- });
+   if (member_id && member_discount) {
+    $.ajax({
+      type: "POST",
+      url: "/origami/" + sale_id + "/member_discount",
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+      async: false,
+      success:function(result){ 
 
+      }
+    });
+  }
+}
 </script>
\ No newline at end of file
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 1589ca1b..073b7e60 100644
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -7,160 +7,194 @@
 				<h2>VISA</h2>
 			</div>
 		</div>
-			<div class="card" style="margin-top:10px;padding-top:20px;">
-				<div class="rebate-form">
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
-									<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_visa %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% if @visacount != 0 %>
-					<div class="row">
-						<div class="form-group col-lg-12 col-md-12 col-sm-12">
-								<label class="col-lg-4 col-md-4 col-sm-4">Recent Visa paid amount </label>
-									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@visacount %>" data-member-value="">
-						</div>
-						<hr>
-					</div>
-					<% end %>
-		    		<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
-						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
-			    		</div>
-			    		<hr>
-			    	</div>
-			    	<div class="row">
-			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
-			      			<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-			    		</div>
-			    		<hr>
-			    	</div>
-		    	</div>
-			</div>
-	</div>
-
-    <div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
-
-    	<div class="row">
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="4" data-type="num">4</div>
-             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
-             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="7" data-type="num">7</div>
-             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
-             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number " data-value="0" data-type="num">0</div>
-             <div class=" cashier_number left" data-value="." data-type="num">.</div>
-             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
-           </div>
-           <div class="row bottom">
-             <div class=" cashier_number green" data-type="nett" >Nett</div>
-             <div class=" cashier_number red left" data-type="del">Del</div>
-             <div class=" cashier_number orange left" data-type="clr">Clr</div>
-           </div>
-         </div>
-         <div class="col-lg-6 col-md-1 col-sm-1">
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-           </div>
-           <div class="row bottom">
-             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
-             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
-           </div>
-           <div class="row bottom">
-             <div class="pay purple" id="visa_pay">Pay</div>
-           </div>
-         </div>
+    <span class="hidden" id="membership_id"><%= @membership_id%></span>
+    <span class="hidden" id="member_discount"><%= @member_discount%></span>
+    <span class="hidden" id="sub-total"><%= @sub_total%></span>
+    <div class="card" style="margin-top:10px;padding-top:20px;">
+      <div class="rebate-form">
+       <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
+          <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@can_visa %>" data-member-value="">
+        </div>
+        <hr>
       </div>
-
+      <% if @visacount != 0 %>
+      <div class="row">
+        <div class="form-group col-lg-12 col-md-12 col-sm-12">
+          <label class="col-lg-4 col-md-4 col-sm-4">Recent Visa paid amount </label>
+          <input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@visacount %>" data-member-value="">
+        </div>
+        <hr>
+      </div>
+      <% end %>
+      <div class="row">
+       <div class="form-group col-lg-12 col-md-12 col-sm-12">
+        <label class="col-lg-4 col-md-4 col-sm-4">Reference Number</label>
+        <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
+      </div>
+      <hr>
     </div>
+    <div class="row">
+     <div class="form-group col-lg-12 col-md-12 col-sm-12">
+      <label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
+      <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+    </div>
+    <hr>
+  </div>
+</div>
+</div>
+</div>
 
-		<div class="col-lg-1 col-md-1 col-sm-1">
-			<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
-		</div>
+<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
+
+ <div class="row">
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="1" data-type="num">1</div>
+       <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+       <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="4" data-type="num">4</div>
+       <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+       <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="7" data-type="num">7</div>
+       <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+       <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number " data-value="0" data-type="num">0</div>
+       <div class=" cashier_number left" data-value="." data-type="num">.</div>
+       <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+     </div>
+     <div class="row bottom">
+       <div class=" cashier_number green" data-type="nett" >Nett</div>
+       <div class=" cashier_number red left" data-type="del">Del</div>
+       <div class=" cashier_number orange left" data-type="clr">Clr</div>
+     </div>
+   </div>
+   <div class="col-lg-6 col-md-1 col-sm-1">
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
+       <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
+     </div>
+     <div class="row bottom">
+       <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+       <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
+     </div>
+     <div class="row bottom">
+       <div class="pay purple" id="visa_pay">Pay</div>
+     </div>
+   </div>
+ </div>
+
+</div>
+
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
+</div>
 </div>
 
 <script>
-$(document).ready(function() {
-		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-	  else {
-	    $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
-	  }
-});
-$(document).on('click', '.cashier_number', function(event){
-        event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
-            var original_value;
-            original_value = $('#amount').text();
+  $(document).ready(function() {
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+     else {
+       $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
+     }
+   });
+  $(document).on('click', '.cashier_number', function(event){
+    event.stopPropagation();
+    event.preventDefault();
+    if(event.handled !== true) {
+      var original_value;
+      original_value = $('#amount').text();
 
-            var input_value = $(this).attr("data-value");
+      var input_value = $(this).attr("data-value");
 
-            var input_type = $(this).attr("data-type");
-            	switch (input_type) {
-              		case 'num':
-		              	if (original_value == "0.0"){
-			                $('#amount').text(input_value);
-			            }else{
-			                $('#amount').append(input_value);
-			            }
-              		break;
+      var input_type = $(this).attr("data-type");
+      switch (input_type) {
+        case 'num':
+        if (original_value == "0.0"){
+         $('#amount').text(input_value);
+       }else{
+         $('#amount').append(input_value);
+       }
+       break;
 
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#amount').html(amount);
+       case 'add':
+       var input_value = $(this).attr("data-value");
+       amount = parseInt(input_value) + parseInt(original_value);
+       $('#amount').html(amount);
 
-             		break;
-             		case 'clr':
-             			$('#amount').html("0.0");
-             		break;
-             		case 'del' :
-			          var cash=$('#amount').text();
-			          $('#amount').text(cash.substr(0,cash.length-1));
-								break;
-								case 'nett':
-								var remain_amount = $('#validamount').val();
-								$('#amount').text(remain_amount);
-			        break;
+       break;
+       case 'clr':
+       $('#amount').html("0.0");
+       break;
+       case 'del' :
+       var cash=$('#amount').text();
+       $('#amount').text(cash.substr(0,cash.length-1));
+       break;
+       case 'nett':
+       var remain_amount = $('#validamount').val();
+       $('#amount').text(remain_amount);
+       break;
 
-          		}
-          	event.handled = true;
-        } else {
-            return false;
-        }
+     }
+     event.handled = true;
+   } else {
+    return false;
+  }
 });
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
-    $.ajax({type: "POST",
-      url: "<%= origami_payment_visa_path  %>",
-      data: "amount="+ amount + "&sale_id="+ sale_id,
-      success:function(result){
-        if(result){
-          alert("Payment success")
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
-       }
+    if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
+      //start member discount 5% by pay card  
+      var sub_total = $('#sub-total').text();
+      var member_id = $('#membership_id').text();
+      var member_discount = $('#member_discount').text();
+      if (member_id && member_discount) {
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+                // success:function(result){           
+                // }
+        });
       }
-    });
-	}else{
-		alert("Paid Amount is over!");
-	}
+      //end member discount
+      $.ajax({type: "POST",
+        url: "<%= origami_payment_visa_path  %>",
+        data: "amount="+ amount + "&sale_id="+ sale_id,
+        success:function(result){
+          if(result){
+            $.confirm({
+                  title: 'Infomation!',
+                  content: 'Payment Successfully',
+                  buttons: {
+                    confirm: {
+                    text: 'Ok',
+                    btnClass: 'btn-green',
+                      action: function(){
+                        window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                      }
+                    }
+                  }
+                });
+          }
+        }
+      });
+    }else{
+      $.alert({
+        title: 'Alert!',
+        content: "Paid Amount is over!",
+        type: 'red',
+        typeAnimated: true,
+        btnClass: 'btn-danger',
+      });
+    }
   })
 </script>
diff --git a/config/routes.rb b/config/routes.rb
index 6ac723aa..70accbb2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,7 +33,7 @@ Rails.application.routes.draw do
       resources :menu, only: [:index, :show]
       resources :menu_categories, only: [:index, :show]
       resources :menu_items, only: [:index, :show]
-      resources :menu_item_attributes, only: [:index]
+      resources :menu_item_attributes, only: [:index, :show]
       resources :menu_item_options, only: [:index]
       resources :menu_sold_out, only: [:index]
       resources :menu_item_instances, only: [:show]
@@ -178,8 +178,9 @@ Rails.application.routes.draw do
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
-     get '/:addorders/:id' => "addorders#detail"
-     post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    get '/:addorders/:id' => "addorders#detail"
+    post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
 
     resources :commissions
     resources :commissioners